Michael Stefaniuc : kernel32/tests: Use todo_wine_if().
Alexandre Julliard
julliard at winehq.org
Wed Aug 10 11:05:56 CDT 2016
Module: wine
Branch: master
Commit: 3e6b503adb51ff854bfe942caf5297c4cb730612
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6b503adb51ff854bfe942caf5297c4cb730612
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Aug 9 22:27:03 2016 +0200
kernel32/tests: Use todo_wine_if().
Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/tests/file.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index ab94c01..5327865 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -4358,17 +4358,10 @@ static void test_file_access(void)
else
{
/* FIXME: Remove once Wine is fixed */
- if ((td[j].access & (GENERIC_READ | GENERIC_WRITE)) ||
- (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) ||
- (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) ||
- (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA)))
- {
-todo_wine
- ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access);
-todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError());
- }
- else
+ todo_wine_if((td[j].access & (GENERIC_READ | GENERIC_WRITE) ||
+ (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) ||
+ (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) ||
+ (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA))))
{
ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access);
ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError());
More information about the wine-cvs
mailing list