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

Alexandros Frantzis : win32u: Implement keyboard auto-repeat using new server request.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: 7eb72b7bb3d3ea771efddcb5273e8a69456548ff URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb72b7bb3d3ea771efddcb5273e8a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 5 16:04:23 2024 +0300 win32u: Implement keyboard auto-repeat using new server request. --- dlls/win32u/message.c | 58 -------------------------------------------- dlls/win32u/ntuser_private.h | 5 ---- dlls/win32u/sysparams.c | 34 ++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 65 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 0f0fe22db33..d1f49ca3ed9 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -288,7 +288,6 @@ struct send_message_info }; static const INPUT_MESSAGE_SOURCE msg_source_unavailable = { IMDT_UNAVAILABLE, IMO_UNAVAILABLE }; -static BOOL keyboard_auto_repeat_enabled; /* flag for messages that contain pointers */ /* 32 messages per entry, messages 0..31 map to bits 0..31 */ @@ -516,13 +515,6 @@ static inline BOOL check_hwnd_filter( const MSG *msg, HWND hwnd_filter ) return (msg->hwnd == hwnd_filter || is_child( hwnd_filter, msg->hwnd )); } -BOOL set_keyboard_auto_repeat( BOOL enable ) -{ - BOOL enabled = keyboard_auto_repeat_enabled; - keyboard_auto_repeat_enabled = enable; - return enabled; -} - /*********************************************************************** * unpack_message * @@ -2306,21 +2298,6 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) } } - -static void handle_keyboard_repeat_message( HWND hwnd ) -{ - struct user_thread_info *thread_info = get_user_thread_info(); - MSG *msg = &thread_info->key_repeat_msg; - UINT speed; - - msg->lParam = (msg->lParam & ~(LPARAM)0xffff) + ((msg->lParam + 1) & 0xffff); - - if (NtUserSystemParametersInfo( SPI_GETKEYBOARDSPEED, 0, &speed, 0 )) - NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_KEY_REPEAT, 400 / (speed + 1) ); - - NtUserPostMessage( hwnd, msg->message, msg->wParam, msg->lParam ); -} - /*********************************************************************** * process_pointer_message * @@ -2413,37 +2390,6 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, if (ImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), msg->wParam, msg->lParam, 0 )) msg->wParam = VK_PROCESSKEY; - /* set/kill timers for key auto-repeat */ - if (remove && keyboard_auto_repeat_enabled) - { - struct user_thread_info *thread_info = get_user_thread_info(); - - switch (msg->message) - { - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - { - UINT delay; - - if (msg->wParam == VK_PROCESSKEY) break; - - if (thread_info->key_repeat_msg.hwnd != msg->hwnd) - kill_system_timer( thread_info->key_repeat_msg.hwnd, SYSTEM_TIMER_KEY_REPEAT ); - thread_info->key_repeat_msg = *msg; - if (NtUserSystemParametersInfo( SPI_GETKEYBOARDDELAY, 0, &delay, 0 )) - NtUserSetSystemTimer( msg->hwnd, SYSTEM_TIMER_KEY_REPEAT, (delay + 1) * 250 ); - break; - } - - case WM_KEYUP: - case WM_SYSKEYUP: - /* Only stop repeat if the scan codes match. */ - if ((thread_info->key_repeat_msg.lParam & 0x01ff0000) == (msg->lParam & 0x01ff0000)) - kill_system_timer( thread_info->key_repeat_msg.hwnd, SYSTEM_TIMER_KEY_REPEAT ); - break; - } - } - return TRUE; } @@ -3652,10 +3598,6 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) case SYSTEM_TIMER_TRACK_MOUSE: update_mouse_tracking_info( msg->hwnd ); return 0; - - case SYSTEM_TIMER_KEY_REPEAT: - handle_keyboard_repeat_message( msg->hwnd ); - return 0; } } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index f0bd14179d4..020c98005df 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -33,9 +33,6 @@ enum system_timer_id { SYSTEM_TIMER_TRACK_MOUSE = 0xfffa, SYSTEM_TIMER_CARET = 0xffff, - - /* not compatible with native */ - SYSTEM_TIMER_KEY_REPEAT = 0xfff0, }; struct user_object @@ -120,7 +117,6 @@ struct user_thread_info struct received_message_info *receive_info; /* Message being currently received */ struct user_key_state_info *key_state; /* Cache of global key state */ struct imm_thread_data *imm_thread_data; /* IMM thread data */ - MSG key_repeat_msg; /* Last WM_KEYDOWN message to repeat */ HKL kbd_layout; /* Current keyboard layout */ UINT kbd_layout_id; /* Current keyboard layout ID */ struct hardware_msg_data *rawinput; /* Current rawinput message data */ @@ -249,7 +245,6 @@ struct peek_message_filter }; extern int peek_message( MSG *msg, const struct peek_message_filter *filter ); -extern BOOL set_keyboard_auto_repeat( BOOL enable ); /* systray.c */ extern LRESULT system_tray_call( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, void *data ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e465ec66af3..71e52b71719 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3793,6 +3793,25 @@ BOOL WINAPI NtUserPerMonitorDPIPhysicalToLogicalPoint( HWND hwnd, POINT *pt ) return ret; } +/* Set server auto-repeat properties. delay and speed are expressed in terms of + * SPI_KEYBOARDDELAY and SPI_KEYBOARDSPEED values. Returns whether auto-repeat + * was enabled before this request. */ +static BOOL set_server_keyboard_repeat( int enable, int delay, int speed ) +{ + BOOL enabled = FALSE; + + SERVER_START_REQ( set_keyboard_repeat ) + { + req->enable = enable >= 0 ? (enable > 0) : -1; + req->delay = delay >= 0 ? (delay + 1) * 250 : -1; + req->period = speed >= 0 ? 400 / (speed + 1) : -1; + if (!wine_server_call( req )) enabled = reply->enable; + } + SERVER_END_REQ; + + return enabled; +} + /* retrieve the cached base keys for a given entry */ static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { @@ -5023,7 +5042,8 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w break; case SPI_SETKEYBOARDSPEED: if (val > 31) val = 31; - ret = set_entry( &entry_KEYBOARDSPEED, val, ptr, winini ); + if ((ret = set_entry( &entry_KEYBOARDSPEED, val, ptr, winini ))) + set_server_keyboard_repeat( -1, -1, val ); break; WINE_SPI_WARN(SPI_LANGDRIVER); /* not implemented in Windows */ @@ -5067,7 +5087,8 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w ret = get_entry( &entry_KEYBOARDDELAY, val, ptr ); break; case SPI_SETKEYBOARDDELAY: - ret = set_entry( &entry_KEYBOARDDELAY, val, ptr, winini ); + if ((ret = set_entry( &entry_KEYBOARDDELAY, val, ptr, winini ))) + set_server_keyboard_repeat( -1, val, -1 ); break; case SPI_ICONVERTICALSPACING: if (ptr != NULL) @@ -6323,6 +6344,15 @@ static void thread_detach(void) exiting_thread_id = 0; } +static BOOL set_keyboard_auto_repeat( BOOL enable ) +{ + UINT delay, speed; + + get_entry( &entry_KEYBOARDDELAY, 0, &delay ); + get_entry( &entry_KEYBOARDSPEED, 0, &speed ); + return set_server_keyboard_repeat( enable, delay, speed ); +} + /*********************************************************************** * NtUserCallNoParam (win32u.@) */

1 0

Rémi Bernon : win32u: Parameterize get_monitor_info dpi.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: f80204011322f4652133057e2217af5cf4f1f98a URL: https://gitlab.winehq.org/wine/wine/-/commit/f80204011322f4652133057e2217af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 20:27:46 2024 +0200 win32u: Parameterize get_monitor_info dpi. --- dlls/win32u/defwnd.c | 2 +- dlls/win32u/input.c | 2 +- dlls/win32u/menu.c | 2 +- dlls/win32u/sysparams.c | 5 ++--- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 10 +++++----- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 95ad9481958..f549f922fd7 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -826,7 +826,7 @@ static void sys_command_size_move( HWND hwnd, WPARAM wparam ) mon = newmon; info.cbSize = sizeof(info); - if (mon && get_monitor_info( mon, &info )) + if (mon && get_monitor_info( mon, &info, get_thread_dpi() )) { pt.x = max( pt.x, info.rcWork.left ); pt.x = min( pt.x, info.rcWork.right - 1 ); diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 05d8eb05d12..5b25086cb6f 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2520,7 +2520,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (!reset && clipping_cursor && thread_info->clipping_cursor) return FALSE; /* already clipping */ if (!(monitor = NtUserMonitorFromWindow( hwnd, MONITOR_DEFAULTTONEAREST ))) return FALSE; - if (!NtUserGetMonitorInfo( monitor, &monitor_info )) return FALSE; + if (!get_monitor_info( monitor, &monitor_info, 0 )) return FALSE; if (!grab_fullscreen) { RECT virtual_rect = NtUserGetVirtualScreenRect(); diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 05eb5445395..8a3f1350004 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -3068,7 +3068,7 @@ static BOOL show_popup( HWND owner, HMENU hmenu, UINT id, UINT flags, pt.y = y; monitor = monitor_from_point( pt, MONITOR_DEFAULTTONEAREST, get_thread_dpi() ); info.cbSize = sizeof(info); - get_monitor_info( monitor, &info ); + get_monitor_info( monitor, &info, get_thread_dpi() ); max_height = info.rcWork.bottom - info.rcWork.top; if (menu->cyMax) max_height = min( max_height, menu->cyMax ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 23b03d858a3..e465ec66af3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3594,10 +3594,9 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc return ret; } -BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) +BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info, UINT dpi ) { struct monitor *monitor; - UINT dpi = get_thread_dpi(); if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; @@ -6484,7 +6483,7 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return get_menu_info( UlongToHandle(arg1), (MENUINFO *)arg2 ); case NtUserCallTwoParam_GetMonitorInfo: - return get_monitor_info( UlongToHandle(arg1), (MONITORINFO *)arg2 ); + return get_monitor_info( UlongToHandle(arg1), (MONITORINFO *)arg2, get_thread_dpi() ); case NtUserCallTwoParam_GetSystemMetricsForDpi: return get_system_metrics_for_dpi( arg1, arg2 ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 43cdda55e2c..96517ef081a 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -163,7 +163,7 @@ extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, int *height ); extern INT get_display_depth( UNICODE_STRING *name ); extern RECT get_display_rect( const WCHAR *display ); extern UINT get_monitor_dpi( HMONITOR monitor ); -extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ); +extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info, UINT dpi ); extern UINT get_win_monitor_dpi( HWND hwnd ); extern RECT get_primary_monitor_rect( UINT dpi ); extern DWORD get_process_layout(void); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index eed4b914331..8ca49afcd87 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2355,7 +2355,7 @@ static BOOL get_work_rect( HWND hwnd, RECT *rect ) if (!monitor) return FALSE; mon_info.cbSize = sizeof(mon_info); - get_monitor_info( monitor, &mon_info ); + get_monitor_info( monitor, &mon_info, get_thread_dpi() ); *rect = mon_info.rcMonitor; style = get_window_long( hwnd, GWL_STYLE ); @@ -2508,7 +2508,7 @@ static void make_rect_onscreen( RECT *rect ) HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTONEAREST, get_thread_dpi() ); info.cbSize = sizeof(info); - if (!monitor || !get_monitor_info( monitor, &info )) return; + if (!monitor || !get_monitor_info( monitor, &info, get_thread_dpi() )) return; /* FIXME: map coordinates from rcWork to rcMonitor */ if (rect->right <= info.rcWork.left) { @@ -4019,7 +4019,7 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) HMONITOR monitor = monitor_from_window( hwnd, MONITOR_DEFAULTTOPRIMARY, get_thread_dpi() ); mon_info.cbSize = sizeof( mon_info ); - get_monitor_info( monitor, &mon_info ); + get_monitor_info( monitor, &mon_info, get_thread_dpi() ); parent_rect = mon_info.rcWork; } else get_client_rect( parent, &parent_rect, get_thread_dpi() ); @@ -4203,7 +4203,7 @@ static UINT arrange_iconic_windows( HWND parent ) HMONITOR monitor = monitor_from_window( 0, MONITOR_DEFAULTTOPRIMARY, get_thread_dpi() ); mon_info.cbSize = sizeof( mon_info ); - get_monitor_info( monitor, &mon_info ); + get_monitor_info( monitor, &mon_info, get_thread_dpi() ); parent_rect = mon_info.rcWork; } else get_client_rect( parent, &parent_rect, get_thread_dpi() ); @@ -5035,7 +5035,7 @@ static void fix_cs_coordinates( CREATESTRUCTW *cs, INT *sw ) monitor = monitor_from_window( cs->hwndParent, MONITOR_DEFAULTTOPRIMARY, get_thread_dpi() ); mon_info.cbSize = sizeof(mon_info); - get_monitor_info( monitor, &mon_info ); + get_monitor_info( monitor, &mon_info, get_thread_dpi() ); if (is_default_coord( cs->x )) {

1 0

Rémi Bernon : win32u: Use get_monitor_rect in more places.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: f57d5305035049e8d738ee7b757b1030bc06a3c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f57d5305035049e8d738ee7b757b10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 20:07:02 2024 +0200 win32u: Use get_monitor_rect in more places. --- dlls/win32u/sysparams.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 006c8820b7b..56410cbf48c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2102,9 +2102,10 @@ UINT get_monitor_dpi( HMONITOR monitor ) return system_dpi; } -static RECT get_monitor_rect( struct monitor *monitor, UINT dpi ) +static RECT get_monitor_rect( struct monitor *monitor, BOOL work, UINT dpi ) { - return map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), dpi ); + RECT rect = work ? monitor->rc_work : monitor->rc_monitor; + return map_dpi_rect( rect, get_monitor_dpi( monitor->handle ), dpi ); } /********************************************************************** @@ -2285,13 +2286,14 @@ RECT get_virtual_screen_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { + RECT monitor_rect; if (!is_monitor_active( monitor ) || monitor->is_clone) continue; - union_rect( &rect, &rect, &monitor->rc_monitor ); + monitor_rect = get_monitor_rect( monitor, FALSE, dpi ); + union_rect( &rect, &rect, &monitor_rect ); } unlock_display_devices(); - if (dpi) rect = map_dpi_rect( rect, system_dpi, dpi ); return rect; } @@ -2308,7 +2310,7 @@ static BOOL is_window_rect_full_screen( const RECT *rect, UINT dpi ) if (!is_monitor_active( monitor ) || monitor->is_clone) continue; - monrect = get_monitor_rect( monitor, dpi ); + monrect = get_monitor_rect( monitor, FALSE, dpi ); if (rect->left <= monrect.left && rect->right >= monrect.right && rect->top <= monrect.top && rect->bottom >= monrect.bottom) { @@ -2338,7 +2340,7 @@ RECT get_display_rect( const WCHAR *display ) struct monitor *monitor; UNICODE_STRING name; RECT rect = {0}; - UINT index; + UINT index, dpi = get_thread_dpi(); RtlInitUnicodeString( &name, display ); if (!(index = get_display_index( &name ))) return rect; @@ -2347,12 +2349,12 @@ RECT get_display_rect( const WCHAR *display ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { if (!monitor->source || monitor->source->id + 1 != index) continue; - rect = monitor->rc_monitor; + rect = get_monitor_rect( monitor, FALSE, dpi ); break; } unlock_display_devices(); - return map_dpi_rect( rect, system_dpi, get_thread_dpi() ); + return rect; } RECT get_primary_monitor_rect( UINT dpi ) @@ -2365,12 +2367,12 @@ RECT get_primary_monitor_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { if (!is_monitor_primary( monitor )) continue; - rect = monitor->rc_monitor; + rect = get_monitor_rect( monitor, FALSE, dpi ); break; } unlock_display_devices(); - return map_dpi_rect( rect, system_dpi, dpi ); + return rect; } /********************************************************************** @@ -3505,7 +3507,7 @@ static BOOL should_enumerate_monitor( struct monitor *monitor, const POINT *orig if (!is_monitor_active( monitor )) return FALSE; if (monitor->is_clone) return FALSE; - *rect = get_monitor_rect( monitor, get_thread_dpi() ); + *rect = get_monitor_rect( monitor, FALSE, get_thread_dpi() ); OffsetRect( rect, -origin->x, -origin->y ); return intersect_rect( rect, rect, limit ); } @@ -3595,7 +3597,7 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) { struct monitor *monitor; - UINT dpi_from, dpi_to; + UINT dpi = get_thread_dpi(); if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; @@ -3606,9 +3608,8 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) if (monitor->handle != handle) continue; if (!is_monitor_active( monitor )) continue; - /* FIXME: map dpi */ - info->rcMonitor = monitor->rc_monitor; - info->rcWork = monitor->rc_work; + info->rcMonitor = get_monitor_rect( monitor, FALSE, dpi ); + info->rcWork = get_monitor_rect( monitor, TRUE, dpi ); info->dwFlags = is_monitor_primary( monitor ) ? MONITORINFOF_PRIMARY : 0; if (info->cbSize >= sizeof(MONITORINFOEXW)) { @@ -3619,12 +3620,6 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) } unlock_display_devices(); - if ((dpi_to = get_thread_dpi())) - { - dpi_from = get_monitor_dpi( handle ); - info->rcMonitor = map_dpi_rect( info->rcMonitor, dpi_from, dpi_to ); - info->rcWork = map_dpi_rect( info->rcWork, dpi_from, dpi_to ); - } TRACE( "flags %04x, monitor %s, work %s\n", (int)info->dwFlags, wine_dbgstr_rect(&info->rcMonitor), wine_dbgstr_rect(&info->rcWork)); return TRUE; @@ -3658,7 +3653,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) if (!is_monitor_active( monitor ) || monitor->is_clone) continue; - monitor_rect = get_monitor_rect( monitor, system_dpi ); + monitor_rect = get_monitor_rect( monitor, FALSE, system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r )) { /* check for larger intersecting area */ @@ -5244,6 +5239,8 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w } case SPI_GETWORKAREA: { + UINT dpi = get_thread_dpi(); + if (!ptr) return FALSE; spi_idx = SPI_SETWORKAREA_IDX; @@ -5256,14 +5253,14 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { if (!is_monitor_primary( monitor )) continue; - work_area = monitor->rc_work; + work_area = get_monitor_rect( monitor, TRUE, dpi ); break; } unlock_display_devices(); spi_loaded[spi_idx] = TRUE; } - *(RECT *)ptr = map_dpi_rect( work_area, system_dpi, get_thread_dpi() ); + *(RECT *)ptr = work_area; ret = TRUE; TRACE("work area %s\n", wine_dbgstr_rect( &work_area )); break;

1 0

Rémi Bernon : winex11: Force the DPI context when restoring cursor clipping.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: 949a3b891bdf16851b67ffe7fa1267bacb0382d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/949a3b891bdf16851b67ffe7fa1267… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 20:20:33 2024 +0200 winex11: Force the DPI context when restoring cursor clipping. Avoiding any lossy conversion. --- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/mouse.c | 11 +++++------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 88863e62dd1..095820596de 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -772,7 +772,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (event->detail == NotifyPointer) return FALSE; /* when focusing in the virtual desktop window, re-apply the cursor clipping rect */ - if (is_virtual_desktop() && hwnd == NtUserGetDesktopWindow()) retry_grab_clipping_window(); + if (is_virtual_desktop() && hwnd == NtUserGetDesktopWindow()) reapply_cursor_clipping(); if (hwnd == NtUserGetDesktopWindow()) return FALSE; x11drv_thread_data()->keymapnotify_hwnd = hwnd; @@ -780,7 +780,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) /* when keyboard grab is released, re-apply the cursor clipping rect */ was_grabbed = keyboard_grabbed; keyboard_grabbed = event->mode == NotifyGrab || event->mode == NotifyWhileGrabbed; - if (was_grabbed > keyboard_grabbed) retry_grab_clipping_window(); + if (was_grabbed > keyboard_grabbed) reapply_cursor_clipping(); /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ if (event->mode == NotifyGrab || event->mode == NotifyUngrab) return FALSE; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1196986424d..dce3c888170 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -458,15 +458,14 @@ void ungrab_clipping_window(void) } /*********************************************************************** - * retry_grab_clipping_window - * - * Restore the current clip rectangle. + * reapply_cursor_clipping */ -void retry_grab_clipping_window(void) +void reapply_cursor_clipping(void) { RECT rect; - NtUserGetClipCursor( &rect ); - NtUserClipCursor( &rect ); + UINT context = NtUserSetThreadDpiAwarenessContext( NTUSER_DPI_PER_MONITOR_AWARE ); + if (NtUserGetClipCursor( &rect )) NtUserClipCursor( &rect ); + NtUserSetThreadDpiAwarenessContext( context ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a221198ffbc..be76dd2609e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -674,7 +674,7 @@ extern UINT get_win_monitor_dpi( HWND hwnd ); extern BOOL is_current_process_focused(void); extern void X11DRV_SetFocus( HWND hwnd ); extern void set_window_cursor( Window window, HCURSOR handle ); -extern void retry_grab_clipping_window(void); +extern void reapply_cursor_clipping(void); extern void ungrab_clipping_window(void); extern void move_resize_window( HWND hwnd, int dir ); extern void X11DRV_InitKeyboard( Display *display );

1 0

Rémi Bernon : win32u: Parameterize get_clip_cursor dpi.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: fd7fcc995edeb2fdccb986ff39cdd136bb376ebb URL: https://gitlab.winehq.org/wine/wine/-/commit/fd7fcc995edeb2fdccb986ff39cdd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 20:14:50 2024 +0200 win32u: Parameterize get_clip_cursor dpi. --- dlls/win32u/input.c | 7 +++---- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index a58a8369559..05d8eb05d12 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2553,9 +2553,8 @@ BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_P return FALSE; } -BOOL get_clip_cursor( RECT *rect ) +BOOL get_clip_cursor( RECT *rect, UINT dpi ) { - UINT dpi; BOOL ret; if (!rect) return FALSE; @@ -2568,7 +2567,7 @@ BOOL get_clip_cursor( RECT *rect ) } SERVER_END_REQ; - if (ret && (dpi = get_thread_dpi())) + if (ret) { HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, 0 ); *rect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), dpi ); @@ -2596,7 +2595,7 @@ BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) if (!grab_pointer) return TRUE; /* we are clipping if the clip rectangle is smaller than the screen */ - get_clip_cursor( &rect ); + get_clip_cursor( &rect, 0 ); intersect_rect( &rect, &rect, &virtual_rect ); if (EqualRect( &rect, &virtual_rect )) empty = TRUE; if (empty && !(flags & SET_CURSOR_FSCLIP)) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 56410cbf48c..23b03d858a3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6404,7 +6404,7 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return enum_clipboard_formats( arg ); case NtUserCallOneParam_GetClipCursor: - return get_clip_cursor( (RECT *)arg ); + return get_clip_cursor( (RECT *)arg, get_thread_dpi() ); case NtUserCallOneParam_GetCursorPos: return get_cursor_pos( (POINT *)arg ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 8cc4d1beed3..43cdda55e2c 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -103,7 +103,7 @@ extern BOOL set_caret_pos( int x, int y ); extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ); extern void toggle_caret( HWND hwnd ); extern void update_mouse_tracking_info( HWND hwnd ); -extern BOOL get_clip_cursor( RECT *rect ); +extern BOOL get_clip_cursor( RECT *rect, UINT dpi ); extern BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ); extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ); extern USHORT map_scan_to_kbd_vkey( USHORT scan, HKL layout );

1 0

Alexandros Frantzis : server: Pass desktop to get_first_global_hook.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: bf1da68aaaca32eccff80ff77bbd5382aaa07901 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf1da68aaaca32eccff80ff77bbd53… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 29 10:34:54 2024 +0300 server: Pass desktop to get_first_global_hook. --- server/hook.c | 4 ++-- server/queue.c | 2 +- server/user.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/hook.c b/server/hook.c index 5abdf39ad37..c22e3748b8b 100644 --- a/server/hook.c +++ b/server/hook.c @@ -372,10 +372,10 @@ unsigned int get_active_hooks(void) } /* return the thread that owns the first global hook */ -struct thread *get_first_global_hook( int id ) +struct thread *get_first_global_hook( struct desktop *desktop, int id ) { struct hook *hook; - struct hook_table *global_hooks = get_global_hooks( current ); + struct hook_table *global_hooks = desktop->global_hooks; if (!global_hooks) return NULL; if (!(hook = get_first_valid_hook( global_hooks, id - WH_MINHOOK, EVENT_MIN, 0, 0, 0 ))) return NULL; diff --git a/server/queue.c b/server/queue.c index 7a1a8b6ece6..55300f107bc 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1751,7 +1751,7 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa struct message *msg; timeout_t timeout = 2000 * -10000; /* FIXME: load from registry */ - if (!(hook_thread = get_first_global_hook( id ))) return 0; + if (!(hook_thread = get_first_global_hook( desktop, id ))) return 0; if (!(queue = hook_thread->queue)) return 0; if (is_queue_hung( queue )) return 0; diff --git a/server/user.h b/server/user.h index 703a55d5009..3b080356251 100644 --- a/server/user.h +++ b/server/user.h @@ -103,7 +103,7 @@ 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( int id ); +extern struct thread *get_first_global_hook( struct desktop *desktop, int id ); /* queue functions */

1 0

Alexandros Frantzis : server: Check message target process for raw input device flags.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: f95a44665f13264b3fa0406eb3d45ba85a0c685a URL: https://gitlab.winehq.org/wine/wine/-/commit/f95a44665f13264b3fa0406eb3d45b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Jun 4 15:24:24 2024 +0300 server: Check message target process for raw input device flags. --- server/queue.c | 56 ++++++++++++++++++-------------------------------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/server/queue.c b/server/queue.c index 55300f107bc..0bd714a92c1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1528,27 +1528,6 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys } } -/* update the desktop key state according to a mouse message flags */ -static void update_desktop_mouse_state( struct desktop *desktop, unsigned int flags, lparam_t wparam ) -{ - if (flags & MOUSEEVENTF_LEFTDOWN) - update_input_key_state( desktop, desktop->keystate, WM_LBUTTONDOWN, wparam ); - if (flags & MOUSEEVENTF_LEFTUP) - update_input_key_state( desktop, desktop->keystate, WM_LBUTTONUP, wparam ); - if (flags & MOUSEEVENTF_RIGHTDOWN) - update_input_key_state( desktop, desktop->keystate, WM_RBUTTONDOWN, wparam ); - if (flags & MOUSEEVENTF_RIGHTUP) - update_input_key_state( desktop, desktop->keystate, WM_RBUTTONUP, wparam ); - if (flags & MOUSEEVENTF_MIDDLEDOWN) - update_input_key_state( desktop, desktop->keystate, WM_MBUTTONDOWN, wparam ); - if (flags & MOUSEEVENTF_MIDDLEUP) - update_input_key_state( desktop, desktop->keystate, WM_MBUTTONUP, wparam ); - if (flags & MOUSEEVENTF_XDOWN) - update_input_key_state( desktop, desktop->keystate, WM_XBUTTONDOWN, wparam ); - if (flags & MOUSEEVENTF_XUP) - update_input_key_state( desktop, desktop->keystate, WM_XBUTTONUP, wparam ); -} - /* release the hardware message currently being processed by the given thread */ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id ) { @@ -1677,6 +1656,19 @@ static void prepend_cursor_history( int x, int y, unsigned int time, lparam_t in pos->info = info; } +static unsigned int get_rawinput_device_flags( struct process *process, struct message *msg ) +{ + switch (get_hardware_msg_bit( msg->msg )) + { + case QS_KEY: + return process->rawinput_kbd ? process->rawinput_kbd->flags : 0; + case QS_MOUSEMOVE: + case QS_MOUSEBUTTON: + return process->rawinput_mouse ? process->rawinput_mouse->flags : 0; + } + return 0; +} + /* queue a hardware message into a given thread input */ static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ) { @@ -1685,6 +1677,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg struct thread_input *input; struct hardware_msg_data *msg_data = msg->data; unsigned int msg_code; + int flags; update_input_key_state( desktop, desktop->keystate, msg->msg, msg->wparam ); last_input_time = get_tick_count(); @@ -1723,12 +1716,14 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg else input = desktop->foreground_input; win = find_hardware_message_window( desktop, input, msg, &msg_code, &thread ); - if (!win || !thread) + flags = thread ? get_rawinput_device_flags( thread->process, msg ) : 0; + if (!win || !thread || (flags & RIDEV_NOLEGACY)) { - if (input) update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); + if (input && !(flags & RIDEV_NOLEGACY)) update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); free_message( msg ); return; } + input = thread->queue->input; if (win != msg->win) always_queue = 1; @@ -1987,7 +1982,6 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input, unsigned int origin, struct msg_queue *sender ) { - const struct rawinput_device *device; struct hardware_msg_data *msg_data; struct rawinput_message raw_msg; struct message *msg; @@ -2056,13 +2050,6 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons release_object( foreground ); } - if ((device = current->process->rawinput_mouse) && (device->flags & RIDEV_NOLEGACY)) - { - if (flags & MOUSEEVENTF_MOVE) update_desktop_cursor_pos( desktop, win, x, y ); - update_desktop_mouse_state( desktop, flags, wparam ); - return 0; - } - for (i = 0; i < ARRAY_SIZE( messages ); i++) { if (!messages[i]) continue; @@ -2097,7 +2084,6 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c unsigned int origin, struct msg_queue *sender ) { struct hw_msg_source source = { IMDT_KEYBOARD, origin }; - const struct rawinput_device *device; struct hardware_msg_data *msg_data; struct message *msg; struct thread *foreground; @@ -2213,12 +2199,6 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c release_object( foreground ); } - if ((device = current->process->rawinput_kbd) && (device->flags & RIDEV_NOLEGACY)) - { - update_input_key_state( desktop, desktop->keystate, message_code, vkey ); - return 0; - } - if (!(msg = alloc_hardware_message( input->kbd.info, source, time, 0 ))) return 0; msg_data = msg->data;

1 0

Alistair Leslie-Hughes : odbccp32: Stop handle leak on error paths.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: dec2e818c0227d5373fae0a9da133b7a71a0b3b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/dec2e818c0227d5373fae0a9da133b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 7 21:14:13 2024 +1000 odbccp32: Stop handle leak on error paths. --- dlls/odbccp32/odbccp32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 62e35e85f75..95bfb90781e 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1003,6 +1003,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons value = malloc(len * sizeof(WCHAR)); if(!value) { + RegCloseKey(hkeydriver); ERR("Out of memory\n"); return; } @@ -1015,6 +1016,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons value = calloc(1, (lstrlenW(divider)+1) * sizeof(WCHAR)); if(!value) { + RegCloseKey(hkeydriver); ERR("Out of memory\n"); return; }

1 0

Rémi Bernon : winewayland: Force the DPI context when restoring cursor clipping.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: 3d351fddeb9a04b24a81528eaca1ea2d8499042e URL: https://gitlab.winehq.org/wine/wine/-/commit/3d351fddeb9a04b24a81528eaca1ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 20:20:33 2024 +0200 winewayland: Force the DPI context when restoring cursor clipping. Avoiding any lossy conversion. --- dlls/winewayland.drv/wayland_pointer.c | 11 +++++++++-- dlls/winewayland.drv/window.c | 12 +++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index df76a4e9954..1d8acaeabd2 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -659,12 +659,19 @@ clear_cursor: } } +static void reapply_cursor_clipping(void) +{ + RECT rect; + UINT context = NtUserSetThreadDpiAwarenessContext(NTUSER_DPI_PER_MONITOR_AWARE); + if (NtUserGetClipCursor(&rect)) NtUserClipCursor(&rect); + NtUserSetThreadDpiAwarenessContext(context); +} + static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) { struct wayland_pointer *pointer = &process_wayland.pointer; struct wayland_surface *surface; double scale; - RECT clip; BOOL reapply_clip = FALSE; if ((surface = wayland_surface_lock_hwnd(hwnd))) @@ -697,7 +704,7 @@ static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) /* Reapply cursor clip since cursor visibility affects pointer constraint * behavior. */ - if (reapply_clip && NtUserGetClipCursor(&clip)) NtUserClipCursor(&clip); + if (reapply_clip) reapply_cursor_clipping(); } /********************************************************************** diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index cd8ca76b679..73bee46cc35 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -199,12 +199,19 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, conf->managed = data->managed; } +static void reapply_cursor_clipping(void) +{ + RECT rect; + UINT context = NtUserSetThreadDpiAwarenessContext(NTUSER_DPI_PER_MONITOR_AWARE); + if (NtUserGetClipCursor(&rect )) NtUserClipCursor(&rect); + NtUserSetThreadDpiAwarenessContext(context); +} + static void wayland_win_data_update_wayland_surface(struct wayland_win_data *data) { struct wayland_surface *surface = data->wayland_surface; HWND parent = NtUserGetAncestor(data->hwnd, GA_PARENT); BOOL visible, xdg_visible; - RECT clip; WCHAR text[1024]; TRACE("hwnd=%p\n", data->hwnd); @@ -255,8 +262,7 @@ static void wayland_win_data_update_wayland_surface(struct wayland_win_data *dat /* Size/position changes affect the effective pointer constraint, so update * it as needed. */ - if (data->hwnd == NtUserGetForegroundWindow() && NtUserGetClipCursor(&clip)) - NtUserClipCursor(&clip); + if (data->hwnd == NtUserGetForegroundWindow()) reapply_cursor_clipping(); out: TRACE("hwnd=%p surface=%p=>%p\n", data->hwnd, data->wayland_surface, surface);

1 0

Rémi Bernon : winevulkan: Fix size mismatch when writing to return pointer.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: d138172b58b81c89a68c6d50a54606fbc5fa1efd URL: https://gitlab.winehq.org/wine/wine/-/commit/d138172b58b81c89a68c6d50a54606… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 7 14:11:31 2024 +0200 winevulkan: Fix size mismatch when writing to return pointer. Fixes vkMapMemory* writing past the returned pointer size in WOW64. --- dlls/winevulkan/make_vulkan | 45 ++++++++++++++++------- dlls/winevulkan/vulkan_thunks.c | 80 +++++++++++++++++++++++++++++++++++------ 2 files changed, 102 insertions(+), 23 deletions(-)

1 0