From 7c1885181e84358fe82b9f3f97d00ea44f19fe5d Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Tue, 6 Jan 2009 09:16:37 +0100 Subject: [PATCH] shell32/tests: Fix some test failures on Win9x and NT4. --- dlls/shell32/tests/shlfileop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 262e7a60a94..91ffe0b2d49 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"); }