wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7aaeec35e2d7cc799461858edb788e412e9a1fbe.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2022-01-13 12:59:06 +11:00
parent e1c496b21e
commit b4028037d9
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "76c9fc8a761c9faff72f97ab508a1afcb28eeb12"
echo "7aaeec35e2d7cc799461858edb788e412e9a1fbe"
}
# Show version information

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

@ -1,4 +1,4 @@
From 9875a6033aaa0043a7c29926a026ecafb56382e6 Mon Sep 17 00:00:00 2001
From c477afc32310c399f4c6a40e9943a2af69811006 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, 62 insertions(+), 17 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 7eaa2c67945..8f8b1b98933 100644
index 139272a61fe..c390afd9e87 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -12648,13 +12648,10 @@ static void test_PeekMessage3(void)
@@ -12853,13 +12853,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, NULL, 0, 0, PM_NOREMOVE);
@ -32,7 +32,7 @@ index 7eaa2c67945..8f8b1b98933 100644
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -12664,10 +12661,8 @@ static void test_PeekMessage3(void)
@@ -12869,10 +12866,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, NULL, 0, 0, PM_REMOVE);
@ -43,7 +43,7 @@ index 7eaa2c67945..8f8b1b98933 100644
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -12679,10 +12674,8 @@ static void test_PeekMessage3(void)
@@ -12884,10 +12879,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 = GetMessageA(&msg, NULL, 0, 0);
@ -54,7 +54,7 @@ index 7eaa2c67945..8f8b1b98933 100644
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -12710,14 +12703,32 @@ static void test_PeekMessage3(void)
@@ -12915,14 +12908,32 @@ static void test_PeekMessage3(void)
ret = GetMessageA(&msg, NULL, 0, 0);
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = GetMessageA(&msg, NULL, 0, 0);
@ -90,10 +90,10 @@ index 7eaa2c67945..8f8b1b98933 100644
* because both messages are in the same queue. */
diff --git a/server/queue.c b/server/queue.c
index fce65e360d4..451aaeca008 100644
index d79add56fba..15c4b21ea50 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -143,6 +143,7 @@ struct msg_queue
@@ -141,6 +141,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 */
@ -101,7 +101,7 @@ index fce65e360d4..451aaeca008 100644
};
struct hotkey
@@ -311,6 +312,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
@@ -309,6 +310,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;
@ -109,7 +109,7 @@ index fce65e360d4..451aaeca008 100644
list_init( &queue->send_result );
list_init( &queue->callback_result );
list_init( &queue->pending_timers );
@@ -577,13 +579,21 @@ static inline struct msg_queue *get_current_queue(void)
@@ -576,13 +578,21 @@ static inline struct msg_queue *get_current_queue(void)
}
/* get a (pseudo-)unique id to tag hardware messages */
@ -132,7 +132,7 @@ index fce65e360d4..451aaeca008 100644
/* try to merge a message with the last in the list; return 1 if successful */
static int merge_message( struct thread_input *input, const struct message *msg )
{
@@ -861,7 +871,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
@@ -860,7 +870,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
}
/* retrieve a posted message */
@ -141,7 +141,7 @@ index fce65e360d4..451aaeca008 100644
unsigned int first, unsigned int last, unsigned int flags,
struct get_message_reply *reply )
{
@@ -872,6 +882,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
@@ -871,6 +881,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;
@ -149,7 +149,7 @@ index fce65e360d4..451aaeca008 100644
goto found; /* found one */
}
return 0;
@@ -1488,6 +1499,7 @@ found:
@@ -1487,6 +1498,7 @@ found:
msg->msg = WM_HOTKEY;
msg->wparam = hotkey->id;
msg->lparam = ((hotkey->vkey & 0xffff) << 16) | modifiers;
@ -157,16 +157,16 @@ index fce65e360d4..451aaeca008 100644
free( msg->data );
msg->data = NULL;
@@ -2125,7 +2137,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
continue;
@@ -2198,7 +2210,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
}
/* now we can return it */
- if (!msg->unique_id) msg->unique_id = get_unique_id();
+ if (!msg->unique_id) msg->unique_id = get_unique_hw_id();
reply->type = MSG_HARDWARE;
reply->win = win;
reply->msg = msg_code;
@@ -2231,6 +2243,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
@@ -2304,6 +2316,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;
@ -174,7 +174,7 @@ index fce65e360d4..451aaeca008 100644
get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time );
@@ -2475,6 +2488,7 @@ DECL_HANDLER(send_message)
@@ -2548,6 +2561,7 @@ DECL_HANDLER(send_message)
set_queue_bits( recv_queue, QS_SENDMESSAGE );
break;
case MSG_POSTED:
@ -182,7 +182,7 @@ index fce65e360d4..451aaeca008 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)
@@ -2595,12 +2609,12 @@ DECL_HANDLER(get_message)
@@ -2668,12 +2682,12 @@ DECL_HANDLER(get_message)
/* then check for posted messages */
if ((filter & QS_POSTMESSAGE) &&
@ -197,7 +197,7 @@ index fce65e360d4..451aaeca008 100644
return;
/* only check for quit messages if not posted messages pending */
@@ -2611,7 +2625,7 @@ DECL_HANDLER(get_message)
@@ -2684,7 +2698,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 ))
@ -206,7 +206,7 @@ index fce65e360d4..451aaeca008 100644
/* now check for WM_PAINT */
if ((filter & QS_PAINT) &&
@@ -2624,7 +2638,7 @@ DECL_HANDLER(get_message)
@@ -2697,7 +2711,7 @@ DECL_HANDLER(get_message)
reply->wparam = 0;
reply->lparam = 0;
get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
@ -215,7 +215,7 @@ index fce65e360d4..451aaeca008 100644
}
/* now check for timer */
@@ -2640,13 +2654,30 @@ DECL_HANDLER(get_message)
@@ -2713,13 +2727,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 );
@ -247,7 +247,7 @@ index fce65e360d4..451aaeca008 100644
}
@@ -2664,7 +2695,10 @@ DECL_HANDLER(reply_message)
@@ -2737,7 +2768,10 @@ DECL_HANDLER(reply_message)
DECL_HANDLER(accept_hardware_message)
{
if (current->queue)
@ -259,5 +259,5 @@ index fce65e360d4..451aaeca008 100644
set_error( STATUS_ACCESS_DENIED );
}
--
2.30.2
2.34.1

2
staging/upstream-commit
View File

@ -1 +1 @@
86eaf7eeb2603d1b13d18e3fe71a615e1ee14cee
7aaeec35e2d7cc799461858edb788e412e9a1fbe