Changeset 62714 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/dev

Timestamp:

Jul 29, 2016 9:41:09 PM (8 years ago)

Author:

vboxsync

Message:

HostDrivers: warnings

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev

Files:

• VBoxUsbPnP.cpp (modified) (3 diffs)
• VBoxUsbPwr.cpp (modified) (13 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp

@@ -3 +3 @@
  * USB PnP Handling
  */
+
 /*
  * Copyright (C) 2011-2016 Oracle Corporation
@@ -14 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #include "VBoxUsbCmn.h"
 
@@ -214 +216 @@
 {
     PVBOXUSBDEV_EXT pDevExt = (PVBOXUSBDEV_EXT)pDeviceObject->DeviceExtension;
-    ENMVBOXUSB_PNPSTATE enmState = vboxUsbPnPStateGet(pDevExt);
     if (!vboxUsbDdiStateRetainIfNotRemoved(pDevExt))
-    {
         return VBoxDrvToolIoComplete(pIrp, STATUS_DELETE_PENDING, 0);
-    }
 
     PIO_STACK_LOCATION pSl = IoGetCurrentIrpStackLocation(pIrp);
-
     switch (pSl->MinorFunction)
     {
         case IRP_MN_START_DEVICE:
-        {
             return vboxUsbPnPMnStartDevice(pDevExt, pIrp);
-        }
+
         case IRP_MN_QUERY_STOP_DEVICE:
-        {
             return vboxUsbPnPMnQueryStopDevice(pDevExt, pIrp);
-        }
+
         case IRP_MN_STOP_DEVICE:
-        {
             return vboxUsbPnPMnStopDevice(pDevExt, pIrp);
-        }
+
         case IRP_MN_CANCEL_STOP_DEVICE:
-        {
             return vboxUsbPnPMnCancelStopDevice(pDevExt, pIrp);
-        }
+
         case IRP_MN_QUERY_REMOVE_DEVICE:
-        {
             return vboxUsbPnPMnQueryRemoveDevice(pDevExt, pIrp);
-        }
+
         case IRP_MN_REMOVE_DEVICE:
-        {
             return vboxUsbPnPMnRemoveDevice(pDevExt, pIrp);
-        }
+
         case IRP_MN_CANCEL_REMOVE_DEVICE:
-        {
             return vboxUsbPnPMnCancelRemoveDevice(pDevExt, pIrp);
-        }
+
         case IRP_MN_SURPRISE_REMOVAL:
-        {
             return vboxUsbPnPMnSurpriseRemoval(pDevExt, pIrp);
-        }
+
         case IRP_MN_QUERY_CAPABILITIES:
-        {
             return vboxUsbPnPMnQueryCapabilities(pDevExt, pIrp);
-        }
+
         default:
-        {
             return vboxUsbPnPMnDefault(pDevExt, pIrp);
-        }
-    }
-}
+    }
+}
+

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp

@@ -54 +54 @@
 
 static VOID vboxUsbPwrIoDeviceCompletion(IN PDEVICE_OBJECT pDeviceObject,
-                    IN UCHAR MinorFunction,
-                    IN POWER_STATE PowerState,
-                    IN PVOID pvContext,
-                    IN PIO_STATUS_BLOCK pIoStatus)
-{
+                                         IN UCHAR MinorFunction,
+                                         IN POWER_STATE PowerState,
+                                         IN PVOID pvContext,
+                                         IN PIO_STATUS_BLOCK pIoStatus)
+{
+    RT_NOREF3(pDeviceObject, MinorFunction, PowerState);
     PVBOXUSB_PWRDEV_CTX pDevCtx = (PVBOXUSB_PWRDEV_CTX)pvContext;
     PVBOXUSBDEV_EXT pDevExt = pDevCtx->pDevExt;
@@ -108 +109 @@
 static NTSTATUS vboxUsbPwrIoPostSysCompletion(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp, IN PVOID pvContext)
 {
+    RT_NOREF1(pDevObj);
     PVBOXUSBDEV_EXT pDevExt = (PVBOXUSBDEV_EXT)pvContext;
     NTSTATUS Status = pIrp->IoStatus.Status;
@@ -138 +140 @@
     IoSetCompletionRoutine(pIrp, vboxUsbPwrIoPostSysCompletion, pDevExt, TRUE, TRUE, TRUE);
     NTSTATUS Status = PoCallDriver(pDevExt->pLowerDO, pIrp);
-    Assert(NT_SUCCESS(Status));
+    Assert(NT_SUCCESS(Status)); NOREF(Status);
     return STATUS_PENDING;
 }
@@ -144 +146 @@
 static NTSTATUS vboxUsbPwrQueryPowerSys(IN PVBOXUSBDEV_EXT pDevExt, IN PIRP pIrp)
 {
-    PIO_STACK_LOCATION pSl = IoGetCurrentIrpStackLocation(pIrp);
-    SYSTEM_POWER_STATE enmSysPState = pSl->Parameters.Power.State.SystemState;
+    /*PIO_STACK_LOCATION pSl = IoGetCurrentIrpStackLocation(pIrp);
+    SYSTEM_POWER_STATE enmSysPState = pSl->Parameters.Power.State.SystemState;*/
 
     return vboxUsbPwrIoPostSys(pDevExt, pIrp);
@@ -152 +154 @@
 static NTSTATUS vboxUsbPwrIoPostDevCompletion(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp, IN PVOID pvContext)
 {
+    RT_NOREF1(pDevObj);
     PVBOXUSBDEV_EXT pDevExt = (PVBOXUSBDEV_EXT)pvContext;
 
     if (pIrp->PendingReturned)
-    {
         IoMarkIrpPending(pIrp);
-    }
 
     NTSTATUS Status = pIrp->IoStatus.Status;
@@ -167 +168 @@
         {
             case IRP_MN_SET_POWER:
-            {
                 pDevExt->DdiState.PwrState.PowerState.DeviceState = pSl->Parameters.Power.State.DeviceState;
                 PoSetPowerState(pDevExt->pFDO, DevicePowerState, pSl->Parameters.Power.State);
                 break;
-            }
+
             default:
-            {
                 break;
-            }
         }
     }
@@ -190 +188 @@
     IoSetCompletionRoutine(pIrp, vboxUsbPwrIoPostDevCompletion, pDevExt, TRUE, TRUE, TRUE);
     NTSTATUS Status = PoCallDriver(pDevExt->pLowerDO, pIrp);
-    Assert(NT_SUCCESS(Status));
+    Assert(NT_SUCCESS(Status)); RT_NOREF_PV(Status);
     return STATUS_PENDING;
 }
@@ -271 +269 @@
 {
     PIO_STACK_LOCATION pSl = IoGetCurrentIrpStackLocation(pIrp);
-
     switch (pSl->Parameters.Power.Type)
     {
         case SystemPowerState:
-        {
             return vboxUsbPwrQueryPowerSys(pDevExt, pIrp);
-        }
+
         case DevicePowerState:
-        {
             return vboxUsbPwrQueryPowerDev(pDevExt, pIrp);
-        }
+
         default:
-        {
             AssertFailed();
             return vboxUsbPwrMnDefault(pDevExt, pIrp);
-        }
-
-    }
-    return vboxUsbPwrMnDefault(pDevExt, pIrp);
+
+    }
 }
 
 static NTSTATUS vboxUsbPwrSetPowerSys(IN PVBOXUSBDEV_EXT pDevExt, IN PIRP pIrp)
 {
-    PIO_STACK_LOCATION pSl = IoGetCurrentIrpStackLocation(pIrp);
-    SYSTEM_POWER_STATE enmSysPState = pSl->Parameters.Power.State.SystemState;
+    /*PIO_STACK_LOCATION pSl = IoGetCurrentIrpStackLocation(pIrp);
+    SYSTEM_POWER_STATE enmSysPState = pSl->Parameters.Power.State.SystemState;*/
 
     return vboxUsbPwrIoPostSys(pDevExt, pIrp);
@@ -339 +331 @@
 {
     PIO_STACK_LOCATION pSl = IoGetCurrentIrpStackLocation(pIrp);
-
     switch (pSl->Parameters.Power.Type)
     {
         case SystemPowerState:
-        {
             return vboxUsbPwrSetPowerSys(pDevExt, pIrp);
-        }
+
         case DevicePowerState:
-        {
             return vboxUsbPwrSetPowerDev(pDevExt, pIrp);
-        }
+
         default:
-        {
             AssertFailed();
             return vboxUsbPwrMnDefault(pDevExt, pIrp);
-        }
-
-    }
-    return vboxUsbPwrMnDefault(pDevExt, pIrp);
+    }
 }
 
@@ -374 +359 @@
     {
         case IRP_MN_POWER_SEQUENCE:
-        {
             return vboxUsbPwrMnPowerSequence(pDevExt, pIrp);
-        }
+
         case IRP_MN_QUERY_POWER:
-        {
             return vboxUsbPwrMnQueryPower(pDevExt, pIrp);
-        }
+
         case IRP_MN_SET_POWER:
-        {
             return vboxUsbPwrMnSetPower(pDevExt, pIrp);
-        }
+
         case IRP_MN_WAIT_WAKE:
-        {
             return vboxUsbPwrMnWaitWake(pDevExt, pIrp);
-        }
+
         default:
-        {
 //            AssertFailed();
             return vboxUsbPwrMnDefault(pDevExt, pIrp);
-        }
     }
 }
@@ -404 +383 @@
     {
         case ENMVBOXUSB_PNPSTATE_REMOVED:
-        {
             PoStartNextPowerIrp(pIrp);
 
@@ -415 +393 @@
 
             return STATUS_DELETE_PENDING;
-        }
+
         case ENMVBOXUSB_PNPSTATE_START_PENDING:
-        {
             PoStartNextPowerIrp(pIrp);
             IoSkipCurrentIrpStackLocation(pIrp);
@@ -424 +401 @@
 
             return PoCallDriver(pDevExt->pLowerDO, pIrp);
-        }
+
         default:
-        {
             return vboxUsbPwrDispatch(pDevExt, pIrp);
-        }
-    }
-}
-
+    }
+}
+