Module: wine Branch: master Commit: a431b4b54a36b49821cae363d7ea8733eefe62ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=a431b4b54a36b49821cae363d...
Author: Zebediah Figura z.figura12@gmail.com Date: Fri Aug 23 00:14:57 2019 -0500
setupapi: Fix handling of FILEOP_SKIP from the SPFILENOTIFY_STARTCOPY callback.
Fixes a regression introduced by 3e5c9798a80641e0e39e95e4467c60405b22b062.
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
---
dlls/setupapi/queue.c | 2 +- dlls/setupapi/tests/install.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index e9b48ed..f7da3a7 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -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);
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 87615e7..fd10fd9 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -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;