setupapi: Recursively remove any subkeys before calling NtDeleteKey().

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

setupapi: Recursively remove any subkeys before calling NtDeleteKey().
c9308b8d · Hugh McMaster · Alexandre Julliard · 19d57982 · c9308b8d · c9308b8d
Commit c9308b8d authored Sep 12, 2017 by Hugh McMaster Committed by Alexandre Julliard Sep 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

install.c dlls/setupapi/install.c +5 -1

install.c dlls/setupapi/tests/install.c +0 -1

No files found.
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -320,7 +320,11 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context
            }
            else RegDeleteValueW( hkey, value );
        }
-        else NtDeleteKey( hkey );
+        else
+        {
+            RegDeleteTreeW( hkey, NULL );
+            NtDeleteKey( hkey );
+        }
        return TRUE;
    }


--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -174,7 +174,6 @@ static void test_registry(void)

    /* Check if the registry key is recursively deleted */
    res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key);
-    todo_wine
    ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n");
    /* Just in case */
    if (res == ERROR_SUCCESS)