=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: user32/tests: Don' t test function directly when reporting GetLastError().
Alexandre Julliard
julliard at winehq.org
Mon Sep 26 16:15:13 CDT 2011
Module: wine
Branch: master
Commit: fd71f876421461dc6a9b864ad54f89ea1f627acb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd71f876421461dc6a9b864ad54f89ea1f627acb
Author: André Hentschel <nerv at dawncrow.de>
Date: Sun Sep 25 20:30:44 2011 +0200
user32/tests: Don't test function directly when reporting GetLastError().
---
dlls/user32/tests/msg.c | 4 ++--
dlls/user32/tests/resource.c | 18 +++++++++---------
dlls/user32/tests/win.c | 20 ++++++++++----------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 9aaf149..90b518d 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -9516,8 +9516,8 @@ static DWORD CALLBACK send_msg_thread_2(void *param)
case WAIT_OBJECT_0 + EV_SENDMSG:
trace("thread: sending message\n");
- ok( SendNotifyMessageA(info->hwnd, WM_USER, 0, 0),
- "SendNotifyMessageA failed error %u\n", GetLastError());
+ ret = SendNotifyMessageA(info->hwnd, WM_USER, 0, 0);
+ ok(ret, "SendNotifyMessageA failed error %u\n", GetLastError());
SetEvent(info->hevent[EV_ACK]);
break;
diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c
index 5bc2d7a..dd4342d 100644
--- a/dlls/user32/tests/resource.c
+++ b/dlls/user32/tests/resource.c
@@ -90,7 +90,7 @@ static void test_LoadStringA (void)
{sizeof str, sizeof str - 1},
{sizeof str - 1, sizeof str - 2}};
unsigned int i;
- int ret;
+ int ret, ret2;
assert (sizeof str < sizeof buf);
for (i = 0; i < sizeof tests / sizeof tests[0]; i++) {
@@ -110,17 +110,17 @@ static void test_LoadStringA (void)
ret = LoadStringA(hInst, 1, buf, sizeof(buf) );
ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError());
- ok( LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)) == ret,
- "LoadString failed: ret %d err %d\n", ret, GetLastError());
- ok( LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)) == ret,
- "LoadString failed: ret %d err %d\n", ret, GetLastError());
+ ret2 = LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf));
+ ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
+ ret2 = LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf));
+ ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ret = LoadStringA(hInst, 65534, buf, sizeof(buf) );
ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError());
- ok( LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)) == ret,
- "LoadString failed: ret %d err %d\n", ret, GetLastError());
- ok( LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)) == ret,
- "LoadString failed: ret %d err %d\n", ret, GetLastError());
+ ret2 = LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf));
+ ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
+ ret2 = LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf));
+ ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError());
ret = LoadStringA(hInst, 0, buf, 0);
ok( ret == -1 || broken(ret == 0),
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index d309f98..3fba84d 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -5094,20 +5094,20 @@ static void test_CreateWindow(void)
ok( !pGetProcessDefaultLayout( NULL ), "GetProcessDefaultLayout succeeded\n" );
ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
- ok( pGetProcessDefaultLayout( &layout ),
- "GetProcessDefaultLayout failed err %u\n", GetLastError ());
+ res = pGetProcessDefaultLayout( &layout );
+ ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( layout == 0, "GetProcessDefaultLayout wrong layout %x\n", layout );
SetLastError( 0xdeadbeef );
- ok( pSetProcessDefaultLayout( 7 ),
- "SetProcessDefaultLayout failed err %u\n", GetLastError ());
- ok( pGetProcessDefaultLayout( &layout ),
- "GetProcessDefaultLayout failed err %u\n", GetLastError ());
+ res = pSetProcessDefaultLayout( 7 );
+ ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ());
+ res = pGetProcessDefaultLayout( &layout );
+ ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( layout == 7, "GetProcessDefaultLayout wrong layout %x\n", layout );
SetLastError( 0xdeadbeef );
- ok( pSetProcessDefaultLayout( LAYOUT_RTL ),
- "SetProcessDefaultLayout failed err %u\n", GetLastError ());
- ok( pGetProcessDefaultLayout( &layout ),
- "GetProcessDefaultLayout failed err %u\n", GetLastError ());
+ res = pSetProcessDefaultLayout( LAYOUT_RTL );
+ ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ());
+ res = pGetProcessDefaultLayout( &layout );
+ ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %x\n", layout );
hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP,
0, 0, 100, 100, 0, 0, 0, NULL);
More information about the wine-cvs
mailing list