Changeset 20659 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jun 17, 2009 10:34:40 AM (15 years ago)

Author:

vboxsync

Message:

Windows guest additions: use KernelMode wait for HCGM calls from shared folders driver.

File:

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

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

@@ -415 +415 @@
 
 #ifdef VBOX_WITH_HGCM
-void VBoxHGCMCallbackWorker (VMMDevHGCMRequestHeader *pHeader, PVBOXGUESTDEVEXT pDevExt,
-                             uint32_t u32Timeout, bool fInterruptible)
+static void VBoxHGCMCallbackWorker (VMMDevHGCMRequestHeader *pHeader, PVBOXGUESTDEVEXT pDevExt,
+                                    uint32_t u32Timeout, bool fInterruptible, KPROCESSOR_MODE ProcessorMode)
 {
     /* Possible problem with request completion right between the fu32Flags check and KeWaitForSingleObject
@@ -434 +434 @@
         /* Specifying UserMode so killing the user process will abort the wait. */
         NTSTATUS rc = KeWaitForSingleObject (&pDevExt->keventNotification, Executive,
-                                             UserMode,
+                                             ProcessorMode,
                                              fInterruptible ? TRUE : FALSE, /* Alertable */
                                              &timeout
@@ -459 +459 @@
 
     dprintf(("VBoxHGCMCallback\n"));
-    VBoxHGCMCallbackWorker (pHeader, pDevExt, u32Data, false);
+    VBoxHGCMCallbackWorker (pHeader, pDevExt, u32Data, false, UserMode);
+}
+
+DECLVBGL(void) VBoxHGCMCallbackKernelMode (VMMDevHGCMRequestHeader *pHeader, void *pvData, uint32_t u32Data)
+{
+    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvData;
+
+    dprintf(("VBoxHGCMCallback\n"));
+    VBoxHGCMCallbackWorker (pHeader, pDevExt, u32Data, false, KernelMode);
 }
 
@@ -468 +476 @@
 
     dprintf(("VBoxHGCMCallbackInterruptible\n"));
-    VBoxHGCMCallbackWorker (pHeader, pDevExt, u32Data, true);
+    VBoxHGCMCallbackWorker (pHeader, pDevExt, u32Data, true, UserMode);
 }
 
@@ -1010 +1018 @@
             dprintf(("a) ptr->u32ClientID = %d\n", ptr->u32ClientID));
 
-            int rc = VbglHGCMConnect (ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+            int rc = VbglHGCMConnect (ptr, pIrp->RequestorMode == KernelMode? VBoxHGCMCallbackKernelMode :VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
 
             dprintf(("b) ptr->u32ClientID = %d\n", ptr->u32ClientID));
@@ -1054 +1062 @@
                         Info.result = 0;
                         Info.u32ClientID = ptr->u32ClientID;
-                        VbglHGCMDisconnect(&Info, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+                        VbglHGCMDisconnect(&Info, pIrp->RequestorMode == KernelMode? VBoxHGCMCallbackKernelMode :VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
                         Status = STATUS_UNSUCCESSFUL;
                         break;
@@ -1133 +1141 @@
              */
 
-            int rc = VbglHGCMDisconnect (ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+            int rc = VbglHGCMDisconnect (ptr, pIrp->RequestorMode == KernelMode? VBoxHGCMCallbackKernelMode :VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
 
             if (RT_FAILURE(rc))
@@ -1182 +1190 @@
             VBoxGuestHGCMCallInfo *ptr = (VBoxGuestHGCMCallInfo *)pBuf;
 
-            rc = VbglHGCMCall32(ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+            rc = VbglHGCMCall32(ptr, pIrp->RequestorMode == KernelMode? VBoxHGCMCallbackKernelMode :VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
 
             if (RT_FAILURE(rc))
@@ -1214 +1222 @@
             VBoxGuestHGCMCallInfo *ptr = (VBoxGuestHGCMCallInfo *)pBuf;
 
-            rc = VbglHGCMCall (ptr, VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
+            rc = VbglHGCMCall (ptr, pIrp->RequestorMode == KernelMode? VBoxHGCMCallbackKernelMode :VBoxHGCMCallback, pDevExt, RT_INDEFINITE_WAIT);
 
             if (RT_FAILURE(rc))
@@ -1230 +1238 @@
         case VBOXGUEST_IOCTL_HGCM_CALL_TIMED(0): /* (The size isn't relevant on NT.) */
         {
+            /* This IOCTL is not used by shared folders, so VBoxHGCMCallbackKernelMode is not used. */
             dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_HGCM_CALL_TIMED\n"));