user32: If the value doesn't exist under the volatile key fallback to the permanent key.

5c8e83c4 · Huw Davies · Alexandre Julliard · fb5dbd60 · 5c8e83c4
Commit 5c8e83c4 authored Oct 03, 2012 by Huw Davies Committed by Alexandre Julliard Oct 03, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

sysparams.c dlls/user32/sysparams.c +10 -3

No files found.
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -622,12 +622,19 @@ static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, LPBYTE lpBuf
    HKEY hKey;

    memset( lpBuf, 0, count );
-    if ((RegOpenKeyW( get_volatile_regkey(), lpRegKey, &hKey ) == ERROR_SUCCESS) ||
-        (RegOpenKeyW( HKEY_CURRENT_USER, lpRegKey, &hKey ) == ERROR_SUCCESS))
+
+    if (RegOpenKeyW( get_volatile_regkey(), lpRegKey, &hKey ) == ERROR_SUCCESS)
+    {
+        ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count );
+        RegCloseKey( hKey );
+    }
+
+    if (!ret && RegOpenKeyW( HKEY_CURRENT_USER, lpRegKey, &hKey ) == ERROR_SUCCESS)
    {
-        ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count);
+        ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count );
        RegCloseKey( hKey );
    }
+
    return ret;
 }