Zebediah Figura : setupapi: Also handle DelFiles and RenFiles directives in SetupInstallFilesFromInfSection().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 506ce2ae6bc2fc1395da402a8ed0de4527fa7e24
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=506ce2ae6bc2fc1395da402a8ed0de4527fa7e24

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Sun Feb  6 22:53:33 2022 -0600

setupapi: Also handle DelFiles and RenFiles directives in SetupInstallFilesFromInfSection().

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 28ef0820ebf..58a19fa8a68 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -1027,7 +1027,9 @@ BOOL WINAPI SetupInstallFilesFromInfSectionW( HINF hinf, HINF hlayout, HSPFILEQ
     info.src_root   = src_root;
     info.copy_flags = flags;
     info.layout     = hlayout;
-    return iterate_section_fields( hinf, section, L"CopyFiles", copy_files_callback, &info );
+    return iterate_section_fields( hinf, section, L"CopyFiles", copy_files_callback, &info ) &&
+           iterate_section_fields( hinf, section, L"DelFiles", delete_files_callback, &info ) &&
+           iterate_section_fields( hinf, section, L"RenFiles", rename_files_callback, &info );
 }
 
 
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index 498cd25aaab..6c41c72453e 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -1167,9 +1167,9 @@ static void test_install_files_queue(void)
     ok(delete_file("dst/six.txt"), "Destination file should exist.\n");
     ok(delete_file("dst/seven.txt"), "Destination file should exist.\n");
     ok(delete_file("dst/eight.txt"), "Destination file should exist.\n");
-    todo_wine ok(!delete_file("dst/nine.txt"), "Destination file should not exist.\n");
-    todo_wine ok(!delete_file("dst/ten.txt"), "Destination file should not exist.\n");
-    todo_wine ok(delete_file("dst/eleven.txt"), "Destination file should exist.\n");
+    ok(!delete_file("dst/nine.txt"), "Destination file should not exist.\n");
+    ok(!delete_file("dst/ten.txt"), "Destination file should not exist.\n");
+    ok(delete_file("dst/eleven.txt"), "Destination file should exist.\n");
 
     SetupTermDefaultQueueCallback(context);
     ret = SetupCloseFileQueue(queue);