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

Timestamp:

Sep 13, 2011 1:09:39 PM (13 years ago)

Author:

vboxsync

Message:

VBoxNetCfg.cpp: Mark non-standard logging as such.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (53 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -37 +37 @@
 
 
-#ifndef Assert
+#ifndef Assert   /** @todo r=bird: where would this be defined? */
 //# ifdef DEBUG
 //#  define Assert(_expr) assert(_expr)
@@ -49 +49 @@
 
 static VOID DoLogging(LPCSTR szString, ...);
-#define Log DoLogging
-#define LogFlow(x) DoLogging x
-
-#define DbgLog
-
-#define VBOX_NETCFG_LOCK_TIME_OUT     5000
+#define NonStandardLog DoLogging
+#define NonStandardLogFlow(x) DoLogging x
+
+#define DbgLog                              /** @todo r=bird: What does this do? */
+
+#define VBOX_NETCFG_LOCK_TIME_OUT     5000  /** @todo r=bird: What does this do? */
 
 
@@ -66 +66 @@
     if (FAILED(hr))
     {
-        LogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -73 +73 @@
     if (hr == S_FALSE)
     {
-        LogFlow(("Write lock busy\n"));
+        NonStandardLogFlow(("Write lock busy\n"));
     }
     else if (FAILED(hr))
     {
-        LogFlow(("AcquireWriteLock failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("AcquireWriteLock failed, hr (0x%x)\n", hr));
     }
 
@@ -90 +90 @@
     if (FAILED(hr))
     {
-        LogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -96 +96 @@
     hr = pLock->ReleaseWriteLock();
     if (FAILED(hr))
-        LogFlow(("ReleaseWriteLock failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("ReleaseWriteLock failed, hr (0x%x)\n", hr));
 
     pLock->Release();
@@ -112 +112 @@
     if (FAILED(hr))
     {
-        LogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -121 +121 @@
         if (hr == S_FALSE)
         {
-            LogFlow(("Write lock is busy\n", hr));
+            NonStandardLogFlow(("Write lock is busy\n", hr));
             hr = NETCFG_E_NO_WRITE_LOCK;
         }
@@ -135 +135 @@
         }
         else
-            LogFlow(("Initialize failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("Initialize failed, hr (0x%x)\n", hr));
     }
 
@@ -147 +147 @@
     if (FAILED(hr))
     {
-        LogFlow(("Uninitialize failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Uninitialize failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -155 +155 @@
         hr = vboxNetCfgWinINetCfgUnlock(pNetCfg);
         if (FAILED(hr))
-            LogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr));
     }
 
@@ -169 +169 @@
     if (FAILED(hr))
     {
-        LogFlow(("Reset failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Reset failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -195 +195 @@
                 }
                 else
-                    LogFlow(("GetInstanceGuid failed, hr (0x%x)\n", hr));
+                    NonStandardLogFlow(("GetInstanceGuid failed, hr (0x%x)\n", hr));
             }
         }
@@ -217 +217 @@
         if (hr == S_FALSE)
         {
-            LogFlow(("Component not found\n"));
+            NonStandardLogFlow(("Component not found\n"));
         }
         else if (FAILED(hr))
         {
-            LogFlow(("vboxNetCfgWinGetComponentByGuidEnum failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("vboxNetCfgWinGetComponentByGuidEnum failed, hr (0x%x)\n", hr));
         }
         pEnumNcc->Release();
     }
     else
-        LogFlow(("EnumComponents failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("EnumComponents failed, hr (0x%x)\n", hr));
     return hr;
 }
@@ -234 +234 @@
     HRESULT hr = pNetCfg->QueryNetCfgClass(pguidClass, IID_INetCfgClassSetup, (void**)ppSetup);
     if (FAILED(hr))
-        LogFlow(("QueryNetCfgClass failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("QueryNetCfgClass failed, hr (0x%x)\n", hr));
     return hr;
 }
@@ -245 +245 @@
     if (FAILED(hr))
     {
-        LogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -265 +265 @@
         Assert(tmpHr == S_OK);
         if (tmpHr != S_OK)
-            LogFlow(("Apply failed, hr (0x%x)\n", tmpHr));
+            NonStandardLogFlow(("Apply failed, hr (0x%x)\n", tmpHr));
     }
     else
-        LogFlow(("Install failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Install failed, hr (0x%x)\n", hr));
 
     pSetup->Release();
@@ -281 +281 @@
     UINT i = 0;
 
-    LogFlow(("Installing %u INF files ...\n", cInfPaths));
+    NonStandardLogFlow(("Installing %u INF files ...\n", cInfPaths));
 
     for (; i < cInfPaths; i++)
     {
-        LogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[i]));
+        NonStandardLogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[i]));
         hr = VBoxDrvCfgInfInstall(apInfPaths[i]);
         if (FAILED(hr))
         {
-            LogFlow(("VBoxNetCfgWinInfInstall failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("VBoxNetCfgWinInfInstall failed, hr (0x%x)\n", hr));
             break;
         }
@@ -298 +298 @@
         hr = VBoxNetCfgWinInstallComponent(pNetCfg, pszwComponentId, pguidClass, ppComponent);
         if (FAILED(hr))
-            LogFlow(("VBoxNetCfgWinInstallComponent failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("VBoxNetCfgWinInstallComponent failed, hr (0x%x)\n", hr));
     }
 
@@ -316 +316 @@
     if (FAILED(hr))
     {
-        LogFlow(("GetClassGuid failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("GetClassGuid failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -324 +324 @@
     if (FAILED(hr))
     {
-        LogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -337 +337 @@
         hr = pNetCfg->Apply();
         if (FAILED(hr))
-            LogFlow(("Apply failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("Apply failed, hr (0x%x)\n", hr));
     }
     else
-        LogFlow(("DeInstall failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("DeInstall failed, hr (0x%x)\n", hr));
 
     if (pSetup)
@@ -386 +386 @@
                 }
                 else
-                    LogFlow(("Next failed, hr (0x%x)\n", hr));
+                    NonStandardLogFlow(("Next failed, hr (0x%x)\n", hr));
                 break;
             }
@@ -418 +418 @@
                     {
                         hr = S_FALSE;
-                        Log(("!!!REBOOT REQUIRED!!!\n"));
+                        NonStandardLog(("!!!REBOOT REQUIRED!!!\n"));
                     }
                 }
@@ -425 +425 @@
             {
                 DWORD dwErr = GetLastError();
-                LogFlow(("SetupDiCallClassInstaller failed with %ld\n", dwErr));
+                NonStandardLogFlow(("SetupDiCallClassInstaller failed with %ld\n", dwErr));
                 hr = HRESULT_FROM_WIN32(dwErr);
             }
@@ -432 +432 @@
         {
             DWORD dwErr = GetLastError();
-            LogFlow(("SetupDiSetSelectedDevice failed with %ld\n", dwErr));
+            NonStandardLogFlow(("SetupDiSetSelectedDevice failed with %ld\n", dwErr));
             hr = HRESULT_FROM_WIN32(dwErr);
         }
@@ -439 +439 @@
     {
         DWORD dwErr = GetLastError();
-        LogFlow(("SetupDiSetClassInstallParams failed with %ld\n", dwErr));
+        NonStandardLogFlow(("SetupDiSetClassInstallParams failed with %ld\n", dwErr));
         hr = HRESULT_FROM_WIN32(dwErr);
     }
@@ -486 +486 @@
                 if (winEr != ERROR_INSUFFICIENT_BUFFER)
                 {
-                    LogFlow(("SetupDiGetDeviceRegistryPropertyW (1) failed winErr(%d)\n", winEr));
+                    NonStandardLogFlow(("SetupDiGetDeviceRegistryPropertyW (1) failed winErr(%d)\n", winEr));
                     hr = HRESULT_FROM_WIN32(winEr);
                     break;
@@ -506 +506 @@
                 {
                     winEr = GetLastError();
-                    LogFlow(("SetupDiGetDeviceRegistryPropertyW (2) failed winErr(%d)\n", winEr));
+                    NonStandardLogFlow(("SetupDiGetDeviceRegistryPropertyW (2) failed winErr(%d)\n", winEr));
                     hr = HRESULT_FROM_WIN32(winEr);
                     break;
@@ -541 +541 @@
     {
         DWORD winEr = GetLastError();
-        LogFlow(("SetupDiGetClassDevsExW failed winErr(%d)\n", winEr));
+        NonStandardLogFlow(("SetupDiGetClassDevsExW failed winErr(%d)\n", winEr));
         hr = HRESULT_FROM_WIN32(winEr);
     }
@@ -824 +824 @@
         }
         else
-            LogFlow(("ExecQuery failed (0x%x)\n", hr));
+            NonStandardLogFlow(("ExecQuery failed (0x%x)\n", hr));
     }
     else
     {
         DWORD winEr = GetLastError();
-        LogFlow(("StringFromGUID2 failed winEr (%d)\n", winEr));
+        NonStandardLogFlow(("StringFromGUID2 failed winEr (%d)\n", winEr));
         hr = HRESULT_FROM_WIN32( winEr );
     }
@@ -1028 +1028 @@
             }
             else
-                LogFlow(("CoSetProxyBlanket failed, hr (0x%x)\n", hr));
+                NonStandardLogFlow(("CoSetProxyBlanket failed, hr (0x%x)\n", hr));
 
             pSvc->Release();
         }
         else
-            LogFlow(("ConnectServer failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("ConnectServer failed, hr (0x%x)\n", hr));
         pLoc->Release();
     }
     else
-        LogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
     return hr;
 }
@@ -1052 +1052 @@
     }
     else
-        LogFlow(("Get failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Get failed, hr (0x%x)\n", hr));
     return hr;
 }
@@ -1804 +1804 @@
     }
     else
-        LogFlow(("GetAdaptersAddresses err (%d)\n", dwRc));
+        NonStandardLogFlow(("GetAdaptersAddresses err (%d)\n", dwRc));
 
     if (pAddresses)
@@ -1829 +1829 @@
     if (hr == S_OK)
     {
-        Log("NetFlt is installed currently, uninstalling ...\n");
+        NonStandardLog("NetFlt is installed currently, uninstalling ...\n");
 
         hr = VBoxNetCfgWinUninstallComponent(pNc, pNcc);
@@ -1837 +1837 @@
     else if (hr == S_FALSE)
     {
-        Log("NetFlt is not installed currently\n");
+        NonStandardLog("NetFlt is not installed currently\n");
         hr = S_OK;
     }
     else
     {
-        LogFlow(("FindComponent failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("FindComponent failed, hr (0x%x)\n", hr));
         hr = S_OK;
     }
@@ -1863 +1863 @@
     if (SUCCEEDED(hr))
     {
-        Log("NetFlt will be installed ...\n");
+        NonStandardLog("NetFlt will be installed ...\n");
         hr = VBoxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETFLT_ID,
                                                  &GUID_DEVCLASS_NETSERVICE,
@@ -1950 +1950 @@
                                             hr = pNetCfgBindings->MoveAfter(pNetCfgBindPath, NULL);
                                             if (FAILED(hr))
-                                                LogFlow(("Unable to move interface, hr (0x%x)\n", hr));
+                                                NonStandardLogFlow(("Unable to move interface, hr (0x%x)\n", hr));
                                             bFoundIface = true;
                                         }
@@ -1957 +1957 @@
                                 }
                                 else
-                                    LogFlow(("GetLowerComponent failed, hr (0x%x)\n", hr));
+                                    NonStandardLogFlow(("GetLowerComponent failed, hr (0x%x)\n", hr));
                                 pNetCfgBindIfce->Release();
                             }
@@ -1965 +1965 @@
                                     hr = S_OK;
                                 else
-                                    LogFlow(("Next binding interface failed, hr (0x%x)\n", hr));
+                                    NonStandardLogFlow(("Next binding interface failed, hr (0x%x)\n", hr));
                                 break;
                             }
@@ -1972 +1972 @@
                     }
                     else
-                        LogFlow(("EnumBindingInterfaces failed, hr (0x%x)\n", hr));
+                        NonStandardLogFlow(("EnumBindingInterfaces failed, hr (0x%x)\n", hr));
                     pNetCfgBindPath->Release();
                 }
@@ -1980 +1980 @@
                         hr = S_OK;
                     else
-                        LogFlow(("Next bind path failed, hr (0x%x)\n", hr));
+                        NonStandardLogFlow(("Next bind path failed, hr (0x%x)\n", hr));
                     break;
                 }
@@ -1987 +1987 @@
         }
         else
-            LogFlow(("EnumBindingPaths failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("EnumBindingPaths failed, hr (0x%x)\n", hr));
         pNetCfgBindings->Release();
     }
     else
-        LogFlow(("QueryInterface for IID_INetCfgComponentBindings failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("QueryInterface for IID_INetCfgComponentBindings failed, hr (0x%x)\n", hr));
     return TRUE;
 }
@@ -2130 +2130 @@
     if (1) { \
         hrc = E_FAIL; \
-        Log strAndArgs; \
+        NonStandardLog strAndArgs; \
         break; \
     } else do {} while (0)
@@ -2429 +2429 @@
                     {
                         DWORD winEr = GetLastError();
-                        LogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
+                        NonStandardLogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
                         break;
                     }
@@ -2435 +2435 @@
                 else
                 {
-                    LogFlow(("SetupDiSetDeviceInstallParams faileed: INF path is too long\n"));
+                    NonStandardLogFlow(("SetupDiSetDeviceInstallParams faileed: INF path is too long\n"));
                     break;
                 }
@@ -2442 +2442 @@
             {
                 DWORD winEr = GetLastError();
-                LogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr));
+                NonStandardLogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr));
             }
         }
@@ -2563 +2563 @@
                 {
                     DWORD winEr = GetLastError();
-                    LogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
+                    NonStandardLogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
                 }
                 Assert(fResult);
@@ -2570 +2570 @@
             {
                 DWORD winEr = GetLastError();
-                LogFlow(("SetupInitDefaultQueueCallback failed, winEr (%d)\n", winEr));
+                NonStandardLogFlow(("SetupInitDefaultQueueCallback failed, winEr (%d)\n", winEr));
             }
         }
@@ -2576 +2576 @@
         {
             DWORD winEr = GetLastError();
-            LogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr));
+            NonStandardLogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr));
         }
 
@@ -2712 +2712 @@
             if (!*lppszName)
             {
-                LogFlow(("SysAllocString failed\n"));
+                NonStandardLogFlow(("SysAllocString failed\n"));
                 hrc = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
             }
@@ -2721 +2721 @@
             hrc = CLSIDFromString(pWCfgGuidString, (LPCLSID)pGuid);
             if (FAILED(hrc))
-                LogFlow(("CLSIDFromString failed, hrc (0x%x)\n", hrc));
+                NonStandardLogFlow(("CLSIDFromString failed, hrc (0x%x)\n", hrc));
         }
 
@@ -2754 +2754 @@
             }
             else
-                LogFlow(("Enumeration failed, hr 0x%x\n", hr));
+                NonStandardLogFlow(("Enumeration failed, hr 0x%x\n", hr));
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
         }
         else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszApp)
         {
-            LogFlow(("Application %ws is holding the lock, failed\n", lpszApp));
+            NonStandardLogFlow(("Application %ws is holding the lock, failed\n", lpszApp));
             CoTaskMemFree(lpszApp);
         }
         else
-            LogFlow(("VBoxNetCfgWinQueryINetCfg failed, hr 0x%x\n", hr));
+            NonStandardLogFlow(("VBoxNetCfgWinQueryINetCfg failed, hr 0x%x\n", hr));
     }
     return hrc;