Changeset 62710 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Timestamp:

Jul 29, 2016 8:50:07 PM (9 years ago)

Author:

vboxsync

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

109284

Message:

vboxNetFltWinMpDeInitializeDeviceInstance + vboxNetFltWinPtDoUnbinding: MSC pointed out uninitialized Status in an unlikely scenario (hopefully). Other warnings.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp (modified) (8 diffs)

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

@@ -27 +27 @@
         IN NDIS_HANDLE WrapperConfigurationContext)
 {
+    RT_NOREF1(WrapperConfigurationContext);
     PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)NdisIMGetDeviceContext(MiniportAdapterHandle);
     NDIS_STATUS Status = NDIS_STATUS_FAILURE;
@@ -158 +159 @@
 }
 
-static NDIS_STATUS vboxNetFltWinMpReadApplyConfig(PVBOXNETFLTINS pThis, NDIS_HANDLE hMiniportAdapter, NDIS_HANDLE hWrapperConfigurationContext)
-{
+static NDIS_STATUS vboxNetFltWinMpReadApplyConfig(PVBOXNETFLTINS pThis, NDIS_HANDLE hMiniportAdapter,
+                                                  NDIS_HANDLE hWrapperConfigurationContext)
+{
+    RT_NOREF1(hMiniportAdapter);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     NDIS_HANDLE hConfiguration;
@@ -1367 +1370 @@
     LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
 
-    if (vboxNetFltWinGetPowerState(&pNetFlt->u.s.WinIf.PtState) != NdisDeviceStateD0
-            || vboxNetFltWinGetPowerState(&pNetFlt->u.s.WinIf.MpState) != NdisDeviceStateD0)
+    if (   vboxNetFltWinGetPowerState(&pNetFlt->u.s.WinIf.PtState) != NdisDeviceStateD0
+        || vboxNetFltWinGetPowerState(&pNetFlt->u.s.WinIf.MpState) != NdisDeviceStateD0)
     {
         LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, NDIS_STATUS_FAILURE));
@@ -1375 +1378 @@
 
     NdisTransferData(&Status, pNetFlt->u.s.WinIf.hBinding, MiniportReceiveContext,
-            ByteOffset, BytesToTransfer, Packet, BytesTransferred);
+                     ByteOffset, BytesToTransfer, Packet, BytesTransferred);
 
     LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
     return Status;
+
 #else
+    RT_NOREF6(Packet, BytesTransferred, hContext, MiniportReceiveContext, ByteOffset, BytesToTransfer);
     LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", hContext));
     /* should never be here */
@@ -1508 +1513 @@
     {
         Status = NdisIMCancelInitializeDeviceInstance(g_VBoxNetFltGlobalsWin.Mp.hMiniport, &pThis->u.s.WinIf.MpDeviceName);
-
         if (Status == NDIS_STATUS_SUCCESS)
         {
@@ -1517 +1521 @@
         }
         else
-        {
             NdisWaitEvent(&pThis->u.s.WinIf.MpInitCompleteEvent, 0);
-        }
-    }
-
-    Assert(vboxNetFltWinGetOpState(&pThis->u.s.WinIf.MpState) == kVBoxNetDevOpState_Initialized
-            || vboxNetFltWinGetOpState(&pThis->u.s.WinIf.MpState) == kVBoxNetDevOpState_Deinitialized);
+    }
+    else
+        Status = NDIS_STATUS_SUCCESS;
+
+    Assert(   vboxNetFltWinGetOpState(&pThis->u.s.WinIf.MpState) == kVBoxNetDevOpState_Initialized
+           || vboxNetFltWinGetOpState(&pThis->u.s.WinIf.MpState) == kVBoxNetDevOpState_Deinitialized);
     if (vboxNetFltWinGetOpState(&pThis->u.s.WinIf.MpState) == kVBoxNetDevOpState_Initialized)
     {
@@ -1532 +1536 @@
         vboxNetFltWinSetOpState(&pThis->u.s.WinIf.MpState, kVBoxNetDevOpState_Deinitialized);
         if (Status != NDIS_STATUS_SUCCESS)
-        {
             Status = NDIS_STATUS_FAILURE;
-        }
 
         *pStatus = Status;
@@ -1546 +1548 @@
     return false;
 }
-#endif
+
+#endif /* !VBOXNETADP */