Changeset 56592 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Jun 23, 2015 8:37:03 AM (10 years ago)

Author:

vboxsync

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

101219

Message:

Network/Win: Replace FUNCTION macro with literal strings to improve compiler compatibility.

File:

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

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

@@ -1474 +1474 @@
         if (pPassHead)
         {
-            vboxNetLwfWinDumpPackets(__FUNCTION__": passing down", pPassHead);
+            vboxNetLwfWinDumpPackets("vboxNetLwfWinSendNetBufferLists: passing down", pPassHead);
             NdisFSendNetBufferLists(pModule->hFilter, pBufLists, nPort, fFlags);
         }
         if (pDropHead)
         {
-            vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pDropHead);
+            vboxNetLwfWinDumpPackets("vboxNetLwfWinSendNetBufferLists: consumed", pDropHead);
             NdisFSendNetBufferListsComplete(pModule->hFilter, pDropHead,
                                             fFlags & NDIS_SEND_FLAGS_DISPATCH_LEVEL ? NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL : 0);
@@ -1490 +1490 @@
             NET_BUFFER_LIST_STATUS(pList) = NDIS_STATUS_PAUSED;
         }
-        vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pBufLists);
+        vboxNetLwfWinDumpPackets("vboxNetLwfWinSendNetBufferLists: consumed", pBufLists);
         NdisFSendNetBufferListsComplete(pModule->hFilter, pBufLists,
                                         fFlags & NDIS_SEND_FLAGS_DISPATCH_LEVEL ? NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL : 0);
@@ -1596 +1596 @@
                     PNET_BUFFER_LIST pNext = NET_BUFFER_LIST_NEXT_NBL(pList);
                     NET_BUFFER_LIST_NEXT_NBL(pList) = NULL; /* Unlink temporarily */
-                    vboxNetLwfWinDumpPackets(__FUNCTION__": passing up", pList);
+                    vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: passing up", pList);
                     NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pList, nPort, nBufLists, fFlags);
                     NET_BUFFER_LIST_NEXT_NBL(pList) = pNext; /* Restore the link */
@@ -1604 +1604 @@
             {
                 /* All NBLs must be indicated, do it in bulk. */
-                vboxNetLwfWinDumpPackets(__FUNCTION__": passing up", pBufLists);
+                vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: passing up", pBufLists);
                 NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pBufLists, nPort, nBufLists, fFlags);
             }
@@ -1646 +1646 @@
             if (pPassHead)
             {
-                vboxNetLwfWinDumpPackets(__FUNCTION__": passing up", pPassHead);
+                vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: passing up", pPassHead);
                 NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pPassHead, nPort, nPass, fFlags);
             }
             if (pDropHead)
             {
-                vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pDropHead);
+                vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: consumed", pDropHead);
                 NdisFReturnNetBufferLists(pModule->hFilter, pDropHead,
                                           fFlags & NDIS_RECEIVE_FLAGS_DISPATCH_LEVEL ? NDIS_RETURN_FLAGS_DISPATCH_LEVEL : 0);
@@ -1660 +1660 @@
     else
     {
-        vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pBufLists);
+        vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: consumed", pBufLists);
         if ((fFlags & NDIS_RECEIVE_FLAGS_RESOURCES) == 0)
             NdisFReturnNetBufferLists(pModule->hFilter, pBufLists,
@@ -2339 +2339 @@
     RTListForEach(&g_VBoxNetLwfGlobals.listModules, pModuleCtx, VBOXNETLWF_MODULE, node)
     {
-        DbgPrint(__FUNCTION__": evaluating module, name=%Z\n", pModuleCtx->strMiniportName);
+        DbgPrint("vboxNetFltOsInitInstance: evaluating module, name=%Z\n", pModuleCtx->strMiniportName);
         if (RtlEqualString(&strInst, &pModuleCtx->strMiniportName, TRUE))
         {