From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/sysparams.c | 1 - server/protocol.def | 2 +- server/queue.c | 21 ++++++++++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9a06db2c7f6..ad95b5c4459 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6337,7 +6337,6 @@ static void thread_detach(void) free( thread_info->rawinput );
cleanup_imm_thread(); - NtClose( thread_info->server_queue ); free( thread_info->session_data );
exiting_thread_id = 0; diff --git a/server/protocol.def b/server/protocol.def index 97b4805c552..70cd835b647 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -915,7 +915,7 @@ typedef volatile struct
typedef volatile struct { - int placeholder; + obj_handle_t handle; /* handle to the queue */ } queue_shm_t;
typedef volatile union diff --git a/server/queue.c b/server/queue.c index 5f4e5fa33c2..d56b199f1f0 100644 --- a/server/queue.c +++ b/server/queue.c @@ -290,6 +290,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ { struct thread_input *new_input = NULL; struct msg_queue *queue; + obj_handle_t handle; int i;
if (!input) @@ -328,6 +329,13 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ return NULL; }
+ handle = alloc_handle( thread->process, queue, SYNCHRONIZE, 0 ); + SHARED_WRITE_BEGIN( queue->shared, queue_shm_t ) + { + shared->handle = handle; + } + SHARED_WRITE_END; + thread->queue = queue; } if (new_input) release_object( new_input ); @@ -337,8 +345,19 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ /* free the message queue of a thread at thread exit */ void free_msg_queue( struct thread *thread ) { + obj_handle_t handle; + remove_thread_hooks( thread ); if (!thread->queue) return; + + SHARED_WRITE_BEGIN( thread->queue->shared, queue_shm_t ) + { + handle = shared->handle; + shared->handle = 0; + } + SHARED_WRITE_END; + close_handle( thread->process, handle ); + release_object( thread->queue ); thread->queue = NULL; } @@ -2866,7 +2885,7 @@ DECL_HANDLER(get_msg_queue) struct msg_queue *queue = get_current_queue();
reply->handle = 0; - if (queue) reply->handle = alloc_handle( current->process, queue, SYNCHRONIZE, 0 ); + if (queue) reply->handle = queue->shared->handle; }