[PATCH v4 09/10] shell32: Don't open reg keys with zero access mask.

[Paul Gofman]

From: Paul Gofman

---
 dlls/shell32/classes.c   | 4 ++--
 dlls/shell32/shellpath.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index a8e70c021c2..399dbf5b4fb 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -135,7 +135,7 @@ BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD l
             lstrcpyW(sTemp, L"shell\");
             lstrcatW(sTemp, szDest);
             lstrcatW(sTemp, L"\command");
-            if (!RegOpenKeyExW(hkeyClass, sTemp, 0, 0, &hkey))
+            if (!RegOpenKeyExW(hkeyClass, sTemp, 0, KEY_ENUMERATE_SUB_KEYS, &hkey))
             {
                 RegCloseKey(hkey);
                 TRACE("default verb=%s\n", debugstr_w(szDest));
@@ -145,7 +145,7 @@ BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD l

/* then fallback to 'open' */
         lstrcpyW(sTemp, L"shell\open\command");
-        if (!RegOpenKeyExW(hkeyClass, sTemp, 0, 0, &hkey))
+        if (!RegOpenKeyExW(hkeyClass, sTemp, 0, KEY_ENUMERATE_SUB_KEYS, &hkey))
         {
             RegCloseKey(hkey);
             lstrcpynW(szDest, L"open", len);
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 4330ee367b3..95ddf661519 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3881,7 +3881,7 @@ static HRESULT knownfolder_set_id(
     /* check is it registry-registered folder */
     hr = get_known_folder_registry_path(kfid, NULL, &knownfolder->registryPath);
     if(SUCCEEDED(hr))
-        hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, 0, 0, &hKey));
+        hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, 0, KEY_ENUMERATE_SUB_KEYS, &hKey));

if(SUCCEEDED(hr))
     {
@@ -4327,7 +4327,7 @@ static BOOL is_knownfolder( struct foldermanager *fm, const KNOWNFOLDERID *id )
     hr = get_known_folder_registry_path(id, NULL, &registryPath);
     if(SUCCEEDED(hr))
     {
-        hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, 0, &hKey));
+        hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, KEY_ENUMERATE_SUB_KEYS, &hKey));
         free(registryPath);
     }