wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b053e924e8e13b3637f2a5a8ffe88d84c2d17075.

Browse Source
This commit is contained in:
Zebediah Figura
2024-03-21 19:29:09 -05:00
parent 621740283c
commit a5a28003b4
5 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch
View File

@@ -1,4 +1,4 @@
From 7685969c358fbfb68d623d6eb4fc80231f07b604 Mon Sep 17 00:00:00 2001
From 898c8d269bdcda704a2a923349d2a1967a1f23eb Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 15 Mar 2015 01:05:48 +0100
Subject: [PATCH] server: Fix handling of GetMessage after previous PeekMessage
@@ -15,10 +15,10 @@ Changes in v3:
2 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 0059afcbac7..cf01e156458 100644
index 1169d82271c..bee49c302cb 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -14113,13 +14113,10 @@ static void test_PeekMessage3(void)
@@ -14329,13 +14329,10 @@ static void test_PeekMessage3(void)
ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
PostMessageA(hwnd, WM_USER, 0, 0);
ret = PeekMessageA(&msg, hwnd, 0, 0, PM_NOREMOVE);
@@ -32,7 +32,7 @@ index 0059afcbac7..cf01e156458 100644
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -14129,10 +14126,8 @@ static void test_PeekMessage3(void)
@@ -14345,10 +14342,8 @@ static void test_PeekMessage3(void)
ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
PostMessageA(hwnd, WM_USER, 0, 0);
ret = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE);
@@ -43,7 +43,7 @@ index 0059afcbac7..cf01e156458 100644
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -14144,10 +14139,11 @@ static void test_PeekMessage3(void)
@@ -14360,10 +14355,11 @@ static void test_PeekMessage3(void)
ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
PostMessageA(hwnd, WM_USER, 0, 0);
ret = GetMessageA(&msg, hwnd, 0, 0);
@@ -57,7 +57,7 @@ index 0059afcbac7..cf01e156458 100644
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -14175,14 +14171,32 @@ static void test_PeekMessage3(void)
@@ -14391,14 +14387,32 @@ static void test_PeekMessage3(void)
ret = GetMessageA(&msg, hwnd, 0, 0);
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = GetMessageA(&msg, hwnd, 0, 0);
@@ -93,10 +93,10 @@ index 0059afcbac7..cf01e156458 100644
* because both messages are in the same queue. */
diff --git a/server/queue.c b/server/queue.c
index 9007438e082..1d7a31a318a 100644
index ed099b3b989..35926b701af 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -142,6 +142,7 @@ struct msg_queue
@@ -145,6 +145,7 @@ struct msg_queue
struct hook_table *hooks; /* hook table */
timeout_t last_get_msg; /* time of last get message call */
int keystate_lock; /* owns an input keystate lock */
@@ -104,7 +104,7 @@ index 9007438e082..1d7a31a318a 100644
};
struct hotkey
@@ -310,6 +311,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
@@ -313,6 +314,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
queue->hooks = NULL;
queue->last_get_msg = current_time;
queue->keystate_lock = 0;
@@ -112,7 +112,7 @@ index 9007438e082..1d7a31a318a 100644
list_init( &queue->send_result );
list_init( &queue->callback_result );
list_init( &queue->pending_timers );
@@ -643,13 +645,21 @@ static inline struct msg_queue *get_current_queue(void)
@@ -656,13 +658,21 @@ static inline struct msg_queue *get_current_queue(void)
}
/* get a (pseudo-)unique id to tag hardware messages */
@@ -135,7 +135,7 @@ index 9007438e082..1d7a31a318a 100644
/* try to merge a WM_MOUSEMOVE message with the last in the list; return 1 if successful */
static int merge_mousemove( struct thread_input *input, const struct message *msg )
{
@@ -960,7 +970,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
@@ -973,7 +983,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
}
/* retrieve a posted message */
@@ -144,7 +144,7 @@ index 9007438e082..1d7a31a318a 100644
unsigned int first, unsigned int last, unsigned int flags,
struct get_message_reply *reply )
{
@@ -971,6 +981,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
@@ -984,6 +994,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
{
if (!match_window( win, msg->win )) continue;
if (!check_msg_filter( msg->msg, first, last )) continue;
@@ -152,7 +152,7 @@ index 9007438e082..1d7a31a318a 100644
goto found; /* found one */
}
return 0;
@@ -1585,6 +1596,7 @@ found:
@@ -1598,6 +1609,7 @@ found:
msg->msg = WM_HOTKEY;
msg->wparam = hotkey->id;
msg->lparam = ((hotkey->vkey & 0xffff) << 16) | modifiers;
@@ -160,7 +160,7 @@ index 9007438e082..1d7a31a318a 100644
free( msg->data );
msg->data = NULL;
@@ -2276,7 +2288,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
@@ -2503,7 +2515,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
}
/* now we can return it */
@@ -169,7 +169,7 @@ index 9007438e082..1d7a31a318a 100644
reply->type = MSG_HARDWARE;
reply->win = win;
reply->msg = msg_code;
@@ -2382,6 +2394,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
@@ -2610,6 +2622,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
msg->result = NULL;
msg->data = NULL;
msg->data_size = 0;
@@ -177,7 +177,7 @@ index 9007438e082..1d7a31a318a 100644
get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time );
@@ -2626,6 +2639,7 @@ DECL_HANDLER(send_message)
@@ -2896,6 +2909,7 @@ DECL_HANDLER(send_message)
set_queue_bits( recv_queue, QS_SENDMESSAGE );
break;
case MSG_POSTED:
@@ -185,7 +185,7 @@ index 9007438e082..1d7a31a318a 100644
list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry );
set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE );
if (msg->msg == WM_HOTKEY)
@@ -2744,12 +2758,12 @@ DECL_HANDLER(get_message)
@@ -3022,12 +3036,12 @@ DECL_HANDLER(get_message)
/* then check for posted messages */
if ((filter & QS_POSTMESSAGE) &&
@@ -200,16 +200,16 @@ index 9007438e082..1d7a31a318a 100644
return;
/* only check for quit messages if not posted messages pending */
@@ -2760,7 +2774,7 @@ DECL_HANDLER(get_message)
@@ -3038,7 +3052,7 @@ DECL_HANDLER(get_message)
if ((filter & QS_INPUT) &&
filter_contains_hw_range( req->get_first, req->get_last ) &&
get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply ))
- return;
+ goto found_msg;
/* check for any internal driver message */
if (get_hardware_message( current, req->hw_id, get_win, WM_WINE_FIRST_DRIVER_MSG,
@@ -2778,7 +2792,7 @@ DECL_HANDLER(get_message)
/* now check for WM_PAINT */
if ((filter & QS_PAINT) &&
@@ -3051,7 +3065,7 @@ DECL_HANDLER(get_message)
reply->wparam = 0;
reply->lparam = 0;
get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
@@ -218,7 +218,7 @@ index 9007438e082..1d7a31a318a 100644
}
/* now check for timer */
@@ -2794,13 +2808,30 @@ DECL_HANDLER(get_message)
@@ -3067,13 +3081,30 @@ DECL_HANDLER(get_message)
get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
if (!(req->flags & PM_NOYIELD) && current->process->idle_event)
set_event( current->process->idle_event );
@@ -250,7 +250,7 @@ index 9007438e082..1d7a31a318a 100644
}
@@ -2818,7 +2849,10 @@ DECL_HANDLER(reply_message)
@@ -3091,7 +3122,10 @@ DECL_HANDLER(reply_message)
DECL_HANDLER(accept_hardware_message)
{
if (current->queue)