Skip to content

W
wine-winehq
Commit fd71f876 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

user32/tests: Don't test function directly when reporting GetLastError().

parent 8b0a2c28
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
dlls/user32/tests/msg.c
View file @ fd71f876
...@@ -9516,8 +9516,8 @@ static DWORD CALLBACK send_msg_thread_2(void *param) ...@@ -9516,8 +9516,8 @@ static DWORD CALLBACK send_msg_thread_2(void *param)
case WAIT_OBJECT_0 + EV_SENDMSG: case WAIT_OBJECT_0 + EV_SENDMSG:
trace("thread: sending message\n"); trace("thread: sending message\n");
ok( SendNotifyMessageA(info->hwnd, WM_USER, 0, 0), ret = SendNotifyMessageA(info->hwnd, WM_USER, 0, 0);
"SendNotifyMessageA failed error %u\n", GetLastError()); ok(ret, "SendNotifyMessageA failed error %u\n", GetLastError());
SetEvent(info->hevent[EV_ACK]); SetEvent(info->hevent[EV_ACK]);
break; break;
......
dlls/user32/tests/resource.c
View file @ fd71f876
...@@ -90,7 +90,7 @@ static void test_LoadStringA (void) ...@@ -90,7 +90,7 @@ static void test_LoadStringA (void)
{sizeof str, sizeof str - 1}, {sizeof str, sizeof str - 1},
{sizeof str - 1, sizeof str - 2}}; {sizeof str - 1, sizeof str - 2}};
unsigned int i; unsigned int i;
int ret; int ret, ret2;
assert (sizeof str < sizeof buf); assert (sizeof str < sizeof buf);
for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { for (i = 0; i < sizeof tests / sizeof tests[0]; i++) {
...@@ -110,17 +110,17 @@ static void test_LoadStringA (void) ...@@ -110,17 +110,17 @@ static void test_LoadStringA (void)
ret = LoadStringA(hInst, 1, buf, sizeof(buf) ); ret = LoadStringA(hInst, 1, buf, sizeof(buf) );
ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)) == ret, ret2 = LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf));
"LoadString failed: ret %d err %d\n", ret, GetLastError()); ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)) == ret, ret2 = LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf));
"LoadString failed: ret %d err %d\n", ret, GetLastError()); ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ret = LoadStringA(hInst, 65534, buf, sizeof(buf) ); ret = LoadStringA(hInst, 65534, buf, sizeof(buf) );
ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)) == ret, ret2 = LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf));
"LoadString failed: ret %d err %d\n", ret, GetLastError()); ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ok( LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)) == ret, ret2 = LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf));
"LoadString failed: ret %d err %d\n", ret, GetLastError()); ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ret = LoadStringA(hInst, 0, buf, 0); ret = LoadStringA(hInst, 0, buf, 0);
ok( ret == -1 || broken(ret == 0), ok( ret == -1 || broken(ret == 0),
......
dlls/user32/tests/win.c
View file @ fd71f876
...@@ -5094,20 +5094,20 @@ static void test_CreateWindow(void) ...@@ -5094,20 +5094,20 @@ static void test_CreateWindow(void)
ok( !pGetProcessDefaultLayout( NULL ), "GetProcessDefaultLayout succeeded\n" ); ok( !pGetProcessDefaultLayout( NULL ), "GetProcessDefaultLayout succeeded\n" );
ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ok( pGetProcessDefaultLayout( &layout ), res = pGetProcessDefaultLayout( &layout );
"GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( layout == 0, "GetProcessDefaultLayout wrong layout %x\n", layout ); ok( layout == 0, "GetProcessDefaultLayout wrong layout %x\n", layout );
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ok( pSetProcessDefaultLayout( 7 ), res = pSetProcessDefaultLayout( 7 );
"SetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( pGetProcessDefaultLayout( &layout ), res = pGetProcessDefaultLayout( &layout );
"GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( layout == 7, "GetProcessDefaultLayout wrong layout %x\n", layout ); ok( layout == 7, "GetProcessDefaultLayout wrong layout %x\n", layout );
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ok( pSetProcessDefaultLayout( LAYOUT_RTL ), res = pSetProcessDefaultLayout( LAYOUT_RTL );
"SetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( pGetProcessDefaultLayout( &layout ), res = pGetProcessDefaultLayout( &layout );
"GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %x\n", layout ); ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %x\n", layout );
hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP,
0, 0, 100, 100, 0, 0, 0, NULL); 0, 0, 100, 100, 0, 0, 0, NULL);
......
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