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: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
6e69e512d8
commit
e2f456cfe5
|
@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl
|
|||
fileDest = &flTo->feFiles[0];
|
||||
}
|
||||
|
||||
if (op->req->fFlags & FOF_MULTIDESTFILES)
|
||||
if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1)
|
||||
{
|
||||
if (flFrom->bAnyFromWildcard)
|
||||
return ERROR_CANCELLED;
|
||||
|
|
|
@ -1816,6 +1816,15 @@ static void test_copy(void)
|
|||
CreateDirectoryA("one", 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 */
|
||||
shfo.pFrom = "a*.txt\0";
|
||||
shfo.pTo = "one\0two\0";
|
||||
|
|
Loading…
Reference in New Issue