Changeset 470 in vbox

Timestamp:

Jan 31, 2007 4:14:04 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18068

Message:

Main/Frontends: Changed all interface attributes and method parameters that used to use ULONG to pass pointers around; they now use BYTE * for this purpose (should fix problems for 64-bit targets).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxSDL/Framebuffer.cpp (modified) (4 diffs)
• Frontends/VBoxSDL/Framebuffer.h (modified) (3 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (6 diffs)
• Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxFBDDRAW.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxFrameBuffer.cpp (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/DisplayImpl.cpp (modified) (12 diffs)
• Main/FramebufferImpl.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (7 diffs)
• Main/include/DisplayImpl.h (modified) (2 diffs)
• Main/include/FramebufferImpl.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -258 +258 @@
  * @param   address Pointer to result variable.
  */
-STDMETHODIMP VBoxSDLFB::COMGETTER(Address)(ULONG *address)
+STDMETHODIMP VBoxSDLFB::COMGETTER(Address)(BYTE **address)
 {
     LogFlow(("VBoxSDLFB::GetAddress\n"));
@@ -266 +266 @@
     if (mSurfVRAM)
     {
-        *address = (uintptr_t)mSurfVRAM->pixels;
+        *address = (BYTE *) mSurfVRAM->pixels;
     }
     else
@@ -424 +424 @@
  *                      continuing with display updates.
  */
-STDMETHODIMP VBoxSDLFB::RequestResize(FramebufferPixelFormat_T pixelFormat, ULONG vram, ULONG lineSize, ULONG w, ULONG h,
-                                      BOOL *finished)
+STDMETHODIMP VBoxSDLFB::RequestResize(FramebufferPixelFormat_T pixelFormat, BYTE *vram,
+                                      ULONG lineSize, ULONG w, ULONG h, BOOL *finished)
 {
     LogFlow(("VBoxSDLFB::RequestResize: w = %d, h = %d, pixelFormat: %d, vram = %p, lineSize = %d\n",
@@ -443 +443 @@
     mGuestYRes = h;
     mPixelFormat = pixelFormat;
-    mPtrVRAM = (void *)vram;
+    mPtrVRAM = vram;
     mLineSize = lineSize;
 

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -89 +89 @@
     STDMETHOD(Lock)();
     STDMETHOD(Unlock)();
-    STDMETHOD(COMGETTER(Address))(ULONG *address);
+    STDMETHOD(COMGETTER(Address))(BYTE **address);
     STDMETHOD(COMGETTER(ColorDepth))(ULONG *colorDepth);
     STDMETHOD(COMGETTER(LineSize))(ULONG *lineSize);
@@ -98 +98 @@
     STDMETHOD(NotifyUpdate)(ULONG x, ULONG y,
                             ULONG w, ULONG h, BOOL *finished);
-    STDMETHOD(RequestResize)(FramebufferPixelFormat_T pixelFormat, ULONG vram, ULONG lineSize, ULONG w, ULONG h,
-                             BOOL *finished);
+    STDMETHOD(RequestResize)(FramebufferPixelFormat_T pixelFormat, BYTE *vram,
+                             ULONG lineSize, ULONG w, ULONG h, BOOL *finished);
     STDMETHOD(OperationSupported)(FramebufferAccelerationOperation_T operation, BOOL *supported);
     STDMETHOD(VideoModeSupported)(ULONG width, ULONG height, ULONG bpp, BOOL *supported);
@@ -179 +179 @@
     SDL_Surface *mSurfVRAM;
 
-    void *mPtrVRAM;
+    BYTE *mPtrVRAM;
     ULONG mLineSize;
     FramebufferPixelFormat_T mPixelFormat;

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -387 +387 @@
 
     STDMETHOD(OnMousePointerShapeChange) (BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
-                                          ULONG width, ULONG height, ULONG shape)
+                                          ULONG width, ULONG height, BYTE *shape)
     {
         PointerShapeChangeData *data;
         data = new PointerShapeChangeData (visible, alpha, xHot, yHot, width, height,
-                                           (const uint8_t *) shape);
+                                           shape);
         Assert (data);
         if (!data)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

@@ -73 +73 @@
 {
 public:
-    VBoxResizeEvent (FramebufferPixelFormat_T f, void *v, unsigned l, int w, int h) :
+    VBoxResizeEvent (FramebufferPixelFormat_T f, uchar *v, unsigned l, int w, int h) :
         QEvent ((QEvent::Type) VBoxDefs::ResizeEventType), fmt (f), vr (v), lsz (l), wdt (w), hgt (h) {}
     FramebufferPixelFormat_T  pixelFormat() { return fmt; }
-    void *vram() { return vr; }
+    uchar *vram() { return vr; }
     unsigned lineSize() { return lsz; }
     int width() { return wdt; }
@@ -82 +82 @@
 private:
     FramebufferPixelFormat_T fmt;
-    void *vr;
+    uchar *vr;
     unsigned lsz;
     int wdt;
@@ -204 +204 @@
 
     // IFramebuffer COM methods
-    STDMETHOD(COMGETTER(Address)) (ULONG *aAddress);
+    STDMETHOD(COMGETTER(Address)) (BYTE **aAddress);
     STDMETHOD(COMGETTER(Width)) (ULONG *aWidth);
     STDMETHOD(COMGETTER(Height)) (ULONG *aHeight);
@@ -217 +217 @@
 
     STDMETHOD(RequestResize) (FramebufferPixelFormat_T aPixelFormat,
-                              ULONG aVRAM, ULONG aLineSize,
+                              BYTE *aVRAM, ULONG aLineSize,
                               ULONG aWidth, ULONG aHeight,
                               BOOL *aFinished);
@@ -362 +362 @@
     SDL_Surface *mSurfVRAM;
 
-    void *mPtrVRAM;
+    uchar *mPtrVRAM;
     ULONG mLineSize;
     FramebufferPixelFormat_T mPixelFormat;
@@ -397 +397 @@
     void releaseObjects();
 
-    void setupSurface (FramebufferPixelFormat_T pixelFormat, void *pvVRAM, ULONG lineSize, ULONG w, ULONG h);
-    void recreateSurface (FramebufferPixelFormat_T pixelFormat, void *pvVRAM, ULONG lineSize, ULONG w, ULONG h);
+    void setupSurface (FramebufferPixelFormat_T pixelFormat, uchar *pvVRAM, ULONG lineSize, ULONG w, ULONG h);
+    void recreateSurface (FramebufferPixelFormat_T pixelFormat, uchar *pvVRAM, ULONG lineSize, ULONG w, ULONG h);
     void deleteSurface ();
     void drawRect (ULONG x, ULONG y, ULONG w, ULONG h);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -258 +258 @@
                                           ULONG xhot, ULONG yhot,
                                           ULONG width, ULONG height,
-                                          ULONG shape)
+                                          BYTE *shape)
     {
         QApplication::postEvent (
             view, new MousePointerChangeEvent (visible, alpha, xhot, yhot,
                                                width, height,
-                                               (const uchar*) shape)
+                                               shape)
         );
         return S_OK;
@@ -1785 +1785 @@
                 QImage shot = QImage (fb->width(), fb->height(), 32, 0);
                 CDisplay dsp = cconsole.GetDisplay();
-                dsp.TakeScreenShot ((uintptr_t) shot.bits(),
-                                    shot.width(), shot.height());
+                dsp.TakeScreenShot (shot.bits(), shot.width(), shot.height());
                 /*
                  *  TakeScreenShot() may fail if, e.g. the Paused notification

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBDDRAW.cpp

@@ -279 +279 @@
  * and VBoxDDRAWFrameBuffer::mPixelFormat to format of the created surface.
  */
-void VBoxDDRAWFrameBuffer::setupSurface (FramebufferPixelFormat_T pixelFormat, void *pvVRAM, ULONG lineSize, ULONG w, ULONG h)
+void VBoxDDRAWFrameBuffer::setupSurface (FramebufferPixelFormat_T pixelFormat, uchar *pvVRAM, ULONG lineSize, ULONG w, ULONG h)
 {
     /* Check requested pixel format. */
@@ -315 +315 @@
  * the requested format is supported and the surface was successfully created.
  */
-void VBoxDDRAWFrameBuffer::recreateSurface (FramebufferPixelFormat_T pixelFormat, void *pvVRAM, ULONG lineSize, ULONG w, ULONG h)
+void VBoxDDRAWFrameBuffer::recreateSurface (FramebufferPixelFormat_T pixelFormat, uchar *pvVRAM, ULONG lineSize, ULONG w, ULONG h)
 {
     HRESULT rc;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp

@@ -59 +59 @@
 // Just forwarders to relevant class methods.
 
-STDMETHODIMP VBoxFrameBuffer::COMGETTER(Address) (ULONG *aAddress)
+STDMETHODIMP VBoxFrameBuffer::COMGETTER(Address) (BYTE **aAddress)
 {
     if (!aAddress)
         return E_POINTER;
-    *aAddress = (uintptr_t) address();
+    *aAddress = address();
     return S_OK;
 }
@@ -140 +140 @@
 /** @note This method is called on EMT from under this object's lock */
 STDMETHODIMP VBoxFrameBuffer::RequestResize (FramebufferPixelFormat_T aPixelFormat,
-                                             ULONG aVRAM, ULONG aLineSize,
+                                             BYTE *aVRAM, ULONG aLineSize,
                                              ULONG aWidth, ULONG aHeight,
                                              BOOL *aFinished)
 {
     QApplication::postEvent (mView,
-                             new VBoxResizeEvent (aPixelFormat, (void *) aVRAM,
+                             new VBoxResizeEvent (aPixelFormat, aVRAM,
                                                   aLineSize, aWidth, aHeight));
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3253 +3253 @@
     CallbackList::iterator it = mCallbacks.begin();
     while (it != mCallbacks.end())
-        (*it++)->OnMousePointerShapeChange(fVisible, fAlpha, xHot, yHot, width, height, (ULONG)pShape);
+        (*it++)->OnMousePointerShapeChange (fVisible, fAlpha, xHot, yHot,
+                                            width, height, (BYTE *) pShape);
 }
 

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -197 +197 @@
     RTSemEventMultiReset(mResizeSem);
 
-    mFramebuffer->RequestResize (pixelFormat, (ULONG)pvVRAM, cbLine, w, h, &finished);
+    mFramebuffer->RequestResize (pixelFormat, (BYTE *) pvVRAM, cbLine, w, h, &finished);
 
     if (!finished)
@@ -270 +270 @@
 
         /* Framebuffer successfully set the requested format. */
-        ULONG address;
+        BYTE *address;
         mFramebuffer->COMGETTER(Address) (&address);
 
@@ -282 +282 @@
         uint32_t cbBuffer = cbLine * h;
 
-        int rc = mpDrv->pUpPort->pfnSetupVRAM (mpDrv->pUpPort, (void *)address, cbBuffer);
+        int rc = mpDrv->pUpPort->pfnSetupVRAM (mpDrv->pUpPort, address, cbBuffer);
 
         if (VBOX_FAILURE(rc))
@@ -1214 +1214 @@
 }
 
-STDMETHODIMP Display::LockFramebuffer (ULONG *address)
+STDMETHODIMP Display::LockFramebuffer (BYTE **address)
 {
     if (!address)
@@ -1229 +1229 @@
         mFramebuffer->Lock();
         mFramebufferOpened = true;
-        *address = (ULONG)mpDrv->Connector.pu8Data;
+        *address = mpDrv->Connector.pu8Data;
         return S_OK;
     }
@@ -1324 +1324 @@
 }
 
-/**
- * Takes a screen shot of the requested size and copies it to the buffer
- * allocated by the caller. The screen shot is always a 32-bpp image, so the
- * size of the buffer must be at least (((width * 32 + 31) / 32) * 4) * height
- * (i.e. dword-aligned). If the requested screen shot dimentions differ from
- * the actual VM display size then the screen shot image is stretched and/or
- * shrunk accordingly.
- *
- * @returns COM status code
- * @param address the address of the buffer allocated by the caller
- * @param width the width of the screenshot to take
- * @param height the height of the screenshot to take
- */
-STDMETHODIMP Display::TakeScreenShot (ULONG address, ULONG width, ULONG height)
+STDMETHODIMP Display::TakeScreenShot (BYTE *address, ULONG width, ULONG height)
 {
     /// @todo (r=dmik) this function may take too long to complete if the VM
@@ -1380 +1367 @@
         rcVBox = VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT,
                              (PFNRT)mpDrv->pUpPort->pfnSnapshot, 6, mpDrv->pUpPort,
-                             (void *)address, cbData, NULL, NULL, NULL);
+                             address, cbData, NULL, NULL, NULL);
         if (VBOX_SUCCESS(rcVBox))
         {
@@ -1406 +1393 @@
 }
 
-/**
- * Draws an image of the specified size from the given buffer to the given
- * point on the VM display. The image is assumed to have a 32-bit depth, so the
- * size of one scanline must be ((width * 32 + 31) / 32) * 4), i.e.
- * dword-aligned. The total image size in the buffer is height * scanline size.
- *
- * @returns COM status code
- * @param address the address of the buffer containing the image
- * @param x the x coordinate on the VM display to place the image to
- * @param y the y coordinate on the VM display to place the image to
- * @param width the width of the image in the buffer
- * @param height the height of the image in the buffer
- */
-STDMETHODIMP Display::DrawToScreen (ULONG address, ULONG x, ULONG y,
+STDMETHODIMP Display::DrawToScreen (BYTE *address, ULONG x, ULONG y,
                                     ULONG width, ULONG height)
 {
@@ -1431 +1405 @@
     LogFlowFunc (("address=%p, x=%d, y=%d, width=%d, height=%d\n",
                   address, x, y, width, height));
+
+    if (!address)
+        return E_POINTER;
+    if (!width || !height)
+        return E_INVALIDARG;
 
     AutoLock lock(this);
@@ -1447 +1426 @@
     int rcVBox = VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT,
                              (PFNRT)mpDrv->pUpPort->pfnDisplayBlt, 6, mpDrv->pUpPort,
-                             (void *)address, x, y, width, height);
+                             address, x, y, width, height);
     if (VBOX_SUCCESS(rcVBox))
     {
@@ -1617 +1596 @@
     {
         HRESULT rc;
-        ULONG address = 0;
+        BYTE *address = 0;
         rc = mFramebuffer->COMGETTER(Address) (&address);
         AssertComRC (rc);
@@ -1640 +1619 @@
          */
         if (aCheckParams &&
-            (mLastAddress != (uint8_t *) address ||
+            (mLastAddress != address ||
              mLastLineSize != lineSize ||
              mLastColorDepth != colorDepth ||

trunk/src/VBox/Main/FramebufferImpl.cpp

@@ -56 +56 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP InternalFramebuffer::COMGETTER(Address) (ULONG *address)
+STDMETHODIMP InternalFramebuffer::COMGETTER(Address) (BYTE **address)
 {
     if (!address)
         return E_POINTER;
-    *address = (ULONG)mData;
+    *address = mData;
     return S_OK;
 }
@@ -148 +148 @@
 }
 
-STDMETHODIMP InternalFramebuffer::RequestResize(FramebufferPixelFormat_T pixelFormat, ULONG vram, ULONG lineSize, ULONG w, ULONG h,
-                                                BOOL *finished)
+STDMETHODIMP
+InternalFramebuffer::RequestResize(FramebufferPixelFormat_T pixelFormat, BYTE *vram,
+                                   ULONG lineSize, ULONG w, ULONG h,
+                                   BOOL *finished)
 {
     if (!finished)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2365 +2365 @@
                 </desc>
             </param>
-            <param name="shape" type="unsigned long" dir="in">
+            <param name="shape" type="octet" mod="ptr" dir="in">
                 <desc>
                     Address of the shape buffer.
@@ -5390 +5390 @@
         uuid="4481F27F-5C79-48d9-86C1-A2EC6747034D"
     >
-        <attribute name="address" type="unsigned long" readonly="yes">
+        <attribute name="address" type="octet" mod="ptr" readonly="yes">
             <desc>Address of the start byte of the framebuffer.</desc>
         </attribute>
@@ -5510 +5510 @@
                 <desc>Pixel format of the surface (BPP and layout)</desc>
             </param>
-            <param name="vram" type="unsigned long" dir="in">
+            <param name="vram" type="octet" mod="ptr" dir="in">
                 <desc>Pointer to the guest VRAM (NULL for non linear modes)</desc>
             </param>
@@ -5636 +5636 @@
         <attribute name="colorDepth" type="unsigned long" readonly="yes">
             <desc>
-                Current guest display color depth. Note that this might
-                be different from <link to="IFramebuffer::colorDepth">IFramebuffer::colorDepth</link>.
+                Current guest display color depth. Note that this may differ
+                from <link to="IFramebuffer::colorDepth">IFramebuffer::colorDepth</link>.
             </desc>
         </attribute>
@@ -5652 +5652 @@
                Requests access to the internal framebuffer.
             </desc>
-            <param name="address" type="unsigned long" dir="return"/>
+            <param name="address" type="octet" mod="ptr" dir="return"/>
         </method>
 
@@ -5689 +5689 @@
                 32-bpp buffer allocated by the caller.
             </desc>
-            <param name="address" type="unsigned long" dir="in"/>
+            <param name="address" type="octet" mod="ptr" dir="in"/>
             <param name="width" type="unsigned long" dir="in"/>
             <param name="height" type="unsigned long" dir="in"/>
@@ -5699 +5699 @@
                 to the given point on the VM display.
             </desc>
-            <param name="address" type="unsigned long" dir="in"/>
+            <param name="address" type="octet" mod="ptr" dir="in"/>
             <param name="x" type="unsigned long" dir="in"/>
             <param name="y" type="unsigned long" dir="in"/>

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -79 +79 @@
 #endif /* VBOX_VRDP */
 
-    /* IConsoleCallback methods */
-    STDMETHOD(OnMousePointerShapeChange)(BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot, ULONG width, ULONG height, ULONG shape)
+    // IConsoleCallback methods
+    STDMETHOD(OnMousePointerShapeChange)(BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
+                                         ULONG width, ULONG height, BYTE *shape)
     {
         return S_OK;
@@ -114 +115 @@
     // IDisplay methods
     STDMETHOD(SetupInternalFramebuffer)(ULONG depth);
-    STDMETHOD(LockFramebuffer)(ULONG *address);
+    STDMETHOD(LockFramebuffer)(BYTE **address);
     STDMETHOD(UnlockFramebuffer)();
     STDMETHOD(RegisterExternalFramebuffer)(IFramebuffer *frameBuf);
     STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth);
-    STDMETHOD(TakeScreenShot)(ULONG address, ULONG width, ULONG height);
-    STDMETHOD(DrawToScreen)(ULONG address, ULONG x, ULONG y, ULONG width, ULONG height);
+    STDMETHOD(TakeScreenShot)(BYTE *address, ULONG width, ULONG height);
+    STDMETHOD(DrawToScreen)(BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
     STDMETHOD(InvalidateAndUpdate)();
     STDMETHOD(ResizeCompleted)();

trunk/src/VBox/Main/include/FramebufferImpl.h

@@ -48 +48 @@
 
     // IFramebuffer properties
-    STDMETHOD(COMGETTER(Address)) (ULONG *address);
+    STDMETHOD(COMGETTER(Address)) (BYTE **address);
     STDMETHOD(COMGETTER(Width)) (ULONG *width);
     STDMETHOD(COMGETTER(Height)) (ULONG *height);
@@ -63 +63 @@
                             ULONG w, ULONG h,
                             BOOL *finished);
-    STDMETHOD(RequestResize)(FramebufferPixelFormat_T pixelFormat, ULONG vram, ULONG lineSize, ULONG w, ULONG h,
+    STDMETHOD(RequestResize)(FramebufferPixelFormat_T pixelFormat, BYTE *vram,
+                             ULONG lineSize, ULONG w, ULONG h,
                              BOOL *finished);
     STDMETHOD(OperationSupported)(FramebufferAccelerationOperation_T operation,