system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 21:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

setupapi: Fix handling of FILEOP_SKIP from the SPFILENOTIFY_STARTCOPY callback.

Browse source 
Fixes a regression introduced by 3e5c9798a8.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47436
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-08-23 00:14:57 -05:00 committed by Alexandre Julliard
parent ab3cc3c11a
commit a431b4b54a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/setupapi/queue.c
View file

@ -1477,7 +1477,7 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC
if (op_result == FILEOP_ABORT)
goto done;
else if (op_result == FILEOP_SKIP)
break;
continue;
else if (op_result != FILEOP_DOIT)
FIXME("Unhandled return value %#x.\n", op_result);

4
dlls/setupapi/tests/install.c
View file

@ -2006,10 +2006,10 @@ static void test_start_copy(void)
ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
run_queue(queue, start_copy_cb);
todo_wine ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy);
ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy);
ok(delete_file("dst/one.txt"), "Destination file should exist.\n");
ok(!file_exists("dst/two.txt"), "Destination file should not exist.\n");
todo_wine ok(delete_file("dst/three.txt"), "Destination file should exist.\n");
ok(delete_file("dst/three.txt"), "Destination file should exist.\n");
start_copy_ret = FILEOP_ABORT;
got_start_copy = 0;