Changeset 11642 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 26, 2008 7:37:36 AM (17 years ago)

Author:

vboxsync

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

35333

Message:

another guest additions 32/64 bit hack

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/OpenGL/VBoxOGL.cpp (modified) (5 diffs)
• WINNT/Graphics/OpenGL/glext.cpp (modified) (1 diff)
• linux/module/hgcmcall.c (modified) (2 diffs)
• linux/module/vboxmod.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp

@@ -179 +179 @@
     parms.pString.type                   = VMMDevHGCMParmType_LinAddr;
     parms.pString.u.Pointer.size         = sizeof(szOpenGLVersion);
-    parms.pString.u.Pointer.u.linearAddr = (vmmDevHypPtr)szOpenGLVersion;
+    parms.pString.u.Pointer.u.linearAddr = (VMMDEVHYPPTR)szOpenGLVersion;
 
     int rc = vboxHGCMCall(&parms, sizeof (parms));
@@ -356 +356 @@
     parms.pCmdBuffer.type                   = VMMDevHGCMParmType_LinAddr_In;
     parms.pCmdBuffer.u.Pointer.size         = pCtx->pCurrentCmd - pCtx->pCmdBuffer;
-    parms.pCmdBuffer.u.Pointer.u.linearAddr = (vmmDevHypPtr)pCtx->pCmdBuffer;
+    parms.pCmdBuffer.u.Pointer.u.linearAddr = (VMMDEVHYPPTR)pCtx->pCmdBuffer;
     parms.cCommands.type                    = VMMDevHGCMParmType_32bit;
     parms.cCommands.u.value32               = pCtx->cCommands;
@@ -404 +404 @@
     parms.pCmdBuffer.type                   = VMMDevHGCMParmType_LinAddr_In;
     parms.pCmdBuffer.u.Pointer.size         = pCtx->pCurrentCmd - pCtx->pCmdBuffer;
-    parms.pCmdBuffer.u.Pointer.u.linearAddr = (vmmDevHypPtr)pCtx->pCmdBuffer;
+    parms.pCmdBuffer.u.Pointer.u.linearAddr = (VMMDEVHYPPTR)pCtx->pCmdBuffer;
     parms.cCommands.type                    = VMMDevHGCMParmType_32bit;
     parms.cCommands.u.value32               = pCtx->cCommands;
@@ -416 +416 @@
         parms.pLastParam.type                   = VMMDevHGCMParmType_LinAddr;
         parms.pLastParam.u.Pointer.size         = cbParam;
-        parms.pLastParam.u.Pointer.u.linearAddr = (vmmDevHypPtr)pLastParam;
+        parms.pLastParam.u.Pointer.u.linearAddr = (VMMDEVHYPPTR)pLastParam;
     }
     else
@@ -462 +462 @@
     parms.pszExtFnName.type                   = VMMDevHGCMParmType_LinAddr_In;
     parms.pszExtFnName.u.Pointer.size         = strlen(pszExtFunctionName)+1;
-    parms.pszExtFnName.u.Pointer.u.linearAddr = (vmmDevHypPtr)pszExtFunctionName;
+    parms.pszExtFnName.u.Pointer.u.linearAddr = (VMMDEVHYPPTR)pszExtFunctionName;
 
     int rc = vboxHGCMCall(&parms, sizeof (parms));

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/glext.cpp

@@ -50 +50 @@
     parms.pString.type                   = VMMDevHGCMParmType_LinAddr;
     parms.pString.u.Pointer.size         = sizeof(szOpenGLExtensions);
-    parms.pString.u.Pointer.u.linearAddr = (vmmDevHypPtr)szOpenGLExtensions;
+    parms.pString.u.Pointer.u.linearAddr = (VMMDEVHYPPTR)szOpenGLExtensions;
 
     rc = vboxHGCMCall(&parms, sizeof (parms));

trunk/src/VBox/Additions/linux/module/hgcmcall.c

@@ -147 +147 @@
             }
             VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr
-                = (vmmDevHypPtr)&pu8PointerData[offPointerData];
+                = (VMMDEVHYPPTR)&pu8PointerData[offPointerData];
             VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size
                 = VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.size;
@@ -157 +157 @@
             /* This type of pointer means that we are reading data from the host. */
             VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr
-                = (vmmDevHypPtr)&pu8PointerData[offPointerData];
+                = (VMMDEVHYPPTR)&pu8PointerData[offPointerData];
             VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size
                 = VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.size;

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -732 +732 @@
             {
                 /* communicate result to VMM, align at 4MB */
-                req->hypervisorStart    = (vmmDevHypPtr)RT_ALIGN_P(hypervisorArea, 0x400000);
+                req->hypervisorStart    = (VMMDEVHYPPTR32)RT_ALIGN_P(hypervisorArea, 0x400000);
                 req->header.requestType = VMMDevReq_SetHypervisorInfo;
                 req->header.rc          = VERR_GENERAL_FAILURE;