儲存庫 vbox 的更動 62719

時間撮記:

2016-7-29 下午10:12:45 (8 年 以前)

作者:

vboxsync

訊息:

HostDrivers: warnings

位置:

trunk/src/VBox/HostDrivers

檔案:

• VBoxNetAdp/win/VBoxNetAdp-win.cpp (修改) (17 筆差異)
• VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp (修改) (2 筆差異)
• VBoxUSB/win/mon/VBoxUsbMon.cpp (修改) (3 筆差異)

trunk/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp

@@ -78 +78 @@
 static NTSTATUS vboxNetAdpWinDevDispatch(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp)
 {
-    PIO_STACK_LOCATION pIrpSl = IoGetCurrentIrpStackLocation(pIrp);;
+    RT_NOREF1(pDevObj);
+    PIO_STACK_LOCATION pIrpSl = IoGetCurrentIrpStackLocation(pIrp);
     NTSTATUS Status = STATUS_SUCCESS;
 
@@ -84 +85 @@
     {
         case IRP_MJ_DEVICE_CONTROL:
-            Status = STATUS_NOT_SUPPORTED; // TODO: add/remove ioctls
+            Status = STATUS_NOT_SUPPORTED; /// @todo add/remove ioctls
             break;
         case IRP_MJ_CREATE:
@@ -221 +222 @@
 DECLINLINE(NDIS_MEDIA_CONNECT_STATE) vboxNetAdpWinGetConnectState(PVBOXNETADP_ADAPTER pAdapter)
 {
+    RT_NOREF1(pAdapter);
     return MediaConnectStateConnected;
 }
@@ -229 +231 @@
                                                   IN PNDIS_MINIPORT_INIT_PARAMETERS MiniportInitParameters)
 {
+    RT_NOREF1(MiniportDriverContext);
     PVBOXNETADP_ADAPTER pAdapter = NULL;
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
@@ -328 +331 @@
                                      IN NDIS_HALT_ACTION HaltAction)
 {
+    RT_NOREF1(HaltAction);
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
     LogFlow(("==>vboxNetAdpWinHaltEx\n"));
@@ -339 +343 @@
                                            IN PNDIS_MINIPORT_PAUSE_PARAMETERS MiniportPauseParameters)
 {
+    RT_NOREF2(MiniportAdapterContext, MiniportPauseParameters);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     LogFlow(("==>vboxNetAdpWinPause\n"));
@@ -348 +353 @@
                                              IN PNDIS_MINIPORT_RESTART_PARAMETERS MiniportRestartParameters)
 {
+    RT_NOREF2(MiniportAdapterContext, MiniportRestartParameters);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     LogFlow(("==>vboxNetAdpWinRestart\n"));
@@ -469 +475 @@
                                               PNDIS_OID_REQUEST pRequest)
 {
+    RT_NOREF1(pAdapter);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     struct _NDIS_OID_REQUEST::_REQUEST_DATA::_SET *pSet = &pRequest->DATA.SET_INFORMATION;
@@ -563 +570 @@
                                                  IN ULONG SendFlags)
 {
+    RT_NOREF1(PortNumber);
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
     LogFlow(("==>vboxNetAdpWinSendNetBufferLists\n"));
@@ -578 +586 @@
                                                    IN ULONG ReturnFlags)
 {
-    PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
+    RT_NOREF3(MiniportAdapterContext, NetBufferLists, ReturnFlags);
     LogFlow(("==>vboxNetAdpWinReturnNetBufferLists\n"));
     Log(("vboxNetAdpWinReturnNetBufferLists: We should not be here!\n"));
@@ -587 +595 @@
                                          IN PVOID CancelId)
 {
-    PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
+    RT_NOREF2(MiniportAdapterContext, CancelId);
     LogFlow(("==>vboxNetAdpWinCancelSend\n"));
     Log(("vboxNetAdpWinCancelSend: We should not be here!\n"));
@@ -596 +604 @@
 DECLHIDDEN(BOOLEAN) vboxNetAdpWinCheckForHangEx(IN NDIS_HANDLE MiniportAdapterContext)
 {
-    PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
+    RT_NOREF1(MiniportAdapterContext);
     LogFlow(("==>vboxNetAdpWinCheckForHangEx\n"));
     LogFlow(("<==vboxNetAdpWinCheckForHangEx return false\n"));
@@ -605 +613 @@
                                              OUT PBOOLEAN AddressingReset)
 {
+    RT_NOREF2(MiniportAdapterContext, AddressingReset);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     LogFlow(("==>vboxNetAdpWinResetEx\n"));
@@ -614 +623 @@
                                                    IN PNET_DEVICE_PNP_EVENT NetDevicePnPEvent)
 {
-    PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
+    RT_NOREF2(MiniportAdapterContext, NetDevicePnPEvent);
     LogFlow(("==>vboxNetAdpWinDevicePnPEventNotify\n"));
     Log(("vboxNetAdpWinDevicePnPEventNotify: PnP event=%d\n", NetDevicePnPEvent->DevicePnPEvent));
@@ -624 +633 @@
                                          IN NDIS_SHUTDOWN_ACTION ShutdownAction)
 {
-    PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
+    RT_NOREF2(MiniportAdapterContext, ShutdownAction);
     LogFlow(("==>vboxNetAdpWinShutdownEx\n"));
     Log(("vboxNetAdpWinShutdownEx: action=%d\n", ShutdownAction));
@@ -633 +642 @@
                                                IN PVOID RequestId)
 {
-    PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
+    RT_NOREF2(MiniportAdapterContext, RequestId);
     LogFlow(("==>vboxNetAdpWinCancelOidRequest\n"));
     Log(("vboxNetAdpWinCancelOidRequest: req id=%p\n", RequestId));
@@ -643 +652 @@
 DECLHIDDEN(VOID) vboxNetAdpWinUnload(IN PDRIVER_OBJECT DriverObject)
 {
+    RT_NOREF1(DriverObject);
     LogFlow(("==>vboxNetAdpWinUnload\n"));
     //vboxNetAdpWinDevDestroy(&g_VBoxNetAdpGlobals);

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp

@@ -1490 +1490 @@
         {
             NDIS_DEVICE_POWER_STATE enmPowerState = *((PNDIS_DEVICE_POWER_STATE)pNetPnPEvent->Buffer);
-            return vboxNetFltWinPtPnPSetPower(pNetFlt, enmPowerState);
-        }
+            NDIS_STATUS rcNdis = vboxNetFltWinPtPnPSetPower(pNetFlt, enmPowerState);
+            LogFlowFunc(("LEAVE: pNetFlt (0x%p), NetEvent (%d), rcNdis=%#x\n", pNetFlt, pNetPnPEvent->NetEvent, rcNdis));
+            return rcNdis;
+        }
+
         case NetEventReconfigure:
         {
@@ -1499 +1502 @@
             }
         }
+        /** @todo r=bird: Is the fall thru intentional?? */
         default:
+            LogFlowFunc(("LEAVE: pNetFlt (0x%p), NetEvent (%d)\n", pNetFlt, pNetPnPEvent->NetEvent));
             return NDIS_STATUS_SUCCESS;
     }
 
-    LogFlowFunc(("LEAVE: pNetFlt (0x%p), NetEvent (%d)\n", pNetFlt, pNetPnPEvent->NetEvent));
 }
 

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

@@ -913 +913 @@
             switch(pSl->Parameters.QueryDeviceRelations.Type)
             {
-            case BusRelations:
-            {
-                LOG(("BusRelations"));
-
-                if (pIoStatus->Status == STATUS_SUCCESS)
-                {
-                    PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)pIoStatus->Information;
-                    LOG(("pRel = %p", pRel));
-                    if (VALID_PTR(pRel))
+                case BusRelations:
+                    LOG(("BusRelations"));
+
+                    if (pIoStatus->Status == STATUS_SUCCESS)
                     {
-                        for (unsigned i=0;i<pRel->Count;i++)
+                        PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)pIoStatus->Information;
+                        LOG(("pRel = %p", pRel));
+                        if (VALID_PTR(pRel))
                         {
-                            if (VBoxUsbFltPdoIsFiltered(pDevObj))
-                                LOG(("New PDO %p", pRel->Objects[i]));
+                            for (unsigned i=0;i<pRel->Count;i++)
+                            {
+                                if (VBoxUsbFltPdoIsFiltered(pDevObj))
+                                    LOG(("New PDO %p", pRel->Objects[i]));
+                            }
                         }
+                        else
+                            LOG(("Invalid pointer %p", pRel));
                     }
-                    else
-                        LOG(("Invalid pointer %p", pRel));
-                }
-                break;
-            }
-            case TargetDeviceRelation:
-                LOG(("TargetDeviceRelation"));
-                break;
-            case RemovalRelations:
-                LOG(("RemovalRelations"));
-                break;
-            case EjectionRelations:
-                LOG(("EjectionRelations"));
-                break;
+                    break;
+                case TargetDeviceRelation:
+                    LOG(("TargetDeviceRelation"));
+                    break;
+                case RemovalRelations:
+                    LOG(("RemovalRelations"));
+                    break;
+                case EjectionRelations:
+                    LOG(("EjectionRelations"));
+                    break;
+                default:
+                    LOG(("QueryDeviceRelations.Type=%d", pSl->Parameters.QueryDeviceRelations.Type));
             }
             break;
@@ -1595 +1595 @@
 }
 
-static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOID pvBuffer, ULONG cbInBuffer, ULONG cbOutBuffer, ULONG_PTR* pInfo)
+static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOID pvBuffer, ULONG cbInBuffer,
+                                        ULONG cbOutBuffer, ULONG_PTR *pInfo)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1659 +1660 @@
             {
                 /* we've validated that already */
-                Assert(cbOutBuffer == *pRc);
+                Assert(cbOutBuffer == (ULONG)*pRc);
                 *pRc = rc;
                 Info = sizeof (*pRc);