From 147464c000c518b3704ee3330a854e1a992490bc Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Thu, 11 Sep 2008 02:37:28 -0500 Subject: [PATCH] shell32: Fix two failing tests in win2k. --- dlls/shell32/tests/shlfileop.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index eca4f94b25a..a4d25591529 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -942,7 +942,9 @@ static void test_copy(void) shfo.pTo = "two.txt\0"; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); + ok(retval == 1148 || retval == 1026 || + retval == ERROR_ACCESS_DENIED, /* win2k */ + "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); @@ -984,7 +986,9 @@ static void test_copy(void) shfo.pTo = to; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); + ok(retval == 1148 || retval == 1026 || + retval == ERROR_ACCESS_DENIED, /* win2k */ + "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); -- 2.11.4.GIT