setupapi: Also handle DelFiles and RenFiles directives in SetupInstallFilesFromInfSection().
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
47111ff6b0
commit
506ce2ae6b
|
@ -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 );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue