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

Timestamp:

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

Author:

vboxsync

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

109288

Message:

HostDrivers: warnings

File:

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

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

@@ -75 +75 @@
 #include "VBoxNetLwf-win.h"
 #include "VBox/VBoxNetCmn-win.h"
-
-/* Forward declarations */
-FILTER_ATTACH vboxNetLwfWinAttach;
-FILTER_DETACH vboxNetLwfWinDetach;
-FILTER_RESTART vboxNetLwfWinRestart;
-FILTER_PAUSE vboxNetLwfWinPause;
-FILTER_OID_REQUEST vboxNetLwfWinOidRequest;
-FILTER_OID_REQUEST_COMPLETE vboxNetLwfWinOidRequestComplete;
-//FILTER_CANCEL_OID_REQUEST vboxNetLwfWinCancelOidRequest;
-FILTER_STATUS vboxNetLwfWinStatus;
-//FILTER_NET_PNP_EVENT vboxNetLwfWinPnPEvent;
-FILTER_SEND_NET_BUFFER_LISTS vboxNetLwfWinSendNetBufferLists;
-FILTER_SEND_NET_BUFFER_LISTS_COMPLETE vboxNetLwfWinSendNetBufferListsComplete;
-FILTER_RECEIVE_NET_BUFFER_LISTS vboxNetLwfWinReceiveNetBufferLists;
-FILTER_RETURN_NET_BUFFER_LISTS vboxNetLwfWinReturnNetBufferLists;
-KSTART_ROUTINE vboxNetLwfWinInitIdcWorker;
 
 typedef enum {
@@ -210 +194 @@
 typedef VBOXNETLWF_OIDREQ *PVBOXNETLWF_OIDREQ;
 
-/* Forward declarations */
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static FILTER_ATTACH                            vboxNetLwfWinAttach;
+static FILTER_DETACH                            vboxNetLwfWinDetach;
+static FILTER_RESTART                           vboxNetLwfWinRestart;
+static FILTER_PAUSE                             vboxNetLwfWinPause;
+static FILTER_OID_REQUEST                       vboxNetLwfWinOidRequest;
+static FILTER_OID_REQUEST_COMPLETE              vboxNetLwfWinOidRequestComplete;
+//static FILTER_CANCEL_OID_REQUEST                vboxNetLwfWinCancelOidRequest;
+static FILTER_STATUS                            vboxNetLwfWinStatus;
+//static FILTER_NET_PNP_EVENT                     vboxNetLwfWinPnPEvent;
+static FILTER_SEND_NET_BUFFER_LISTS             vboxNetLwfWinSendNetBufferLists;
+static FILTER_SEND_NET_BUFFER_LISTS_COMPLETE    vboxNetLwfWinSendNetBufferListsComplete;
+static FILTER_RECEIVE_NET_BUFFER_LISTS          vboxNetLwfWinReceiveNetBufferLists;
+static FILTER_RETURN_NET_BUFFER_LISTS           vboxNetLwfWinReturnNetBufferLists;
+static KSTART_ROUTINE vboxNetLwfWinInitIdcWorker;
+
 static VOID vboxNetLwfWinUnloadDriver(IN PDRIVER_OBJECT pDriver);
-static int vboxNetLwfWinInitBase();
-static int vboxNetLwfWinFini();
+static int  vboxNetLwfWinInitBase(void);
+static int  vboxNetLwfWinFini(void);
+
+
 
 /**
@@ -279 +283 @@
 
 #ifdef DEBUG
+
 static const char *vboxNetLwfWinStatusToText(NDIS_STATUS code)
 {
@@ -616 +621 @@
 
 #else /* !DEBUG */
-#define vboxNetLwfWinDumpFilterTypes(uFlags)
-#define vboxNetLwfWinDumpOffloadSettings(p)
-#define vboxNetLwfWinDumpSetOffloadSettings(p)
-#define vboxNetLwfWinDumpPackets(m,l)
-#define vboxNetLwfWinDumpPacket(p,t)
+# define vboxNetLwfWinDumpFilterTypes(uFlags)    do { } while (0)
+# define vboxNetLwfWinDumpOffloadSettings(p)     do { } while (0)
+# define vboxNetLwfWinDumpSetOffloadSettings(p)  do { } while (0)
+# define vboxNetLwfWinDumpPackets(m,l)           do { } while (0)
+# define vboxNetLwfWinDumpPacket(p,t)            do { } while (0)
 #endif /* !DEBUG */
 
@@ -648 +653 @@
              vboxNetLwfWinStateToText(enmPrevState),
              vboxNetLwfWinStateToText(enmNew)));
+        NOREF(enmPrevState);
     }
     return fSuccess;
@@ -786 +792 @@
         /* NDIS is supposed to serialize requests */
         PNDIS_OID_REQUEST pPrev = ASMAtomicXchgPtrT(&pModuleCtx->pPendingRequest, NULL, PNDIS_OID_REQUEST);
-        Assert(pPrev == pRequest);
+        Assert(pPrev == pRequest); NOREF(pPrev);
 
         Log5(("vboxNetLwfWinOidRequestComplete: completed rq type=%d oid=%x\n", pRequest->RequestType, pRequest->DATA.QUERY_INFORMATION.Oid));
@@ -907 +913 @@
 static NTSTATUS vboxNetLwfWinDevDispatch(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp)
 {
+    RT_NOREF1(pDevObj);
     PIO_STACK_LOCATION pIrpSl = IoGetCurrentIrpStackLocation(pIrp);;
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1207 +1214 @@
 static NDIS_STATUS vboxNetLwfWinPause(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_PAUSE_PARAMETERS pParameters)
 {
+    RT_NOREF1(pParameters);
     LogFlow(("==>vboxNetLwfWinPause: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
@@ -1241 +1249 @@
 static NDIS_STATUS vboxNetLwfWinRestart(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_RESTART_PARAMETERS pParameters)
 {
+    RT_NOREF1(pParameters);
     LogFlow(("==>vboxNetLwfWinRestart: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
@@ -1272 +1281 @@
     {
         pMdlNext = pMdl->Next;
-#ifndef VBOXNETLWF_SYNC_SEND
+# ifndef VBOXNETLWF_SYNC_SEND
         PUCHAR pDataBuf;
         ULONG cb = 0;
         NdisQueryMdl(pMdl, &pDataBuf, &cb, NormalPagePriority);
-#endif /* !VBOXNETLWF_SYNC_SEND */
+# endif /* !VBOXNETLWF_SYNC_SEND */
         NdisFreeMdl(pMdl);
         Log4(("vboxNetLwfWinFreeMdlChain: freed MDL 0x%p\n", pMdl));
-#ifndef VBOXNETLWF_SYNC_SEND
+# ifndef VBOXNETLWF_SYNC_SEND
         NdisFreeMemory(pDataBuf, 0, 0);
         Log4(("vboxNetLwfWinFreeMdlChain: freed data buffer 0x%p\n", pDataBuf));
-#endif /* !VBOXNETLWF_SYNC_SEND */
+# endif /* !VBOXNETLWF_SYNC_SEND */
         pMdl = pMdlNext;
     }
+#else  /* VBOXNETLWF_FIXED_SIZE_POOLS */
+    RT_NOREF1(pMdl);
 #endif /* VBOXNETLWF_FIXED_SIZE_POOLS */
 }
@@ -1616 +1627 @@
 VOID vboxNetLwfWinSendNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_LIST pBufLists, IN NDIS_PORT_NUMBER nPort, IN ULONG fFlags)
 {
-    size_t cb = 0;
     LogFlow(("==>vboxNetLwfWinSendNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
@@ -1693 +1703 @@
 VOID vboxNetLwfWinSendNetBufferListsComplete(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_LIST pBufLists, IN ULONG fFlags)
 {
-    size_t cb = 0;
     LogFlow(("==>vboxNetLwfWinSendNetBufferListsComplete: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
@@ -1864 +1873 @@
 VOID vboxNetLwfWinReturnNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_LIST pBufLists, IN ULONG fFlags)
 {
-    size_t cb = 0;
     LogFlow(("==>vboxNetLwfWinReturnNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
@@ -1918 +1926 @@
 DECLHIDDEN(NDIS_STATUS) vboxNetLwfWinRegister(PDRIVER_OBJECT pDriverObject, PUNICODE_STRING pRegistryPathStr)
 {
+    RT_NOREF1(pRegistryPathStr);
     NDIS_FILTER_DRIVER_CHARACTERISTICS FChars;
     NDIS_STRING FriendlyName;
@@ -2068 +2077 @@
 static VOID vboxNetLwfWinUnloadDriver(IN PDRIVER_OBJECT pDriver)
 {
+    RT_NOREF1(pDriver);
     LogFlow(("==>vboxNetLwfWinUnloadDriver: driver=%p\n", pDriver));
     vboxNetLwfWinDevDestroy(&g_VBoxNetLwfGlobals);
@@ -2222 +2232 @@
 int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
 {
+    RT_NOREF1(pvIfData);
     int rc = VINF_SUCCESS;
 
@@ -2240 +2251 @@
     }
 
-    const char *pszDir = (fDst & INTNETTRUNKDIR_WIRE) ?
-        ( (fDst & INTNETTRUNKDIR_HOST) ? "intnet --> all" : "intnet --> wire" ) : "intnet --> host";
-    vboxNetLwfWinDumpPacket(pSG, pszDir);
+    vboxNetLwfWinDumpPacket(pSG,   !(fDst & INTNETTRUNKDIR_WIRE) ? "intnet --> host"
+                                 : !(fDst & INTNETTRUNKDIR_HOST) ? "intnet --> wire" : "intnet --> all");
+
     /*
      * There are two possible strategies to deal with incoming SGs:
@@ -2316 +2327 @@
 {
     /* WARNING! Call this with IRQL=Passive! */
+    RT_NOREF1(NdisIoWorkItemHandle);
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)WorkItemContext;
 
@@ -2377 +2389 @@
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
 {
+    RT_NOREF1(pThis);
     LogFlow(("==>vboxNetFltOsDisconnectIt: instance=%p\n", pThis));
     LogFlow(("<==vboxNetFltOsDisconnectIt: return 0\n"));
@@ -2384 +2397 @@
 int vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
 {
+    RT_NOREF1(pThis);
     LogFlow(("==>vboxNetFltOsConnectIt: instance=%p\n", pThis));
     LogFlow(("<==vboxNetFltOsConnectIt: return 0\n"));
@@ -2400 +2414 @@
 {
     PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)pvCtx;
-    PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
 
     /* We are only interested in add or remove notifications. */
@@ -2532 +2545 @@
 int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {
+    RT_NOREF1(pvContext);
     LogFlow(("==>vboxNetFltOsInitInstance: instance=%p context=%p\n", pThis, pvContext));
     AssertReturn(pThis, VERR_INVALID_PARAMETER);
@@ -2569 +2583 @@
 void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRTMAC pMac)
 {
+    RT_NOREF3(pThis, pvIfData, pMac);
     LogFlow(("==>vboxNetFltPortOsNotifyMacAddress: instance=%p data=%p mac=%RTmac\n", pThis, pvIfData, pMac));
     LogFlow(("<==vboxNetFltPortOsNotifyMacAddress\n"));
@@ -2575 +2590 @@
 int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **ppvIfData)
 {
+    RT_NOREF3(pThis, pvIf, ppvIfData);
     LogFlow(("==>vboxNetFltPortOsConnectInterface: instance=%p if=%p data=%p\n", pThis, pvIf, ppvIfData));
     LogFlow(("<==vboxNetFltPortOsConnectInterface: return 0\n"));
@@ -2583 +2599 @@
 int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, void *pvIfData)
 {
+    RT_NOREF2(pThis, pvIfData);
     LogFlow(("==>vboxNetFltPortOsDisconnectInterface: instance=%p data=%p\n", pThis, pvIfData));
     LogFlow(("<==vboxNetFltPortOsDisconnectInterface: return 0\n"));