Changeset 59077 in vbox for trunk/src/VBox

Timestamp:

Dec 10, 2015 3:48:40 PM (9 years ago)

Author:

vboxsync

Message:

NetCfg/win: fixed regression causing failure to create first host-only adapter instance (bugref:8164)

File:

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

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

@@ -3317 +3317 @@
         if (SetupDiOpenDeviceInfo(hDevInfo, pwszId, NULL, 0, &DevInfoData))
         {
-            if (SetupDiGetDeviceRegistryPropertyW(hDevInfo, &DevInfoData,
-                                                  SPDRP_FRIENDLYNAME, NULL,
-                                                  (PBYTE)wszDevName, RT_ELEMENTS(wszDevName), NULL))
+            DWORD err = ERROR_SUCCESS;
+            if (!SetupDiGetDeviceRegistryPropertyW(hDevInfo, &DevInfoData,
+                                                   SPDRP_FRIENDLYNAME, NULL,
+                                                   (PBYTE)wszDevName, RT_ELEMENTS(wszDevName), NULL))
+            {
+                err = GetLastError();
+                if (err == ERROR_INVALID_DATA)
+                {
+                    err = SetupDiGetDeviceRegistryPropertyW(hDevInfo, &DevInfoData,
+                                                            SPDRP_DEVICEDESC, NULL,
+                                                            (PBYTE)wszDevName, RT_ELEMENTS(wszDevName), NULL)
+                        ? ERROR_SUCCESS
+                        : GetLastError();
+                }
+            }
+            if (err == ERROR_SUCCESS)
             {
                 hr = VBoxNetCfgWinGenHostonlyConnectionName(wszDevName, wszConnectionNewName, &cbName);
@@ -3330 +3343 @@
                         hr = VBoxNetCfgWinRenameConnection(wszGuid, wszConnectionNewName);
                         if (FAILED(hr))
-                            NonStandardLogFlow(("NetIf: VBoxNetCfgWinRenameConnection failed (0x%x)\n", hr));
+                            NonStandardLogFlow(("VBoxNetCfgWinRenameHostOnlyConnection: VBoxNetCfgWinRenameConnection failed (0x%x)\n", hr));
                     }
                     else
                     {
-                        DWORD winEr = GetLastError();
-                        hr = HRESULT_FROM_WIN32(winEr);
+                        err = GetLastError();
+                        hr = HRESULT_FROM_WIN32(err);
                         if (SUCCEEDED(hr))
                             hr = E_FAIL;
-                        NonStandardLogFlow(("StringFromGUID2 failed winEr=%u, hr=0x%x\n", winEr, hr));
+                        NonStandardLogFlow(("StringFromGUID2 failed err=%u, hr=0x%x\n", err, hr));
                     }
                 }
                 else
-                    NonStandardLogFlow(("NetIf: VBoxNetCfgWinGenHostonlyConnectionName failed (0x%x)\n", hr));
+                    NonStandardLogFlow(("VBoxNetCfgWinRenameHostOnlyConnection: VBoxNetCfgWinGenHostonlyConnectionName failed (0x%x)\n", hr));
                 if (SUCCEEDED(hr) && pDevName)
                 {
@@ -3355 +3368 @@
             else
             {
-                DWORD winEr = GetLastError();
-                hr = HRESULT_FROM_WIN32(winEr);
-                NonStandardLogFlow(("NetIf: SetupDiGetDeviceRegistryPropertyW failed (0x%x)\n", winEr));
+                hr = HRESULT_FROM_WIN32(err);
+                NonStandardLogFlow(("VBoxNetCfgWinRenameHostOnlyConnection: SetupDiGetDeviceRegistryPropertyW failed (0x%x)\n", err));
             }
         }
         else
         {
-            DWORD winEr = GetLastError();
-            hr = HRESULT_FROM_WIN32(winEr);
-            NonStandardLogFlow(("NetIf: SetupDiOpenDeviceInfo failed (0x%x)\n", winEr));
+            DWORD err = GetLastError();
+            hr = HRESULT_FROM_WIN32(err);
+            NonStandardLogFlow(("VBoxNetCfgWinRenameHostOnlyConnection: SetupDiOpenDeviceInfo failed (0x%x)\n", err));
         }
         SetupDiDestroyDeviceInfoList(hDevInfo);