Skip to content

W
wine-winehq
Commit 1f297893 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

user: Give meaningful names to the structures used to transfer

information to the test threads.
parent 2ee5a5bf
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
dlls/user/tests/msg.c
View file @ 1f297893
...@@ -5535,12 +5535,12 @@ static void test_message_conversion(void) ...@@ -5535,12 +5535,12 @@ static void test_message_conversion(void)
ok( ret, "DestroyWindow() error %ld\n", GetLastError()); ok( ret, "DestroyWindow() error %ld\n", GetLastError());
} }
typedef struct _thread_info struct timer_info
{ {
HWND hWnd; HWND hWnd;
HANDLE handles[2]; HANDLE handles[2];
DWORD id; DWORD id;
} thread_info; };
static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT id, DWORD dwTime) static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT id, DWORD dwTime)
{ {
...@@ -5550,7 +5550,7 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT id, DWORD dwTime) ...@@ -5550,7 +5550,7 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT id, DWORD dwTime)
static DWORD WINAPI timer_thread_proc(LPVOID x) static DWORD WINAPI timer_thread_proc(LPVOID x)
{ {
thread_info *info = x; struct timer_info *info = x;
DWORD r; DWORD r;
r = KillTimer(info->hWnd, 0x19); r = KillTimer(info->hWnd, 0x19);
...@@ -5565,7 +5565,7 @@ static DWORD WINAPI timer_thread_proc(LPVOID x) ...@@ -5565,7 +5565,7 @@ static DWORD WINAPI timer_thread_proc(LPVOID x)
static void test_timers(void) static void test_timers(void)
{ {
thread_info info; struct timer_info info;
DWORD id; DWORD id;
info.hWnd = CreateWindow ("TestWindowClass", NULL, info.hWnd = CreateWindow ("TestWindowClass", NULL,
...@@ -6432,7 +6432,7 @@ static const struct message WmUser[] = { ...@@ -6432,7 +6432,7 @@ static const struct message WmUser[] = {
{ 0 } { 0 }
}; };
struct thread_info struct sendmsg_info
{ {
HWND hwnd; HWND hwnd;
DWORD timeout; DWORD timeout;
...@@ -6441,7 +6441,7 @@ struct thread_info ...@@ -6441,7 +6441,7 @@ struct thread_info
static DWORD CALLBACK send_msg_thread( LPVOID arg ) static DWORD CALLBACK send_msg_thread( LPVOID arg )
{ {
struct thread_info *info = arg; struct sendmsg_info *info = arg;
info->ret = SendMessageTimeoutA( info->hwnd, WM_USER, 0, 0, 0, info->timeout, NULL ); info->ret = SendMessageTimeoutA( info->hwnd, WM_USER, 0, 0, 0, info->timeout, NULL );
if (!info->ret) ok( GetLastError() == ERROR_TIMEOUT, "unexpected error %ld\n", GetLastError()); if (!info->ret) ok( GetLastError() == ERROR_TIMEOUT, "unexpected error %ld\n", GetLastError());
return 0; return 0;
...@@ -6466,7 +6466,7 @@ static void test_SendMessageTimeout(void) ...@@ -6466,7 +6466,7 @@ static void test_SendMessageTimeout(void)
{ {
MSG msg; MSG msg;
HANDLE thread; HANDLE thread;
struct thread_info info; struct sendmsg_info info;
DWORD tid; DWORD tid;
info.hwnd = CreateWindowA( "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, info.hwnd = CreateWindowA( "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW,
...@@ -6783,7 +6783,7 @@ static const struct message WmUserChar[] = { ...@@ -6783,7 +6783,7 @@ static const struct message WmUserChar[] = {
#define EV_SENDMSG 1 #define EV_SENDMSG 1
#define EV_ACK 2 #define EV_ACK 2
struct thread_info_2 struct peekmsg_info
{ {
HWND hwnd; HWND hwnd;
HANDLE hevent[3]; /* 0 - start/stop, 1 - SendMessage, 2 - ack */ HANDLE hevent[3]; /* 0 - start/stop, 1 - SendMessage, 2 - ack */
...@@ -6792,7 +6792,7 @@ struct thread_info_2 ...@@ -6792,7 +6792,7 @@ struct thread_info_2
static DWORD CALLBACK send_msg_thread_2(void *param) static DWORD CALLBACK send_msg_thread_2(void *param)
{ {
DWORD ret; DWORD ret;
struct thread_info_2 *info = param; struct peekmsg_info *info = param;
trace("thread: waiting for start\n"); trace("thread: waiting for start\n");
WaitForSingleObject(info->hevent[EV_START_STOP], INFINITE); WaitForSingleObject(info->hevent[EV_START_STOP], INFINITE);
...@@ -6830,7 +6830,7 @@ static void test_PeekMessage(void) ...@@ -6830,7 +6830,7 @@ static void test_PeekMessage(void)
DWORD tid, qstatus; DWORD tid, qstatus;
UINT qs_all_input = QS_ALLINPUT; UINT qs_all_input = QS_ALLINPUT;
UINT qs_input = QS_INPUT; UINT qs_input = QS_INPUT;
struct thread_info_2 info; struct peekmsg_info info;
info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW,
100, 100, 200, 200, 0, 0, 0, NULL); 100, 100, 200, 200, 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