[PATCH 3/4] setupapi: Also handle DelFiles and RenFiles directives in SetupInstallFilesFromInfSection().

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/setupapi/install.c       | 4 +++-
 dlls/setupapi/tests/install.c | 2 +-
 2 files changed, 4 insertions(+), 2 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 f12e8a122e6..eba70f2573e 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -1167,7 +1167,7 @@ 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");
+    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");
 
-- 
2.34.1