Changeset 57370 in vbox

Timestamp:

Aug 14, 2015 7:41:33 PM (10 years ago)

Author:

vboxsync

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

102133

Message:

HostOnly/win: Move up NetCfgInstanceId error handling (#7973)

File:

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

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

@@ -2690 +2690 @@
     WCHAR pWCfgGuidString [50];
     WCHAR DevName[256];
+    HKEY hkey = (HKEY)INVALID_HANDLE_VALUE;
 
     do
@@ -2704 +2705 @@
         DWORD detailBuf [2048];
 
-        HKEY hkey = NULL;
         DWORD cbSize;
         DWORD dwValueType;
@@ -2990 +2990 @@
         }
 
+        if (ret != ERROR_SUCCESS)
+            SetErrBreak(("Querying NetCfgInstanceId failed (0x%08X)", GetLastError()));
+
         /*
          * We need to query the device name after we have succeeded in querying its
@@ -3021 +3024 @@
             }
         }
-        RegCloseKey (hkey);
-
-        if (ret != ERROR_SUCCESS)
-            SetErrBreak(("Querying NetCfgInstanceId failed (0x%08X)", GetLastError()));
     }
     while (0);
@@ -3031 +3030 @@
      * cleanup
      */
+    if (hkey != INVALID_HANDLE_VALUE)
+        RegCloseKey (hkey);
+
     if (pQueueCallbackContext)
         SetupTermDefaultQueueCallback(pQueueCallbackContext);