Skip to content

W
wine-cw
Commit 15950689 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: Fix some test failures on Win9x/WinMe.

parent 9d61f1d7
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
dlls/kernel32/tests/file.c
View file @ 15950689
...@@ -650,8 +650,10 @@ static void test_CopyFileA(void) ...@@ -650,8 +650,10 @@ static void test_CopyFileA(void)
ret = CopyFileA(source, dest, FALSE); ret = CopyFileA(source, dest, FALSE);
todo_wine { todo_wine {
ok(!ret && GetLastError() == ERROR_USER_MAPPED_FILE, ok(!ret, "CopyFileA: expected failure\n");
"CopyFileA with mapped dest file: expected ERROR_USER_MAPPED_FILE, got %d\n", GetLastError()); ok(GetLastError() == ERROR_USER_MAPPED_FILE ||
broken(GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x and WinMe */
"CopyFileA with mapped dest file: expected ERROR_USER_MAPPED_FILE, got %d\n", GetLastError());
} }
CloseHandle(hmapfile); CloseHandle(hmapfile);
...@@ -1325,7 +1327,9 @@ static void test_MoveFileA(void) ...@@ -1325,7 +1327,9 @@ static void test_MoveFileA(void)
ret = MoveFileA(source, dest); ret = MoveFileA(source, dest);
todo_wine { todo_wine {
ok(!ret, "MoveFileA: expected failure\n"); ok(!ret, "MoveFileA: expected failure\n");
ok(GetLastError() == ERROR_SHARING_VIOLATION, "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); ok(GetLastError() == ERROR_SHARING_VIOLATION ||
broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */
"MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
} }
CloseHandle(hmapfile); CloseHandle(hmapfile);
...@@ -1343,7 +1347,9 @@ static void test_MoveFileA(void) ...@@ -1343,7 +1347,9 @@ static void test_MoveFileA(void)
ret = MoveFileA(source, dest); ret = MoveFileA(source, dest);
todo_wine { todo_wine {
ok(!ret, "MoveFileA: expected failure\n"); ok(!ret, "MoveFileA: expected failure\n");
ok(GetLastError() == ERROR_SHARING_VIOLATION, "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); ok(GetLastError() == ERROR_SHARING_VIOLATION ||
broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */
"MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
} }
CloseHandle(hmapfile); CloseHandle(hmapfile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment