Changeset 57306 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

Timestamp:

Aug 13, 2015 8:16:33 AM (9 years ago)

Author:

vboxsync

Message:

HostOnly/win: Reverse the order of NetCfgInstanceId and name querying (#7973)

File:

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

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

@@ -2974 +2974 @@
             SetErrBreak(("SetupDiOpenDevRegKey failed (0x%08X)", GetLastError()));
 
-        if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfo, &DeviceInfoData,
-                                               SPDRP_FRIENDLYNAME , /* IN DWORD Property,*/
-                                               NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
-                                               (PBYTE)DevName, /*OUT PBYTE PropertyBuffer,*/
-                                               sizeof(DevName), /* IN DWORD PropertyBufferSize,*/
-                                               NULL /*OUT PDWORD RequiredSize OPTIONAL*/))
-        {
-            int err = GetLastError();
-            if (err != ERROR_INVALID_DATA)
-            {
-                SetErrBreak (("SetupDiGetDeviceRegistryProperty failed (0x%08X)",
-                              err));
-            }
-
-            if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfo, &DeviceInfoData,
-                              SPDRP_DEVICEDESC, /* IN DWORD Property,*/
-                              NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
-                              (PBYTE)DevName, /*OUT PBYTE PropertyBuffer,*/
-                              sizeof(DevName), /* IN DWORD PropertyBufferSize,*/
-                              NULL /*OUT PDWORD RequiredSize OPTIONAL*/
-                            ))
-            {
-                err = GetLastError();
-                SetErrBreak (("SetupDiGetDeviceRegistryProperty failed (0x%08X)",
-                                              err));
-            }
-        }
 
         /* Query the instance ID; on Windows 10, the registry key may take a short
@@ -3015 +2988 @@
             else
                 break;
+        }
+
+        /*
+         * We need to query the device name after we have succeeded in querying its
+         * instance ID to avoid similar waiting-and-retrying loop (see @bugref{7973}).
+         */
+        if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfo, &DeviceInfoData,
+                                               SPDRP_FRIENDLYNAME , /* IN DWORD Property,*/
+                                               NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
+                                               (PBYTE)DevName, /*OUT PBYTE PropertyBuffer,*/
+                                               sizeof(DevName), /* IN DWORD PropertyBufferSize,*/
+                                               NULL /*OUT PDWORD RequiredSize OPTIONAL*/))
+        {
+            int err = GetLastError();
+            if (err != ERROR_INVALID_DATA)
+            {
+                SetErrBreak (("SetupDiGetDeviceRegistryProperty failed (0x%08X)",
+                              err));
+            }
+
+            if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfo, &DeviceInfoData,
+                              SPDRP_DEVICEDESC, /* IN DWORD Property,*/
+                              NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
+                              (PBYTE)DevName, /*OUT PBYTE PropertyBuffer,*/
+                              sizeof(DevName), /* IN DWORD PropertyBufferSize,*/
+                              NULL /*OUT PDWORD RequiredSize OPTIONAL*/
+                            ))
+            {
+                err = GetLastError();
+                SetErrBreak (("SetupDiGetDeviceRegistryProperty failed (0x%08X)",
+                                              err));
+            }
         }
         RegCloseKey (hkey);