From 2b6ae1241ec56585ab6eeaf17103f647e9145d1a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 3 Nov 2015 21:14:15 +0000 Subject: [PATCH] [USER32_APITEST] Fix a typo. svn path=/trunk/; revision=69799 --- rostests/apitests/user32/DeferWindowPos.c | 6 +++--- rostests/apitests/user32/SendMessageTimeout.c | 18 +++++++++--------- rostests/apitests/user32/SetActiveWindow.c | 6 +++--- rostests/apitests/user32/SetParent.c | 6 +++--- .../apitests/user32/SystemParametersInfo.c | 6 +++--- rostests/apitests/user32/TrackMouseEvent.c | 10 +++++----- rostests/apitests/user32/helper.h | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/rostests/apitests/user32/DeferWindowPos.c b/rostests/apitests/user32/DeferWindowPos.c index 7f177fb7fff..debe2120919 100644 --- a/rostests/apitests/user32/DeferWindowPos.c +++ b/rostests/apitests/user32/DeferWindowPos.c @@ -42,11 +42,11 @@ LRESULT CALLBACK DWPTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECORD_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -59,7 +59,7 @@ static void FlushMessages() { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } diff --git a/rostests/apitests/user32/SendMessageTimeout.c b/rostests/apitests/user32/SendMessageTimeout.c index 28d0136f598..1bec5f3215e 100644 --- a/rostests/apitests/user32/SendMessageTimeout.c +++ b/rostests/apitests/user32/SendMessageTimeout.c @@ -62,15 +62,15 @@ WndProc( if (hWnd == hWndThread1) { - RECOND_MESSAGE(1, message, SENT, wParam, lParam); + RECORD_MESSAGE(1, message, SENT, wParam, lParam); } else if (hWnd == hWndThread2) { - RECOND_MESSAGE(2, message, SENT, wParam, lParam); + RECORD_MESSAGE(2, message, SENT, wParam, lParam); } else { - RECOND_MESSAGE(3, message, SENT, wParam, lParam); + RECORD_MESSAGE(3, message, SENT, wParam, lParam); } switch (message) @@ -115,7 +115,7 @@ Thread1( while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(1, msg.message, POST, 0, 0); + RECORD_MESSAGE(1, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -126,7 +126,7 @@ Thread1( while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(1, msg.message, POST, 0, 0); + RECORD_MESSAGE(1, msg.message, POST, 0, 0); DispatchMessageA(&msg); } } @@ -135,7 +135,7 @@ Thread1( while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(1, msg.message, POST, 0, 0); + RECORD_MESSAGE(1, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -158,7 +158,7 @@ Thread2( while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(2, msg.message, POST, 0, 0); + RECORD_MESSAGE(2, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -169,7 +169,7 @@ Thread2( while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(2, msg.message, POST, 0, 0); + RECORD_MESSAGE(2, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -177,7 +177,7 @@ Thread2( while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(2, msg.message, POST, 0, 0); + RECORD_MESSAGE(2, msg.message, POST, 0, 0); DispatchMessageA(&msg); } diff --git a/rostests/apitests/user32/SetActiveWindow.c b/rostests/apitests/user32/SetActiveWindow.c index 6688c112286..fa4088c4ef8 100644 --- a/rostests/apitests/user32/SetActiveWindow.c +++ b/rostests/apitests/user32/SetActiveWindow.c @@ -49,11 +49,11 @@ LRESULT CALLBACK OwnerTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECORD_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -66,7 +66,7 @@ static void FlushMessages() { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } diff --git a/rostests/apitests/user32/SetParent.c b/rostests/apitests/user32/SetParent.c index 721b0edb19b..e8a503f60ac 100644 --- a/rostests/apitests/user32/SetParent.c +++ b/rostests/apitests/user32/SetParent.c @@ -77,7 +77,7 @@ WndProc( if (message > WM_USER || IsDWmMsg(message) || IseKeyMsg(message)) return DefWindowProcW(hWnd, message, wParam, lParam); - RECOND_MESSAGE(iwnd, message, SENT, wParam, lParam); + RECORD_MESSAGE(iwnd, message, SENT, wParam, lParam); switch(message) { @@ -150,7 +150,7 @@ trace("\n"); { int iwnd = get_iwnd(msg.hwnd, FALSE); if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + RECORD_MESSAGE(iwnd, msg.message, POST, 0, 0); DispatchMessageA( &msg ); } trace("\n"); @@ -181,7 +181,7 @@ trace("\n"); { int iwnd = get_iwnd(msg.hwnd, FALSE); if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + RECORD_MESSAGE(iwnd, msg.message, POST, 0, 0); DispatchMessageA( &msg ); } trace("\n"); diff --git a/rostests/apitests/user32/SystemParametersInfo.c b/rostests/apitests/user32/SystemParametersInfo.c index 8f6e99f4d16..0ff12314920 100644 --- a/rostests/apitests/user32/SystemParametersInfo.c +++ b/rostests/apitests/user32/SystemParametersInfo.c @@ -39,11 +39,11 @@ LRESULT CALLBACK SysParamsTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARA { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECORD_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -56,7 +56,7 @@ static void FlushMessages() { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } diff --git a/rostests/apitests/user32/TrackMouseEvent.c b/rostests/apitests/user32/TrackMouseEvent.c index 7c9c0f7fdce..70a857d276a 100644 --- a/rostests/apitests/user32/TrackMouseEvent.c +++ b/rostests/apitests/user32/TrackMouseEvent.c @@ -50,7 +50,7 @@ LRESULT CALLBACK TmeTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar ok(0, "Got unexpected WM_SYSTIMER in the winproc. wParam=%d\n", wParam); break; default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -58,7 +58,7 @@ LRESULT CALLBACK TmeTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar static LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) { LRESULT ret; - RECOND_MESSAGE(0, WH_MOUSE_LL, HOOK, wParam, 0); + RECORD_MESSAGE(0, WH_MOUSE_LL, HOOK, wParam, 0); ret = CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); if(ignore_mousell) return TRUE; @@ -69,7 +69,7 @@ static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) { MOUSEHOOKSTRUCT *hs = (MOUSEHOOKSTRUCT*) lParam; LRESULT ret; - RECOND_MESSAGE(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); + RECORD_MESSAGE(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); ret = CallNextHookEx(hMouseHook, nCode, wParam, lParam); if(ignore_mouse) return TRUE; @@ -87,12 +87,12 @@ static void FlushMessages() { if(msg.message == WM_SYSTIMER) { - RECOND_MESSAGE(iwnd, msg.message, POST,msg.wParam,0); + RECORD_MESSAGE(iwnd, msg.message, POST,msg.wParam,0); if(ignore_timer) continue; } else if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); } DispatchMessageA( &msg ); } diff --git a/rostests/apitests/user32/helper.h b/rostests/apitests/user32/helper.h index 5221c645d35..6edb13f8702 100644 --- a/rostests/apitests/user32/helper.h +++ b/rostests/apitests/user32/helper.h @@ -55,7 +55,7 @@ static inline BOOL IseKeyMsg(UINT msg) #define COMPARE_CACHE(msg_chain) compare_cache(&default_cache, __FILE__, __LINE__, msg_chain) #define TRACE_CACHE() trace_cache(&default_cache, __FILE__, __LINE__) #define EMPTY_CACHE() empty_message_cache(&default_cache); -#define RECOND_MESSAGE(...) record_message(&default_cache, ##__VA_ARGS__); +#define RECORD_MESSAGE(...) record_message(&default_cache, ##__VA_ARGS__); #define COMPARE_CACHE_(cache, msg_chain) compare_cache(cache, __FILE__, __LINE__, msg_chain) #define TRACE_CACHE_(cache) trace_cache(cache, __FILE__, __LINE__) -- 2.17.1