diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 7650b64..ac8260c 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -852,7 +852,7 @@ static void test_copy(void) retval = SHFileOperation(&shfo); todo_wine { - ok(retval == 1148, "Expected 1148, got %d\n", retval); + ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); } ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); @@ -894,7 +894,7 @@ static void test_copy(void) retval = SHFileOperation(&shfo); todo_wine { - ok(retval == 1148, "Expected 1148, got %d\n", retval); + ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); } ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); @@ -975,10 +975,9 @@ static void test_copy(void) ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(DeleteFileA("two.txt"), "Expected file to exist\n"); ok(!RemoveDirectoryA("threedir"), "Expected dir to not exist\n"); - todo_wine - { - ok(!DeleteFileA("threedir"), "Expected file to not exist\n"); - } + + /* file exists in win2k */ + DeleteFileA("threedir"); createTestFile("one.txt"); createTestFile("two.txt"); -- 1.5.4.3