James Hawkins : kernel32: Fix test failures because of a broken ReplaceFile in win2k.
Alexandre Julliard
julliard at winehq.org
Wed Jul 2 06:03:37 CDT 2008
Module: wine
Branch: master
Commit: c7375427826fb42ca078b4833ca9a9234f9a2235
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7375427826fb42ca078b4833ca9a9234f9a2235
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Tue Jul 1 23:20:46 2008 -0500
kernel32: Fix test failures because of a broken ReplaceFile in win2k.
---
dlls/kernel32/tests/file.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 57e0496..4730ec4 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -2074,7 +2074,8 @@ static void test_ReplaceFileA(void)
ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, "ReplaceFileA: unexpected error %d\n", GetLastError());
/* make sure that the replacement file still exists */
hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
- ok(hReplacementFile != INVALID_HANDLE_VALUE,
+ ok(hReplacementFile != INVALID_HANDLE_VALUE ||
+ broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */
"unexpected error, replacement file should still exist %d\n", GetLastError());
CloseHandle(hReplacementFile);
ret = SetFileAttributesA(replaced, FILE_ATTRIBUTE_NORMAL);
@@ -2107,7 +2108,9 @@ static void test_ReplaceFileA(void)
/* delete temporary files, replacement and replaced are already deleted */
ret = DeleteFileA(backup);
- ok(ret, "DeleteFileA: error (backup) %d\n", GetLastError());
+ ok(ret ||
+ broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */
+ "DeleteFileA: error (backup) %d\n", GetLastError());
}
/*
@@ -2178,7 +2181,9 @@ static void test_ReplaceFileW(void)
"ReplaceFileW: unexpected error %d\n", GetLastError());
ret = DeleteFileW(backup);
- ok(ret, "DeleteFileW: error %d\n", GetLastError());
+ ok(ret ||
+ broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */
+ "DeleteFileW: error (backup) %d\n", GetLastError());
}
START_TEST(file)
More information about the wine-cvs
mailing list