Skip to content

W
wine-cw
Commit 7c188518 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

shell32/tests: Fix some test failures on Win9x and NT4.

parent b4dcc6b4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/shell32/tests/shlfileop.c
View file @ 7c188518
...@@ -736,7 +736,7 @@ static void test_copy(void) ...@@ -736,7 +736,7 @@ static void test_copy(void)
} }
else else
{ {
ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */);
ok(!file_exists("test6.txt"), "The file is copied - many files are " ok(!file_exists("test6.txt"), "The file is copied - many files are "
"specified as a target\n"); "specified as a target\n");
} }
...@@ -771,7 +771,7 @@ static void test_copy(void) ...@@ -771,7 +771,7 @@ static void test_copy(void)
} }
else else
{ {
ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */);
ok(!file_exists("test6.txt"), "The file is copied - many files are " ok(!file_exists("test6.txt"), "The file is copied - many files are "
"specified as a target\n"); "specified as a target\n");
} }
...@@ -1552,7 +1552,7 @@ static void test_move(void) ...@@ -1552,7 +1552,7 @@ static void test_move(void)
} }
else else
{ {
ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */);
ok(!file_exists("test6.txt"), "The file is not moved - many files are " ok(!file_exists("test6.txt"), "The file is not moved - many files are "
"specified as a target\n"); "specified as a target\n");
} }
...@@ -1580,7 +1580,7 @@ static void test_move(void) ...@@ -1580,7 +1580,7 @@ static void test_move(void)
} }
else else
{ {
ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */);
ok(file_exists("test1.txt"), "The file is moved. Many files are specified\n"); ok(file_exists("test1.txt"), "The file is moved. Many files are specified\n");
ok(dir_exists("test4.txt"), "The directory is moved. Many files are specified\n"); ok(dir_exists("test4.txt"), "The directory is moved. Many files are specified\n");
} }
......
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