Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- 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);