wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Alexandre Julliard : ntdll: Move RtlHashUnicodeString constants to a public header.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 9478e1f74c343ca3fa237d2bdb11ab969d9ca03e URL: https://gitlab.winehq.org/wine/wine/-/commit/9478e1f74c343ca3fa237d2bdb11ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 14:22:04 2024 +0100 ntdll: Move RtlHashUnicodeString constants to a public header. --- dlls/ntdll/ntdll_misc.h | 6 ------ dlls/ntdll/tests/rtlstr.c | 3 --- include/winternl.h | 5 +++++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 9ac3d5a9c86..50a3dde574c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -122,12 +122,6 @@ static inline TEB64 *NtCurrentTeb64(void) { return NULL; } static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } #endif -#define HASH_STRING_ALGORITHM_DEFAULT 0 -#define HASH_STRING_ALGORITHM_X65599 1 -#define HASH_STRING_ALGORITHM_INVALID 0xffffffff - -NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); - /* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) { diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 53ac223980e..3d2d4e4ac5e 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -30,9 +30,6 @@ #include "winnls.h" #include "guiddef.h" -#define HASH_STRING_ALGORITHM_X65599 1 -#define HASH_STRING_ALGORITHM_INVALID 0xffffffff - /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); diff --git a/include/winternl.h b/include/winternl.h index 04778c5cd59..cccbc149480 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4331,6 +4331,11 @@ typedef struct _API_SET_VALUE_ENTRY ULONG ValueLength; } API_SET_VALUE_ENTRY; + +#define HASH_STRING_ALGORITHM_DEFAULT 0 +#define HASH_STRING_ALGORITHM_X65599 1 +#define HASH_STRING_ALGORITHM_INVALID 0xffffffff + /*********************************************************************** * Function declarations */

1 0

Alexandre Julliard : ntdll: Use the exported structures for dll redirection data.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 6a153ac33e25d7cbd5633aa4b9ab95eddf94eeab URL: https://gitlab.winehq.org/wine/wine/-/commit/6a153ac33e25d7cbd5633aa4b9ab95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 14:19:35 2024 +0100 ntdll: Use the exported structures for dll redirection data. --- dlls/ntdll/actctx.c | 51 ++++++++++++++++++++++++++----------------------- dlls/ntdll/loader.c | 20 ++++++++++--------- dlls/ntdll/ntdll_misc.h | 15 --------------- include/winnt.h | 20 +++++++++++++++++++ 4 files changed, 58 insertions(+), 48 deletions(-)

1 0

Alexandre Julliard : ntdll: Implement RtlCaptureContext on ARM64EC.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 31e3c4316d8c014fda2e95b9db6e54d8a3b91120 URL: https://gitlab.winehq.org/wine/wine/-/commit/31e3c4316d8c014fda2e95b9db6e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 13:40:33 2024 +0100 ntdll: Implement RtlCaptureContext on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 67 +++++++++++++++++++- dlls/ntdll/tests/exception.c | 144 +++++++++++++++++++++++-------------------- dlls/ntdll/unwind.h | 2 +- 3 files changed, 142 insertions(+), 71 deletions(-)

1 0

Rémi Bernon : server: Dispatch rawinput messages using the rawinput process list.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 9591a36ee85b5e850e06e7f65c03ccff50ff6683 URL: https://gitlab.winehq.org/wine/wine/-/commit/9591a36ee85b5e850e06e7f65c03cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 22:36:04 2024 +0100 server: Dispatch rawinput messages using the rawinput process list. --- dlls/dinput/tests/joystick8.c | 9 ------ server/queue.c | 75 ++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 53 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 428fc59c1af..be6f432808f 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5756,23 +5756,16 @@ static DWORD WINAPI test_rawinput_desktop_thread( void *args ) rawbuffer_size = sizeof(rawbuffer); memset( rawbuffer, 0, sizeof(rawbuffer) ); res = msg_wait_for_events( 1, &rawinput_event, 100 ); - todo_wine_if( params->input ) ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); - todo_wine_if( params->input ) ok( rawinput_calls == 1, "got %u WM_INPUT messages\n", rawinput_calls ); rawinput = (RAWINPUT *)rawbuffer; - todo_wine_if( params->input ) ok( rawinput->header.dwType == RIM_TYPEHID, "got dwType %lu\n", rawinput->header.dwType ); - todo_wine_if( params->input ) ok( rawinput->header.dwSize == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength * rawinput->data.hid.dwCount]), "got header.dwSize %lu\n", rawinput->header.dwSize ); - todo_wine_if( params->input ) ok( rawinput->header.hDevice != 0, "got hDevice %p\n", rawinput->header.hDevice ); ok( rawinput->header.wParam == 0, "got wParam %#Ix\n", rawinput->header.wParam ); - todo_wine_if( params->input ) ok( rawinput->data.hid.dwSizeHid == desc.caps.InputReportByteLength, "got dwSizeHid %lu\n", rawinput->data.hid.dwSizeHid ); - todo_wine_if( params->input ) ok( rawinput->data.hid.dwCount >= 1, "got dwCount %lu\n", rawinput->data.hid.dwCount ); @@ -5878,9 +5871,7 @@ static void test_rawinput_desktop( const char *path, BOOL input ) } else { - todo_wine ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); - todo_wine ok( rawinput_calls == 0, "got %u WM_INPUT messages\n", rawinput_calls ); } diff --git a/server/queue.c b/server/queue.c index 041df36331e..4373bd71254 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1896,7 +1896,6 @@ static void rawhid_init( struct rawinput *rawinput, RAWHID *hid, const hw_input_ struct rawinput_message { struct thread *foreground; - struct desktop *desktop; struct hw_msg_source source; unsigned int time; unsigned int message; @@ -1912,12 +1911,10 @@ struct rawinput_message }; /* check if process is supposed to receive a WM_INPUT message and eventually queue it */ -static int queue_rawinput_message( struct process* process, void *arg ) +static void queue_rawinput_message( struct desktop *desktop, struct process *process, void *args ) { - const struct rawinput_message *raw_msg = arg; - const struct rawinput_device *device = NULL; - struct desktop *target_desktop = NULL, *desktop = NULL; - struct thread *target_thread = NULL, *foreground = NULL; + const struct rawinput_message *raw_msg = args; + const struct rawinput_device *device; struct hardware_msg_data *msg_data; struct message *msg; data_size_t report_size = 0, data_size = 0; @@ -1942,26 +1939,16 @@ static int queue_rawinput_message( struct process* process, void *arg ) data_size = offsetof(RAWHID, bRawData[0]); report_size = raw_msg->data.hid.dwCount * raw_msg->data.hid.dwSizeHid; } - if (!device) return 0; - - if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return 0; - - if (raw_msg->desktop) desktop = (struct desktop *)grab_object( raw_msg->desktop ); - else if (!(desktop = get_desktop_obj( process, process->desktop, 0 ))) goto done; + if (!device) return; - if (raw_msg->foreground) foreground = (struct thread *)grab_object( raw_msg->foreground ); - else if (!(foreground = get_foreground_thread( desktop, 0 ))) goto done; - - if (process != foreground->process) + if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return; + if (process != raw_msg->foreground->process) { - if (raw_msg->message == WM_INPUT && !(device->flags & RIDEV_INPUTSINK)) goto done; - if (!(target_thread = get_window_thread( device->target ))) goto done; - if (!(target_desktop = get_thread_desktop( target_thread, 0 ))) goto done; - if (target_desktop != desktop) goto done; + if (raw_msg->message == WM_INPUT && !(device->flags & RIDEV_INPUTSINK)) return; wparam = RIM_INPUTSINK; } - if (!(msg = alloc_hardware_message( info, raw_msg->source, raw_msg->time, data_size + report_size ))) goto done; + if (!(msg = alloc_hardware_message( info, raw_msg->source, raw_msg->time, data_size + report_size ))) return; msg->win = device->target; msg->msg = raw_msg->message; msg->wparam = wparam; @@ -1980,13 +1967,14 @@ static int queue_rawinput_message( struct process* process, void *arg ) } queue_hardware_message( desktop, msg, 1 ); +} -done: - if (target_thread) release_object( target_thread ); - if (target_desktop) release_object( target_desktop ); - if (foreground) release_object( foreground ); - if (desktop) release_object( desktop ); - return 0; +static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_message *raw_msg ) +{ + struct process *process; + + LIST_FOR_EACH_ENTRY( process, &rawinput_processes, struct process, rawinput_entry ) + queue_rawinput_message( desktop, process, raw_msg ); } /* queue a hardware message for a mouse event */ @@ -2050,7 +2038,6 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons { memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; - raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; @@ -2058,7 +2045,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons rawmouse_init( &raw_msg.rawinput, &raw_msg.data.mouse, x - desktop->cursor.x, y - desktop->cursor.y, raw_msg.flags, input->mouse.data, input->mouse.info ); - enum_processes( queue_rawinput_message, &raw_msg ); + dispatch_rawinput_message( desktop, &raw_msg ); release_object( foreground ); } @@ -2105,7 +2092,6 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c struct hw_msg_source source = { IMDT_KEYBOARD, origin }; const struct rawinput_device *device; struct hardware_msg_data *msg_data; - struct rawinput_message raw_msg; struct message *msg; struct thread *foreground; unsigned char vkey = input->kbd.vkey; @@ -2180,9 +2166,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c if ((foreground = get_foreground_thread( desktop, win ))) { - memset( &raw_msg, 0, sizeof(raw_msg) ); + struct rawinput_message raw_msg = {0}; raw_msg.foreground = foreground; - raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; @@ -2190,7 +2175,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c rawkeyboard_init( &raw_msg.rawinput, &raw_msg.data.keyboard, input->kbd.scan, vkey, raw_msg.flags, message_code, input->kbd.info ); - enum_processes( queue_rawinput_message, &raw_msg ); + dispatch_rawinput_message( desktop, &raw_msg ); release_object( foreground ); } @@ -2236,26 +2221,28 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ unsigned int origin, const hw_input_t *input ) { struct hw_msg_source source = { IMDT_UNAVAILABLE, origin }; - struct rawinput_message raw_msg; + struct thread *foreground; struct message *msg; switch (input->hw.msg) { case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: - memset( &raw_msg, 0, sizeof(raw_msg) ); - raw_msg.source = source; - raw_msg.time = get_tick_count(); - raw_msg.message = input->hw.msg; - raw_msg.hid_report = get_req_data(); if (input->hw.hid.length * input->hw.hid.count != get_req_data_size()) - { set_error( STATUS_INVALID_PARAMETER ); - return; + else if ((foreground = get_foreground_thread( desktop, win ))) + { + struct rawinput_message raw_msg = {0}; + raw_msg.foreground = foreground; + raw_msg.source = source; + raw_msg.time = get_tick_count(); + raw_msg.message = input->hw.msg; + raw_msg.hid_report = get_req_data(); + rawhid_init( &raw_msg.rawinput, &raw_msg.data.hid, input ); + + dispatch_rawinput_message( desktop, &raw_msg ); + release_object( foreground ); } - rawhid_init( &raw_msg.rawinput, &raw_msg.data.hid, input ); - - enum_processes( queue_rawinput_message, &raw_msg ); return; }

1 0

Rémi Bernon : server: Keep a list of processes that can receive rawinput messages.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: c43b1ecbc3e8509b1f4778d799f9759eb64dda40 URL: https://gitlab.winehq.org/wine/wine/-/commit/c43b1ecbc3e8509b1f4778d799f975… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 25 09:53:09 2024 +0100 server: Keep a list of processes that can receive rawinput messages. --- server/process.c | 2 ++ server/process.h | 1 + server/queue.c | 24 ++++++++++++++++++++++++ server/user.h | 1 + server/winstation.c | 30 +++++++++++++++++++++++++++++- 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 349aa87be3d..c9ab161e3fb 100644 --- a/server/process.c +++ b/server/process.c @@ -684,6 +684,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; memset( &process->image_info, 0, sizeof(process->image_info) ); + list_init( &process->rawinput_entry ); list_init( &process->kernel_object ); list_init( &process->thread_list ); list_init( &process->locks ); @@ -784,6 +785,7 @@ static void process_destroy( struct object *obj ) if (process->idle_event) release_object( process->idle_event ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); + list_remove( &process->rawinput_entry ); free( process->rawinput_devices ); free( process->dir_cache ); free( process->image ); diff --git a/server/process.h b/server/process.h index 97e0d455ece..1e73e9d47dc 100644 --- a/server/process.h +++ b/server/process.h @@ -83,6 +83,7 @@ struct process unsigned int rawinput_device_count; /* number of registered rawinput devices */ const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ + struct list rawinput_entry; /* entry in the rawinput process list */ struct list kernel_object; /* list of kernel object pointers */ pe_image_info_t image_info; /* main exe image info */ }; diff --git a/server/queue.c b/server/queue.c index dbd83c43217..041df36331e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -50,6 +50,8 @@ enum message_kind { SEND_MESSAGE, POST_MESSAGE }; #define NB_MSG_KINDS (POST_MESSAGE+1) +/* list of processes registered for rawinput in the input desktop */ +static struct list rawinput_processes = LIST_INIT(rawinput_processes); struct message_result { @@ -2620,6 +2622,14 @@ static struct desktop *get_hardware_input_desktop( user_handle_t win ) return desktop; } +/* enable or disable rawinput for a given process */ +void set_rawinput_process( struct process *process, int enable ) +{ + list_remove( &process->rawinput_entry ); /* remove it first, it might already be in the list */ + if (!process->rawinput_device_count || !enable) list_init( &process->rawinput_entry ); + else list_add_tail( &rawinput_processes, &process->rawinput_entry ); +} + /* check if the thread owning the window is hung */ DECL_HANDLER(is_window_hung) @@ -3639,12 +3649,15 @@ DECL_HANDLER(update_rawinput_devices) unsigned int device_count = get_req_data_size() / sizeof (*devices); size_t size = device_count * sizeof(*devices); struct process *process = current->process; + struct winstation *winstation; + struct desktop *desktop; if (!size) { process->rawinput_device_count = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; + set_rawinput_process( process, 0 ); return; } @@ -3659,4 +3672,15 @@ DECL_HANDLER(update_rawinput_devices) process->rawinput_mouse = find_rawinput_device( process, MAKELONG(HID_USAGE_GENERIC_MOUSE, HID_USAGE_PAGE_GENERIC) ); process->rawinput_kbd = find_rawinput_device( process, MAKELONG(HID_USAGE_GENERIC_KEYBOARD, HID_USAGE_PAGE_GENERIC) ); + + if ((winstation = get_visible_winstation()) && (desktop = get_input_desktop( winstation ))) + { + struct thread *thread; + + /* one of the process thread might be connected to the input desktop, update the full list */ + LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 1 ); + + release_object( desktop ); + } } diff --git a/server/user.h b/server/user.h index c3ca90d5a77..b4cf618f87e 100644 --- a/server/user.h +++ b/server/user.h @@ -125,6 +125,7 @@ extern void post_win_event( struct thread *thread, unsigned int event, const WCHAR *module, data_size_t module_size, user_handle_t handle ); extern void free_hotkeys( struct desktop *desktop, user_handle_t window ); +extern void set_rawinput_process( struct process *process, int enable ); /* region functions */ diff --git a/server/winstation.c b/server/winstation.c index f6fe5fd9e57..373a1f7ba92 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -232,9 +232,27 @@ struct desktop *get_input_desktop( struct winstation *winstation ) /* changes the winstation current input desktop and update its input time */ int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ) { + struct desktop *old_desktop = winstation->input_desktop; + struct thread *thread; + if (!(winstation->flags & WSF_VISIBLE)) return 0; if (new_desktop) new_desktop->input_time = current_time; - winstation->input_desktop = new_desktop; + if (old_desktop == new_desktop) return 1; + + if (old_desktop) + { + /* disconnect every process of the old input desktop from rawinput */ + LIST_FOR_EACH_ENTRY( thread, &old_desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 0 ); + } + + if ((winstation->input_desktop = new_desktop)) + { + /* connect every process of the new input desktop to rawinput */ + LIST_FOR_EACH_ENTRY( thread, &new_desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 1 ); + } + return 1; } @@ -376,6 +394,9 @@ static void add_desktop_thread( struct desktop *desktop, struct thread *thread ) desktop->close_timeout = NULL; } } + + /* if thread process is now connected to the input desktop, let it receive rawinput */ + if (desktop == desktop->winstation->input_desktop) set_rawinput_process( thread->process, 1 ); } /* remove a user of the desktop and start the close timeout if necessary */ @@ -394,6 +415,13 @@ static void remove_desktop_thread( struct desktop *desktop, struct thread *threa if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); } + + if (desktop == desktop->winstation->input_desktop) + { + /* thread process might still be connected the input desktop through another thread, update the full list */ + LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 1 ); + } } /* set the thread default desktop handle */

1 0

Rémi Bernon : server: Keep a list of threads connected to each desktop.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: f7303cf7b6f57c7b0baa1dc4f1a1f600d5ce0f61 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7303cf7b6f57c7b0baa1dc4f1a1f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 22:00:12 2024 +0100 server: Keep a list of threads connected to each desktop. --- server/thread.h | 1 + server/user.h | 1 + server/winstation.c | 53 +++++++++++++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/server/thread.h b/server/thread.h index 8dcf966a90a..766ed78a72f 100644 --- a/server/thread.h +++ b/server/thread.h @@ -51,6 +51,7 @@ struct thread struct object obj; /* object header */ struct list entry; /* entry in system-wide thread list */ struct list proc_entry; /* entry in per-process thread list */ + struct list desktop_entry; /* entry in per-desktop thread list */ struct process *process; thread_id_t id; /* thread id */ struct list mutex_list; /* list of currently owned mutexes */ diff --git a/server/user.h b/server/user.h index 1acd0638520..c3ca90d5a77 100644 --- a/server/user.h +++ b/server/user.h @@ -70,6 +70,7 @@ struct desktop struct winstation *winstation; /* winstation this desktop belongs to */ timeout_t input_time; /* last time this desktop had the input */ struct list entry; /* entry in winstation list of desktops */ + struct list threads; /* list of threads connected to this desktop */ struct window *top_window; /* desktop window for this desktop */ struct window *msg_window; /* HWND_MESSAGE top window */ struct hook_table *global_hooks; /* table of global hooks on this desktop */ diff --git a/server/winstation.c b/server/winstation.c index 00afe0119ff..f6fe5fd9e57 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -273,6 +273,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned desktop->close_timeout = NULL; desktop->foreground_input = NULL; desktop->users = 0; + list_init( &desktop->threads ); memset( &desktop->cursor, 0, sizeof(desktop->cursor) ); memset( desktop->keystate, 0, sizeof(desktop->keystate) ); list_add_tail( &winstation->desktops, &desktop->entry ); @@ -362,26 +363,37 @@ static void close_desktop_timeout( void *private ) } /* add a user of the desktop and cancel the close timeout */ -static void add_desktop_user( struct desktop *desktop ) +static void add_desktop_thread( struct desktop *desktop, struct thread *thread ) { - desktop->users++; - if (desktop->close_timeout) + list_add_tail( &desktop->threads, &thread->desktop_entry ); + + if (!thread->process->is_system) { - remove_timeout_user( desktop->close_timeout ); - desktop->close_timeout = NULL; + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } } } /* remove a user of the desktop and start the close timeout if necessary */ -static void remove_desktop_user( struct desktop *desktop ) +static void remove_desktop_thread( struct desktop *desktop, struct thread *thread ) { struct process *process; - assert( desktop->users > 0 ); - desktop->users--; - /* if we have one remaining user, it has to be the manager of the desktop window */ - if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) - desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); + list_remove( &thread->desktop_entry ); + + if (!thread->process->is_system) + { + assert( desktop->users > 0 ); + desktop->users--; + + /* if we have one remaining user, it has to be the manager of the desktop window */ + if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) + desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); + } } /* set the thread default desktop handle */ @@ -390,7 +402,7 @@ void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, if (thread->desktop) return; /* nothing to do */ thread->desktop = handle; - if (!thread->process->is_system) add_desktop_user( desktop ); + add_desktop_thread( desktop, thread ); } /* set the process default desktop handle */ @@ -500,14 +512,11 @@ void release_thread_desktop( struct thread *thread, int close ) if (!(handle = thread->desktop)) return; - if (!thread->process->is_system) + if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ + else { - if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ - else - { - remove_desktop_user( desktop ); - release_object( desktop ); - } + remove_desktop_thread( desktop, thread ); + release_object( desktop ); } if (close) @@ -730,10 +739,10 @@ DECL_HANDLER(set_thread_desktop) else { current->desktop = req->handle; /* FIXME: should we close the old one? */ - if (!current->process->is_system && old_desktop != new_desktop) + if (old_desktop != new_desktop) { - add_desktop_user( new_desktop ); - if (old_desktop) remove_desktop_user( old_desktop ); + if (old_desktop) remove_desktop_thread( old_desktop, current ); + add_desktop_thread( new_desktop, current ); } }

1 0

Rémi Bernon : server: Send hardware input to the visible input desktop.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 496eed7aafdb4bce0963bd4258b9a8096e8b4696 URL: https://gitlab.winehq.org/wine/wine/-/commit/496eed7aafdb4bce0963bd4258b9a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 25 09:33:06 2024 +0100 server: Send hardware input to the visible input desktop. When hwnd is specified, it is because it received a direct host input, so switch the input desktop to match the one that is receiving it. We don't validate that the sending thread uses the same desktop as the target window: it may not even be the case for drivers with a separate thread that listens on input events. --- dlls/user32/tests/winstation.c | 6 ++---- server/queue.c | 40 ++++++++++++++++++++++++++++------------ server/user.h | 3 +++ server/winstation.c | 13 +++++++++++-- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 11ad7685e97..bcbb55ee918 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -652,9 +652,8 @@ static void test_inputdesktop(void) win_skip("Skip tests on NT4\n"); return; } - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError()); - ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret); + ok(ret == 0 || broken(ret == 1) /* Win32 */, "unexpected return count %ld\n", ret); /* Set thread desktop back to the old thread desktop, SendInput should success. */ ret = SetThreadDesktop(old_thread_desk); @@ -699,9 +698,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError()); - ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret); + ok(ret == 0 || broken(ret == 1) /* Win32 */, "unexpected return count %ld\n", ret); /* Set thread desktop to the new desktop, SendInput should success. */ ret = SetThreadDesktop(new_desk); diff --git a/server/queue.c b/server/queue.c index 6f38227aa84..dbd83c43217 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2598,6 +2598,28 @@ void free_hotkeys( struct desktop *desktop, user_handle_t window ) } } +/* retrieve the desktop which should receive some hardware input event */ +static struct desktop *get_hardware_input_desktop( user_handle_t win ) +{ + struct winstation *winstation; + struct desktop *desktop; + struct thread *thread; + + if (!win || !(thread = get_window_thread( win ))) + { + if (!(winstation = get_visible_winstation())) return NULL; + return get_input_desktop( winstation ); + } + else + { + /* if window is specified, use its desktop to make it the input desktop */ + desktop = (struct desktop *)grab_object( thread->queue->input->desktop ); + release_object( thread ); + } + + return desktop; +} + /* check if the thread owning the window is hung */ DECL_HANDLER(is_window_hung) @@ -2767,22 +2789,17 @@ DECL_HANDLER(send_message) /* send a hardware message to a thread queue */ DECL_HANDLER(send_hardware_message) { - struct thread *thread = NULL; struct desktop *desktop; unsigned int origin = (req->flags & SEND_HWMSG_INJECTED ? IMO_INJECTED : IMO_HARDWARE); struct msg_queue *sender = get_current_queue(); - if (!(desktop = get_thread_desktop( current, 0 ))) return; - - if (req->win) + if (!(desktop = get_hardware_input_desktop( req->win ))) return; + if ((origin == IMO_INJECTED && desktop != current->queue->input->desktop) || + !set_input_desktop( desktop->winstation, desktop )) { - if (!(thread = get_window_thread( req->win ))) return; - if (desktop != thread->queue->input->desktop) - { - /* don't allow queuing events to a different desktop */ - release_object( desktop ); - return; - } + release_object( desktop ); + set_error( STATUS_ACCESS_DENIED ); + return; } reply->prev_x = desktop->cursor.x; @@ -2802,7 +2819,6 @@ DECL_HANDLER(send_hardware_message) default: set_error( STATUS_INVALID_PARAMETER ); } - if (thread) release_object( thread ); reply->new_x = desktop->cursor.x; reply->new_y = desktop->cursor.y; diff --git a/server/user.h b/server/user.h index 56b0eb685f0..1acd0638520 100644 --- a/server/user.h +++ b/server/user.h @@ -186,6 +186,9 @@ extern client_ptr_t get_class_client_ptr( struct window_class *class ); /* windows station functions */ +extern struct winstation *get_visible_winstation(void); +extern struct desktop *get_input_desktop( struct winstation *winstation ); +extern int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ); extern struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct winstation *get_process_winstation( struct process *process, unsigned int access ); extern struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ); diff --git a/server/winstation.c b/server/winstation.c index a23cd24261a..00afe0119ff 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -212,8 +212,17 @@ struct winstation *get_process_winstation( struct process *process, unsigned int access, &winstation_ops ); } +/* retrieve the visible winstation */ +struct winstation *get_visible_winstation(void) +{ + struct winstation *winstation; + LIST_FOR_EACH_ENTRY( winstation, &winstation_list, struct winstation, entry ) + if (winstation->flags & WSF_VISIBLE) return winstation; + return NULL; +} + /* retrieve the winstation current input desktop */ -static struct desktop *get_input_desktop( struct winstation *winstation ) +struct desktop *get_input_desktop( struct winstation *winstation ) { struct desktop *desktop; if (!(desktop = winstation->input_desktop)) return NULL; @@ -221,7 +230,7 @@ static struct desktop *get_input_desktop( struct winstation *winstation ) } /* changes the winstation current input desktop and update its input time */ -static int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ) +int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ) { if (!(winstation->flags & WSF_VISIBLE)) return 0; if (new_desktop) new_desktop->input_time = current_time;

1 0

Rémi Bernon : server: Keep track of the winstation input desktop.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: a1d63d109d10c80837b9bb8aff3af8648a2ee375 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1d63d109d10c80837b9bb8aff3af8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 21:03:41 2024 +0100 server: Keep track of the winstation input desktop. --- dlls/user32/tests/msg.c | 1 - dlls/user32/tests/winstation.c | 2 -- dlls/win32u/winstation.c | 10 ++++++++- include/wine/server_protocol.h | 17 ++++++++++++++- server/protocol.def | 6 ++++++ server/request.h | 4 ++++ server/trace.c | 8 +++++++ server/user.h | 2 ++ server/winstation.c | 48 +++++++++++++++++++++++++++++++++++++++++- 9 files changed, 92 insertions(+), 6 deletions(-)

1 0

Rémi Bernon : win32u: Introduce new NtUserSwitchDesktop syscall stub.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: c77261dd5c3000175434dc2c7dbc1f0ade9dc0e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c77261dd5c3000175434dc2c7dbc1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 11:03:02 2024 +0100 win32u: Introduce new NtUserSwitchDesktop syscall stub. --- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 12 ------ dlls/win32u/main.c | 5 +++ dlls/win32u/win32syscalls.h | 98 +++++++++++++++++++++++---------------------- dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 6 +++ dlls/wow64win/user.c | 7 ++++ include/ntuser.h | 1 + 8 files changed, 71 insertions(+), 62 deletions(-)

1 0

Zhiyi Zhang : Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()."
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: d287548c77350b81faa946b0977dffcbfcce9b83 URL: https://gitlab.winehq.org/wine/wine/-/commit/d287548c77350b81faa946b0977dff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 28 10:22:23 2024 +0800 Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()." This reverts commit 6f9d20806e821ab07c8adf81ae6630fae94b00ef. 6f9d208 was committed to work around a Nvidia driver bug that can cause vkGetRandROutputDisplayEXT() to generate an X exception and crash applications. The bug is later fixed in Nvidia driver 450.56.11 and newer. Thus 6f9d208 is no longer necessary on the newer Nvidia drivers. Then after 18ae96e, another bug in the Nvidia driver can cause vkGetRandROutputDisplayEXT() to hang forever when XLockDisplay() is called before vkGetRandROutputDisplayEXT() and this bug is still not fixed and affects multiple applications. Reverting 6f9d208 allows us to work around the vkGetRandROutputDisplayEXT() hang bug because then it no longer calls XLockDisplay() before vkGetRandROutputDisplayEXT(). Nvidia driver 455 was released on September 9th 2020 so hopefully the fix is already widespread. We could theoretically still keep 6f9d208 on older Nvidia drivers by doing version checks. But it's more straightforward to remove the workaround since it's not a bug of Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53428 --- dlls/winex11.drv/xrandr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5c0269f3550..d77eb1a0163 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -707,11 +707,9 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { - X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); - XSync( gdi_display, FALSE ); - if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) );

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024