On Fri, Jun 20, 2008 at 9:37 AM, Vitaly Perov vitperov@etersoft.ru wrote:
Changelog:
- shell32/tests: FOF_MULTIDESTFILES must be set when we are moving multiple
files
+ /* move many files into directory with FOF_MULTIDESTFILES */ + shfo.fFlags |= FOF_MULTIDESTFILES; set_curr_dir_path(from, "test?.txt\0"); set_curr_dir_path(to, "testdir2\0"); - ok(!file_exists("testdir2\test2.txt"), "The file is not moved yet\n"); - ok(!file_exists("testdir2\test4.txt"), "The directory is not moved yet\n"); - ok(!SHFileOperationA(&shfo), "Files and directories are moved to directory\n"); - ok(file_exists("testdir2\test2.txt"), "The file is moved\n"); - ok(file_exists("testdir2\test4.txt"), "The directory is moved\n"); - ok(file_exists("testdir2\test4.txt\test1.txt"), "The file in subdirectory is moved\n"); + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(file_exists("testdir2\test2.txt"), "Expected the file 'test2.txt' to exist\n"); + ok(file_exists("testdir2\test4.txt"), "Expected the directory 'test4.txt' to exist\n"); + ok(file_exists("testdir2\test4.txt\test1.txt"), "Expected the file in subdirectory 'test1.txt' to exist\n"); + }
That test was there for a reason. You need to add another test like I wrote in my last email about this.