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

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 54612205b446ae8dc84177e1907b2a9da2008364
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=54612205b446ae8dc84177e19...

Author: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Date:   Tue Sep 12 06:08:13 2017 +0000

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

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit c9308b8d6b1e2f4dd39b19a6890423cd42fd4620)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/setupapi/install.c       | 6 +++++-
 dlls/setupapi/tests/install.c | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index a8d38aa..0593df8 100644
--- 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;
     }
 
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index 558453c..3ca7f26 100644
--- 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)