Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp	(revision 56591)
+++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp	(revision 56592)
@@ -173,5 +173,5 @@
     PVBOXNETADP_ADAPTER pAdapter = NULL;
 
-    LogFlow(("==>"__FUNCTION__": adapter handle=%p\n", hAdapter));
+    LogFlow(("==>vboxNetAdpWinAllocAdapter: adapter handle=%p\n", hAdapter));
 
     *ppAdapter = NULL;
@@ -184,5 +184,5 @@
     {
         Status = NDIS_STATUS_RESOURCES;
-        Log((__FUNCTION__": Out of memory while allocating adapter context (size=%d)\n", sizeof(VBOXNETADP_ADAPTER)));
+        Log(("vboxNetAdpWinAllocAdapter: Out of memory while allocating adapter context (size=%d)\n", sizeof(VBOXNETADP_ADAPTER)));
     }
     else
@@ -205,5 +205,5 @@
         *ppAdapter = pAdapter;
     }
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinAllocAdapter: status=0x%x\n", Status));
     return Status;
 }
@@ -227,5 +227,5 @@
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
 
-    LogFlow(("==>"__FUNCTION__": miniport=0x%x\n", NdisMiniportHandle));
+    LogFlow(("==>vboxNetAdpWinInitializeEx: miniport=0x%x\n", NdisMiniportHandle));
 
     do
@@ -237,5 +237,5 @@
         if (Status != NDIS_STATUS_SUCCESS)
         {
-            Log((__FUNCTION__": Failed to allocate the adapter context with 0x%x\n", Status));
+            Log(("vboxNetAdpWinInitializeEx: Failed to allocate the adapter context with 0x%x\n", Status));
             break;
         }
@@ -253,5 +253,5 @@
         if (Status != NDIS_STATUS_SUCCESS)
         {
-            Log((__FUNCTION__": NdisMSetMiniportAttributes(registration) failed with 0x%x\n", Status));
+            Log(("vboxNetAdpWinInitializeEx: NdisMSetMiniportAttributes(registration) failed with 0x%x\n", Status));
             break;
         }
@@ -305,5 +305,5 @@
         if (Status != NDIS_STATUS_SUCCESS)
         {
-            Log((__FUNCTION__": NdisMSetMiniportAttributes(general) failed with 0x%x\n", Status));
+            Log(("vboxNetAdpWinInitializeEx: NdisMSetMiniportAttributes(general) failed with 0x%x\n", Status));
             break;
         }
@@ -316,5 +316,5 @@
     }
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinInitializeEx: status=0x%x\n", Status));
     return Status;
 }
@@ -324,7 +324,7 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinHaltEx\n"));
     // TODO: Stop something?
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetAdpWinHaltEx\n"));
 }
 
@@ -333,6 +333,6 @@
 {
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("==>vboxNetAdpWinPause\n"));
+    LogFlow(("<==vboxNetAdpWinPause: status=0x%x\n", Status));
     return Status;
 }
@@ -342,6 +342,6 @@
 {
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("==>vboxNetAdpWinRestart\n"));
+    LogFlow(("<==vboxNetAdpWinRestart: status=0x%x\n", Status));
     return Status;
 }
@@ -353,5 +353,5 @@
     struct _NDIS_OID_REQUEST::_REQUEST_DATA::_QUERY *pQuery = &pRequest->DATA.QUERY_INFORMATION;
 
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinOidRqQuery\n"));
 
     uint64_t u64Tmp = 0;
@@ -455,5 +455,5 @@
     }
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinOidRqQuery: status=0x%x\n", Status));
     return Status;
 }
@@ -465,5 +465,5 @@
     struct _NDIS_OID_REQUEST::_REQUEST_DATA::_SET *pSet = &pRequest->DATA.SET_INFORMATION;
 
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinOidRqSet\n"));
 
     switch (pSet->Oid)
@@ -514,5 +514,5 @@
     }
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinOidRqSet: status=0x%x\n", Status));
     return Status;
 }
@@ -523,5 +523,5 @@
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinOidRequest\n"));
     vboxNetCmnWinDumpOidRequest(__FUNCTION__, NdisRequest);
 
@@ -547,5 +547,5 @@
             break;
     }
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinOidRequest: status=0x%x\n", Status));
     return Status;
 }
@@ -557,5 +557,5 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinSendNetBufferLists\n"));
     PNET_BUFFER_LIST pNbl = NetBufferLists;
     for (pNbl = NetBufferLists; pNbl; pNbl = NET_BUFFER_LIST_NEXT_NBL(pNbl))
@@ -564,5 +564,5 @@
                                     (SendFlags & NDIS_SEND_FLAGS_DISPATCH_LEVEL) ?
                                     NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL : 0);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetAdpWinSendNetBufferLists\n"));
 }
 
@@ -572,7 +572,7 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": We should not be here!\n"));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinReturnNetBufferLists\n"));
+    Log(("vboxNetAdpWinReturnNetBufferLists: We should not be here!\n"));
+    LogFlow(("<==vboxNetAdpWinReturnNetBufferLists\n"));
 }
 
@@ -581,7 +581,7 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": We should not be here!\n"));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinCancelSend\n"));
+    Log(("vboxNetAdpWinCancelSend: We should not be here!\n"));
+    LogFlow(("<==vboxNetAdpWinCancelSend\n"));
 }
 
@@ -590,6 +590,6 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__" return false\n"));
+    LogFlow(("==>vboxNetAdpWinCheckForHangEx\n"));
+    LogFlow(("<==vboxNetAdpWinCheckForHangEx return false\n"));
     return FALSE;
 }
@@ -599,6 +599,6 @@
 {
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("==>vboxNetAdpWinResetEx\n"));
+    LogFlow(("<==vboxNetAdpWinResetEx: status=0x%x\n", Status));
     return Status;
 }
@@ -608,7 +608,7 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": PnP event=%d\n", NetDevicePnPEvent->DevicePnPEvent));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinDevicePnPEventNotify\n"));
+    Log(("vboxNetAdpWinDevicePnPEventNotify: PnP event=%d\n", NetDevicePnPEvent->DevicePnPEvent));
+    LogFlow(("<==vboxNetAdpWinDevicePnPEventNotify\n"));
 }
 
@@ -618,7 +618,7 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": action=%d\n", ShutdownAction));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinShutdownEx\n"));
+    Log(("vboxNetAdpWinShutdownEx: action=%d\n", ShutdownAction));
+    LogFlow(("<==vboxNetAdpWinShutdownEx\n"));
 }
 
@@ -627,7 +627,7 @@
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": req id=%p\n", RequestId));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinCancelOidRequest\n"));
+    Log(("vboxNetAdpWinCancelOidRequest: req id=%p\n", RequestId));
+    LogFlow(("<==vboxNetAdpWinCancelOidRequest\n"));
 }
 
@@ -636,10 +636,10 @@
 DECLHIDDEN(VOID) vboxNetAdpWinUnload(IN PDRIVER_OBJECT DriverObject)
 {
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinUnload\n"));
     //vboxNetAdpWinDevDestroy(&g_VBoxNetAdpGlobals);
     if (g_VBoxNetAdpGlobals.hMiniportDriver)
         NdisMDeregisterMiniportDriver(g_VBoxNetAdpGlobals.hMiniportDriver);
     //NdisFreeSpinLock(&g_VBoxNetAdpGlobals.Lock);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetAdpWinUnload\n"));
     RTR0Term();
 }
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp	(revision 56591)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp	(revision 56592)
@@ -1474,10 +1474,10 @@
         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,5 +1490,5 @@
             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,5 +1596,5 @@
                     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,5 +1604,5 @@
             {
                 /* 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,10 +1646,10 @@
             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,5 +1660,5 @@
     else
     {
-        vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pBufLists);
+        vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: consumed", pBufLists);
         if ((fFlags & NDIS_RECEIVE_FLAGS_RESOURCES) == 0)
             NdisFReturnNetBufferLists(pModule->hFilter, pBufLists,
@@ -2339,5 +2339,5 @@
     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))
         {