kernelbase/tests: Don't test functions directly when reporting GetLastError().
Signed-off-by: André Zwing <nerv@dawncrow.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a6bf1a5ffb
commit
25e1fcc563
|
@ -35,6 +35,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE);
|
||||||
static void test_CompareObjectHandles(void)
|
static void test_CompareObjectHandles(void)
|
||||||
{
|
{
|
||||||
HANDLE h1, h2;
|
HANDLE h1, h2;
|
||||||
|
BOOL ret;
|
||||||
|
|
||||||
if (!pCompareObjectHandles)
|
if (!pCompareObjectHandles)
|
||||||
{
|
{
|
||||||
|
@ -42,24 +43,24 @@ static void test_CompareObjectHandles(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ok( pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() ),
|
ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() );
|
||||||
"comparing GetCurrentProcess() to self failed with %u\n", GetLastError() );
|
ok( ret, "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() );
|
||||||
|
|
||||||
ok( pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() ),
|
ret = pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() );
|
||||||
"comparing GetCurrentThread() to self failed with %u\n", GetLastError() );
|
ok( ret, "comparing GetCurrentThread() to self failed with %u\n", GetLastError() );
|
||||||
|
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
ok( !pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() ) &&
|
ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() );
|
||||||
GetLastError() == ERROR_NOT_SAME_OBJECT,
|
ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT,
|
||||||
"comparing GetCurrentProcess() to GetCurrentThread() returned %u\n", GetLastError() );
|
"comparing GetCurrentProcess() to GetCurrentThread() returned %u\n", GetLastError() );
|
||||||
|
|
||||||
h1 = NULL;
|
h1 = NULL;
|
||||||
ok( DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
|
ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
|
||||||
&h1, 0, FALSE, DUPLICATE_SAME_ACCESS ),
|
&h1, 0, FALSE, DUPLICATE_SAME_ACCESS );
|
||||||
"failed to duplicate current process handle: %u\n", GetLastError() );
|
ok( ret, "failed to duplicate current process handle: %u\n", GetLastError() );
|
||||||
|
|
||||||
ok( pCompareObjectHandles( GetCurrentProcess(), h1 ),
|
ret = pCompareObjectHandles( GetCurrentProcess(), h1 );
|
||||||
"comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() );
|
ok( ret, "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() );
|
||||||
|
|
||||||
CloseHandle( h1 );
|
CloseHandle( h1 );
|
||||||
|
|
||||||
|
@ -67,12 +68,12 @@ static void test_CompareObjectHandles(void)
|
||||||
ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
|
ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
|
||||||
|
|
||||||
h2 = NULL;
|
h2 = NULL;
|
||||||
ok( DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(),
|
ret = DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(),
|
||||||
&h2, 0, FALSE, DUPLICATE_SAME_ACCESS ),
|
&h2, 0, FALSE, DUPLICATE_SAME_ACCESS );
|
||||||
"failed to duplicate handle %p: %u\n", h1, GetLastError() );
|
ok( ret, "failed to duplicate handle %p: %u\n", h1, GetLastError() );
|
||||||
|
|
||||||
ok( pCompareObjectHandles( h1, h2 ),
|
ret = pCompareObjectHandles( h1, h2 );
|
||||||
"comparing %p with %p failed with %u\n", h1, h2, GetLastError() );
|
ok( ret, "comparing %p with %p failed with %u\n", h1, h2, GetLastError() );
|
||||||
|
|
||||||
CloseHandle( h2 );
|
CloseHandle( h2 );
|
||||||
|
|
||||||
|
@ -80,7 +81,8 @@ static void test_CompareObjectHandles(void)
|
||||||
ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
|
ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
|
||||||
|
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
ok( !pCompareObjectHandles( h1, h2 ) && GetLastError() == ERROR_NOT_SAME_OBJECT,
|
ret = pCompareObjectHandles( h1, h2 );
|
||||||
|
ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT,
|
||||||
"comparing %p with %p returned %u\n", h1, h2, GetLastError() );
|
"comparing %p with %p returned %u\n", h1, h2, GetLastError() );
|
||||||
|
|
||||||
CloseHandle( h2 );
|
CloseHandle( h2 );
|
||||||
|
|
Loading…
Reference in New Issue