Commit e2f456cf authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard

shell32: Only consider copy operation multidest if the number of dst files is greater than one.

Fixes crash on start in Worms World Party Remastered. Signed-off-by: 's avatarPaul Gofman <pgofman@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6e69e512
...@@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl ...@@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl
fileDest = &flTo->feFiles[0]; fileDest = &flTo->feFiles[0];
} }
if (op->req->fFlags & FOF_MULTIDESTFILES) if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1)
{ {
if (flFrom->bAnyFromWildcard) if (flFrom->bAnyFromWildcard)
return ERROR_CANCELLED; return ERROR_CANCELLED;
......
...@@ -1816,6 +1816,15 @@ static void test_copy(void) ...@@ -1816,6 +1816,15 @@ static void test_copy(void)
CreateDirectoryA("one", NULL); CreateDirectoryA("one", NULL);
CreateDirectoryA("two", NULL); CreateDirectoryA("two", NULL);
/* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */
shfo.pFrom = "a*.txt\0";
shfo.pTo = "one\0";
shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES;
retval = SHFileOperationA(&shfo);
ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval);
ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n");
ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n");
/* pFrom has a glob, pTo has more than one dest */ /* pFrom has a glob, pTo has more than one dest */
shfo.pFrom = "a*.txt\0"; shfo.pFrom = "a*.txt\0";
shfo.pTo = "one\0two\0"; shfo.pTo = "one\0two\0";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment