Paul Vriens : shell32/tests: Fix some test failures on Win9x and NT4.
Alexandre Julliard
julliard at winehq.org
Tue Jan 6 08:23:19 CST 2009
Module: wine
Branch: master
Commit: 7c1885181e84358fe82b9f3f97d00ea44f19fe5d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1885181e84358fe82b9f3f97d00ea44f19fe5d
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Tue Jan 6 09:16:37 2009 +0100
shell32/tests: Fix some test failures on Win9x and NT4.
---
dlls/shell32/tests/shlfileop.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 262e7a6..91ffe0b 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -736,7 +736,7 @@ static void test_copy(void)
}
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 "
"specified as a target\n");
}
@@ -771,7 +771,7 @@ static void test_copy(void)
}
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 "
"specified as a target\n");
}
@@ -1552,7 +1552,7 @@ static void test_move(void)
}
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 "
"specified as a target\n");
}
@@ -1580,7 +1580,7 @@ static void test_move(void)
}
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(dir_exists("test4.txt"), "The directory is moved. Many files are specified\n");
}
More information about the wine-cvs
mailing list