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

Timestamp:

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

Author:

vboxsync

Message:

usb/win: better logging & cleanup

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon

Files:

• VBoxUsbFlt.cpp (modified) (11 diffs)
• VBoxUsbHook.cpp (modified) (1 diff)
• VBoxUsbMon.cpp (modified) (49 diffs)
• VBoxUsbMon.h (modified) (1 diff)

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));

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

@@ -24 +24 @@
     if (pHook->fIsInstalled)
     {
-        AssertFailed();
+        WARN(("hook is marked installed, returning failure"));
         KeReleaseSpinLock(&pHook->Lock, Irql);
         return STATUS_UNSUCCESSFUL;

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

@@ -102 +102 @@
         case _t: return #_t
 #define VBOXUSBDBG_STRCASE_UNKNOWN(_v) \
-        default: Log((__FUNCTION__": Unknown Value (0n%d), (0x%x)\n", _v, _v)); return "Unknown"
+        default: LOG((__FUNCTION__": Unknown Value (0n%d), (0x%x)\n", _v, _v)); return "Unknown"
 
 static const char* vboxUsbDbgStrPnPMn(UCHAR uMn)
@@ -140 +140 @@
     for (int i = 0; i < pUnicodeString->Length/2; ++i)
     {
-        Log(("%c", *pStr++));
+        LOG(("%c", *pStr++));
     }
 }
@@ -182 +182 @@
     if (Status == STATUS_PENDING)
     {
-        Log(("IoCallDriver returned STATUS_PENDING!!\n"));
+        LOG(("IoCallDriver returned STATUS_PENDING!!\n"));
         KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);
         Status = IoStatus.Status;
@@ -190 +190 @@
     {
         PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)IoStatus.Information;
-        Log(("pRel = %p\n", pRel));
+        LOG(("pRel = %p\n", pRel));
         if (VALID_PTR(pRel))
         {
@@ -196 +196 @@
         }
         else
-            Log(("Invalid pointer %p\n", pRel));
-    }
-
-    Log(("IoCallDriver returned %x\n", Status));
+            LOG(("Invalid pointer %p\n", pRel));
+    }
+
+    LOG(("IoCallDriver returned %x\n", Status));
     return Status;
 }
@@ -213 +213 @@
     RtlInitUnicodeString(&szStandardHubName, L"\\Driver\\usbhub");
 
-    Log(("Search USB hub\n"));
+    LOG(("Search USB hub\n"));
     for (int i = 0; i < 16; i++)
     {
@@ -238 +238 @@
             if (Status == STATUS_SUCCESS)
             {
-                Log(("IoGetDeviceObjectPointer for %S returned %p %p\n", szwHubName, pHubDevObj, pHubFileObj));
+                LOG(("IoGetDeviceObjectPointer for %S returned %p %p\n", szwHubName, pHubDevObj, pHubFileObj));
 
                 if (pHubDevObj->DriverObject
@@ -245 +245 @@
                     && !RtlCompareUnicodeString(&szStandardHubName, &pHubDevObj->DriverObject->DriverName, TRUE /* case insensitive */))
                 {
-#if 0
-                    Log(("Associated driver"));
-                    Log(("%S\n", &pHubDevObj->DriverObject->DriverName.Buffer));
-#endif
-                    Log(("pnp handler %p\n", pHubDevObj->DriverObject->MajorFunction[IRP_MJ_PNP]));
+                    LOG(("Associated driver"));
+                    LOG_STRW(pHubDevObj->DriverObject->DriverName.Buffer);
+                    LOG(("pnp handler %p\n", pHubDevObj->DriverObject->MajorFunction[IRP_MJ_PNP]));
 
                     pDrvObj = pHubDevObj->DriverObject;
@@ -258 +256 @@
             else
             {
-                Log(("IoGetDeviceObjectPointer returned Status (0x%x) for %S returned\n", Status, szwHubName));
+                WARN(("IoGetDeviceObjectPointer returned Status (0x%x) for %S", Status, szwHubName));
             }
         }
         else
         {
-            AssertFailed();
+            WARN(("RtlAnsiStringToUnicodeString failed, Status (0x%x)", Status));
         }
     }
@@ -275 +273 @@
 static NTSTATUS vboxUsbMonHandlePnPIoctl(PDEVICE_OBJECT pDevObj, PIO_STACK_LOCATION pSl, PIO_STATUS_BLOCK pIoStatus)
 {
-    Log(("VBoxUSBMonHandlePnPIoctl IRQL = %d\n", KeGetCurrentIrql()));
+    LOG(("VBoxUSBMonHandlePnPIoctl IRQL = %d\n", KeGetCurrentIrql()));
     switch(pSl->MinorFunction)
     {
         case IRP_MN_QUERY_DEVICE_TEXT:
         {
-            Log(("IRP_MN_QUERY_DEVICE_TEXT: pIoStatus->Status = %x\n", pIoStatus->Status));
+            LOG(("IRP_MN_QUERY_DEVICE_TEXT: pIoStatus->Status = %x\n", pIoStatus->Status));
             if (pIoStatus->Status == STATUS_SUCCESS)
             {
@@ -292 +290 @@
                     {
                         case DeviceTextLocationInformation:
-                            Log(("DeviceTextLocationInformation %ws\n", pId));
+                            LOG(("DeviceTextLocationInformation"));
+                            LOG_STRW(pId);
                             break;
 
                         case DeviceTextDescription:
-                            Log(("DeviceTextDescription %ws\n", pId));
+                            LOG(("DeviceTextDescription"));
+                            LOG_STRW(pId);
                             if (VBoxUsbFltPdoIsFiltered(pDevObj))
                             {
@@ -306 +306 @@
                                 }
                                 memcpy(pId, szDeviceTextDescription, sizeof(szDeviceTextDescription));
-                                Log(("NEW szDeviceTextDescription %ws\n", pId));
+                                LOG(("NEW szDeviceTextDescription"));
+                                LOG_STRW(pId);
                                 ExFreePool((PVOID)pIoStatus->Information);
                                 pIoStatus->Information = (ULONG_PTR)pId;
@@ -316 +317 @@
                 }
                 else
-                    Log(("Invalid pointer %p\n", pId));
+                    LOG(("Invalid pointer %p\n", pId));
             }
             break;
@@ -323 +324 @@
         case IRP_MN_QUERY_ID:
         {
-            Log(("IRP_MN_QUERY_ID: Irp->pIoStatus->Status = %x\n", pIoStatus->Status));
+            LOG(("IRP_MN_QUERY_ID: Irp->pIoStatus->Status = %x\n", pIoStatus->Status));
             if (pIoStatus->Status == STATUS_SUCCESS &&  pDevObj)
             {
@@ -339 +340 @@
                     {
                         case BusQueryInstanceID:
-                            Log(("BusQueryInstanceID %ws\n", pId));
+                            LOG(("BusQueryInstanceID"));
+                            LOG_STRW(pId);
                             break;
 
@@ -370 +372 @@
                         while(*pId) //MULTI_SZ
                         {
-                            Log(("BusQueryHardwareIDs %ws\n", pId));
+                            LOG(("BusQueryHardwareIDs"));
+                            LOG_STRW(pId);
                             while(*pId) pId++;
                             pId++;
@@ -396 +399 @@
                         while(*pTmp) //MULTI_SZ
                         {
-                            Log(("NEW BusQueryHardwareIDs %ws\n", pTmp));
+                            LOG(("NEW BusQueryHardwareIDs"));
+                            LOG_STRW(pTmp);
                             while(*pTmp) pTmp++;
                             pTmp++;
@@ -409 +413 @@
                         while(*pId) //MULTI_SZ
                         {
-                            Log(("BusQueryCompatibleIDs %ws\n", pId));
+                            LOG(("BusQueryCompatibleIDs"));
+                            LOG_STRW(pId);
                             while(*pId) pId++;
                             pId++;
@@ -427 +432 @@
                             while(*pTmp) //MULTI_SZ
                             {
-                                Log(("NEW BusQueryCompatibleIDs %ws\n", pTmp));
+                                LOG(("NEW BusQueryCompatibleIDs"));
+                                LOG_STRW(pTmp);
                                 while(*pTmp) pTmp++;
                                 pTmp++;
@@ -439 +445 @@
                 }
                 else
-                    Log(("Invalid pointer %p\n", pId));
+                    LOG(("Invalid pointer %p\n", pId));
             }
             break;
@@ -451 +457 @@
             case BusRelations:
             {
-                Log(("BusRelations\n"));
+                LOG(("BusRelations\n"));
 
                 if (pIoStatus->Status == STATUS_SUCCESS)
                 {
                     PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)pIoStatus->Information;
-                    Log(("pRel = %p\n", pRel));
+                    LOG(("pRel = %p\n", pRel));
                     if (VALID_PTR(pRel))
                     {
@@ -462 +468 @@
                         {
                             if (VBoxUsbFltPdoIsFiltered(pDevObj))
-                                Log(("New PDO %p\n", pRel->Objects[i]));
+                                LOG(("New PDO %p\n", pRel->Objects[i]));
                         }
                     }
                     else
-                        Log(("Invalid pointer %p\n", pRel));
+                        LOG(("Invalid pointer %p\n", pRel));
                 }
                 break;
             }
             case TargetDeviceRelation:
-                Log(("TargetDeviceRelation\n"));
+                LOG(("TargetDeviceRelation\n"));
                 break;
             case RemovalRelations:
-                Log(("RemovalRelations\n"));
+                LOG(("RemovalRelations\n"));
                 break;
             case EjectionRelations:
-                Log(("EjectionRelations\n"));
+                LOG(("EjectionRelations\n"));
                 break;
             }
@@ -485 +491 @@
         case IRP_MN_QUERY_CAPABILITIES:
         {
-            Log(("IRP_MN_QUERY_CAPABILITIES: pIoStatus->Status = %x\n", pIoStatus->Status));
+            LOG(("IRP_MN_QUERY_CAPABILITIES: pIoStatus->Status = %x\n", pIoStatus->Status));
             if (pIoStatus->Status == STATUS_SUCCESS)
             {
@@ -491 +497 @@
                 if (VALID_PTR(pCaps))
                 {
-                    Log(("Caps.SilentInstall  = %d\n", pCaps->SilentInstall));
-                    Log(("Caps.UniqueID       = %d\n", pCaps->UniqueID ));
-                    Log(("Caps.Address        = %d\n", pCaps->Address ));
-                    Log(("Caps.UINumber       = %d\n", pCaps->UINumber ));
+                    LOG(("Caps.SilentInstall  = %d\n", pCaps->SilentInstall));
+                    LOG(("Caps.UniqueID       = %d\n", pCaps->UniqueID ));
+                    LOG(("Caps.Address        = %d\n", pCaps->Address ));
+                    LOG(("Caps.UINumber       = %d\n", pCaps->UINumber ));
                 }
                 else
-                    Log(("Invalid pointer %p\n", pCaps));
+                    LOG(("Invalid pointer %p\n", pCaps));
             }
             break;
@@ -507 +513 @@
     } /*switch */
 
-    Log(("VBoxUSBMonHandlePnPIoctl returns %x (IRQL = %d)\n", pIoStatus->Status, KeGetCurrentIrql()));
+    LOG(("VBoxUSBMonHandlePnPIoctl returns %x (IRQL = %d)\n", pIoStatus->Status, KeGetCurrentIrql()));
     return pIoStatus->Status;
 }
@@ -583 +589 @@
     }
 
-    Log(("<==PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x), Sl PDO(0x%p), Compl PDO(0x%p)\n",
+    LOG(("<==PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x), Sl PDO(0x%p), Compl PDO(0x%p)\n",
                             vboxUsbDbgStrPnPMn(pSl->MinorFunction),
                             pRealDevObj, pIrp, pIrp->IoStatus.Status,
@@ -626 +632 @@
     }
 
-    Log(("==>PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x)\n", vboxUsbDbgStrPnPMn(IoGetCurrentIrpStackLocation(pIrp)->MinorFunction), pDevObj, pIrp, pIrp->IoStatus.Status));
+    LOG(("==>PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x)\n", vboxUsbDbgStrPnPMn(IoGetCurrentIrpStackLocation(pIrp)->MinorFunction), pDevObj, pIrp, pIrp->IoStatus.Status));
 
     NTSTATUS Status = VBoxUsbHookRequestPassDownHookCompletion(&g_VBoxUsbMonGlobals.UsbHubPnPHook.Hook, pDevObj, pIrp, VBoxUsbPnPCompletion, &pCompletion->Rq);
@@ -643 +649 @@
     static bool fIsHookInited = false;
     if (fIsHookInited)
+    {
+        LOG(("hook inited already, success"));
         return STATUS_SUCCESS;
+    }
     PDRIVER_OBJECT pDrvObj = vboxUsbMonHookFindHubDrvObj();
-    Assert(pDrvObj);
     if (pDrvObj)
     {
         VBoxUsbHookInit(&g_VBoxUsbMonGlobals.UsbHubPnPHook.Hook, pDrvObj, IRP_MJ_PNP, VBoxUsbMonPnPHook);
         fIsHookInited = true;
+        LOG(("SUCCESS"));
         return STATUS_SUCCESS;
     }
+    WARN(("hub drv obj not found, fail"));
     return STATUS_UNSUCCESSFUL;
 }
@@ -662 +672 @@
     if (g_VBoxUsbMonGlobals.UsbHubPnPHook.fUninitFailed)
     {
-        AssertMsgFailed(("trying to hook usbhub pnp after the unhook failed, do nothing & pretend success..\n"));
+        WARN(("trying to hook usbhub pnp after the unhook failed, do nothing & pretend success"));
         return STATUS_SUCCESS;
     }
@@ -721 +731 @@
             NULL /* IN PLARGE_INTEGER Timeout */
         );
-    Assert(Status == STATUS_SUCCESS);
     if (Status == STATUS_SUCCESS)
     {
@@ -727 +736 @@
         {
             if (g_VBoxUsbMonGlobals.cOpens++)
-                break;
+            {
+                LOG(("opens: %d, success", g_VBoxUsbMonGlobals.cOpens));
+                break;
+            }
 
             Status = VBoxUsbFltInit();
@@ -739 +751 @@
                     {
                         Status = STATUS_SUCCESS;
+                        LOG(("succeded!!"));
                         break;
                     }
                     else
                     {
-                        AssertFailed();
+                        WARN(("vboxUsbMonHookInstall failed, Status (0x%x)", Status));
                     }
                 }
+                else
+                {
+                    WARN(("vboxUsbMonHookCheckInit failed, Status (0x%x)", Status));
+                }
                 VBoxUsbFltTerm();
             }
             else
             {
-                AssertFailed();
+                WARN(("VBoxUsbFltInit failed, Status (0x%x)", Status));
             }
 
@@ -758 +775 @@
 
         KeSetEvent(&g_VBoxUsbMonGlobals.OpenSynchEvent, 0, FALSE);
+    }
+    else
+    {
+        WARN(("KeWaitForSingleObject failed, Status (0x%x)", Status));
     }
     return Status;
@@ -776 +797 @@
             {
                 *ppCtx = pFileCtx;
+                LOG(("succeeded!!"));
                 return STATUS_SUCCESS;
             }
             else
             {
-                AssertFailed();
+                WARN(("VBoxUsbFltCreate failed"));
             }
             vboxUsbMonCheckTermStuff();
@@ -786 +808 @@
         else
         {
-            AssertFailed();
+            WARN(("vboxUsbMonCheckInitStuff failed"));
         }
         VBoxUsbMonMemFree(pFileCtx);
@@ -792 +814 @@
     else
     {
-        AssertFailed();
+        WARN(("VBoxUsbMonMemAllocZ failed"));
         Status = STATUS_NO_MEMORY;
     }
@@ -820 +842 @@
     PVBOXUSBMONCTX pCtx = (PVBOXUSBMONCTX)pFileObj->FsContext;
     NTSTATUS Status = vboxUsbMonContextClose(pCtx);
-    Assert(Status == STATUS_SUCCESS);
     if (Status != STATUS_SUCCESS)
     {
-        AssertMsgFailed(("close failed with Status 0x%x, prefent unload\n", Status));
+        WARN(("vboxUsbMonContextClose failed, Status (0x%x), prefent unload", Status));
         if (!InterlockedExchange(&g_VBoxUsbMonGlobals.ulPreventUnloadOn, 1))
         {
-            LogRel(("ulPreventUnloadOn not set, preventing unload\n"));
+            LOGREL(("ulPreventUnloadOn not set, preventing unload\n"));
             UNICODE_STRING UniName;
             PDEVICE_OBJECT pTmpDevObj;
@@ -836 +857 @@
         else
         {
-            AssertMsgFailed(("ulPreventUnloadOn already set\n"));
+            WARN(("ulPreventUnloadOn already set"));
         }
         Status = STATUS_SUCCESS;
@@ -854 +875 @@
     NTSTATUS Status;
 
-    Log(("VBoxUSBMonCreate\n"));
+    LOG(("VBoxUSBMonCreate\n"));
 
     if (pStack->Parameters.Create.Options & FILE_DIRECTORY_FILE)
     {
+        WARN(("trying to open as a directory\n"));
         pIrp->IoStatus.Status = STATUS_NOT_A_DIRECTORY;
         pIrp->IoStatus.Information = 0;
@@ -871 +893 @@
         Assert(pCtx);
         pFileObj->FsContext = pCtx;
+    }
+    else
+    {
+        WARN(("vboxUsbMonContextCreate failed Status (0x%x)\n", Status));
     }
 
@@ -930 +956 @@
             PUSBSUP_VERSION pOut = (PUSBSUP_VERSION)pvBuffer;
 
-            Log(("SUPUSBFLT_IOCTL_GET_VERSION\n"));
+            LOG(("SUPUSBFLT_IOCTL_GET_VERSION\n"));
             if (!pvBuffer || cbOutBuffer != sizeof(*pOut) || cbInBuffer != 0)
             {
@@ -977 +1003 @@
                 break;
             }
-            Log(("SUPUSBFLT_IOCTL_REMOVE_FILTER %x\n", *pIn));
+            LOG(("SUPUSBFLT_IOCTL_REMOVE_FILTER %x\n", *pIn));
             int rc = VBoxUsbMonFltRemove(pContext, *pIn);
             if (cbOutBuffer)
@@ -998 +1024 @@
                 break;
             }
-            Log(("SUPUSBFLT_IOCTL_RUN_FILTERS \n"));
+            LOG(("SUPUSBFLT_IOCTL_RUN_FILTERS \n"));
             Status = VBoxUsbMonRunFilters(pContext);
             Assert(Status == STATUS_SUCCESS);
@@ -1096 +1122 @@
             PVBOXUSBIDC_VERSION pOut = (PVBOXUSBIDC_VERSION)pvBuffer;
 
-            Log(("VBOXUSBIDC_INTERNAL_IOCTL_GET_VERSION\n"));
+            LOG(("VBOXUSBIDC_INTERNAL_IOCTL_GET_VERSION\n"));
             if (!pvBuffer)
             {
@@ -1112 +1138 @@
             PVBOXUSBIDC_PROXY_STARTUP pOut = (PVBOXUSBIDC_PROXY_STARTUP)pvBuffer;
 
-            Log(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_STARTUP\n"));
+            LOG(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_STARTUP\n"));
             if (!pvBuffer)
             {
@@ -1128 +1154 @@
             PVBOXUSBIDC_PROXY_TEARDOWN pOut = (PVBOXUSBIDC_PROXY_TEARDOWN)pvBuffer;
 
-            Log(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_TEARDOWN\n"));
+            LOG(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_TEARDOWN\n"));
             if (!pvBuffer)
             {
@@ -1179 +1205 @@
 static void _stdcall VBoxUsbMonUnload(PDRIVER_OBJECT pDrvObj)
 {
-    Log(("VBoxUSBMonUnload pDrvObj (0x%p)\n", pDrvObj));
+    LOG(("VBoxUSBMonUnload pDrvObj (0x%p)\n", pDrvObj));
 
     IoReleaseRemoveLockAndWait(&g_VBoxUsbMonGlobals.RmLock, &g_VBoxUsbMonGlobals);
@@ -1221 +1247 @@
 #endif
 
-    Log(("VBoxUSBMon::DriverEntry\n"));
+    LOG(("VBoxUSBMon::DriverEntry\n"));
 
     memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
@@ -1251 +1277 @@
 
                 g_VBoxUsbMonGlobals.pDevObj = pDevObj;
-                Log(("VBoxUSBMon::DriverEntry returning STATUS_SUCCESS\n"));
+                LOG(("VBoxUSBMon::DriverEntry returning STATUS_SUCCESS\n"));
                 return STATUS_SUCCESS;
             }

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

@@ -31 +31 @@
 #endif
 
+#define VBOX_DBG_LOG_NAME "USBMon"
+#include "../../../win/VBoxDbgLog.h"
 #include "../cmn/VBoxDrvTool.h"
 #include "../cmn/VBoxUsbTool.h"