[USER32_APITEST] Convert global variables to static ones

This commit is contained in:
Victor Perevertkin 2022-03-24 02:24:35 +03:00
parent b9c4b6aa65
commit 97f075a2ab
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
12 changed files with 140 additions and 127 deletions

View file

@ -19,10 +19,9 @@ typedef struct {
MSG_CACHE cache;
} THREAD_DATA;
DWORD tidMouseMove;
THREAD_DATA data[6];
HHOOK hMouseHookLL = NULL;
HHOOK hKbdHookLL = NULL;
static THREAD_DATA data[6];
static HHOOK hMouseHookLL = NULL;
static HHOOK hKbdHookLL = NULL;
#define EXPECT_FOREGROUND(expected) ok(GetForegroundWindow() == expected, \

View file

@ -31,7 +31,7 @@ typedef struct
tagMsgInfo msgList[TEST_MAX_MSG];
} tagMsgList;
tagMsgList msglist;
static tagMsgList msglist;
/* the expected message-list */
const tagMsgList t1msgList =

View file

@ -65,9 +65,9 @@ static void Test_Params(void)
ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError);
}
HWND g_TestWindow = NULL;
HWND g_ChildWindow = NULL;
HWND g_hwndMDIClient = NULL;
static HWND g_TestWindow = NULL;
static HWND g_ChildWindow = NULL;
static HWND g_hwndMDIClient = NULL;
static int get_iwnd(HWND hWnd)
{
@ -83,16 +83,16 @@ static int get_iwnd(HWND hWnd)
return 0;
}
DWORD g_FaultLine = 0;
DWORD g_NcExpectStyle = 0;
DWORD g_NcExpectExStyle = 0;
DWORD g_ExpectStyle = 0;
DWORD g_ExpectExStyle = 0;
static DWORD g_FaultLine = 0;
static DWORD g_NcExpectStyle = 0;
static DWORD g_NcExpectExStyle = 0;
static DWORD g_ExpectStyle = 0;
static DWORD g_ExpectExStyle = 0;
DWORD g_ChildNcExpectStyle = 0;
DWORD g_ChildNcExpectExStyle = 0;
DWORD g_ChildExpectStyle = 0;
DWORD g_ChildExpectExStyle = 0;
static DWORD g_ChildNcExpectStyle = 0;
static DWORD g_ChildNcExpectExStyle = 0;
static DWORD g_ChildExpectStyle = 0;
static DWORD g_ChildExpectExStyle = 0;
#undef ok_hex_
#define ok_hex_(expression, result) \
@ -170,7 +170,7 @@ static LRESULT CALLBACK MSGTestProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
return lRet;
}
MSG_ENTRY create_chain[] =
static MSG_ENTRY create_chain[] =
{
{ 1, WM_GETMINMAXINFO, SENT },
{ 1, WM_GETMINMAXINFO, SENT_RET },
@ -183,7 +183,7 @@ MSG_ENTRY create_chain[] =
{ 0, 0 }
};
MSG_ENTRY create_chain_modify[] =
static MSG_ENTRY create_chain_modify[] =
{
{ 1, WM_GETMINMAXINFO, SENT },
{ 1, WM_GETMINMAXINFO, SENT_RET },
@ -212,7 +212,7 @@ MSG_ENTRY create_chain_modify[] =
{ 0, 0 }
};
MSG_ENTRY create_chain_modify_below8_nonsrv[] =
static MSG_ENTRY create_chain_modify_below8_nonsrv[] =
{
{ 1, WM_GETMINMAXINFO, SENT },
{ 1, WM_GETMINMAXINFO, SENT_RET },
@ -884,7 +884,7 @@ static LRESULT CALLBACK MSGChildProcMDI2(HWND hWnd, UINT message, WPARAM wParam,
}
MSG_ENTRY child_create_chain_MDI[] =
static MSG_ENTRY child_create_chain_MDI[] =
{
{ 1, WM_GETMINMAXINFO, SENT },
{ 1, WM_GETMINMAXINFO, SENT_RET },
@ -949,7 +949,7 @@ MSG_ENTRY child_create_chain_MDI[] =
{ 0, 0 },
};
MSG_ENTRY child_create_chain_MDI_below8[] =
static MSG_ENTRY child_create_chain_MDI_below8[] =
{
{ 1, WM_GETMINMAXINFO, SENT },
{ 1, WM_GETMINMAXINFO, SENT_RET },
@ -1014,7 +1014,7 @@ MSG_ENTRY child_create_chain_MDI_below8[] =
{ 0, 0 },
};
MSG_ENTRY child_create_chain_MDI_below8_nonsrv[] =
static MSG_ENTRY child_create_chain_MDI_below8_nonsrv[] =
{
{ 1, WM_GETMINMAXINFO, SENT },
{ 1, WM_GETMINMAXINFO, SENT_RET },

View file

@ -7,7 +7,7 @@
#include "precomp.h"
HWND hWnd1, hWnd2, hWnd3, hWnd4;
static HWND hWnd1, hWnd2, hWnd3, hWnd4;
/* FIXME: test for HWND_TOP, etc...*/
static int get_iwnd(HWND hWnd)

View file

@ -7,9 +7,9 @@
#include "precomp.h"
HWND hWnd1, hWnd2;
static HWND hWnd1, hWnd2;
CRITICAL_SECTION CritSect;
static CRITICAL_SECTION CritSect;
/* FIXME: test for HWND_TOP, etc...*/
static int get_iwnd(HWND hWnd)
@ -94,7 +94,7 @@ static DWORD WINAPI ClipThread(PVOID Parameter)
return 0;
}
MSG_ENTRY EmptyClipboard_chain[]={
static MSG_ENTRY EmptyClipboard_chain[]={
{1,WM_DESTROYCLIPBOARD, MARKER, 0},
{1,WM_DESTROYCLIPBOARD, SENT},
{1,WM_DESTROYCLIPBOARD, MARKER, 1},

View file

@ -7,7 +7,7 @@
#include "precomp.h"
HHOOK hKbdHook, hKbdLLHook;
static HHOOK hKbdHook, hKbdLLHook;
LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam)
{

View file

@ -26,14 +26,14 @@ typedef struct _LPK_LPEDITCONTROL_LIST
} LPK_LPEDITCONTROL_LIST, *PLPK_LPEDITCONTROL_LIST;
DWORD (APIENTRY *fpLpkTabbedTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID);
DWORD (APIENTRY *fpLpkPSMTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID);
DWORD (APIENTRY *fpLpkDrawTextEx) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID);
PLPK_LPEDITCONTROL_LIST (APIENTRY *fpLpkEditControl) ();
static DWORD (APIENTRY *fpLpkTabbedTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID);
static DWORD (APIENTRY *fpLpkPSMTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID);
static DWORD (APIENTRY *fpLpkDrawTextEx) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID);
static PLPK_LPEDITCONTROL_LIST (APIENTRY *fpLpkEditControl) ();
int Count_myLpkTabbedTextOut = 0;
int Count_myLpkPSMTextOut = 0;
int Count_myLpkDrawTextEx = 0;
static int Count_myLpkTabbedTextOut = 0;
static int Count_myLpkPSMTextOut = 0;
static int Count_myLpkDrawTextEx = 0;
DWORD WINAPI myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8,
LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12)

View file

@ -7,7 +7,7 @@
#include "precomp.h"
HWND hWnd1, hWnd2;
static HWND hWnd1, hWnd2;
/* FIXME: test for HWND_TOP, etc...*/
static int get_iwnd(HWND hWnd)
@ -92,7 +92,7 @@ static void destroy_test_window()
UnregisterClassW(L"testClass", 0);
}
MSG_ENTRY activate2to1_chain[]={
static MSG_ENTRY activate2to1_chain[]={
{2,WM_NCACTIVATE},
{2,WM_ACTIVATE},
{1,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOSIZE|SWP_NOMOVE},
@ -103,7 +103,7 @@ MSG_ENTRY activate2to1_chain[]={
{1,WM_SETFOCUS},
{0,0}};
MSG_ENTRY activate1to2_chain[]={
static MSG_ENTRY activate1to2_chain[]={
{1,WM_NCACTIVATE},
{1,WM_ACTIVATE},
{2,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOSIZE|SWP_NOMOVE},

View file

@ -7,7 +7,7 @@
#include "precomp.h"
HHOOK hMouseHookLL, hMouseHook;
static HHOOK hMouseHookLL, hMouseHook;
struct _test_info
{
@ -16,18 +16,20 @@ struct _test_info
int mouse_move_called;
};
struct _test_info info[] = { {0,0,0}, /* SetCursorPos without a window */
{1,1,0}, /* mouse_event without a window */
{0,1,1}, /* SetCursorPos with a window */
{1,1,1}, /* mouse_event with a window */
{0,1,1}, /* multiple SetCursorPos with a window with coalescing */
{0,2,2}, /* multiple SetCursorPos with a window without coalescing */
{2,1,1}, /* multiple mouse_event with a window with coalescing */
{2,2,2}, /* multiple mouse_event with a window without coalescing */
};
static struct _test_info info[] =
{
{0,0,0}, /* SetCursorPos without a window */
{1,1,0}, /* mouse_event without a window */
{0,1,1}, /* SetCursorPos with a window */
{1,1,1}, /* mouse_event with a window */
{0,1,1}, /* multiple SetCursorPos with a window with coalescing */
{0,2,2}, /* multiple SetCursorPos with a window without coalescing */
{2,1,1}, /* multiple mouse_event with a window with coalescing */
{2,2,2}, /* multiple mouse_event with a window without coalescing */
};
struct _test_info results[8];
int test_no = 0;
static struct _test_info results[8];
static int test_no = 0;
LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam)

View file

@ -7,7 +7,7 @@
#include "precomp.h"
HWND hWnd1, hWnd2;
static HWND hWnd1, hWnd2;
static BOOL g_bReadyForDisplayChange = FALSE;
static HANDLE g_hSemDisplayChange;
@ -66,7 +66,7 @@ static void FlushMessages()
}
}
MSG_ENTRY NcMetricsChange_chain[]={
static MSG_ENTRY NcMetricsChange_chain[]={
{2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW},
{2,WM_GETMINMAXINFO},
{2,WM_NCCALCSIZE},
@ -77,7 +77,7 @@ MSG_ENTRY NcMetricsChange_chain[]={
{1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOSIZE},
{0,0}};
MSG_ENTRY NcMetricsChange1_chain[]={
static MSG_ENTRY NcMetricsChange1_chain[]={
{2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW},
{2,WM_GETMINMAXINFO},
{2,WM_NCCALCSIZE},
@ -90,7 +90,7 @@ MSG_ENTRY NcMetricsChange1_chain[]={
{1,WM_SETTINGCHANGE},
{0,0}};
MSG_ENTRY CaptionHeight_chain[]={
static MSG_ENTRY CaptionHeight_chain[]={
{2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW},
{2,WM_GETMINMAXINFO},
{2,WM_NCCALCSIZE},

View file

@ -7,9 +7,9 @@
#include "precomp.h"
HWND hWnd1, hWnd2, hWnd3;
HHOOK hMouseHookLL, hMouseHook;
int ignore_timer = 0, ignore_mouse = 0, ignore_mousell = 0;
static HWND hWnd1, hWnd2, hWnd3;
static HHOOK hMouseHookLL, hMouseHook;
static int ignore_timer = 0, ignore_mouse = 0, ignore_mousell = 0;
static int get_iwnd(HWND hWnd)
{
@ -164,97 +164,109 @@ DWORD TmeQuery(HWND hwnd)
y*(65535/GetSystemMetrics(SM_CYVIRTUALSCREEN)) , 0,0);
/* the mouse moves over hwnd2 */
MSG_ENTRY mousemove2_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{2, WM_NCHITTEST},
{2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{2, WM_SETCURSOR},
{1, WM_SETCURSOR},
{2, WM_MOUSEMOVE, POST},
{0,0}};
static MSG_ENTRY mousemove2_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{2, WM_NCHITTEST},
{2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{2, WM_SETCURSOR},
{1, WM_SETCURSOR},
{2, WM_MOUSEMOVE, POST},
{0,0}};
/* the mouse hovers hwnd2 */
MSG_ENTRY mousehover2_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{2, WM_NCHITTEST},
{2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{2, WM_SETCURSOR},
{1, WM_SETCURSOR},
{2, WM_MOUSEMOVE, POST},
{2, WM_SYSTIMER, POST, ID_TME_TIMER},
{2, WM_MOUSEHOVER, POST},
{0,0}};
static MSG_ENTRY mousehover2_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{2, WM_NCHITTEST},
{2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{2, WM_SETCURSOR},
{1, WM_SETCURSOR},
{2, WM_MOUSEMOVE, POST},
{2, WM_SYSTIMER, POST, ID_TME_TIMER},
{2, WM_MOUSEHOVER, POST},
{0,0}};
/* the mouse leaves hwnd2 and moves to hwnd1 */
MSG_ENTRY mouseleave2to1_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{1, WM_NCHITTEST},
{1, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{1, WM_SETCURSOR},
{1, WM_MOUSEMOVE, POST},
{2, WM_MOUSELEAVE, POST},
{0,0}};
static MSG_ENTRY mouseleave2to1_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{1, WM_NCHITTEST},
{1, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{1, WM_SETCURSOR},
{1, WM_MOUSEMOVE, POST},
{2, WM_MOUSELEAVE, POST},
{0,0}};
/* the mouse leaves hwnd2 and moves to hwnd3 */
MSG_ENTRY mouseleave2to3_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SETCURSOR},
{1, WM_SETCURSOR},
{3, WM_MOUSEMOVE, POST},
{2, WM_MOUSELEAVE, POST},
{0,0}};
static MSG_ENTRY mouseleave2to3_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SETCURSOR},
{1, WM_SETCURSOR},
{3, WM_MOUSEMOVE, POST},
{2, WM_MOUSELEAVE, POST},
{0,0}};
/* the mouse hovers hwnd3 */
MSG_ENTRY mousehover3_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SETCURSOR},
{1, WM_SETCURSOR},
{3, WM_MOUSEMOVE, POST},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
static MSG_ENTRY mousehover3_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SETCURSOR},
{1, WM_SETCURSOR},
{3, WM_MOUSEMOVE, POST},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
/* the mouse hovers hwnd3 without moving */
MSG_ENTRY mousehover3_nomove_chain[]={{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
static MSG_ENTRY mousehover3_nomove_chain[]={
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
/* the mouse hovers hwnd3 and the timer is not dispatched */
MSG_ENTRY mousehover3_droptimer_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SETCURSOR},
{1, WM_SETCURSOR},
{3, WM_MOUSEMOVE, POST},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{0,0}};
static MSG_ENTRY mousehover3_droptimer_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SETCURSOR},
{1, WM_SETCURSOR},
{3, WM_MOUSEMOVE, POST},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{0,0}};
/* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE */
MSG_ENTRY mousehover3_dropmouse_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
static MSG_ENTRY mousehover3_dropmouse_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_NCHITTEST},
{3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
/* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE_LL */
MSG_ENTRY mousehover3_dropmousell_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
static MSG_ENTRY mousehover3_dropmousell_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{3, WM_SYSTIMER, POST, ID_TME_TIMER},
{3, WM_MOUSEHOVER, POST},
{0,0}};
/* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE */
MSG_ENTRY mouseleave3to2_dropmouse_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{2, WM_NCHITTEST},
{2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{0,0}};
static MSG_ENTRY mouseleave3to2_dropmouse_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{2, WM_NCHITTEST},
{2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT},
{0,0}};
/* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE_LL */
MSG_ENTRY mouseleave3to2_dropmousell_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{0,0}};
static MSG_ENTRY mouseleave3to2_dropmousell_chain[]={
{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE},
{0,0}};
/* after WH_MOUSE drops WM_MOUSEMOVE, WM_MOUSELEAVE is still in the queue */
MSG_ENTRY mouseleave3_remainging_chain[]={{3, WM_MOUSELEAVE, POST},
{0,0}};
static MSG_ENTRY mouseleave3_remainging_chain[]={
{3, WM_MOUSELEAVE, POST},
{0,0}};
void Test_TrackMouseEvent()
{

View file

@ -15,7 +15,7 @@ struct test_info {
WCHAR* ExpectedDesktp;
};
struct test_info TestResults[] =
static struct test_info TestResults[] =
{
{L"WinSta0",L"Default"},
{L"WinSta0",L"Default"},