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

Timestamp:

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

Author:

vboxsync

Message:

SUPDrv: Fixed broken IDC on windows.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

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

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -1852 +1852 @@
             if (pReq->Hdr.pSession != NULL)
             {
-                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: pSession=%p expected NULL!\n", pReq->Hdr.pSession));
+                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: Hdr.pSession=%p expected NULL!\n", pReq->Hdr.pSession));
                 return pReqHdr->rc = VERR_INVALID_PARAMETER;
             }
@@ -1866 +1866 @@
                 OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: uMinVersion=%#x uMaxVersion=%#x doesn't match!\n",
                             pReq->u.In.uMinVersion, pReq->u.In.uReqVersion));
+                return pReqHdr->rc = VERR_INVALID_PARAMETER;
+            }
+            if (pSession != NULL)
+            {
+                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: pSession=%p expected NULL!\n", pSession));
                 return pReqHdr->rc = VERR_INVALID_PARAMETER;
             }
@@ -1891 +1896 @@
             pReq->u.Out.uDriverRevision = VBOX_SVN_REV;
 
-            /*
-             * On NT we will already have a session associated with the
-             * client, just like with the SUP_IOCTL_COOKIE request, while
-             * the other doesn't.
-             */
-#ifdef RT_OS_WINDOWS
-            pReq->Hdr.rc = VINF_SUCCESS;
-#else
-            AssertReturn(!pSession, VERR_INTERNAL_ERROR);
             pReq->Hdr.rc = supdrvCreateSession(pDevExt, false /* fUser */, &pSession);
             if (RT_FAILURE(pReq->Hdr.rc))
@@ -1906 +1902 @@
                 return VINF_SUCCESS;
             }
-#endif
 
             pReq->u.Out.pSession = pSession;

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;
         }