Changeset 62715 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB

Timestamp:

Jul 29, 2016 9:55:17 PM (9 years ago)

Author:

vboxsync

Message:

HostDrivers: warnings

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp (modified) (15 diffs)

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

@@ -156 +156 @@
 void vboxUsbDbgPrintUnicodeString(PUNICODE_STRING pUnicodeString)
 {
-    PWSTR pStr = pUnicodeString->Buffer;
-    for (int i = 0; i < pUnicodeString->Length/2; ++i)
-    {
-        LOG(("%c", *pStr++));
-    }
+    RT_NOREF1(pUnicodeString);
+    Log(("%.*ls", pUnicodeString->Length / 2, pUnicodeString->Buffer));
 }
 
@@ -421 +418 @@
 static DECLCALLBACK(VOID) vboxUsbObjDevNamePrefixMatcher(PDEVICE_OBJECT pDo, PUNICODE_STRING pName, PVOID pvMatcher)
 {
+    RT_NOREF1(pDo);
     PVBOXUSBOBJNAMEPREFIXMATCHER pData = (PVBOXUSBOBJNAMEPREFIXMATCHER)pvMatcher;
     PUNICODE_STRING pNamePrefix = pData->pNamePrefix;
@@ -438 +436 @@
 static DECLCALLBACK(BOOLEAN) vboxUsbObjDevObjSearcherWalker(PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pCurDo, PVOID pvContext)
 {
+    RT_NOREF1(pTopDo);
     PVBOXUSBOBJDRVOBJSEARCHER pData = (PVBOXUSBOBJDRVOBJSEARCHER)pvContext;
     ASSERT_WARN(!pData->pDevObj, ("non-null dev object (0x%p) on enter", pData->pDevObj));
@@ -608 +607 @@
     }
 #else /* VBOX_USB3PORT */
+    RT_NOREF1(fFlags);
     PWSTR szwHubList;
     Status = IoGetDeviceInterfaces(&GUID_DEVINTERFACE_USB_HUB, NULL, 0, &szwHubList);
@@ -655 +655 @@
 static DECLCALLBACK(BOOLEAN) vboxUsbMonFindHubDrvObjWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext)
 {
+    RT_NOREF2(pFile, pTopDo);
     PVBOXUSBMONFINDHUBWALKER pData = (PVBOXUSBMONFINDHUBWALKER)pvContext;
     PDRIVER_OBJECT pDrvObj = pHubDo->DriverObject;
@@ -673 +674 @@
 static PDRIVER_OBJECT vboxUsbMonHookFindHubDrvObj()
 {
-    NTSTATUS Status = STATUS_UNSUCCESSFUL;
     UNICODE_STRING szStandardHubName;
-    PDRIVER_OBJECT pDrvObj = NULL;
     szStandardHubName.Length = 0;
     szStandardHubName.MaximumLength = 0;
@@ -685 +684 @@
     vboxUsbMonHubDevWalk(vboxUsbMonFindHubDrvObjWalker, &Data, VBOXUSBMONHUBWALK_F_ALL);
     if (Data.pDrvObj)
-    {
         LOG(("returning driver object 0x%p", Data.pDrvObj));
-    }
     else
-    {
         WARN(("no hub driver object found!"));
-    }
     return Data.pDrvObj;
 }
@@ -770 +765 @@
                     ASSERT_WARN(Iqrl == PASSIVE_LEVEL, ("irql is not PASSIVE"));
 
-                    switch (pSl->Parameters.QueryDeviceRelations.Type)
+                    switch (pSl->Parameters.QueryId.IdType)
                     {
                         case BusQueryInstanceID:
@@ -899 +894 @@
                         }
                         break;
+
+                        default:
+                            /** @todo r=bird: handle BusQueryContainerID and whatever else we might see  */
+                            break;
                     }
                 }
@@ -1192 +1191 @@
 static DECLCALLBACK(BOOLEAN) vboxUsbMonHookDrvObjWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext)
 {
+    RT_NOREF3(pFile, pTopDo, pvContext);
     PDRIVER_OBJECT pDrvObj = pHubDo->DriverObject;
 
@@ -1519 +1519 @@
 static NTSTATUS _stdcall VBoxUsbMonCreate(PDEVICE_OBJECT pDevObj, PIRP pIrp)
 {
+    RT_NOREF1(pDevObj);
     PIO_STACK_LOCATION pStack = IoGetCurrentIrpStackLocation(pIrp);
     PFILE_OBJECT pFileObj = pStack->FileObject;
@@ -1866 +1867 @@
 static void _stdcall VBoxUsbMonUnload(PDRIVER_OBJECT pDrvObj)
 {
+    RT_NOREF1(pDrvObj);
     LOG(("VBoxUSBMonUnload pDrvObj (0x%p)", pDrvObj));
 
@@ -1874 +1876 @@
     UNICODE_STRING DosName;
     RtlInitUnicodeString(&DosName, USBMON_DEVICE_NAME_DOS);
-    NTSTATUS rc = IoDeleteSymbolicLink(&DosName);
+    IoDeleteSymbolicLink(&DosName);
 
     IoDeleteDevice(g_VBoxUsbMonGlobals.pDevObj);
@@ -1881 +1883 @@
     PRTLOGGER pLogger = RTLogRelSetDefaultInstance(NULL);
     if (pLogger)
-    {
         RTLogDestroy(pLogger);
-    }
     pLogger = RTLogSetDefaultInstance(NULL);
     if (pLogger)
-    {
         RTLogDestroy(pLogger);
-    }
 }
 
@@ -1904 +1902 @@
 NTSTATUS _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath)
 {
+    RT_NOREF1(pRegPath);
 #ifdef VBOX_USB_WITH_VERBOSE_LOGGING
     RTLogGroupSettings(0, "+default.e.l.f.l2.l3");