Changeset 37042 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win

Timestamp:

May 11, 2011 7:04:07 PM (14 years ago)

Author:

vboxsync

Message:

usb: back out r71658 as it's not correct; some additional debugging

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon

Files:

• VBoxUsbFlt.cpp (modified) (4 diffs)
• VBoxUsbHook.cpp (modified) (1 diff)
• VBoxUsbHook.h (modified) (1 diff)
• VBoxUsbMon.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp

@@ -668 +668 @@
                             {
                                 PDEVICE_OBJECT pDevObj = pDevRelations->Objects[k];
-                                if (!pDevObj->DriverObject
-                                        || !pDevObj->DriverObject->DriverName.Buffer
-                                        || !pDevObj->DriverObject->DriverName.Length)
-                                {
-                                    AssertFailed();
-                                    continue;
-                                }
-
-                                bool fIsHub = false;
-                                for (int z = 0; z < RT_ELEMENTS(lpszStandardControllerName); ++z)
-                                {
-                                    if (!RtlCompareUnicodeString(&szStandardControllerName[z], &pDevObj->DriverObject->DriverName, TRUE /* case insensitive */))
-                                    {
-                                        fIsHub = true;
-                                        break;
-                                    }
-                                }
-
-                                if (fIsHub)
-                                {
-                                    Log(("Found sub-hub, PDO 0x%p\n", pDevObj));
-                                    continue;
-                                }
 
                                 Log(("Found existing USB PDO 0x%p\n", pDevObj));
@@ -706 +683 @@
                                     else
                                     {
-                                        ObDereferenceObject(pDevRelations->Objects[k]);
+                                        ObDereferenceObject(pDevObj);
                                     }
 
@@ -719 +696 @@
 
                                 VBOXUSBFLT_DEVICE Device;
-                                Status = vboxUsbFltDevPopulate(&Device, pDevRelations->Objects[k] /*, FALSE /* only need filter properties */);
+                                Status = vboxUsbFltDevPopulate(&Device, pDevObj /*, FALSE /* only need filter properties */);
                                 if (NT_SUCCESS(Status))
                                 {
@@ -733 +710 @@
                                     {
                                         /* this device should not be filtered, and it's not */
-                                        ObDereferenceObject(pDevRelations->Objects[k]);
+                                        ObDereferenceObject(pDevObj);
                                         pDevRelations->Objects[k] = NULL;
                                         --cReplugPdos;

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp

@@ -164 +164 @@
 }
 
+#define PVBOXUSBHOOK_REQUEST_FROM_LE(_pLe) ( (PVBOXUSBHOOK_REQUEST)( ((uint8_t*)(_pLe)) - RT_OFFSETOF(VBOXUSBHOOK_REQUEST, ListEntry) ) )
+
+VOID VBoxUsbHookVerifyCompletion(PVBOXUSBHOOK_ENTRY pHook, PVBOXUSBHOOK_REQUEST pRequest, PIRP pIrp)
+{
+    KIRQL oldIrql;
+    KeAcquireSpinLock(&pHook->Lock, &oldIrql);
+    for (PLIST_ENTRY pLe = pHook->RequestList.Flink; pLe != &pHook->RequestList; pLe = pLe->Flink)
+    {
+        PVBOXUSBHOOK_REQUEST pCur = PVBOXUSBHOOK_REQUEST_FROM_LE(pLe);
+        if (pCur != pRequest)
+            continue;
+        if (pCur->pIrp != pIrp)
+            continue;
+        AssertFailed();
+    }
+    KeReleaseSpinLock(&pHook->Lock, oldIrql);
+
+}

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h

@@ -70 +70 @@
 NTSTATUS VBoxUsbHookRequestMoreProcessingRequired(PVBOXUSBHOOK_ENTRY pHook, PDEVICE_OBJECT pDevObj, PIRP pIrp, PVBOXUSBHOOK_REQUEST pRequest);
 NTSTATUS VBoxUsbHookRequestComplete(PVBOXUSBHOOK_ENTRY pHook, PDEVICE_OBJECT pDevObj, PIRP pIrp, PVBOXUSBHOOK_REQUEST pRequest);
+VOID VBoxUsbHookVerifyCompletion(PVBOXUSBHOOK_ENTRY pHook, PVBOXUSBHOOK_REQUEST pRequest, PIRP pIrp);
 
 #endif /* #ifndef ___VBoxUsbHook_h___ */

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp

@@ -625 +625 @@
     Log(("==>PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x)\n", vboxUsbDbgStrPnPMn(IoGetCurrentIrpStackLocation(pIrp)->MinorFunction), pDevObj, pIrp, pIrp->IoStatus.Status));
 
-    return VBoxUsbHookRequestPassDownHookCompletion(&g_VBoxUsbMonGlobals.UsbHubPnPHook.Hook, pDevObj, pIrp, VBoxUsbPnPCompletion, &pCompletion->Rq);
+    NTSTATUS Status = VBoxUsbHookRequestPassDownHookCompletion(&g_VBoxUsbMonGlobals.UsbHubPnPHook.Hook, pDevObj, pIrp, VBoxUsbPnPCompletion, &pCompletion->Rq);
+#ifdef DEBUG
+    if (Status != STATUS_PENDING)
+    {
+        VBoxUsbHookVerifyCompletion(&g_VBoxUsbMonGlobals.UsbHubPnPHook.Hook, &pCompletion->Rq, pIrp);
+    }
+#endif
+    return Status;
 }