shell32: Avoid closing the caller's key.

Signed-off-by: Theodore Dubois <tblodt@icloud.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Avoid closing the caller's key.
7c915af4 · Theodore Dubois · Alexandre Julliard · 2a7c4ea8 · 7c915af4
Commit 7c915af4 authored Jun 05, 2016 by Theodore Dubois Committed by Alexandre Julliard Jun 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

assoc.c dlls/shell32/assoc.c +3 -1

No files found.
--- a/dlls/shell32/assoc.c
+++ b/dlls/shell32/assoc.c
@@ -259,7 +259,9 @@ static HRESULT WINAPI IQueryAssociations_fnInit(
    }
    else if (hkeyProgid != NULL)
    {
-        This->hkeySource = This->hkeyProgID = hkeyProgid;
+        /* reopen the key so we don't end up closing a key owned by the caller */
+        RegOpenKeyExW(hkeyProgid, NULL, 0, KEY_READ, &This->hkeyProgID);
+        This->hkeySource = This->hkeyProgID;
        return S_OK;
    }
    else