From 7e9fa0ee8a00ff2c692dc12c26292ba410f93c09 Mon Sep 17 00:00:00 2001
From: winesync <ros-dev@reactos.org>
Date: Fri, 5 Jan 2024 21:08:49 +0100
Subject: [PATCH] [WINESYNC] 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>

wine commit id c9308b8d6b1e2f4dd39b19a6890423cd42fd4620 by Hugh McMaster <hugh.mcmaster@outlook.com>
---
 dll/win32/setupapi/install.c    | 6 +++++-
 sdk/tools/winesync/setupapi.cfg | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dll/win32/setupapi/install.c b/dll/win32/setupapi/install.c
index 7e0ab5f9eb3..9eeac4fea50 100644
--- a/dll/win32/setupapi/install.c
+++ b/dll/win32/setupapi/install.c
@@ -331,7 +331,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/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg
index d99e35f1b36..428ddbb0aa0 100644
--- a/sdk/tools/winesync/setupapi.cfg
+++ b/sdk/tools/winesync/setupapi.cfg
@@ -5,4 +5,4 @@ files:
   dlls/setupapi/misc.c: dll/win32/setupapi/misc.c
   dlls/setupapi/stubs.c: dll/win32/setupapi/stubs.c
 tags:
-  wine: e4645d60d72a9fbfbd745e275d4f90110bdceb4d
+  wine: c9308b8d6b1e2f4dd39b19a6890423cd42fd4620