From: Paul Vriens <Paul.Vriens.Wine@gmail.com>
Date: Tue, 6 Jan 2009 08:16:37 +0000 (+0100)
Subject: shell32/tests: Fix some test failures on Win9x and NT4.
X-Git-Tag: wine-1.1.13~465
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=7c1885181e84358fe82b9f3f97d00ea44f19fe5d;p=wine%2Feterwine.git

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

diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 262e7a60a9..91ffe0b2d4 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");
     }