Changeset 57934 in vbox

Timestamp:

Sep 29, 2015 10:24:25 AM (9 years ago)

Author:

vboxsync

Message:

HosDrivers/USBMon: fixed BSOD under driver verifier. Increased timeout in USBMon Uninstaller.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win

Files:

• Install/USBUninstall.cpp (modified) (1 diff)
• mon/VBoxUsbMon.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp

@@ -120 +120 @@
             else if (ControlService(hService, SERVICE_CONTROL_STOP, &Status))
             {
-                int iWait = 100;
+                /*
+                 * Wait for finish about 1 minute.
+                 * It should be enough for work with driver verifier
+                 */
+                int iWait = 600;
                 while (Status.dwCurrentState == SERVICE_STOP_PENDING && iWait-- > 0)
                 {

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

@@ -566 +566 @@
             if (Status == STATUS_SUCCESS)
             {
-                LOG(("IoGetDeviceObjectPointer for %S returned %p %p", szwHubName, pHubDevObj, pHubFileObj));
+                LOG(("IoGetDeviceObjectPointer for \\Device\\USBPDO-%d returned %p %p", i, pHubDevObj, pHubFileObj));
 
                 VBOXUSBOBJDRVOBJSEARCHER Data = {0};
@@ -599 +599 @@
             else
             {
-                LOG(("IoGetDeviceObjectPointer returned Status (0x%x) for (%S)", Status, szwHubName));
+                LOG(("IoGetDeviceObjectPointer returned Status (0x%x) for (\\Device\\USBPDO-%d)", Status, i));
             }
         }
         else
         {
-            WARN(("RtlAnsiStringToUnicodeString failed, Status (0x%x) for Ansu name (%s)", Status, szHubName));
+            WARN(("RtlAnsiStringToUnicodeString failed, Status (0x%x) for Ansu name (\\Device\\USBPDO-%d)", Status, i));
         }
     }
@@ -627 +627 @@
             if (Status == STATUS_SUCCESS)
             {
-                /** @todo Replace %S with something else as it does not work for PWSTR. */
-                LOG(("IoGetDeviceObjectPointer for %S returned %p %p", szwHubName, pHubDevObj, pHubFileObj));
+                /* We can't log HubName here couse string logging could lead to BSOD */
+                LOG(("IoGetDeviceObjectPointer returned %p %p", pHubDevObj, pHubFileObj));
                 if (!pfnWalker(pHubFileObj, pHubDevObj, pHubDevObj, pvWalker))
                 {