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

Timestamp:

Aug 1, 2011 2:10:21 PM (13 years ago)

Author:

vboxsync

Message:

usb/win: better logging & cleanup

File:

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

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

@@ -405 +405 @@
         if (!NT_SUCCESS(Status))
         {
-            LogRel((__FUNCTION__": getting device descriptor failed\n"));
+            LOGREL((__FUNCTION__": getting device descriptor failed\n"));
             break;
         }
@@ -411 +411 @@
         if (vboxUsbFltBlDevMatchLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice))
         {
-            LogRel((__FUNCTION__": found a known black list device, vid(0x%x), pid(0x%x), rev(0x%x)\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice));
+            LOGREL((__FUNCTION__": found a known black list device, vid(0x%x), pid(0x%x), rev(0x%x)\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice));
 #ifdef DEBUG_misha
             AssertFailed();
@@ -419 +419 @@
         }
 
-        Log(("Device pid=%x vid=%x rev=%x\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice));
+        LOG(("Device pid=%x vid=%x rev=%x\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice));
         pDevice->idVendor     = pDevDr->idVendor;
         pDevice->idProduct    = pDevDr->idProduct;
@@ -535 +535 @@
             }
 #endif
-            Log((__FUNCTION__": strings: '%s':'%s':'%s' (lang ID %x)\n",
+            LOG((__FUNCTION__": strings: '%s':'%s':'%s' (lang ID %x)\n",
                         pDevice->szMfgName, pDevice->szProduct, pDevice->szSerial, langId));
         }
@@ -713 +713 @@
     Assert(Irql == PASSIVE_LEVEL);
 
-    Log(("==" __FUNCTION__"\n"));
+    LOG(("==" __FUNCTION__"\n"));
 
     for (int i=0;i<RT_ELEMENTS(lpszStandardControllerName);i++)
@@ -745 +745 @@
         if (Status == STATUS_SUCCESS)
         {
-            Log(("IoGetDeviceObjectPointer for %s returned %p %p\n", szHubName, pHubDevObj, pHubFileObj));
+            LOG(("IoGetDeviceObjectPointer for %s returned %p %p\n", szHubName, pHubDevObj, pHubFileObj));
 
             if (pHubDevObj->DriverObject
@@ -759 +759 @@
 
 #ifdef DEBUG
-                        Log(("Associated driver "));
+                        LOG(("Associated driver "));
                         vboxUsbDbgPrintUnicodeString(&pHubDevObj->DriverObject->DriverName);
-                        Log((" -> related dev obj=0x%p\n", IoGetRelatedDeviceObject(pHubFileObj)));
+                        LOG((" -> related dev obj=0x%p\n", IoGetRelatedDeviceObject(pHubFileObj)));
 #endif
 
@@ -774 +774 @@
                                 PDEVICE_OBJECT pDevObj = pDevRelations->Objects[k];
 
-                                Log(("Found existing USB PDO 0x%p\n", pDevObj));
+                                LOG(("Found existing USB PDO 0x%p\n", pDevObj));
                                 VBOXUSBFLT_LOCK_ACQUIRE();
                                 PVBOXUSBFLT_DEVICE pDevice = vboxUsbFltDevGetLocked(pDevObj);
@@ -931 +931 @@
 {
     *pId = 0;
-    /* Log the filter details. */
-    Log((__FUNCTION__": %s %s %s\n",
+    /* LOG the filter details. */
+    LOG((__FUNCTION__": %s %s %s\n",
         USBFilterGetString(pFilter, USBFILTERIDX_MANUFACTURER_STR)  ? USBFilterGetString(pFilter, USBFILTERIDX_MANUFACTURER_STR)  : "<null>",
         USBFilterGetString(pFilter, USBFILTERIDX_PRODUCT_STR)       ? USBFilterGetString(pFilter, USBFILTERIDX_PRODUCT_STR)       : "<null>",
         USBFilterGetString(pFilter, USBFILTERIDX_SERIAL_NUMBER_STR) ? USBFilterGetString(pFilter, USBFILTERIDX_SERIAL_NUMBER_STR) : "<null>"));
 #ifdef DEBUG
-    Log(("VBoxUSBClient::addFilter: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x\n",
+    LOG(("VBoxUSBClient::addFilter: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x\n",
               USBFilterGetNum(pFilter, USBFILTERIDX_VENDOR_ID),
               USBFilterGetNum(pFilter, USBFILTERIDX_PRODUCT_ID),
@@ -1300 +1300 @@
     {
         /* this is due to devie was physically removed */
-        Log(("The proxy notified progy stop for the captured device 0x%x\n", pDevice));
+        LOG(("The proxy notified progy stop for the captured device 0x%x\n", pDevice));
         pDevice->enmState = VBOXUSBFLT_DEVSTATE_CAPTURING;
         vboxUsbFltSignalChangeLocked();
@@ -1316 +1316 @@
 {
     int rc = VBoxUSBFilterInit();
-    AssertRC(rc);
     if (RT_FAILURE(rc))
+    {
+        WARN(("VBoxUSBFilterInit failed, rc (%d)", rc));
         return STATUS_UNSUCCESSFUL;
+    }
 
     memset(&g_VBoxUsbFltGlobals, 0, sizeof (g_VBoxUsbFltGlobals));