André Hentschel : advapi32/tests: Don' t test function directly when reporting GetLastError().
Alexandre Julliard
julliard at winehq.org
Mon Jan 3 10:58:02 CST 2011
Module: wine
Branch: master
Commit: b49e1c299438cf2b08dbf87b76a865c1de9b74d4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49e1c299438cf2b08dbf87b76a865c1de9b74d4
Author: André Hentschel <nerv at dawncrow.de>
Date: Sun Jan 2 18:48:08 2011 +0100
advapi32/tests: Don't test function directly when reporting GetLastError().
---
dlls/advapi32/tests/security.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index ff07513..5810752 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2318,9 +2318,9 @@ static void test_process_security_child(void)
ok(handle != NULL, "OpenProcess(PROCESS_TERMINATE) with err:%d\n", GetLastError());
TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE );
- ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(),
- &handle1, 0, TRUE, DUPLICATE_SAME_ACCESS ),
- "duplicating handle err:%d\n", GetLastError());
+ ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(),
+ &handle1, 0, TRUE, DUPLICATE_SAME_ACCESS );
+ ok(ret, "duplicating handle err:%d\n", GetLastError());
TEST_GRANTED_ACCESS( handle1, PROCESS_TERMINATE );
CloseHandle( handle1 );
@@ -2344,23 +2344,23 @@ static void test_process_security_child(void)
ok(handle == NULL, "OpenProcess(PROCESS_ALL_ACCESS) should have failed\n");
/* Documented privilege elevation */
- ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
- &handle, 0, TRUE, DUPLICATE_SAME_ACCESS ),
- "duplicating handle err:%d\n", GetLastError());
+ ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
+ &handle, 0, TRUE, DUPLICATE_SAME_ACCESS );
+ ok(ret, "duplicating handle err:%d\n", GetLastError());
TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS,
STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL );
CloseHandle( handle );
/* Same only explicitly asking for all access rights */
- ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
- &handle, PROCESS_ALL_ACCESS, TRUE, 0 ),
- "duplicating handle err:%d\n", GetLastError());
+ ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
+ &handle, PROCESS_ALL_ACCESS, TRUE, 0 );
+ ok(ret, "duplicating handle err:%d\n", GetLastError());
TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS,
PROCESS_ALL_ACCESS | PROCESS_QUERY_LIMITED_INFORMATION );
- ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(),
- &handle1, PROCESS_VM_READ, TRUE, 0 ),
- "duplicating handle err:%d\n", GetLastError());
+ ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(),
+ &handle1, PROCESS_VM_READ, TRUE, 0 );
+ ok(ret, "duplicating handle err:%d\n", GetLastError());
TEST_GRANTED_ACCESS( handle1, PROCESS_VM_READ );
CloseHandle( handle1 );
CloseHandle( handle );
More information about the wine-cvs
mailing list