Frédéric Delanoy : gameux: Do not use RegCloseKey on invalid/uninitialized registry key handle ( Coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 46229acde9869209619cb76f9d50b8b4490d18f9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=46229acde9869209619cb76f9d...

Author: Frédéric Delanoy 
Date:   Wed Nov 30 16:26:17 2011 +0100

gameux: Do not use RegCloseKey on invalid/uninitialized registry key handle (Coverity).

---

dlls/gameux/gamestatistics.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c
index cfe14b9..5cdd516 100644
--- a/dlls/gameux/gamestatistics.c
+++ b/dlls/gameux/gamestatistics.c
@@ -388,17 +388,18 @@ static HRESULT GAMEUX_getAppIdFromGDFPath(
         /* game is registered, let's read it's application id from registry */
         hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath);

-    if(SUCCEEDED(hr))
+    if(SUCCEEDED(hr)) {
         hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE,
                 lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hKey));
-
-    if(SUCCEEDED(hr))
-        hr = HRESULT_FROM_WIN32(RegGetValueW(hKey,
-                NULL, sApplicationId, RRF_RT_REG_SZ,
-                NULL, lpApplicationId, &dwLength));
+        if(SUCCEEDED(hr)) {
+            hr = HRESULT_FROM_WIN32(RegGetValueW(hKey,
+                    NULL, sApplicationId, RRF_RT_REG_SZ,
+                    NULL, lpApplicationId, &dwLength));
+            RegCloseKey(hKey);
+        }
+    }

HeapFree(GetProcessHeap(), 0, lpRegistryPath);
-    RegCloseKey(hKey);

TRACE("found app id: %s, return: %#x\n", debugstr_w(lpApplicationId), hr);
     return hr;