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

Timestamp:

Apr 17, 2020 11:41:46 PM (5 years ago)

Author:

vboxsync

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

137312

Message:

HostDrivers/VBoxNetCfg.cpp: VC++ 14.1 adjustments. bugref:8489

File:

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

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

@@ -1739 +1739 @@
                         if (SUCCEEDED(hr))
                         {
-                            VARIANT varReturnValue;
                             hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0, &varReturnValue, NULL, 0);
                             Assert(SUCCEEDED(hr));
@@ -1745 +1744 @@
                             {
             //                    Assert(varReturnValue.vt == VT_UINT);
-                                int winEr = varReturnValue.uintVal;
+                                winEr = varReturnValue.uintVal;
                                 if (winEr == 0)
                                     hr = S_OK;
@@ -2523 +2522 @@
     /* This is the GUID for the network connections folder. It is constant.
      * {7007ACC7-3202-11D1-AAD2-00805FC1270E} */
-    const GUID CLSID_NetworkConnections = {
+    const GUID MY_CLSID_NetworkConnections = {
         0x7007ACC7, 0x3202, 0x11D1, {
             0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E
@@ -2540 +2539 @@
 
     /* Create an instance of the network connections folder. */
-    hr = CoCreateInstance(CLSID_NetworkConnections, NULL,
+    hr = CoCreateInstance(MY_CLSID_NetworkConnections, NULL,
                           CLSCTX_INPROC_SERVER, IID_IShellFolder,
                           reinterpret_cast<LPVOID *>(&pShellFolder));
@@ -3139 +3138 @@
         while (TRUE)
         {
-            BOOL ret;
-
-            ret = SetupDiEnumDriverInfo (hDeviceInfo, &DeviceInfoData,
-                                         SPDIT_CLASSDRIVER, index, &DriverInfoData);
-
-            /* if the function failed and GetLastError() returned
+            BOOL fRet = SetupDiEnumDriverInfo(hDeviceInfo, &DeviceInfoData, SPDIT_CLASSDRIVER, index, &DriverInfoData);
+
+            /* if the function failed and GetLastError() returns
              * ERROR_NO_MORE_ITEMS, then we have reached the end of the
              * list.  Otherwise there was something wrong with this
              * particular driver. */
-            if (!ret)
+            if (!fRet)
             {
                 if (GetLastError() == ERROR_NO_MORE_ITEMS)
                     break;
-                else
-                {
-                    index++;
-                    continue;
-                }
+                index++;
+                continue;
             }