Changeset 146 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 18, 2007 3:58:29 PM (18 years ago)

Author:

vboxsync

Message:

64-bit.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• DisplayImpl.cpp (modified) (2 diffs)
• Framebuffer.h (modified) (1 diff)
• SDLConsole.cpp (modified) (1 diff)
• SDLFramebuffer.cpp (modified) (1 diff)
• SDLFramebuffer.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -387 +387 @@
     if (mpDrv)
     {
-        mFramebuffer->getAddress ((ULONG*)&mpDrv->Connector.pu8Data);
+        mFramebuffer->getAddress ((uintptr_t *)&mpDrv->Connector.pu8Data);
         mFramebuffer->getLineSize ((ULONG*)&mpDrv->Connector.cbScanline);
         mFramebuffer->getColorDepth ((ULONG*)&mpDrv->Connector.cBits);
@@ -403 +403 @@
     if (mpDrv)
     {
-        mFramebuffer->getAddress ((ULONG*)&mpDrv->Connector.pu8Data);
+        mFramebuffer->getAddress ((uintptr_t *)&mpDrv->Connector.pu8Data);
         mFramebuffer->getColorDepth ((ULONG*)&mpDrv->Connector.cBits);
     }

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

@@ -40 +40 @@
     virtual HRESULT Lock() = 0;
     virtual HRESULT Unlock() = 0;
-    virtual HRESULT getAddress(ULONG *address) = 0;
+    virtual HRESULT getAddress(uintptr_t *address) = 0;
     virtual HRESULT getColorDepth(ULONG *colorDepth) = 0;
     virtual HRESULT getLineSize(ULONG *lineSize) = 0;

trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp

@@ -317 +317 @@
              * Decode event parameters.
              */
-            #define DECODEX(ev) ((int)(ev)->user.data1 >> 16)
-            #define DECODEY(ev) ((int)(ev)->user.data1 & 0xFFFF)
-            #define DECODEW(ev) ((int)(ev)->user.data2 >> 16)
-            #define DECODEH(ev) ((int)(ev)->user.data2 & 0xFFFF)
+            #define DECODEX(ev) ((intptr_t)(ev)->user.data1 >> 16)
+            #define DECODEY(ev) ((intptr_t)(ev)->user.data1 & 0xFFFF)
+            #define DECODEW(ev) ((intptr_t)(ev)->user.data2 >> 16)
+            #define DECODEH(ev) ((intptr_t)(ev)->user.data2 & 0xFFFF)
             int x = DECODEX(ev);
             int y = DECODEY(ev);

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp

@@ -162 +162 @@
  * @param   address Pointer to result variable.
  */
-HRESULT SDLFramebuffer::getAddress(ULONG *address)
+HRESULT SDLFramebuffer::getAddress(uintptr_t *address)
 {
     LogFlow(("SDLFramebuffer::GetAddress\n"));

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h

@@ -47 +47 @@
     virtual HRESULT Lock();
     virtual HRESULT Unlock();
-    virtual HRESULT getAddress(ULONG *address);
+    virtual HRESULT getAddress(uintptr_t *address);
     virtual HRESULT getColorDepth(ULONG *colorDepth);
     virtual HRESULT getLineSize(ULONG *lineSize);