[EXPLORER] Registry key not closed on error (#3136)

CORE-14519

diff --git a/base/shell/explorer/shellservice.cpp b/base/shell/explorer/shellservice.cpp
index 2aded30..459e908 100644 (file)
--- a/base/shell/explorer/shellservice.cpp
+++ b/base/shell/explorer/shellservice.cpp
@@ -115,17 +115,18 @@ HRESULT InitShellServices(HDPA * phdpa)
         goto cleanup;
     }
 
-    RegCloseKey(hkey);
-
     /* Initialize */
     DPA_EnumCallback(hdpa, InitializeAllCallback, &hr);
     if (FAILED_UNEXPECTEDLY(hr))
         goto cleanup;
 
+    RegCloseKey(hkey);
+
     *phdpa = hdpa;
     return count > 0 ? S_OK : S_FALSE;
 
 cleanup:
+    RegCloseKey(hkey);
     *phdpa = NULL;
     ShutdownShellServices(hdpa);
     return hr;