ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Paul Vriens 2009-01-06 09:16:37 +01:00 committed by Alexandre Julliard
parent b4dcc6b42a
commit 7c1885181e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/shell32/tests/shlfileop.c
View File

@ -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)
} }
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)
} }
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)
} }
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");
} }