ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Don't fail a queued copy if no copy was necessary. 

This fixes a regression introduced by 3e5c9798a8.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47219
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-05-17 17:36:53 -05:00 committed by Alexandre Julliard
parent a748f685a5
commit 8bc25b24af
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/setupapi/queue.c
View File

@ -1309,7 +1309,7 @@ static BOOL queue_copy_file( const WCHAR *source, const WCHAR *dest,
if (op->dst_path && !create_full_pathW(op->dst_path))
return FALSE;
if (do_file_copyW(source, dest, op->style, handler, context))
if (do_file_copyW(source, dest, op->style, handler, context) || GetLastError() == ERROR_SUCCESS)
return TRUE;
/* try to extract it from the cabinet file */

10
dlls/setupapi/tests/install.c
View File

@ -1468,6 +1468,16 @@ static void test_need_media(void)
ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media);
ok(delete_file("dst/one.txt"), "Destination file should exist.\n");
got_need_media = 0;
queue = SetupOpenFileQueue();
ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError());
ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", "File One", NULL,
"dst", NULL, SP_COPY_WARNIFSKIP | SP_COPY_REPLACEONLY);
ok(ret, "Failed to queue copy, error %#x.\n", GetLastError());
run_queue(queue, need_media_cb);
ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media);
ok(!file_exists("dst/one.txt"), "Destination file should exist.\n");
/* Test with a subdirectory. */
got_need_media = 0;