June 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Remove now unnecessary thread info active_hooks cache.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 96a24135be3fd0e1239846152f72de6ee6be669f URL: https://gitlab.winehq.org/wine/wine/-/commit/96a24135be3fd0e1239846152f72de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 20:50:22 2024 +0200 win32u: Remove now unnecessary thread info active_hooks cache. --- dlls/win32u/hook.c | 9 --------- dlls/win32u/message.c | 1 - dlls/win32u/ntuser_private.h | 1 - 3 files changed, 11 deletions(-) diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 3e2798b8c75..d47aed4c6d6 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -135,7 +135,6 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO if (!wine_server_call_err( req )) { handle = wine_server_ptr_handle( reply->handle ); - get_user_thread_info()->active_hooks = reply->active_hooks; } } SERVER_END_REQ; @@ -156,7 +155,6 @@ BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ) req->handle = wine_server_user_handle( handle ); req->id = 0; status = wine_server_call_err( req ); - if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; } SERVER_END_REQ; if (status == STATUS_INVALID_HANDLE) RtlSetLastWin32Error( ERROR_INVALID_HOOK_HANDLE ); @@ -176,7 +174,6 @@ BOOL unhook_windows_hook( INT id, HOOKPROC proc ) req->id = id; req->proc = wine_server_client_ptr( proc ); status = wine_server_call_err( req ); - if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; } SERVER_END_REQ; if (status == STATUS_INVALID_HANDLE) RtlSetLastWin32Error( ERROR_INVALID_HOOK_HANDLE ); @@ -427,7 +424,6 @@ LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) LRESULT call_message_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size_t lparam_size, size_t message_size, BOOL ansi ) { - struct user_thread_info *thread_info = get_user_thread_info(); struct win_hook_params info; WCHAR module[MAX_PATH]; DWORD_PTR ret; @@ -457,7 +453,6 @@ LRESULT call_message_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, size info.tid = reply->tid; info.proc = wine_server_get_ptr( reply->proc ); info.next_unicode = reply->unicode; - thread_info->active_hooks = reply->active_hooks; } } SERVER_END_REQ; @@ -525,7 +520,6 @@ HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HM if (!wine_server_call_err( req )) { handle = wine_server_ptr_handle( reply->handle ); - get_user_thread_info()->active_hooks = reply->active_hooks; } } SERVER_END_REQ; @@ -546,7 +540,6 @@ BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK handle ) req->handle = wine_server_user_handle( handle ); req->id = WH_WINEVENT; ret = !wine_server_call_err( req ); - if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; } SERVER_END_REQ; return ret; @@ -557,7 +550,6 @@ BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK handle ) */ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG child_id ) { - struct user_thread_info *thread_info = get_user_thread_info(); struct win_event_hook_params info; void *ret_ptr; ULONG ret_len; @@ -599,7 +591,6 @@ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG c info.module[wine_server_reply_size(req) / sizeof(WCHAR)] = 0; info.handle = wine_server_ptr_handle( reply->handle ); info.proc = wine_server_get_ptr( reply->proc ); - thread_info->active_hooks = reply->active_hooks; } } SERVER_END_REQ; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 941af31701f..3099f5a6660 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2698,7 +2698,6 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) info.msg.pt.x = reply->x; info.msg.pt.y = reply->y; hw_id = 0; - thread_info->active_hooks = reply->active_hooks; } else buffer_size = reply->total; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index d95ea03d45f..44edadad8f8 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -114,7 +114,6 @@ struct user_thread_info WORD hook_call_depth; /* Number of recursively called hook procs */ WORD hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ - UINT active_hooks; /* Bitmap of active hooks */ struct received_message_info *receive_info; /* Message being currently received */ struct imm_thread_data *imm_thread_data; /* IMM thread data */ HKL kbd_layout; /* Current keyboard layout */

1 0

Rémi Bernon : win32u: Read the active hooks count from the shared memory.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 96c44adae808aff62a6d8435884ae360e74c307a URL: https://gitlab.winehq.org/wine/wine/-/commit/96c44adae808aff62a6d8435884ae3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 22:37:36 2024 +0100 win32u: Read the active hooks count from the shared memory. --- dlls/win32u/hook.c | 16 +++++++++++----- dlls/win32u/message.c | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/winstation.c | 35 +++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 22 +++++++++++++++++++--- server/protocol.def | 9 ++++++++- server/queue.c | 12 ++++++++++-- server/request.h | 9 +++++++-- server/trace.c | 14 +++++++++++++- 9 files changed, 105 insertions(+), 15 deletions(-)

1 0

Rémi Bernon : server: Keep a reference on the desktop the hook are registered for.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: f784374bcb5195c918754b1da6142a618a0da7dd URL: https://gitlab.winehq.org/wine/wine/-/commit/f784374bcb5195c918754b1da6142a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 24 16:32:29 2024 +0200 server: Keep a reference on the desktop the hook are registered for. --- server/hook.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/hook.c b/server/hook.c index c22e3748b8b..140f2ba5a90 100644 --- a/server/hook.c +++ b/server/hook.c @@ -43,6 +43,7 @@ struct hook { struct list chain; /* hook chain entry */ user_handle_t handle; /* user handle for this hook */ + struct desktop *desktop; /* desktop the hook is registered for */ struct process *process; /* process the hook is set to */ struct thread *thread; /* thread the hook is set to */ struct thread *owner; /* owner of the out of context hook */ @@ -145,6 +146,7 @@ static struct hook *add_hook( struct desktop *desktop, struct thread *thread, in free( hook ); return NULL; } + hook->desktop = (struct desktop *)grab_object( desktop ); hook->thread = thread ? (struct thread *)grab_object( thread ) : NULL; hook->table = table; hook->index = index; @@ -165,6 +167,7 @@ static void free_hook( struct hook *hook ) release_object( hook->thread ); } if (hook->process) release_object( hook->process ); + release_object( hook->desktop ); release_object( hook->owner ); list_remove( &hook->chain ); free( hook ); @@ -500,6 +503,7 @@ DECL_HANDLER(remove_hook) return; } } + remove_hook( hook ); reply->active_hooks = get_active_hooks(); }

1 0

Rémi Bernon : server: Create a thread message queue shared mapping.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: fd3de9005ef504a810aeb828c5b491a7bebd7888 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd3de9005ef504a810aeb828c5b491… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 22:37:36 2024 +0100 server: Create a thread message queue shared mapping. --- include/wine/server_protocol.h | 8 +++++++- server/protocol.def | 6 ++++++ server/queue.c | 8 ++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f5b1e9f8475..b8a4878c7d5 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -897,9 +897,15 @@ typedef volatile struct unsigned char keystate[256]; } desktop_shm_t; +typedef volatile struct +{ + int placeholder; +} queue_shm_t; + typedef volatile union { desktop_shm_t desktop; + queue_shm_t queue; } object_shm_t; typedef volatile struct @@ -6569,7 +6575,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 815 +#define SERVER_PROTOCOL_VERSION 816 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 11539654dc3..97b4805c552 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -913,9 +913,15 @@ typedef volatile struct unsigned char keystate[256]; /* asynchronous key state */ } desktop_shm_t; +typedef volatile struct +{ + int placeholder; +} queue_shm_t; + typedef volatile union { desktop_shm_t desktop; + queue_shm_t queue; } object_shm_t; typedef volatile struct diff --git a/server/queue.c b/server/queue.c index a7814c83737..5f4e5fa33c2 100644 --- a/server/queue.c +++ b/server/queue.c @@ -146,6 +146,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 */ + const queue_shm_t *shared; /* queue in session shared memory */ }; struct hotkey @@ -321,6 +322,12 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ list_init( &queue->expired_timers ); for (i = 0; i < NB_MSG_KINDS; i++) list_init( &queue->msg_list[i] ); + if (!(queue->shared = alloc_shared_object())) + { + release_object( queue ); + return NULL; + } + thread->queue = queue; } if (new_input) release_object( new_input ); @@ -1210,6 +1217,7 @@ static void msg_queue_destroy( struct object *obj ) release_object( queue->input ); if (queue->hooks) release_object( queue->hooks ); if (queue->fd) release_object( queue->fd ); + if (queue->shared) free_shared_object( queue->shared ); } static void msg_queue_poll_event( struct fd *fd, int event )

1 0

Rémi Bernon : server: Move hooks struct initialization within add_hook.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: cd8bbea138819915fe870afaf46b49afc2cd38bc URL: https://gitlab.winehq.org/wine/wine/-/commit/cd8bbea138819915fe870afaf46b49… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 24 23:35:06 2024 +0200 server: Move hooks struct initialization within add_hook. And some run_hook_in_current_thread logic in a separate helper. --- server/hook.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/server/hook.c b/server/hook.c index 140f2ba5a90..ed5ab7f5938 100644 --- a/server/hook.c +++ b/server/hook.c @@ -127,8 +127,20 @@ static struct hook_table *get_global_hooks( struct thread *thread ) return table; } +/* check if a given hook should run in the given thread */ +static int run_hook_in_thread( struct hook *hook, struct thread *thread ) +{ + if (hook->process && hook->process != thread->process) return 0; + if ((hook->flags & WINEVENT_SKIPOWNPROCESS) && hook->process == thread->process) return 0; + if (hook->thread && hook->thread != thread) return 0; + if ((hook->flags & WINEVENT_SKIPOWNTHREAD) && hook->thread == thread) return 0; + return 1; +} + /* create a new hook and add it to the specified table */ -static struct hook *add_hook( struct desktop *desktop, struct thread *thread, int index, int global ) +static struct hook *add_hook( struct desktop *desktop, struct process *process, struct thread *thread, int index, int global, + int event_min, int event_max, int flags, client_ptr_t proc, int unicode, + WCHAR *module, data_size_t module_size ) { struct hook *hook; struct hook_table *table = global ? desktop->global_hooks : get_queue_hooks(thread); @@ -146,10 +158,19 @@ static struct hook *add_hook( struct desktop *desktop, struct thread *thread, in free( hook ); return NULL; } - hook->desktop = (struct desktop *)grab_object( desktop ); - hook->thread = thread ? (struct thread *)grab_object( thread ) : NULL; - hook->table = table; - hook->index = index; + hook->owner = (struct thread *)grab_object( current ); + hook->desktop = (struct desktop *)grab_object( desktop ); + hook->process = process ? (struct process *)grab_object( process ) : NULL; + hook->thread = thread ? (struct thread *)grab_object( thread ) : NULL; + hook->table = table; + hook->index = index; + hook->event_min = event_min; + hook->event_max = event_max; + hook->flags = flags; + hook->proc = proc; + hook->unicode = unicode; + hook->module = module; + hook->module_size = module_size; list_add_head( &table->hooks[index], &hook->chain ); if (thread) thread->desktop_users++; return hook; @@ -209,10 +230,7 @@ static inline int run_hook_in_owner_thread( struct hook *hook ) /* check if a given hook should run in the current thread */ static inline int run_hook_in_current_thread( struct hook *hook ) { - if (hook->process && hook->process != current->process) return 0; - if ((hook->flags & WINEVENT_SKIPOWNPROCESS) && hook->process == current->process) return 0; - if (hook->thread && hook->thread != current) return 0; - if ((hook->flags & WINEVENT_SKIPOWNTHREAD) && hook->thread == current) return 0; + if (!run_hook_in_thread( hook, current )) return 0; /* don't run low-level hooks in processes suspended for debugging */ if (run_hook_in_owner_thread( hook ) && hook->owner->process->suspend) return 0; return 1; @@ -454,17 +472,9 @@ DECL_HANDLER(set_hook) global = 0; } - if ((hook = add_hook( desktop, thread, req->id - WH_MINHOOK, global ))) + if ((hook = add_hook( desktop, process, thread, req->id - WH_MINHOOK, global, req->event_min, req->event_max, + req->flags, req->proc, req->unicode, module, module_size ))) { - hook->owner = (struct thread *)grab_object( current ); - hook->process = process ? (struct process *)grab_object( process ) : NULL; - hook->event_min = req->event_min; - hook->event_max = req->event_max; - hook->flags = req->flags; - hook->proc = req->proc; - hook->unicode = req->unicode; - hook->module = module; - hook->module_size = module_size; reply->handle = hook->handle; reply->active_hooks = get_active_hooks(); }

1 0

Rémi Bernon : server: Update the active hooks bitmaps when hooks are added / removed.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: ae5a02e808f6d8fbbb182e556c76827cf9f804db URL: https://gitlab.winehq.org/wine/wine/-/commit/ae5a02e808f6d8fbbb182e556c7682… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 24 23:35:06 2024 +0200 server: Update the active hooks bitmaps when hooks are added / removed. --- include/wine/server_protocol.h | 4 +-- server/hook.c | 70 ++++++++++++++++++++++++------------------ server/protocol.def | 2 +- server/queue.c | 42 +++++++++++++++++++++++++ server/user.h | 2 ++ server/winstation.c | 2 ++ 6 files changed, 89 insertions(+), 33 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b8a4878c7d5..b39be73443c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -899,7 +899,7 @@ typedef volatile struct typedef volatile struct { - int placeholder; + int hooks_count[WH_MAX - WH_MIN + 2]; } queue_shm_t; typedef volatile union @@ -6575,7 +6575,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 816 +#define SERVER_PROTOCOL_VERSION 817 /* ### protocol_version end ### */ diff --git a/server/hook.c b/server/hook.c index ed5ab7f5938..3047f52492d 100644 --- a/server/hook.c +++ b/server/hook.c @@ -173,6 +173,15 @@ static struct hook *add_hook( struct desktop *desktop, struct process *process, hook->module_size = module_size; list_add_head( &table->hooks[index], &hook->chain ); if (thread) thread->desktop_users++; + + if (!global) + add_queue_hook_count( hook->thread, index, 1 ); + else LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + { + if (!run_hook_in_thread( hook, thread )) continue; + add_queue_hook_count( thread, index, 1 ); + } + return hook; } @@ -315,12 +324,43 @@ static void hook_table_destroy( struct object *obj ) /* remove a hook, freeing it if the chain is not in use */ static void remove_hook( struct hook *hook ) { + struct desktop *desktop = hook->desktop; + int global = hook->table == desktop->global_hooks; + struct thread *thread; + + if (!global) + add_queue_hook_count( hook->thread, hook->index, -1 ); + else LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + { + if (!run_hook_in_thread( hook, thread )) continue; + add_queue_hook_count( thread, hook->index, -1 ); + } + if (hook->table->counts[hook->index]) hook->proc = 0; /* chain is in use, just mark it and return */ else free_hook( hook ); } +/* update the thread message queue hooks counters from the desktop global hooks */ +void add_desktop_hook_count( struct desktop *desktop, struct thread *thread, int count ) +{ + struct hook_table *table; + struct hook *hook; + int index; + + if (!(table = desktop->global_hooks)) return; + + for (index = 0; index < ARRAY_SIZE(table->hooks); index++) + { + LIST_FOR_EACH_ENTRY( hook, &table->hooks[index], struct hook, chain ) + { + if (!run_hook_in_thread( hook, thread )) continue; + add_queue_hook_count( thread, hook->index, count ); + } + } +} + /* release a hook chain, removing deleted hooks if the use count drops to 0 */ static void release_hook_chain( struct hook_table *table, int index ) { @@ -362,36 +402,6 @@ void remove_thread_hooks( struct thread *thread ) } } -/* get a bitmap of active hooks in a hook table */ -static int is_hook_active( struct hook_table *table, int index ) -{ - struct hook *hook = get_first_hook( table, index ); - - while (hook) - { - if (hook->proc && run_hook_in_current_thread( hook )) return 1; - hook = HOOK_ENTRY( list_next( &table->hooks[index], &hook->chain ) ); - } - return 0; -} - -/* get a bitmap of all active hooks for the current thread */ -unsigned int get_active_hooks(void) -{ - struct hook_table *table = get_queue_hooks( current ); - struct hook_table *global_hooks = get_global_hooks( current ); - unsigned int ret = 1u << 31; /* set high bit to indicate that the bitmap is valid */ - int id; - - for (id = WH_MINHOOK; id <= WH_WINEVENT; id++) - { - if ((table && is_hook_active( table, id - WH_MINHOOK )) || - (global_hooks && is_hook_active( global_hooks, id - WH_MINHOOK ))) - ret |= 1 << (id - WH_MINHOOK); - } - return ret; -} - /* return the thread that owns the first global hook */ struct thread *get_first_global_hook( struct desktop *desktop, int id ) { diff --git a/server/protocol.def b/server/protocol.def index 97b4805c552..12c27a8e3e1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -915,7 +915,7 @@ typedef volatile struct typedef volatile struct { - int placeholder; + int hooks_count[WH_MAX - WH_MIN + 2]; /* active hooks count */ } queue_shm_t; typedef volatile union diff --git a/server/queue.c b/server/queue.c index 5f4e5fa33c2..6d9c9f20a5f 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; + struct desktop *desktop; int i; if (!input) @@ -328,7 +329,19 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ return NULL; } + SHARED_WRITE_BEGIN( queue->shared, queue_shm_t ) + { + memset( (void *)shared->hooks_count, 0, sizeof(shared->hooks_count) ); + } + SHARED_WRITE_END; + thread->queue = queue; + + if ((desktop = get_thread_desktop( thread, 0 ))) + { + add_desktop_hook_count( desktop, thread, 1 ); + release_object( desktop ); + } } if (new_input) release_object( new_input ); return queue; @@ -612,6 +625,35 @@ void set_queue_hooks( struct thread *thread, struct hook_table *hooks ) queue->hooks = hooks; } +/* get the thread message queue active hooks bitmap */ +unsigned int get_active_hooks(void) +{ + unsigned int ret = 1u << 31; /* set high bit to indicate that the bitmap is valid */ + struct msg_queue *queue; + int bit; + + if (!(queue = current->queue)) return ret; + + for (bit = 0; bit < ARRAY_SIZE(queue->shared->hooks_count); bit++) + if (queue->shared->hooks_count[bit]) ret |= 1 << bit; + + return ret; +} + +/* update the thread message queue hooks counters */ +void add_queue_hook_count( struct thread *thread, unsigned int index, int count ) +{ + if (!thread->queue) return; + + SHARED_WRITE_BEGIN( thread->queue->shared, queue_shm_t ) + { + shared->hooks_count[index] += count; + } + SHARED_WRITE_END; + + assert( thread->queue->shared->hooks_count[index] >= 0 ); +} + /* check the queue status */ static inline int is_signaled( struct msg_queue *queue ) { diff --git a/server/user.h b/server/user.h index 99491293a7c..4633c7dae7f 100644 --- a/server/user.h +++ b/server/user.h @@ -108,12 +108,14 @@ extern void cleanup_clipboard_thread( struct thread *thread ); extern void remove_thread_hooks( struct thread *thread ); extern unsigned int get_active_hooks(void); extern struct thread *get_first_global_hook( struct desktop *desktop, int id ); +extern void add_desktop_hook_count( struct desktop *desktop, struct thread *thread, int count ); /* queue functions */ extern void free_msg_queue( struct thread *thread ); extern struct hook_table *get_queue_hooks( struct thread *thread ); extern void set_queue_hooks( struct thread *thread, struct hook_table *hooks ); +extern void add_queue_hook_count( struct thread *thread, unsigned int index, int count ); extern void inc_queue_paint_count( struct thread *thread, int incr ); extern void queue_cleanup_window( struct thread *thread, user_handle_t win ); extern int init_thread_queue( struct thread *thread ); diff --git a/server/winstation.c b/server/winstation.c index 45c7defa1f7..75b604ae1c3 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -410,6 +410,7 @@ static void close_desktop_timeout( void *private ) static void add_desktop_thread( struct desktop *desktop, struct thread *thread ) { list_add_tail( &desktop->threads, &thread->desktop_entry ); + add_desktop_hook_count( desktop, thread, 1 ); if (!thread->process->is_system) { @@ -441,6 +442,7 @@ static void remove_desktop_user( struct desktop *desktop, struct thread *thread /* remove a thread from the list of threads attached to a desktop */ static void remove_desktop_thread( struct desktop *desktop, struct thread *thread ) { + add_desktop_hook_count( desktop, thread, -1 ); list_remove( &thread->desktop_entry ); if (!thread->process->is_system) remove_desktop_user( desktop, thread );

1 0

Eric Pouech : cmd: Let token errors be tranlatable.
by Alexandre Julliard June 26, 2024

June 26, 2024

1 0

Eric Pouech : cmd: Move code around to avoid forward declaration.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: cb56c7b7bde9a29e52bfc208bb7078c291fc245d URL: https://gitlab.winehq.org/wine/wine/-/commit/cb56c7b7bde9a29e52bfc208bb7078… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 20 16:46:44 2024 +0200 cmd: Move code around to avoid forward declaration. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 98 ++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 13ed0e09bab..e2c60f3b8c0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1098,55 +1098,6 @@ void for_control_append_set(CMD_FOR_CONTROL *for_ctrl, const WCHAR *set) for_ctrl->set = xstrdupW(set); } -/*************************************************************************** - * node_dispose_tree - * - * Frees the storage held for a parsed command line - * - This is not done in the process_commands, as eventually the current - * pointer will be modified within the commands, and hence a single free - * routine is simpler - */ -void node_dispose_tree(CMD_NODE *cmds) -{ - /* Loop through the commands, freeing them one by one */ - while (cmds) - { - CMD_NODE *thisCmd = cmds; - cmds = CMD_node_next(cmds); - if (thisCmd->op == CMD_SINGLE) - { - redirection_dispose_list(thisCmd->redirects); - command_dispose(thisCmd->command); - } - else - node_dispose_tree(thisCmd->left); - free(thisCmd); - } -} - -static CMD_NODE *node_create_single(CMD_COMMAND *c, CMD_REDIRECTION *redir) -{ - CMD_NODE *new = xalloc(sizeof(CMD_NODE)); - - new->op = CMD_SINGLE; - new->command = c; - new->redirects = redir; - - return new; -} - -static CMD_NODE *node_create_binary(CMD_OPERATOR op, CMD_NODE *l, CMD_NODE *r) -{ - CMD_NODE *new = xalloc(sizeof(CMD_NODE)); - - new->op = op; - new->left = l; - new->right = r; - new->redirects = NULL; - - return new; -} - void if_condition_dispose(CMD_IF_CONDITION *cond) { switch (cond->op) @@ -1287,6 +1238,55 @@ const char *debugstr_if_condition(const CMD_IF_CONDITION *cond) } } +/*************************************************************************** + * node_dispose_tree + * + * Frees the storage held for a parsed command line + * - This is not done in the process_commands, as eventually the current + * pointer will be modified within the commands, and hence a single free + * routine is simpler + */ +void node_dispose_tree(CMD_NODE *cmds) +{ + /* Loop through the commands, freeing them one by one */ + while (cmds) + { + CMD_NODE *thisCmd = cmds; + cmds = CMD_node_next(cmds); + if (thisCmd->op == CMD_SINGLE) + { + redirection_dispose_list(thisCmd->redirects); + command_dispose(thisCmd->command); + } + else + node_dispose_tree(thisCmd->left); + free(thisCmd); + } +} + +static CMD_NODE *node_create_single(CMD_COMMAND *c, CMD_REDIRECTION *redir) +{ + CMD_NODE *new = xalloc(sizeof(CMD_NODE)); + + new->op = CMD_SINGLE; + new->command = c; + new->redirects = redir; + + return new; +} + +static CMD_NODE *node_create_binary(CMD_OPERATOR op, CMD_NODE *l, CMD_NODE *r) +{ + CMD_NODE *new = xalloc(sizeof(CMD_NODE)); + + new->op = op; + new->left = l; + new->right = r; + new->redirects = NULL; + + return new; +} + static void init_msvcrt_io_block(STARTUPINFOW* st) { STARTUPINFOW st_p;

1 0

Eric Pouech : cmd: Fix a couple of expansions issues.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 6ad88c5512c4524efed592e5c1191b756fd97fd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ad88c5512c4524efed592e5c1191b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon May 6 16:03:40 2024 +0200 cmd: Fix a couple of expansions issues. Fix several incorrect behaviors that (partly) compensate each others: - when replacing %XXX% by %YYY%, advance current position after the copied %YYY% (otherwise it will expand %YYY% in same run), - don't parse the command in run_program(), - always expand full content in CALL command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 78 +++++++++++++-------------- programs/cmd/tests/test_builtins.cmd.exp | 6 +-- programs/cmd/tests/test_cmdline.cmd.exp | 2 +- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 90 ++++++++++++++++---------------- 5 files changed, 88 insertions(+), 92 deletions(-)

1 0

Paul Gofman : mmdevapi/tests: Add test for capturing render loopback.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: e727324e15f781f21f33046e1ed430cdc38ca183 URL: https://gitlab.winehq.org/wine/wine/-/commit/e727324e15f781f21f33046e1ed430… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 17 20:06:19 2024 -0600 mmdevapi/tests: Add test for capturing render loopback. --- dlls/mmdevapi/tests/capture.c | 62 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 08ab730ef1a..e3ae87fd9bd 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -41,7 +41,8 @@ /* undocumented error code */ #define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) -static IMMDevice *dev = NULL; +static IMMDeviceEnumerator *mme; +static IMMDevice *dev; static const LARGE_INTEGER ullZero; static void test_uninitialized(IAudioClient *ac) @@ -1012,10 +1013,66 @@ static void test_marshal(void) } +static void test_render_loopback(void) +{ + IAudioCaptureClient *capture; + IAudioRenderClient *render; + WAVEFORMATEX *pwfx; + IMMDevice *device; + IAudioClient *ac; + HRESULT hr; + + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &device); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: %#lx.\n", hr); + + if (hr != S_OK || !dev) + { + if (hr == E_NOTFOUND) + skip("No sound card available\n"); + else + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); + return; + } + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_LOOPBACK, 5000000, 0, pwfx, NULL); + ok(hr == AUDCLNT_E_WRONG_ENDPOINT_TYPE, "got %#lx.\n", hr); + IAudioClient_Release(ac); + CoTaskMemFree(pwfx); + + hr = IMMDevice_Activate(device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_LOOPBACK, 5000000, 0, pwfx, NULL); + todo_wine_if(hr == E_NOTIMPL) ok(hr == S_OK, "got %#lx.\n", hr); + if (FAILED(hr)) + goto done; + + hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void **)&render); + ok(hr == AUDCLNT_E_WRONG_ENDPOINT_TYPE, "got %#lx.\n", hr); + + hr = IAudioClient_GetService(ac, &IID_IAudioCaptureClient, (void **)&capture); + ok(hr == S_OK, "got %#lx.\n", hr); + IAudioCaptureClient_Release(capture); + +done: + IAudioClient_Release(ac); + IMMDevice_Release(device); + CoTaskMemFree(pwfx); +} + START_TEST(capture) { HRESULT hr; - IMMDeviceEnumerator *mme = NULL; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -1042,6 +1099,7 @@ START_TEST(capture) test_simplevolume(); test_volume_dependence(); test_marshal(); + test_render_loopback(); IMMDevice_Release(dev);

1 0