Changeset 32474 in vbox

Timestamp:

Sep 14, 2010 11:35:57 AM (14 years ago)

Author:

vboxsync

Message:

VBoxGuest/win: Fixes for NT4 boot.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-win-legacy.cpp (modified) (8 diffs)
• VBoxGuest-win.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-legacy.cpp

@@ -41 +41 @@
 *******************************************************************************/
 RT_C_DECLS_BEGIN
+NTSTATUS vboxguestwinnt4CreateDevice(PDRIVER_OBJECT pDrvObj, PDEVICE_OBJECT pDevObj, PUNICODE_STRING pRegPath);
 static NTSTATUS vboxguestwinnt4FindPCIDevice(PULONG pBusNumber, PPCI_SLOT_NUMBER pSlotNumber);
-static void     vboxguestwinnt4FreeDeviceResources(PDRIVER_OBJECT pDrvObj, PDEVICE_OBJECT pDevObj);
 RT_C_DECLS_END
 
@@ -48 +48 @@
 #pragma alloc_text (INIT, vboxguestwinnt4CreateDevice)
 #pragma alloc_text (INIT, vboxguestwinnt4FindPCIDevice)
-#pragma alloc_text (INIT, vboxguestwinnt4FreeDeviceResources)
 #endif
 
 
 /**
- * Helper function to create the device object
- *
- * @returns NT status code
- * @param
+ * Legacy helper function to create the device object.
+ *
+ * @returns NT status code.
+ *
+ * @param pDrvObj
+ * @param pDevObj
+ * @param pRegPath
  */
 NTSTATUS vboxguestwinnt4CreateDevice(PDRIVER_OBJECT pDrvObj, PDEVICE_OBJECT pDevObj, PUNICODE_STRING pRegPath)
@@ -63 +65 @@
     NTSTATUS rc = STATUS_SUCCESS;
 
-    Log(("VBoxGuest::vboxguestwinnt4CreateDevice: pDrvObj=%x, pDevObj=%x, pRegPath=%x\n",
+    Log(("VBoxGuest::vboxguestwinnt4CreateDevice: pDrvObj=%p, pDevObj=%p, pRegPath=%p\n",
          pDrvObj, pDevObj, pRegPath));
 
@@ -74 +76 @@
         Log(("VBoxGuest::vboxguestwinnt4CreateDevice: Device not found!\n"));
 
+    bool fSymbolicLinkCreated = false;
+    UNICODE_STRING szDosName;
     PDEVICE_OBJECT pDeviceObject = NULL;
     if (NT_SUCCESS(rc))
@@ -87 +91 @@
             Log(("VBoxGuest::vboxguestwinnt4CreateDevice: Device created\n"));
 
-            UNICODE_STRING DosName;
-            RtlInitUnicodeString(&DosName, VBOXGUEST_DEVICE_NAME_DOS);
-            rc = IoCreateSymbolicLink(&DosName, &szDevName);
-            if (NT_ERROR(rc))
+            RtlInitUnicodeString(&szDosName, VBOXGUEST_DEVICE_NAME_DOS);
+            rc = IoCreateSymbolicLink(&szDosName, &szDevName);
+            if (NT_SUCCESS(rc))
             {
+                Log(("VBoxGuest::vboxguestwinnt4CreateDevice: Symlink created\n"));
+                fSymbolicLinkCreated = true;
+            }
+            else
                 Log(("VBoxGuest::vboxguestwinnt4CreateDevice: IoCreateSymbolicLink failed with rc = %#x\n", rc));
-                //IoDeleteDevice(pDeviceObject);
-            }
-            Log(("VBoxGuest::vboxguestwinnt4CreateDevice: Symlink created\n"));
         }
         else
@@ -110 +114 @@
 
         pDevExt = (PVBOXGUESTDEVEXT)pDeviceObject->DeviceExtension;
-        Assert(pDevExt);
         RtlZeroMemory(pDevExt, sizeof(VBOXGUESTDEVEXT));
     }
 
-    if (   NT_SUCCESS(rc)
-        && pDevExt)
-    {
+    if (NT_SUCCESS(rc) && pDevExt)
+    {
+        Log(("VBoxGuest::vboxguestwinnt4CreateDevice: Device extension created\n"));
+
         /* Store a reference to ourself. */
         pDevExt->win.s.pDeviceObject = pDeviceObject;
@@ -129 +133 @@
     }
 
+    /* Do the actual VBox init ... */
     if (NT_SUCCESS(rc))
-    {
-        rc = vboxguestwinInit(pDrvObj, pDevObj, pRegPath);
+        rc = vboxguestwinInit(pDrvObj, pDeviceObject, pRegPath);
+
+    /* Clean up in case of errors. */
+    if (NT_ERROR(rc))
+    {
+        if (fSymbolicLinkCreated && szDosName.Length > 0)
+            IoDeleteSymbolicLink(&szDosName);
+        if (pDeviceObject)
+            IoDeleteDevice(pDeviceObject);
     }
 
@@ -140 +152 @@
 
 /**
- * Helper function to handle the PCI device lookup
- *
- * @returns NT error codes
+ * Helper function to handle the PCI device lookup.
+ *
+ * @returns NT status code.
+ *
+ * @param pBusNumber
+ * @param pSlotNumber
+ *
  */
 static NTSTATUS vboxguestwinnt4FindPCIDevice(PULONG pBusNumber, PPCI_SLOT_NUMBER pSlotNumber)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -435 +435 @@
         IoInitializeDpcRequest(pDevExt->win.s.pDeviceObject, vboxguestwinDpcHandler);
 #ifdef TARGET_NT4
+        ULONG uInterruptVector;
+        KIRQL irqLevel;
         /* Get an interrupt vector. */
         /* Only proceed if the device provides an interrupt. */
@@ -440 +442 @@
             || pDevExt->win.s.interruptVector)
         {
-            pDevExt->win.s.interruptVector = HalGetInterruptVector(PCIBus,
-                                                                   pDevExt->win.s.busNumber,
-                                                                   pDevExt->win.s.interruptLevel,
-                                                                   pDevExt->win.s.interruptVector,
-                                                                   (PKIRQL)pDevExt->win.s.interruptLevel,
-                                                                   &pDevExt->win.s.interruptAffinity);
+            Log(("VBoxGuest::vboxguestwinInit: Getting interrupt vector (HAL): Bus: %u, IRQL: %u, Vector: %u\n",
+                 pDevExt->win.s.busNumber, pDevExt->win.s.interruptLevel, pDevExt->win.s.interruptVector));
+
+            uInterruptVector = HalGetInterruptVector(PCIBus,
+                                                     pDevExt->win.s.busNumber,
+                                                     pDevExt->win.s.interruptLevel,
+                                                     pDevExt->win.s.interruptVector,
+                                                     &irqLevel,
+                                                     &pDevExt->win.s.interruptAffinity);
+            Log(("VBoxGuest::vboxguestwinInit: HalGetInterruptVector returns vector %u\n", uInterruptVector));
+            if (uInterruptVector == 0)
+                Log(("VBoxGuest::vboxguestwinInit: No interrupt vector found!\n"));
         }
         else
@@ -452 +460 @@
         if (pDevExt->win.s.interruptVector)
         {
+            Log(("VBoxGuest::vboxguestwinInit: Connecting interrupt ...\n"));
+
             rc = IoConnectInterrupt(&pDevExt->win.s.pInterruptObject,          /* Out: interrupt object. */
                                     (PKSERVICE_ROUTINE)vboxguestwinIsrHandler, /* Our ISR handler. */
                                     pDevExt,                                   /* Device context. */
                                     NULL,                                      /* Optional spinlock. */
+#ifdef TARGET_NT4
+                                    uInterruptVector,                          /* Interrupt vector. */
+                                    irqLevel,                                  /* Interrupt level. */
+                                    irqLevel,                                  /* Interrupt level. */
+#else
                                     pDevExt->win.s.interruptVector,            /* Interrupt vector. */
                                     (KIRQL)pDevExt->win.s.interruptLevel,      /* Interrupt level. */
                                     (KIRQL)pDevExt->win.s.interruptLevel,      /* Interrupt level. */
+#endif
                                     pDevExt->win.s.interruptMode,              /* LevelSensitive or Latched. */
                                     TRUE,                                      /* Shareable interrupt. */
@@ -479 +495 @@
     pDevExt->win.s.hgcm.s.WaitTimeout.QuadPart *= -10000; /* Relative in 100ns units. */
 
+    Log(("VBoxGuest::vboxguestwinInit: Allocating kernel session data ...\n"));
     int vrc = VBoxGuestCreateKernelSession(pDevExt, &pDevExt->win.s.pKernelSession);
     if (RT_FAILURE(vrc))
@@ -492 +509 @@
         Log(("VBoxGuest::vboxguestwinInit: Device is ready!\n"));
         pDevExt->win.s.devState = WORKING;
+    }
+    else
+    {
+        pDevExt->win.s.pInterruptObject = NULL;
     }