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 f9741837a3bff3a912442695b4f7c3f5efbef557.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2025-05-09 13:30:18 +10:00
parent abf4b4db07
commit 86a7c93cdd
5 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/eventfd_synchronization/0020-server-Create-eventfd-file-descriptors-for-message-q.patch
View File

@@ -1,4 +1,4 @@
From 27e2bc1b0d098abce9168ea46589024054817e25 Mon Sep 17 00:00:00 2001
From 52be83d9a557eec924a964944e6b926fb1e347ad Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 6 Jul 2020 16:01:56 -0500
Subject: [PATCH] server: Create eventfd file descriptors for message queues.
@@ -8,10 +8,10 @@ Subject: [PATCH] server: Create eventfd file descriptors for message queues.
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/server/queue.c b/server/queue.c
index ee575724e4e..60f0c043257 100644
index a3479055ed4..08635c047b2 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -44,6 +44,7 @@
@@ -45,6 +45,7 @@
#include "process.h"
#include "request.h"
#include "user.h"
@@ -19,15 +19,15 @@ index ee575724e4e..60f0c043257 100644
#define WM_NCMOUSEFIRST WM_NCMOUSEMOVE
#define WM_NCMOUSELAST (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST))
@@ -144,6 +145,7 @@ struct msg_queue
@@ -135,6 +136,7 @@ struct msg_queue
int keystate_lock; /* owns an input keystate lock */
const queue_shm_t *shared; /* queue in session shared memory */
queue_shm_t *shared; /* queue in session shared memory */
unsigned int ignore_post_msg; /* ignore post messages newer than this unique id */
+ int esync_fd; /* esync file descriptor (signalled on message) */
};
struct hotkey
@@ -160,6 +162,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
@@ -151,6 +153,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry );
static void msg_queue_remove_queue( struct object *obj, struct wait_queue_entry *entry );
static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry );
@@ -35,7 +35,7 @@ index ee575724e4e..60f0c043257 100644
static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry );
static void msg_queue_destroy( struct object *obj );
static void msg_queue_poll_event( struct fd *fd, int event );
@@ -175,7 +178,7 @@ static const struct object_ops msg_queue_ops =
@@ -166,7 +169,7 @@ static const struct object_ops msg_queue_ops =
msg_queue_add_queue, /* add_queue */
msg_queue_remove_queue, /* remove_queue */
msg_queue_signaled, /* signaled */
@@ -44,7 +44,7 @@ index ee575724e4e..60f0c043257 100644
msg_queue_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -313,6 +316,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
@@ -317,6 +320,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
queue->last_get_msg = current_time;
queue->keystate_lock = 0;
queue->ignore_post_msg = 0;
@@ -52,7 +52,7 @@ index ee575724e4e..60f0c043257 100644
list_init( &queue->send_result );
list_init( &queue->callback_result );
list_init( &queue->pending_timers );
@@ -335,6 +339,9 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
@@ -339,6 +343,9 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
}
SHARED_WRITE_END;
@@ -62,7 +62,7 @@ index ee575724e4e..60f0c043257 100644
thread->queue = queue;
if ((desktop = get_thread_desktop( thread, 0 )))
@@ -685,6 +692,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
@@ -753,6 +760,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
if (queue->keystate_lock) unlock_input_keystate( queue->input );
queue->keystate_lock = 0;
}
@@ -72,7 +72,7 @@ index ee575724e4e..60f0c043257 100644
}
/* check if message is matched by the filter */
@@ -1227,6 +1237,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
@@ -1335,6 +1345,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
return ret || is_signaled( queue );
}
@@ -86,7 +86,7 @@ index ee575724e4e..60f0c043257 100644
static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry )
{
struct msg_queue *queue = (struct msg_queue *)obj;
@@ -1278,6 +1295,7 @@ static void msg_queue_destroy( struct object *obj )
@@ -1391,6 +1408,7 @@ static void msg_queue_destroy( struct object *obj )
if (queue->hooks) release_object( queue->hooks );
if (queue->fd) release_object( queue->fd );
if (queue->shared) free_shared_object( queue->shared );
@@ -94,7 +94,7 @@ index ee575724e4e..60f0c043257 100644
}
static void msg_queue_poll_event( struct fd *fd, int event )
@@ -3000,6 +3018,9 @@ DECL_HANDLER(set_queue_mask)
@@ -3181,6 +3199,9 @@ DECL_HANDLER(set_queue_mask)
}
else wake_up( &queue->obj, 0 );
}
@@ -104,7 +104,7 @@ index ee575724e4e..60f0c043257 100644
}
}
@@ -3020,6 +3041,9 @@ DECL_HANDLER(get_queue_status)
@@ -3201,6 +3222,9 @@ DECL_HANDLER(get_queue_status)
shared->changed_bits &= ~req->clear_bits;
}
SHARED_WRITE_END;
@@ -114,7 +114,7 @@ index ee575724e4e..60f0c043257 100644
}
else reply->wake_bits = reply->changed_bits = 0;
}
@@ -3286,6 +3310,10 @@ DECL_HANDLER(get_message)
@@ -3469,6 +3493,10 @@ DECL_HANDLER(get_message)
SHARED_WRITE_END;
set_error( STATUS_PENDING ); /* FIXME */
@@ -126,5 +126,5 @@ index ee575724e4e..60f0c043257 100644
found_msg:
--
2.43.0
2.47.2

34
patches/eventfd_synchronization/0021-server-ntdll-Implement-message-waits.patch
View File

@@ -1,4 +1,4 @@
From 7522f4cf4bb29413bce97be5e61ebaefb5276c77 Mon Sep 17 00:00:00 2001
From c9d64a429d4343f4ceb53ae28ecc380aaa42b09e Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 6 Jul 2020 16:11:23 -0500
Subject: [PATCH] server, ntdll: Implement message waits.
@@ -10,10 +10,10 @@ Subject: [PATCH] server, ntdll: Implement message waits.
3 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
index 399930c444b..06d7d8babc6 100644
index b2204d44ed9..3af79a2de15 100644
--- a/dlls/ntdll/unix/esync.c
+++ b/dlls/ntdll/unix/esync.c
@@ -474,12 +474,13 @@ static void update_grabbed_object( struct esync *obj )
@@ -476,12 +476,13 @@ static void update_grabbed_object( struct esync *obj )
/* A value of STATUS_NOT_IMPLEMENTED returned from this function means that we
* need to delegate to server_select(). */
@@ -28,7 +28,7 @@ index 399930c444b..06d7d8babc6 100644
LONGLONG timeleft;
LARGE_INTEGER now;
ULONGLONG end;
@@ -507,6 +508,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
@@ -509,6 +510,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
return ret;
}
@@ -38,7 +38,7 @@ index 399930c444b..06d7d8babc6 100644
if (has_esync && has_server)
FIXME("Can't wait on esync and server objects at the same time!\n");
else if (has_server)
@@ -518,6 +522,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
@@ -520,6 +524,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
for (i = 0; i < count; i++)
TRACE(" %p", handles[i]);
@@ -48,7 +48,7 @@ index 399930c444b..06d7d8babc6 100644
if (!timeout)
TRACE(", timeout = INFINITE.\n");
else
@@ -557,7 +564,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
@@ -559,7 +566,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
int64_t value;
ssize_t size;
@@ -59,7 +59,7 @@ index 399930c444b..06d7d8babc6 100644
{
/* Don't grab the object, just check if it's signaled. */
if (fds[i].revents & POLLIN)
@@ -602,6 +611,44 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
@@ -604,6 +613,44 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
}
}
@@ -105,10 +105,10 @@ index 399930c444b..06d7d8babc6 100644
{
struct stat st;
diff --git a/server/protocol.def b/server/protocol.def
index 56f2d263100..46cdbbed9b7 100644
index 86040d5b619..c2fdec93b8d 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3968,6 +3968,10 @@ enum esync_type
@@ -4121,6 +4121,10 @@ enum esync_type
unsigned int shm_idx;
@END
@@ -120,18 +120,18 @@ index 56f2d263100..46cdbbed9b7 100644
@REQ(set_keyboard_repeat)
int enable; /* whether to enable auto-repeat */
diff --git a/server/queue.c b/server/queue.c
index 60f0c043257..d6b6f2f20aa 100644
index 08635c047b2..8f1a68acd7f 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -146,6 +146,7 @@ struct msg_queue
const queue_shm_t *shared; /* queue in session shared memory */
@@ -137,6 +137,7 @@ struct msg_queue
queue_shm_t *shared; /* queue in session shared memory */
unsigned int ignore_post_msg; /* ignore post messages newer than this unique id */
int esync_fd; /* esync file descriptor (signalled on message) */
+ int esync_in_msgwait; /* our thread is currently waiting on us */
};
struct hotkey
@@ -317,6 +318,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
@@ -321,6 +322,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
queue->keystate_lock = 0;
queue->ignore_post_msg = 0;
queue->esync_fd = -1;
@@ -139,7 +139,7 @@ index 60f0c043257..d6b6f2f20aa 100644
list_init( &queue->send_result );
list_init( &queue->callback_result );
list_init( &queue->pending_timers );
@@ -1183,6 +1185,10 @@ static int is_queue_hung( struct msg_queue *queue )
@@ -1291,6 +1293,10 @@ static int is_queue_hung( struct msg_queue *queue )
if (get_wait_queue_thread(entry)->queue == queue)
return 0; /* thread is waiting on queue -> not hung */
}
@@ -150,7 +150,7 @@ index 60f0c043257..d6b6f2f20aa 100644
return 1;
}
@@ -4079,6 +4085,23 @@ DECL_HANDLER(update_rawinput_devices)
@@ -4281,6 +4287,23 @@ DECL_HANDLER(update_rawinput_devices)
}
}
@@ -174,11 +174,11 @@ index 60f0c043257..d6b6f2f20aa 100644
DECL_HANDLER(set_keyboard_repeat)
{
struct desktop *desktop;
@@ -4097,3 +4120,4 @@ DECL_HANDLER(set_keyboard_repeat)
@@ -4299,3 +4322,4 @@ DECL_HANDLER(set_keyboard_repeat)
release_object( desktop );
}
+
--
2.43.0
2.47.2