You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-12-15 08:03:15 -08:00
Rebase against 7fb9d22a7932aaf32383ecebb59487d57a503754.
This commit is contained in:
Alistair Leslie-Hughes
@@ -1,4 +1,4 @@
|
||||
From 623d7db7b7e909c2c2dfd40acc454e8c344bd7f1 Mon Sep 17 00:00:00 2001
|
||||
From d1f7a457006ab95ec23b0dad5979daa7169fb832 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
|
||||
@@ -11,8 +11,8 @@ Changes in v3:
|
||||
* Fix remaining todo_wine.
|
||||
---
|
||||
dlls/user32/tests/msg.c | 32 ++++++++++++++++++--------
|
||||
server/queue.c | 50 ++++++++++++++++++++++++++++++++++-------
|
||||
2 files changed, 65 insertions(+), 17 deletions(-)
|
||||
server/queue.c | 51 ++++++++++++++++++++++++++++++++++-------
|
||||
2 files changed, 66 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
|
||||
index c8a12a6f998..618eba3419a 100644
|
||||
@@ -93,26 +93,27 @@ index c8a12a6f998..618eba3419a 100644
|
||||
* because both messages are in the same queue. */
|
||||
|
||||
diff --git a/server/queue.c b/server/queue.c
|
||||
index 3f06c15d006..46c52c32d24 100644
|
||||
index 268c921a914..70d9991e698 100644
|
||||
--- a/server/queue.c
|
||||
+++ b/server/queue.c
|
||||
@@ -136,6 +136,7 @@ struct msg_queue
|
||||
@@ -135,6 +135,7 @@ struct msg_queue
|
||||
struct hook_table *hooks; /* hook table */
|
||||
int keystate_lock; /* owns an input keystate lock */
|
||||
int waiting; /* is thread waiting on queue */
|
||||
queue_shm_t *shared; /* queue in session shared memory */
|
||||
+ unsigned int ignore_post_msg; /* ignore post messages newer than this unique id */
|
||||
};
|
||||
|
||||
struct hotkey
|
||||
@@ -319,6 +320,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
|
||||
@@ -318,6 +319,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
|
||||
queue->input = (struct thread_input *)grab_object( input );
|
||||
queue->hooks = NULL;
|
||||
queue->keystate_lock = 0;
|
||||
+ queue->ignore_post_msg = 0;
|
||||
queue->waiting = 0;
|
||||
+
|
||||
list_init( &queue->send_result );
|
||||
list_init( &queue->callback_result );
|
||||
@@ -818,13 +820,21 @@ static inline struct msg_queue *get_current_queue(void)
|
||||
list_init( &queue->pending_timers );
|
||||
@@ -816,13 +819,21 @@ static inline struct msg_queue *get_current_queue(void)
|
||||
}
|
||||
|
||||
/* get a (pseudo-)unique id to tag hardware messages */
|
||||
@@ -135,7 +136,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
/* lookup an already queued mouse message that matches the message, window and type */
|
||||
static struct message *find_mouse_message( struct thread_input *input, const struct message *msg )
|
||||
{
|
||||
@@ -1175,7 +1185,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
|
||||
@@ -1173,7 +1184,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
|
||||
}
|
||||
|
||||
/* retrieve a posted message */
|
||||
@@ -144,7 +145,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
unsigned int first, unsigned int last, unsigned int flags,
|
||||
struct get_message_reply *reply )
|
||||
{
|
||||
@@ -1186,6 +1196,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
|
||||
@@ -1184,6 +1195,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 +153,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
goto found; /* found one */
|
||||
}
|
||||
return 0;
|
||||
@@ -1858,6 +1869,7 @@ found:
|
||||
@@ -1842,6 +1854,7 @@ found:
|
||||
msg->msg = WM_HOTKEY;
|
||||
msg->wparam = hotkey->id;
|
||||
msg->lparam = ((hotkey->vkey & 0xffff) << 16) | modifiers;
|
||||
@@ -160,7 +161,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
|
||||
free( msg->data );
|
||||
msg->data = NULL;
|
||||
@@ -2844,7 +2856,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
|
||||
@@ -2828,7 +2841,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
|
||||
}
|
||||
|
||||
/* now we can return it */
|
||||
@@ -169,7 +170,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
reply->type = MSG_HARDWARE;
|
||||
reply->win = win;
|
||||
reply->msg = msg_code;
|
||||
@@ -2951,6 +2963,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
|
||||
@@ -2935,6 +2948,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 +178,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
|
||||
get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time );
|
||||
|
||||
@@ -3254,6 +3267,7 @@ DECL_HANDLER(send_message)
|
||||
@@ -3239,6 +3253,7 @@ DECL_HANDLER(send_message)
|
||||
set_queue_bits( recv_queue, QS_SENDMESSAGE );
|
||||
break;
|
||||
case MSG_POSTED:
|
||||
@@ -185,7 +186,7 @@ index 3f06c15d006..46c52c32d24 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)
|
||||
@@ -3394,12 +3408,12 @@ DECL_HANDLER(get_message)
|
||||
@@ -3379,12 +3394,12 @@ DECL_HANDLER(get_message)
|
||||
|
||||
/* then check for posted messages */
|
||||
if ((filter & QS_POSTMESSAGE) &&
|
||||
@@ -200,7 +201,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
return;
|
||||
|
||||
/* only check for quit messages if not posted messages pending */
|
||||
@@ -3410,7 +3424,7 @@ DECL_HANDLER(get_message)
|
||||
@@ -3395,7 +3410,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 ))
|
||||
@@ -209,7 +210,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
|
||||
/* now check for WM_PAINT */
|
||||
if ((filter & QS_PAINT) &&
|
||||
@@ -3423,7 +3437,7 @@ DECL_HANDLER(get_message)
|
||||
@@ -3408,7 +3423,7 @@ DECL_HANDLER(get_message)
|
||||
reply->wparam = 0;
|
||||
reply->lparam = 0;
|
||||
get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
|
||||
@@ -218,7 +219,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
}
|
||||
|
||||
/* now check for timer */
|
||||
@@ -3439,9 +3453,19 @@ DECL_HANDLER(get_message)
|
||||
@@ -3424,9 +3439,19 @@ 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 );
|
||||
@@ -239,7 +240,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event );
|
||||
|
||||
SHARED_WRITE_BEGIN( queue_shm, queue_shm_t )
|
||||
@@ -3453,6 +3477,13 @@ DECL_HANDLER(get_message)
|
||||
@@ -3438,6 +3463,13 @@ DECL_HANDLER(get_message)
|
||||
|
||||
reset_queue_sync( queue );
|
||||
set_error( STATUS_PENDING ); /* FIXME */
|
||||
@@ -253,7 +254,7 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
}
|
||||
|
||||
|
||||
@@ -3470,7 +3501,10 @@ DECL_HANDLER(reply_message)
|
||||
@@ -3455,7 +3487,10 @@ DECL_HANDLER(reply_message)
|
||||
DECL_HANDLER(accept_hardware_message)
|
||||
{
|
||||
if (current->queue)
|
||||
@@ -265,5 +266,5 @@ index 3f06c15d006..46c52c32d24 100644
|
||||
set_error( STATUS_ACCESS_DENIED );
|
||||
}
|
||||
--
|
||||
2.50.1
|
||||
2.51.0
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From d68918425e249c5c218ee6f0c9418e2e2daf9931 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Kislyuk <dimaki@rocketmail.com>
|
||||
Date: Wed, 28 Apr 2021 09:47:41 -0500
|
||||
Subject: [PATCH] wscript: return TRUE for /d and /u stub switches
|
||||
|
||||
Patch by Robert Wilhelm from bug:
|
||||
https://bugs.winehq.org/show_bug.cgi?id=49905
|
||||
|
||||
VbsEdit is able to execute scripts with this patch applied.
|
||||
|
||||
Signed-off-by: Dmitry Kislyuk <dimaki@rocketmail.com>
|
||||
---
|
||||
programs/wscript/main.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/programs/wscript/main.c b/programs/wscript/main.c
|
||||
index a7005a9289c..6d6e8935149 100644
|
||||
--- a/programs/wscript/main.c
|
||||
+++ b/programs/wscript/main.c
|
||||
@@ -393,6 +393,10 @@ static BOOL set_host_properties(const WCHAR *prop)
|
||||
wshInteractive = VARIANT_FALSE;
|
||||
else if(wcsicmp(prop, L"nologo") == 0)
|
||||
WINE_FIXME("ignored %s switch\n", debugstr_w(L"nologo"));
|
||||
+ else if(wcsicmp(prop, L"d") == 0)
|
||||
+ WINE_FIXME("ignored %s switch\n", debugstr_w(L"d"));
|
||||
+ else if(wcsicmp(prop, L"u") == 0)
|
||||
+ WINE_FIXME("ignored %s switch\n", debugstr_w(L"u"));
|
||||
else
|
||||
{
|
||||
WINE_FIXME("unsupported switch %s\n", debugstr_w(prop));
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
Fixes: [49905] wscript: return TRUE for /d and /u stub switches
|
||||
Reference in New Issue
Block a user