James Hawkins : shell32: Fix a few tests that fail in win2k.
Alexandre Julliard
julliard at winehq.org
Fri Apr 11 06:28:45 CDT 2008
Module: wine
Branch: master
Commit: 81f2d3cc0b40205ea87a64b41551535899a4180f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f2d3cc0b40205ea87a64b41551535899a4180f
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Thu Apr 10 18:09:34 2008 -0500
shell32: Fix a few tests that fail in win2k.
---
dlls/shell32/tests/shlfileop.c | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 7650b64..223828e 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -850,10 +850,7 @@ static void test_copy(void)
shfo.pTo = "two.txt\0";
shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI;
retval = SHFileOperation(&shfo);
- todo_wine
- {
- ok(retval == 1148, "Expected 1148, got %d\n", retval);
- }
+ ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval);
ok(DeleteFileA("one.txt"), "Expected file to exist\n");
ok(!DeleteFileA("two.txt"), "Expected file to not exist\n");
@@ -892,10 +889,7 @@ static void test_copy(void)
shfo.pTo = to;
shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI;
retval = SHFileOperation(&shfo);
- todo_wine
- {
- ok(retval == 1148, "Expected 1148, got %d\n", retval);
- }
+ ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval);
ok(DeleteFileA("one.txt"), "Expected file to exist\n");
ok(!DeleteFileA("two.txt"), "Expected file to not exist\n");
@@ -975,10 +969,9 @@ static void test_copy(void)
ok(DeleteFileA("one.txt"), "Expected file to exist\n");
ok(DeleteFileA("two.txt"), "Expected file to exist\n");
ok(!RemoveDirectoryA("threedir"), "Expected dir to not exist\n");
- todo_wine
- {
- ok(!DeleteFileA("threedir"), "Expected file to not exist\n");
- }
+
+ /* file exists in win2k */
+ DeleteFileA("threedir");
createTestFile("one.txt");
createTestFile("two.txt");
More information about the wine-cvs
mailing list