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

Timestamp:

Jul 27, 2011 2:34:03 PM (13 years ago)

Author:

vboxsync

Message:

usb/win: fix detection devices w/o drv key

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win

Files:

• lib/VBoxUsbLib-win.cpp (modified) (1 diff)
• mon/VBoxUsbMon.cpp (modified) (1 diff)
• mon/VBoxUsbMon.h (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp

@@ -766 +766 @@
     }
 
+    char nameEmptyBuf = '0';
     LPSTR lpszName = NULL;
     rc = usbLibDevStrDriverKeyGet(hHub, iPort, &lpszName);
-    if (RT_FAILURE(rc))
-    {
-        return rc;
-    }
-
-    Assert(lpszName);
+    Assert(!!lpszName == !!RT_SUCCESS(rc));
+    if (!lpszName)
+        lpszName = &nameEmptyBuf;
 
     PUSB_CONFIGURATION_DESCRIPTOR pCfgDr = NULL;

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

@@ -258 +258 @@
             else
             {
-                AssertFailed();
+                Log(("IoGetDeviceObjectPointer returned Status (0x%x) for %S returned\n", Status, szwHubName));
             }
         }

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

@@ -32 +32 @@
 
 #include "../cmn/VBoxDrvTool.h"
-
-#ifdef Log
-# undef Log
-# define Log(_m) DbgPrint _m
-#endif
-
-#ifdef LogRel
-# undef LogRel
-# define LogRel(_m) DbgPrint _m
-#endif
-
-#ifdef LogFlow
-# undef LogFlow
-# define LogFlow(_m) DbgPrint _m
-#endif
-
 #include "../cmn/VBoxUsbTool.h"