Changeset 57147 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg

Timestamp:

Jul 31, 2015 4:36:57 PM (9 years ago)

Author:

vboxsync

Message:

Main: Attempted fix for Win10 host-only interface creation.

File:

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

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

@@ -2962 +2962 @@
             SetErrBreak(("SetupDiOpenDevRegKey failed (0x%08X)", GetLastError()));
 
-        cbSize = sizeof(pWCfgGuidString);
-        DWORD ret;
-        ret = RegQueryValueExW (hkey, L"NetCfgInstanceId", NULL,
-                               &dwValueType, (LPBYTE) pWCfgGuidString, &cbSize);
-
-        RegCloseKey (hkey);
-
         if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfo, &DeviceInfoData,
                                                SPDRP_FRIENDLYNAME , /* IN DWORD Property,*/
@@ -2996 +2989 @@
             }
         }
+
+        /* Query the instance ID; on Windows 10, the registry key may take a short
+         * while to appear. Microsoft recommends waiting for up to 5 seconds.
+         */
+        for (int retries = 0; retries < 5 * 5; ++retries)
+        {
+            cbSize = sizeof(pWCfgGuidString);
+            ret = RegQueryValueExW (hkey, L"NetCfgInstanceId", NULL,
+                                   &dwValueType, (LPBYTE) pWCfgGuidString, &cbSize);
+            /* As long as the return code is FILE_NOT_FOUND, sleep and retry. */
+            if (ret == ERROR_FILE_NOT_FOUND)
+                Sleep(200); /* 1/5 of a second. */
+            else
+                break;
+        }
+        RegCloseKey (hkey);
+
+        if (ret != ERROR_SUCCESS)
+            SetErrBreak(("Querying NetCfgInstanceId failed (0x%08X)", GetLastError()));
     }
     while (0);