Changeset 25141 in vbox

Timestamp:

Dec 2, 2009 9:38:41 AM (15 years ago)

Author:

vboxsync

Message:

VBoxGuest: Fixed spinlock creation for NT4.

Location:

trunk/src/VBox/Additions/WINNT/VBoxGuest

Files:

• NTLegacy.cpp (modified) (3 diffs)
• VBoxGuest.cpp (modified) (2 diffs)

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

@@ -58 +58 @@
 {
     ULONG busNumber, slotNumber;
-//    ULONG i;
     NTSTATUS rc = STATUS_SUCCESS;
 
-    dprintf(("VBoxGuest::ntCreateDevice: entered\n"));
-
-    // find our virtual PCI device
+    dprintf(("VBoxGuest::ntCreateDevice: entered, pDrvObj=%x, pDevObj=%x, pRegPath=%x\n",
+        pDrvObj, pDevObj, pRegPath));
+
+    /*
+     * Find our virtual PCI device
+     */
     rc = findPCIDevice(&busNumber, (PCI_SLOT_NUMBER*)&slotNumber);
     if (!NT_SUCCESS(rc))
@@ -101 +103 @@
     RtlZeroMemory(pDevExt, sizeof(VBOXGUESTDEVEXT));
 
-    if (pDevObj)
+    if (pDevObj) /* pDevObj always is NULL at the moment, so don't attach to the driver stack */
     {
         pDevExt->nextLowerDriver = IoAttachDeviceToDeviceStack(deviceObject, pDevObj);
@@ -111 +113 @@
             return STATUS_NO_SUCH_DEVICE;
         }
+        dprintf(("VBoxGuest::ntCreateDevice: device attached to stack\n"));
+    }
 
 #ifdef VBOX_WITH_HGCM
-        int rc2 = RTSpinlockCreate(&pDevExt->SessionSpinlock);
-        if (RT_FAILURE(rc2))
-        {
-            dprintf(("VBoxGuest::ntCreateDevice: RTSpinlockCreate failed\n"));
-            IoDetachDevice(pDevExt->nextLowerDriver);
-            IoDeleteSymbolicLink(&DosName);
-            IoDeleteDevice(deviceObject);
-            return STATUS_DRIVER_UNABLE_TO_LOAD;
-        }
+    /* Create global spinlock for all driver sessions */
+    int rc2 = RTSpinlockCreate(&pDevExt->SessionSpinlock);
+    if (RT_FAILURE(rc2))
+    {
+        dprintf(("VBoxGuest::ntCreateDevice: RTSpinlockCreate failed\n"));
+        IoDetachDevice(pDevExt->nextLowerDriver);
+        IoDeleteSymbolicLink(&DosName);
+        IoDeleteDevice(deviceObject);
+        return STATUS_DRIVER_UNABLE_TO_LOAD;
+    }
+    dprintf(("VBoxGuest::ntCreateDevice: spinlock created\n"));
 #endif
-    }
-    // store a reference to ourself
+
+    /* Store a reference to ourself */
     pDevExt->deviceObject = deviceObject;
-    // store bus and slot number we've queried before
+    /* Store bus and slot number we've queried before */
     pDevExt->busNumber = busNumber;
     pDevExt->slotNumber = slotNumber;

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

@@ -183 +183 @@
     pDrvObj->MajorFunction[IRP_MJ_WRITE]              = VBoxGuestNotSupportedStub;
 #ifdef TARGET_NT4
-    rc = ntCreateDevice(pDrvObj, NULL, pRegPath);
+    rc = ntCreateDevice(pDrvObj, NULL /* pDevObj */, pRegPath);
 #else
     pDrvObj->MajorFunction[IRP_MJ_PNP]                = VBoxGuestPnP;
@@ -320 +320 @@
 #ifdef VBOX_WITH_HGCM
     if (pDevExt->SessionSpinlock != NIL_RTSPINLOCK)
-        RTSpinlockDestroy(pDevExt->SessionSpinlock);
+    {
+        int rc2 = RTSpinlockDestroy(pDevExt->SessionSpinlock);
+        dprintf(("VBoxGuest::VBoxGuestUnload: spinlock destroyed with rc=%Rrc\n", rc2));
+    }
 #endif
     IoDeleteDevice(pDrvObj->DeviceObject);