Changeset 62716 in vbox

Timestamp:

Jul 29, 2016 10:01:27 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109290

Message:

HostDrivers: warnings

Location:

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

Files:

• VBoxUsbFlt.cpp (modified) (9 diffs)
• VBoxUsbFlt.h (modified) (3 diffs)

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

@@ -783 +783 @@
 } VBOXUSBFLTCHECKWALKER, *PVBOXUSBFLTCHECKWALKER;
 
-static DECLCALLBACK(BOOLEAN) vboxUsbFltFilterCheckWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext)
-{
+static DECLCALLBACK(BOOLEAN) vboxUsbFltFilterCheckWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo,
+                                                         PDEVICE_OBJECT pHubDo, PVOID pvContext)
+{
+    RT_NOREF1(pHubDo);
     PVBOXUSBFLTCHECKWALKER pData = (PVBOXUSBFLTCHECKWALKER)pvContext;
     PVBOXUSBFLTCTX pContext = pData->pContext;
@@ -843 +845 @@
                 VBOXUSBFLT_LOCK_ACQUIRE();
                 PVBOXUSBFLTCTX pCtx = vboxUsbFltDevMatchLocked(&Device, &uId,
-                        false, /* do not remove a one-shot filter */
-                        &fFilter, &fIsOneShot);
+                                                               false, /* do not remove a one-shot filter */
+                                                               &fFilter, &fIsOneShot);
                 VBOXUSBFLT_LOCK_RELEASE();
+                NOREF(pCtx);
                 LOG(("Matching Info: Filter (0x%p), pCtx(0x%p), fFilter(%d), fIsOneShot(%d)", uId, pCtx, (int)fFilter, (int)fIsOneShot));
                 if (fFilter)
@@ -931 +934 @@
 
     VBOXUSBFLT_LOCK_ACQUIRE();
-    uint32_t cActiveFilters = pContext->cActiveFilters;
+
     pContext->bRemoved = TRUE;
     if (pContext->pChangeEvent)
@@ -943 +946 @@
     }
     else
-    {
         LOG(("no change event"));
-    }
     RemoveEntryList(&pContext->ListEntry);
 
@@ -956 +957 @@
     /* 2. check if there are devices owned */
     for (PLIST_ENTRY pEntry = g_VBoxUsbFltGlobals.DeviceList.Flink;
-            pEntry != &g_VBoxUsbFltGlobals.DeviceList;
-            pEntry = pEntry->Flink)
+         pEntry != &g_VBoxUsbFltGlobals.DeviceList;
+         pEntry = pEntry->Flink)
     {
         PVBOXUSBFLT_DEVICE pDevice = PVBOXUSBFLT_DEVICE_FROM_LE(pEntry);
@@ -984 +985 @@
         }
     }
+
     VBOXUSBFLT_LOCK_RELEASE();
 
@@ -1192 +1194 @@
     }
     pDevInfo->fHighSpeed = pDevice->fHighSpeed;
+#else
+    RT_NOREF3(pContext, pDevice, pDevInfo);
 #endif
 }
@@ -1316 +1320 @@
 NTSTATUS VBoxUsbFltPdoAddCompleted(PDEVICE_OBJECT pPdo)
 {
+    RT_NOREF1(pPdo);
     VBOXUSBFLT_LOCK_ACQUIRE();
     vboxUsbFltSignalChangeLocked();
@@ -1326 +1331 @@
     VBOXUSBFLT_DEVSTATE enmState = VBOXUSBFLT_DEVSTATE_REMOVED;
     VBOXUSBFLT_LOCK_ACQUIRE();
+
     PVBOXUSBFLT_DEVICE pDevice = vboxUsbFltDevGetLocked(pPdo);
     if (pDevice)
-    {
         enmState = pDevice->enmState;
-    }
+
     VBOXUSBFLT_LOCK_RELEASE();
 

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

@@ -3 +3 @@
  * VBox USB Monitor Device Filtering functionality
  */
+
 /*
  * Copyright (C) 2011-2016 Oracle Corporation
@@ -14 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-#ifndef ___VBoxUsbFlt_h___
-#define ___VBoxUsbFlt_h___
+
+#ifndef ___win_mon_VBoxUsbFlt_h___
+#define ___win_mon_VBoxUsbFlt_h___
 
 #include "VBoxUsbMon.h"
@@ -51 +53 @@
 BOOLEAN VBoxUsbFltPdoIsFiltered(PDEVICE_OBJECT pPdo);
 
-#endif /* #ifndef ___VBoxUsbFlt_h___ */
+#endif
+