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

Timestamp:

Apr 8, 2025 11:51:30 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168339

Message:

VBoxUSBMon: Removed temporary registry key workaround added for bugref:9479

File:

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

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

@@ -171 +171 @@
     LIST_ENTRY BlackDeviceList;
     VBOXUSBFLT_LOCK Lock;
-    /** Flag whether to force replugging a device we can't query descirptors from.
-     * Short term workaround for @bugref{9479}. */
-    ULONG           dwForceReplugWhenDevPopulateFails;
 } VBOXUSBFLTGLOBALS, *PVBOXUSBFLTGLOBALS;
 static VBOXUSBFLTGLOBALS g_VBoxUsbFltGlobals;
@@ -1104 +1101 @@
             {
                 WARN(("vboxUsbFltDevPopulate for PDO 0x%p failed with Status 0x%x", pDevObj, Status));
-                if (   Status == STATUS_CANCELLED
-                    && g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails)
-                {
-                    /*
-                     * This can happen if the device got suspended and is in D3 state where we can't query any strings.
-                     * There is no known way to set the power state of the device, especially if there is no driver attached yet.
-                     * The sledgehammer approach is to just replug the device to force it out of suspend, see bugref @{9479}.
-                     */
-                    continue;
-                }
             }
 
@@ -1681 +1668 @@
     VBOXUSBFLT_LOCK_INIT();
 
-    /*
-     * Check whether the setting to force replugging USB devices when
-     * querying string descriptors fail is set in the registry,
-     * see @bugref{9479}.
-     */
-    RTL_QUERY_REGISTRY_TABLE aParams[] =
-    {
-        {vboxUsbFltRegKeyQuery, 0, (PWSTR)L"ForceReplugWhenDevPopulateFails", &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, REG_DWORD, &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, sizeof(ULONG) },
-        {                 NULL, 0,                                      NULL,                                                   NULL,         0,                                                      0,             0 }
-    };
-    UNICODE_STRING UnicodePath = RTL_CONSTANT_STRING(L"\\VBoxUSB");
-
-    NTSTATUS Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, UnicodePath.Buffer, &aParams[0], NULL, NULL);
-    if (Status == STATUS_SUCCESS)
-    {
-        if (g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails)
-            LOG(("Forcing replug of USB devices where querying the descriptors fail\n"));
-    }
-    else
-        LOG(("RtlQueryRegistryValues() -> %#x, assuming defaults\n", Status));
-
     return STATUS_SUCCESS;
 }