Changeset 15811 in vbox for trunk/src/VBox

Timestamp:

Jan 5, 2009 3:53:20 PM (16 years ago)

Author:

vboxsync

Message:

Support 32 bit IOCtls in the Windows 64 bit guest driver.

File:

• trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -905 +905 @@
          * uses the same waiting code.
          */
+#ifdef RT_ARCH_AMD64
+        case VBOXGUEST_IOCTL_HGCM_CONNECT_32:
+#endif /* RT_ARCH_AMD64 */
         case VBOXGUEST_IOCTL_HGCM_CONNECT:
         {
@@ -950 +953 @@
         } break;
 
+#ifdef RT_ARCH_AMD64
+        case VBOXGUEST_IOCTL_HGCM_DISCONNECT_32:
+#endif /* RT_ARCH_AMD64 */
         case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
         {
@@ -991 +997 @@
         } break;
 
-        case VBOXGUEST_IOCTL_HGCM_CALL(0): /* (The size isn't relevant on NT.) */
-        {
+#ifdef RT_ARCH_AMD64
+        case VBOXGUEST_IOCTL_HGCM_CALL_32(0): /* (The size isn't relevant on NT.) */
+        {
+            /* A 32 bit application call. */
             int rc;
 
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_HGCM_CALL\n"));
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_HGCM_CALL_32\n"));
 
             Status = vboxHGCMVerifyIOBuffers (pStack,
@@ -1006 +1014 @@
             }
 
+            /* @todo: Old guest OpenGL driver used the same IOCtl code for both 32 and 64 bit binaries.
+             *        This is a protection, and can be removed if there were no 64 bit driver.
+             */
+            if (!IoIs32bitProcess(pIrp))
+            {
+                Status = STATUS_UNSUCCESSFUL;
+                break;
+            }
+
             VBoxGuestHGCMCallInfo *ptr = (VBoxGuestHGCMCallInfo *)pBuf;
 
-# if ARCH_BITS == 64
-            if (IoIs32bitProcess(pIrp))
-                rc = VbglHGCMCall32(ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+            rc = VbglHGCMCall32(ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+
+            if (RT_FAILURE(rc))
+            {
+                dprintf(("VBOXGUEST_IOCTL_HGCM_CALL_32: vbox rc = %Rrc\n", rc));
+                Status = STATUS_UNSUCCESSFUL;
+            }
             else
-# endif
-                rc = VbglHGCMCall (ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+            {
+                cbOut = pStack->Parameters.DeviceIoControl.OutputBufferLength;
+            }
+
+        } break;
+#endif /* RT_ARCH_AMD64 */
+
+        case VBOXGUEST_IOCTL_HGCM_CALL(0): /* (The size isn't relevant on NT.) */
+        {
+            int rc;
+
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_HGCM_CALL\n"));
+
+            Status = vboxHGCMVerifyIOBuffers (pStack,
+                                              sizeof (VBoxGuestHGCMCallInfo));
+
+            if (Status != STATUS_SUCCESS)
+            {
+                dprintf(("VBoxGuest::VBoxGuestDeviceControl: invalid parameter. Status: %p\n", Status));
+                break;
+            }
+
+            VBoxGuestHGCMCallInfo *ptr = (VBoxGuestHGCMCallInfo *)pBuf;
+
+            rc = VbglHGCMCall (ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
 
             if (RT_FAILURE(rc))