Changeset 59056 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Dec 8, 2015 12:45:56 PM (9 years ago)

Author:

vboxsync

Message:

Main/Network: excessive release log messages removed (bugref:7973)

File:

• trunk/src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (14 diffs)

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -1474 +1474 @@
 
 
-#define netIfLog LogRel
+#define netIfLog Log
 
 struct BoundAdapter
@@ -1491 +1491 @@
 
     if ((hr = pNetCfg->EnumComponents(&GUID_DEVCLASS_NET, &pEnumComponent)) != S_OK)
-        netIfLog(("netIfGetUnboundHostOnlyAdapters: failed to enumerate network adapter components (0x%x)\n", hr));
+        LogRel(("netIfGetUnboundHostOnlyAdapters: failed to enumerate network adapter components (0x%x)\n", hr));
     else
     {
@@ -1501 +1501 @@
             memset(&adapter, 0, sizeof(adapter));
             if ((hr = pMiniport->GetDisplayName(&adapter.pName)) != S_OK)
-                netIfLog(("netIfGetUnboundHostOnlyAdapters: failed to get device display name (0x%x)\n", hr));
+                LogRel(("netIfGetUnboundHostOnlyAdapters: failed to get device display name (0x%x)\n", hr));
             else if ((hr = pMiniport->GetDeviceStatus(&uComponentStatus)) != S_OK)
                 netIfLog(("netIfGetUnboundHostOnlyAdapters: failed to get device status (0x%x)\n", hr));
@@ -1507 +1507 @@
                 netIfLog(("netIfGetUnboundHostOnlyAdapters: wrong device status (0x%x)\n", uComponentStatus));
             else if ((hr = pMiniport->GetId(&adapter.pHwId)) != S_OK)
-                netIfLog(("netIfGetUnboundHostOnlyAdapters: failed to get device id (0x%x)\n", hr));
+                LogRel(("netIfGetUnboundHostOnlyAdapters: failed to get device id (0x%x)\n", hr));
             else if (_wcsnicmp(adapter.pHwId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
                 netIfLog(("netIfGetUnboundHostOnlyAdapters: not host-only id = %ls, ignored\n", adapter.pHwId));
             else if ((hr = pMiniport->GetInstanceGuid(&guid)) != S_OK)
-                netIfLog(("netIfGetUnboundHostOnlyAdapters: failed to get instance id (0x%x)\n", hr));
+                LogRel(("netIfGetUnboundHostOnlyAdapters: failed to get instance id (0x%x)\n", hr));
             else
             {
@@ -1549 +1549 @@
     if (hr != S_OK)
     {
-        netIfLog(("netIfGetBoundAdapters: failed to query INetCfg (0x%x)\n", hr));
+        LogRel(("netIfGetBoundAdapters: failed to query INetCfg (0x%x)\n", hr));
         return hr;
     }
@@ -1556 +1556 @@
         /* fall back to NDIS5 miniport lookup */
         && (hr = pNetCfg->FindComponent(L"sun_VBoxNetFlt", &pFilter)))
-        netIfLog(("netIfGetBoundAdapters: could not find either 'oracle_VBoxNetLwf' or 'sun_VBoxNetFlt' components (0x%x)\n", hr));
+        LogRel(("netIfGetBoundAdapters: could not find either 'oracle_VBoxNetLwf' or 'sun_VBoxNetFlt' components (0x%x)\n", hr));
     else
     {
         INetCfgComponentBindings *pFilterBindings;
         if ((pFilter->QueryInterface(IID_INetCfgComponentBindings, (PVOID*)&pFilterBindings)) != S_OK)
-            netIfLog(("netIfGetBoundAdapters: failed to query INetCfgComponentBindings (0x%x)\n", hr));
+            LogRel(("netIfGetBoundAdapters: failed to query INetCfgComponentBindings (0x%x)\n", hr));
         else
         {
@@ -1567 +1567 @@
             INetCfgBindingPath     *pBp;
             if ((pFilterBindings->EnumBindingPaths(EBP_BELOW, &pEnumBp)) != S_OK)
-                netIfLog(("netIfGetBoundAdapters: failed to enumerate binding paths (0x%x)\n", hr));
+                LogRel(("netIfGetBoundAdapters: failed to enumerate binding paths (0x%x)\n", hr));
             else
             {
@@ -1583 +1583 @@
                     }
                     if ((pBp->EnumBindingInterfaces(&pEnumBi)) != S_OK)
-                        netIfLog(("netIfGetBoundAdapters: failed to enumerate binding interfaces (0x%x)\n", hr));
+                        LogRel(("netIfGetBoundAdapters: failed to enumerate binding interfaces (0x%x)\n", hr));
                     else
                     {
@@ -1591 +1591 @@
                             INetCfgComponent *pAdapter;
                             if ((hr = pBi->GetLowerComponent(&pAdapter)) != S_OK)
-                                netIfLog(("netIfGetBoundAdapters: failed to get lower component (0x%x)\n", hr));
+                                LogRel(("netIfGetBoundAdapters: failed to get lower component (0x%x)\n", hr));
                             else
                             {
                                 LPWSTR pwszName = NULL;
                                 if ((hr = pAdapter->GetDisplayName(&pwszName)) != S_OK)
-                                    netIfLog(("netIfGetBoundAdapters: failed to get display name (0x%x)\n", hr));
+                                    LogRel(("netIfGetBoundAdapters: failed to get display name (0x%x)\n", hr));
                                 else
                                 {
@@ -1618 +1618 @@
                                         LPWSTR pwszHwId = NULL;
                                         if ((hr = pAdapter->GetId(&pwszHwId)) != S_OK)
-                                            netIfLog(("netIfGetBoundAdapters: %ls: failed to get hardware id (0x%x)\n",
+                                            LogRel(("netIfGetBoundAdapters: %ls: failed to get hardware id (0x%x)\n",
                                                       pwszName, hr));
                                         else if (!_wcsnicmp(pwszHwId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
                                             netIfLog(("netIfGetBoundAdapters: host-only adapter %ls, ignored\n", pwszName));
                                         else if ((hr = pAdapter->GetInstanceGuid(&guid)) != S_OK)
-                                            netIfLog(("netIfGetBoundAdapters: %ls: failed to get instance GUID (0x%x)\n",
+                                            LogRel(("netIfGetBoundAdapters: %ls: failed to get instance GUID (0x%x)\n",
                                                       pwszName, hr));
                                         else
@@ -1834 +1834 @@
     if (dwRc != NO_ERROR)
     {
-        netIfLog(("NetIfList: GetAdaptersAddresses failed (0x%x)\n", dwRc));
+        LogRel(("NetIfList: GetAdaptersAddresses failed (0x%x)\n", dwRc));
         hr = HRESULT_FROM_WIN32(dwRc);
     }
@@ -1846 +1846 @@
 #endif
         if (hr != S_OK)
-            netIfLog(("NetIfList: netIfGetBoundAdapters failed (0x%x)\n", hr));
+            LogRel(("NetIfList: netIfGetBoundAdapters failed (0x%x)\n", hr));
         else
         {
@@ -1856 +1856 @@
                 if (!pszUuid)
                 {
-                    netIfLog(("NetIfList: out of memory\n"));
+                    LogRel(("NetIfList: out of memory\n"));
                     break;
                 }
                 size_t len = strlen(pszUuid) - 1;
                 if (pszUuid[0] != '{' || pszUuid[len] != '}')
-                    netIfLog(("NetIfList: ignoring invalid GUID %s\n", pAdapter->AdapterName));
+                    LogRel(("NetIfList: ignoring invalid GUID %s\n", pAdapter->AdapterName));
                 else
                 {
@@ -1905 +1905 @@
                 int rc = iface->init((*it).pName, enmType, &info);
                 if (FAILED(rc))
-                    netIfLog(("NetIfList: HostNetworkInterface::init() -> %Rrc\n", rc));
+                    LogRel(("NetIfList: HostNetworkInterface::init() -> %Rrc\n", rc));
                 else
                 {