Changeset 38321 in vbox for trunk/src/VBox/HostDrivers/Support/win

Timestamp:

Aug 5, 2011 10:08:31 AM (14 years ago)

Author:

vboxsync

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

73337

Message:

SUPDrv: Fixed broken IDC on windows.

Location:

trunk/src/VBox/HostDrivers/Support/win

Files:

• SUPDrv-win.cpp (modified) (2 diffs)
• SUPR0IdcClient-win.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -484 +484 @@
     {
         /* Verify the pDevExt in the session. */
-        if (    (   !pSession
-                 && pStack->Parameters.DeviceIoControl.IoControlCode == SUPDRV_IDC_REQ_CONNECT)
-            ||  (   VALID_PTR(pSession)
-                 && pSession->pDevExt == pDevExt))
+        if (  pStack->Parameters.DeviceIoControl.IoControlCode != SUPDRV_IDC_REQ_CONNECT
+            ? VALID_PTR(pSession) && pSession->pDevExt == pDevExt
+            : !pSession
+           )
         {
             /* Verify that the size in the request header is correct. */
@@ -501 +501 @@
                 if (!rc)
                 {
+                    if (pStack->Parameters.DeviceIoControl.IoControlCode == SUPDRV_IDC_REQ_CONNECT)
+                        pFileObj->FsContext = ((PSUPDRVIDCREQCONNECT)pHdr)->u.Out.pSession;
+                    /** @todo Handle SUPDRV_IDC_REQ_DISCONNECT and drop the
+                     *        windows hack in the generic code. */
+
                     rcNt = STATUS_SUCCESS;
                     cbOut = pHdr->cb;

trunk/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c

@@ -119 +119 @@
         {
             pHandle->s.pDeviceObject = pDeviceObject;
-            pHandle->s.pFileObject = pFileObject;
+            pHandle->s.pFileObject   = pFileObject;
             return rc;
         }