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

Timestamp:

Jun 5, 2008 3:39:11 PM (17 years ago)

Author:

vboxsync

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

31687

Message:

Extend HGCM interface to support 64 bit pointers.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• common/VBoxGuestLib/GenericRequest.cpp (modified) (1 diff)
• common/VBoxGuestLib/PhysHeap.cpp (modified) (1 diff)
• common/VBoxGuestLib/VBoxCalls.c (modified) (11 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -153 +153 @@
     pParm->type                    = VMMDevHGCMParmType_LinAddr;
     pParm->u.Pointer.size          = cb;
-    pParm->u.Pointer.u.linearAddr  = (RTGCPTR)pv;
+    pParm->u.Pointer.u.linearAddr  = (uintptr_t)pv;
 }
 

trunk/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp

@@ -76 +76 @@
 
     physaddr = VbglPhysHeapGetPhysAddr (pReq);
-    if (!physaddr)
+    if (  !physaddr
+       || (physaddr >> 32) != 0) /* Port IO is 32 bit. */
     {
         rc = VERR_VBGL_INVALID_ADDR;

trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp

@@ -305 +305 @@
 
     physAddr = 0;
+    /* This function allocates physical contiguous memory (below 4GB) according to the IPRT docs.
+     * Address < 4G is required for the port IO.
+     */
     pChunk = (VBGLPHYSHEAPCHUNK *)RTMemContAlloc (&physAddr, cbSize);
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.c

@@ -129 +129 @@
     data.mappings.type                   = VMMDevHGCMParmType_LinAddr;
     data.mappings.u.Pointer.size         = sizeof (SHFLMAPPING) * *pcMappings;
-    data.mappings.u.Pointer.u.linearAddr = (RTGCPTR)&paMappings[0];
+    data.mappings.u.Pointer.u.linearAddr = (uintptr_t)&paMappings[0];
 
 /*    Log(("VBOXSF: in ifs difference %d\n",
@@ -166 +166 @@
     data.name.type                   = VMMDevHGCMParmType_LinAddr;
     data.name.u.Pointer.size         = size;
-    data.name.u.Pointer.u.linearAddr = (RTGCPTR)pString;
+    data.name.u.Pointer.u.linearAddr = (uintptr_t)pString;
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
@@ -192 +192 @@
     data.path.type                    = VMMDevHGCMParmType_LinAddr;
     data.path.u.Pointer.size          = ShflStringSizeOfBuffer (szFolderName);
-    data.path.u.Pointer.u.linearAddr  = (RTGCPTR)szFolderName;
+    data.path.u.Pointer.u.linearAddr  = (uintptr_t)szFolderName;
 
     data.root.type                    = VMMDevHGCMParmType_32bit;
@@ -227 +227 @@
         data.path.type                    = VMMDevHGCMParmType_LinAddr;
         data.path.u.Pointer.size          = ShflStringSizeOfBuffer (szFolderName);
-        data.path.u.Pointer.u.linearAddr  = (RTGCPTR)szFolderName;
+        data.path.u.Pointer.u.linearAddr  = (uintptr_t)szFolderName;
 
         data.root.type                    = VMMDevHGCMParmType_32bit;
@@ -284 +284 @@
     data.path.type                    = VMMDevHGCMParmType_LinAddr;
     data.path.u.Pointer.size          = ShflStringSizeOfBuffer (pParsedPath);
-    data.path.u.Pointer.u.linearAddr  = (RTGCPTR)pParsedPath;
+    data.path.u.Pointer.u.linearAddr  = (uintptr_t)pParsedPath;
 
     data.parms.type                   = VMMDevHGCMParmType_LinAddr;
     data.parms.u.Pointer.size         = sizeof (SHFLCREATEPARMS);
-    data.parms.u.Pointer.u.linearAddr = (RTGCPTR)pCreateParms;
+    data.parms.u.Pointer.u.linearAddr = (uintptr_t)pCreateParms;
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
@@ -343 +343 @@
     data.path.type                      = VMMDevHGCMParmType_LinAddr_In;
     data.path.u.Pointer.size            = ShflStringSizeOfBuffer (pParsedPath);
-    data.path.u.Pointer.u.linearAddr    = (RTGCPTR)pParsedPath;
+    data.path.u.Pointer.u.linearAddr    = (uintptr_t)pParsedPath;
 
     data.flags.type                     = VMMDevHGCMParmType_32bit;
@@ -375 +375 @@
     data.src.type                       = VMMDevHGCMParmType_LinAddr_In;
     data.src.u.Pointer.size             = ShflStringSizeOfBuffer (pSrcPath);
-    data.src.u.Pointer.u.linearAddr     = (RTGCPTR)pSrcPath;
+    data.src.u.Pointer.u.linearAddr     = (uintptr_t)pSrcPath;
 
     data.dest.type                      = VMMDevHGCMParmType_LinAddr_In;
     data.dest.u.Pointer.size            = ShflStringSizeOfBuffer (pDestPath);
-    data.dest.u.Pointer.u.linearAddr    = (RTGCPTR)pDestPath;
+    data.dest.u.Pointer.u.linearAddr    = (uintptr_t)pDestPath;
 
     data.flags.type                     = VMMDevHGCMParmType_32bit;
@@ -416 +416 @@
     data.buffer.type                    = (fLocked) ? VMMDevHGCMParmType_LinAddr_Locked_Out : VMMDevHGCMParmType_LinAddr_Out;
     data.buffer.u.Pointer.size          = *pcbBuffer;
-    data.buffer.u.Pointer.u.linearAddr  = (RTGCPTR)pBuffer;
+    data.buffer.u.Pointer.u.linearAddr  = (uintptr_t)pBuffer;
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
@@ -451 +451 @@
     data.buffer.type                    = (fLocked) ? VMMDevHGCMParmType_LinAddr_Locked_In : VMMDevHGCMParmType_LinAddr_In;
     data.buffer.u.Pointer.size          = *pcbBuffer;
-    data.buffer.u.Pointer.u.linearAddr  = (RTGCPTR)pBuffer;
+    data.buffer.u.Pointer.u.linearAddr  = (uintptr_t)pBuffer;
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
@@ -521 +521 @@
     data.path.u.Pointer.size            =
         (ParsedPath) ? ShflStringSizeOfBuffer(ParsedPath) : 0;
-    data.path.u.Pointer.u.linearAddr    = (RTGCPTR) ParsedPath;
+    data.path.u.Pointer.u.linearAddr    = (uintptr_t) ParsedPath;
 
     data.buffer.type                    = VMMDevHGCMParmType_LinAddr_Out;
     data.buffer.u.Pointer.size          = *pcbBuffer;
-    data.buffer.u.Pointer.u.linearAddr  = (RTGCPTR)pBuffer;
+    data.buffer.u.Pointer.u.linearAddr  = (uintptr_t)pBuffer;
 
     data.resumePoint.type               = VMMDevHGCMParmType_32bit;
@@ -566 +566 @@
     data.info.type                      = VMMDevHGCMParmType_LinAddr;
     data.info.u.Pointer.size            = *pcbBuffer;
-    data.info.u.Pointer.u.linearAddr    = (RTGCPTR)pBuffer;
+    data.info.u.Pointer.u.linearAddr    = (uintptr_t)pBuffer;
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));