comdlg32: Improve error handling in get_config_key_string.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comdlg32: Improve error handling in get_config_key_string.
a16b9ff5 · Jacek Caban · Alexandre Julliard · 0239026b · a16b9ff5
Commit a16b9ff5 authored May 08, 2020 by Jacek Caban Committed by Alexandre Julliard May 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

filedlg.c dlls/comdlg32/filedlg.c +4 -5

No files found.
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -250,11 +250,10 @@ static BOOL get_config_key_string(HKEY hkey, const WCHAR *name, WCHAR **value)
    DWORD type, size;
    WCHAR *str;

-    if (hkey && !RegQueryValueExW(hkey, name, 0, &type, NULL, &size))
-    {
-        if (type != REG_SZ && type != REG_EXPAND_SZ)
-            return FALSE;
-    }
+    if (RegQueryValueExW(hkey, name, 0, &type, NULL, &size))
+        return FALSE;
+    if (type != REG_SZ && type != REG_EXPAND_SZ)
+        return FALSE;

    str = heap_alloc(size);
    if (RegQueryValueExW(hkey, name, 0, &type, (BYTE *)str, &size))