Changeset 80891 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/mon

Timestamp:

Sep 18, 2019 2:06:30 PM (5 years ago)

Author:

vboxsync

Message:

USB/win: Removed unused arguments.

Location:

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

Files:

• VBoxUsbFlt.cpp (modified) (6 diffs)
• VBoxUsbMon.cpp (modified) (4 diffs)
• VBoxUsbMon.h (modified) (1 diff)

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

@@ -857 +857 @@
 } VBOXUSBFLTCHECKWALKER, *PVBOXUSBFLTCHECKWALKER;
 
-static DECLCALLBACK(BOOLEAN) vboxUsbFltFilterCheckWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo,
+static DECLCALLBACK(BOOLEAN) vboxUsbFltFilterCheckWalker(PFILE_OBJECT pHubFile,
                                                          PDEVICE_OBJECT pHubDo, PVOID pvContext)
 {
-    RT_NOREF1(pHubDo);
     PVBOXUSBFLTCHECKWALKER pData = (PVBOXUSBFLTCHECKWALKER)pvContext;
     PVBOXUSBFLTCTX pContext = pData->pContext;
 
-    LOG(("Visiting pFile(0x%p), pTopDo(0x%p), pHubDo(0x%p), oContext(0x%p)", pFile, pTopDo, pHubDo, pContext));
+    LOG(("Visiting pHubFile(0x%p), pHubDo(0x%p), oContext(0x%p)", pHubFile, pHubDo, pContext));
     KIRQL Irql = KeGetCurrentIrql();
     ASSERT_WARN(Irql == PASSIVE_LEVEL, ("unexpected IRQL (%d)", Irql));
@@ -870 +869 @@
     PDEVICE_RELATIONS pDevRelations = NULL;
 
-    NTSTATUS Status = VBoxUsbMonQueryBusRelations(pTopDo, pFile, &pDevRelations);
+    NTSTATUS Status = VBoxUsbMonQueryBusRelations(pHubDo, pHubFile, &pDevRelations);
     if (Status == STATUS_SUCCESS && pDevRelations)
     {
@@ -966 +965 @@
 
                 Status = vboxUsbFltPdoReplug(pDevRelations->Objects[k]);
-                ASSERT_WARN(Status == STATUS_SUCCESS, ("vboxUsbFltPdoReplug ailed Status(0x%x)", Status));
+                ASSERT_WARN(Status == STATUS_SUCCESS, ("vboxUsbFltPdoReplug failed! Status(0x%x)", Status));
                 ObDereferenceObject(pDevRelations->Objects[k]);
                 if (!--cReplugPdos)
@@ -972 +971 @@
             }
 
-            ASSERT_WARN(!cReplugPdos, ("cReplugPdosreached zero!"));
+            ASSERT_WARN(!cReplugPdos, ("cReplugPdos reached zero!"));
         }
 
@@ -981 +980 @@
     else
     {
-        WARN(("VBoxUsbMonQueryBusRelations failed for DO(0x%p), Status(0x%x), pDevRelations(0x%p)",
-                pTopDo, Status, pDevRelations));
-    }
-
-    LOG(("Done Visiting pFile(0x%p), pTopDo(0x%p), pHubDo(0x%p), oContext(0x%p)", pFile, pTopDo, pHubDo, pContext));
+        WARN(("VBoxUsbMonQueryBusRelations failed for hub DO(0x%p), Status(0x%x), pDevRelations(0x%p)",
+                pHubDo, Status, pDevRelations));
+    }
+
+    LOG(("Done Visiting pHubFile(0x%p), pHubDo(0x%p), oContext(0x%p)", pHubFile, pHubDo, pContext));
 
     return TRUE;
@@ -999 +998 @@
     VBOXUSBFLTCHECKWALKER Data;
     Data.pContext = pContext;
-    vboxUsbMonHubDevWalk(vboxUsbFltFilterCheckWalker, &Data, VBOXUSBMONHUBWALK_F_FDO);
+    vboxUsbMonHubDevWalk(vboxUsbFltFilterCheckWalker, &Data);
 
     LOG(("DONE Running filters, Context (0x%p)", pContext));

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

@@ -246 +246 @@
 }
 
-VOID vboxUsbMonHubDevWalk(PFNVBOXUSBMONDEVWALKER pfnWalker, PVOID pvWalker, ULONG fFlags)
+VOID vboxUsbMonHubDevWalk(PFNVBOXUSBMONDEVWALKER pfnWalker, PVOID pvWalker)
 {
     NTSTATUS Status = STATUS_UNSUCCESSFUL;
-    RT_NOREF1(fFlags);
     PWSTR szwHubList;
     Status = IoGetDeviceInterfaces(&GUID_DEVINTERFACE_USB_HUB, NULL, 0, &szwHubList);
@@ -273 +272 @@
                  */
                 LOG(("IoGetDeviceObjectPointer returned %p %p", pHubDevObj, pHubFileObj));
-                if (!pfnWalker(pHubFileObj, pHubDevObj, pHubDevObj, pvWalker))
+                if (!pfnWalker(pHubFileObj, pHubDevObj, pvWalker))
                 {
                     LOG(("the walker said to stop"));
@@ -768 +767 @@
 }
 
-static DECLCALLBACK(BOOLEAN) vboxUsbMonHookDrvObjWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext)
-{
-    RT_NOREF3(pFile, pTopDo, pvContext);
+static DECLCALLBACK(BOOLEAN) vboxUsbMonHookDrvObjWalker(PFILE_OBJECT pHubFile, PDEVICE_OBJECT pHubDo, PVOID pvContext)
+{
+    RT_NOREF2(pHubFile, pvContext);
     PDRIVER_OBJECT pDrvObj = pHubDo->DriverObject;
 
@@ -824 +823 @@
 static NTSTATUS vboxUsbMonInstallAllHooks()
 {
-    vboxUsbMonHubDevWalk(vboxUsbMonHookDrvObjWalker, NULL, VBOXUSBMONHUBWALK_F_ALL);
+    vboxUsbMonHubDevWalk(vboxUsbMonHookDrvObjWalker, NULL);
     return STATUS_SUCCESS;
 }

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

@@ -60 +60 @@
 void vboxUsbDbgPrintUnicodeString(PUNICODE_STRING pUnicodeString);
 
-/* visit usbhub-originated device PDOs */
-#define VBOXUSBMONHUBWALK_F_PDO 0x00000001
-/* visit usbhub device FDOs */
-#define VBOXUSBMONHUBWALK_F_FDO 0x00000002
-/* visit all usbhub-originated device objects */
-#define VBOXUSBMONHUBWALK_F_ALL (VBOXUSBMONHUBWALK_F_FDO | VBOXUSBMONHUBWALK_F_PDO)
-
-typedef DECLCALLBACK(BOOLEAN) FNVBOXUSBMONDEVWALKER(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext);
+typedef DECLCALLBACK(BOOLEAN) FNVBOXUSBMONDEVWALKER(PFILE_OBJECT pHubFile, PDEVICE_OBJECT pHubDo, PVOID pvContext);
 typedef FNVBOXUSBMONDEVWALKER *PFNVBOXUSBMONDEVWALKER;
 
-VOID vboxUsbMonHubDevWalk(PFNVBOXUSBMONDEVWALKER pfnWalker, PVOID pvWalker, ULONG fFlags);
+VOID vboxUsbMonHubDevWalk(PFNVBOXUSBMONDEVWALKER pfnWalker, PVOID pvWalker);
 
 #endif /* !VBOX_INCLUDED_SRC_VBoxUSB_win_mon_VBoxUsbMon_h */