Changeset 37042 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp

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

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp (modified) (4 diffs)

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;