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

Alexandros Frantzis : server: Pass desktop to get_first_global_hook.
by Alexandre Julliard 07 Jun '24

07 Jun '24

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 07 Jun '24

07 Jun '24

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

Alexandros Frantzis : server: Implement key auto-repeat request.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 37e7038c5c314527dc242cdbe5e8a70000fdfe98 URL: https://gitlab.winehq.org/wine/wine/-/commit/37e7038c5c314527dc242cdbe5e8a7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon May 27 12:48:52 2024 +0300 server: Implement key auto-repeat request. --- include/wine/server_protocol.h | 21 +++++++++++++- server/protocol.def | 10 +++++++ server/queue.c | 62 ++++++++++++++++++++++++++++++++++++++++-- server/request.h | 8 ++++++ server/trace.c | 15 ++++++++++ server/user.h | 11 ++++++++ server/winstation.c | 2 ++ 7 files changed, 126 insertions(+), 3 deletions(-)

1 0

Alexandros Frantzis : win32u: Implement keyboard auto-repeat using new server request.
by Alexandre Julliard 07 Jun '24

07 Jun '24

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

Alexandre Julliard : msvcrt: Reimplement __crtCapturePreviousContext() based on RtlWalkFrameChain().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 356be34dcd2b1acfaa55c5d896b06a2628d41dfe URL: https://gitlab.winehq.org/wine/wine/-/commit/356be34dcd2b1acfaa55c5d896b06a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:19:57 2024 +0200 msvcrt: Reimplement __crtCapturePreviousContext() based on RtlWalkFrameChain(). --- dlls/msvcrt/except_arm64ec.c | 20 +++++++++++++++++++- dlls/msvcrt/except_x86_64.c | 36 ++++++++++++++---------------------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index 12790cee7d8..b2e723f79b3 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -144,7 +144,25 @@ int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, */ void __cdecl __crtCapturePreviousContext( CONTEXT *ctx ) { - FIXME("not implemented\n"); + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR pc, frame, base; + void *data; + ULONG i; + + RtlCaptureContext( ctx ); + for (i = 0; i < 2; i++) + { + pc = ctx->Rip; + if ((ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL) && RtlIsEcCode( pc )) pc -= 4; + if (!(func = RtlLookupFunctionEntry( pc, &base, &table ))) break; + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, pc, func, ctx, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!ctx->Rip) break; + if (!frame) break; + } } #endif diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 1c3cc62bc7f..e0fda975be4 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -133,33 +133,25 @@ int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, /********************************************************************* * __crtCapturePreviousContext (MSVCR110.@) */ -void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) +void __cdecl __crtCapturePreviousContext( CONTEXT *ctx ) { - ULONG64 frame, image_base; - RUNTIME_FUNCTION *rf; + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR frame, base; void *data; + ULONG i; - TRACE("(%p)\n", ctx); - - rf = RtlLookupFunctionEntry(ctx->Rip, &image_base, NULL); - if(!rf) { - FIXME("RtlLookupFunctionEntry failed\n"); - return; + RtlCaptureContext( ctx ); + for (i = 0; i < 2; i++) + { + if (!(func = RtlLookupFunctionEntry( ctx->Rip, &base, &table ))) break; + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, ctx->Rip, func, ctx, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) break; + if (!ctx->Rip) break; + if (!frame) break; } - - RtlVirtualUnwind(UNW_FLAG_NHANDLER, image_base, ctx->Rip, - rf, ctx, &data, &frame, NULL); } - -__ASM_GLOBAL_FUNC( __crtCapturePreviousContext, - "movq %rcx,8(%rsp)\n\t" - "call " __ASM_NAME("RtlCaptureContext") "\n\t" - "movq 8(%rsp),%rcx\n\t" /* context */ - "leaq 8(%rsp),%rax\n\t" - "movq %rax,0x98(%rcx)\n\t" /* context->Rsp */ - "movq (%rsp),%rax\n\t" - "movq %rax,0xf8(%rcx)\n\t" /* context->Rip */ - "jmp " __ASM_NAME("get_prev_context") ) #endif #endif /* __x86_64__ */

1 0

Alexandre Julliard : msvcrt: Use the __os_arm64x functions to get/set mxcsr on ARM64EC.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: ad6674efdbfbc828918f8cb3bb433a11424c66e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad6674efdbfbc828918f8cb3bb433a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:20:17 2024 +0200 msvcrt: Use the __os_arm64x functions to get/set mxcsr on ARM64EC. --- dlls/msvcrt/math.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a62705bc8f4..cbe17463b03 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -698,14 +698,36 @@ __int64 CDECL _abs64( __int64 n ) } #if defined(__i386__) || defined(__x86_64__) + +static unsigned int get_mxcsr(void) +{ + unsigned int ret; +#ifdef __arm64ec__ + extern NTSTATUS (*__os_arm64x_get_x64_information)(ULONG,void*,void*); + __os_arm64x_get_x64_information( 0, &ret, NULL ); +#else + __asm__ __volatile__( "stmxcsr %0" : "=m" (ret) ); +#endif + return ret; +} + +static void set_mxcsr( unsigned int val ) +{ +#ifdef __arm64ec__ + extern NTSTATUS (*__os_arm64x_set_x64_information)(ULONG,ULONG_PTR,void*); + __os_arm64x_set_x64_information( 0, val, NULL ); +#else + __asm__ __volatile__( "ldmxcsr %0" : : "m" (val) ); +#endif +} + static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { #if defined(__GNUC__) || defined(__clang__) - unsigned long old_fpword, fpword; + unsigned int old_fpword, fpword = get_mxcsr(); unsigned int flags; - __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); old_fpword = fpword; cw_mask &= _MCW_EM | _MCW_RC | _MCW_DN; @@ -785,8 +807,7 @@ static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, } } - if (fpword != old_fpword) - __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + if (fpword != old_fpword) set_mxcsr( fpword ); #else FIXME("not implemented\n"); if (cw) *cw = 0; @@ -993,7 +1014,7 @@ static void _setfp( unsigned int *cw, unsigned int cw_mask, __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); if (old_fpcr != fpcr) __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); -#elif defined(__arm__) && !defined(__SOFTFP__) +#elif defined(__arm__) DWORD old_fpscr, fpscr; unsigned int flags;

1 0

Alexandre Julliard : msvcrt: Implement asm sqrt functions on ARM platforms.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 2fc773199080dedbe64a33ef66be02a4f44bcd08 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fc773199080dedbe64a33ef66be02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:21:34 2024 +0200 msvcrt: Implement asm sqrt functions on ARM platforms. --- dlls/msvcrt/math.c | 67 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index cbe17463b03..738d4138c99 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -77,14 +77,12 @@ void msvcrt_init_math( void *module ) #endif } -#if defined(__i386__) || defined(__x86_64__) static inline double ret_nan( BOOL update_sw ) { double x = 1.0; if (!update_sw) return -NAN; return (x - x) / (x - x); } -#endif #define SET_X87_CW(MASK) \ "subl $4, %esp\n\t" \ @@ -260,7 +258,7 @@ float CDECL MSVCRT_atanf( float x ) } #endif -#ifdef __x86_64__ +#ifndef __i386__ extern short CDECL _fdclass(float x); static BOOL sqrtf_validate( float *x ) @@ -278,10 +276,21 @@ static BOOL sqrtf_validate( float *x ) return TRUE; } -float CDECL sse2_sqrtf(float); -__ASM_GLOBAL_FUNC( sse2_sqrtf, - "sqrtss %xmm0, %xmm0\n\t" - "ret" ) +#ifdef __arm64ec__ +static float __attribute__((naked)) CDECL asm_sqrtf(float x) +{ + asm( "fsqrt s0,s0; ret" ); +} +#elif defined __aarch64__ +float CDECL asm_sqrtf(float); +__ASM_GLOBAL_FUNC( asm_sqrtf, "fsqrt s0,s0; ret" ) +#elif defined __arm__ +float CDECL asm_sqrtf(float); +__ASM_GLOBAL_FUNC( asm_sqrtf, "vsqrt s0,s0; bx lr" ) +#elif defined __x86_64__ +float CDECL asm_sqrtf(float); +__ASM_GLOBAL_FUNC( asm_sqrtf, "sqrtss %xmm0, %xmm0; ret" ) +#endif #endif /********************************************************************* @@ -289,11 +298,11 @@ __ASM_GLOBAL_FUNC( sse2_sqrtf, */ float CDECL MSVCRT_sqrtf( float x ) { -#ifdef __x86_64__ +#ifndef __i386__ if (!sqrtf_validate(&x)) return x; - return sse2_sqrtf(x); + return asm_sqrtf(x); #else return sqrtf( x ); #endif @@ -382,7 +391,6 @@ double CDECL MSVCRT_exp( double x ) } #endif -#if defined(__x86_64__) || defined(__i386__) extern short CDECL _dclass(double x); static BOOL sqrt_validate( double *x, BOOL update_sw ) @@ -410,15 +418,23 @@ static BOOL sqrt_validate( double *x, BOOL update_sw ) return TRUE; } -double CDECL sse2_sqrt(double); -__ASM_GLOBAL_FUNC( sse2_sqrt, - "sqrtsd %xmm0, %xmm0\n\t" - "ret" ) -#endif - -#ifdef __i386__ -double CDECL x87_sqrt(double); -__ASM_GLOBAL_FUNC( x87_sqrt, +#ifdef __arm64ec__ +static double __attribute__((naked)) CDECL asm_sqrt(double x) +{ + asm( "fsqrt d0,d0; ret" ); +} +#elif defined __aarch64__ +double CDECL asm_sqrt(double); +__ASM_GLOBAL_FUNC( asm_sqrt, "fsqrt d0,d0; ret" ) +#elif defined __arm__ +double CDECL asm_sqrt(double); +__ASM_GLOBAL_FUNC( asm_sqrt, "vsqrt d0,d0; bx lr" ) +#elif defined __x86_64__ +double CDECL asm_sqrt(double); +__ASM_GLOBAL_FUNC( asm_sqrt, "sqrtsd %xmm0, %xmm0; ret" ) +#elif defined __i386__ +double CDECL asm_sqrt(double); +__ASM_GLOBAL_FUNC( asm_sqrt, "fldl 4(%esp)\n\t" SET_X87_CW(0xc00) "fsqrt\n\t" @@ -431,19 +447,10 @@ __ASM_GLOBAL_FUNC( x87_sqrt, */ double CDECL MSVCRT_sqrt( double x ) { -#ifdef __x86_64__ if (!sqrt_validate(&x, TRUE)) return x; - return sse2_sqrt(x); -#elif defined( __i386__ ) - if (!sqrt_validate(&x, TRUE)) - return x; - - return x87_sqrt(x); -#else - return sqrt( x ); -#endif + return asm_sqrt(x); } /********************************************************************* @@ -2561,7 +2568,7 @@ void __cdecl __libm_sse2_sqrt_precise(void) __asm__ __volatile__( "movq %0,%%xmm0" : : "m" (d) ); return; } - __asm__ __volatile__( "call " __ASM_NAME( "sse2_sqrt" ) ); + __asm__ __volatile__( "call " __ASM_NAME( "asm_sqrt" ) ); } #endif /* __i386__ */

1 0

Alexandre Julliard : msvcrt: Disable SSE2 memmove implementation on ARM64EC.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: bdd89987782b4828317b68264f48bc99cfaa33b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdd89987782b4828317b68264f48bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:21:45 2024 +0200 msvcrt: Disable SSE2 memmove implementation on ARM64EC. --- dlls/msvcrt/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 7f7959e81e6..571ca34b847 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2786,7 +2786,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) return memcmp_blocks(p1, p2, n); } -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__)) #ifdef __i386__ @@ -3052,7 +3052,7 @@ __ASM_GLOBAL_FUNC( sse2_memmove, #endif void * __cdecl memmove(void *dst, const void *src, size_t n) { -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(__arm64ec__) return sse2_memmove(dst, src, n); #else unsigned char *d = dst;

1 0

Alexandre Julliard : kernelbase: Implement the GetProcAddress wrapper on ARM64EC.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 468fbf5907f690c4df3e60a1794d2f7ce0eade13 URL: https://gitlab.winehq.org/wine/wine/-/commit/468fbf5907f690c4df3e60a1794d2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:23:38 2024 +0200 kernelbase: Implement the GetProcAddress wrapper on ARM64EC. --- dlls/kernelbase/loader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index e0be2a88d2b..7afbe0460eb 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -430,7 +430,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO * GetProcAddress (kernelbase.@) */ -#ifdef __x86_64__ /* * Work around a Delphi bug on x86_64. When delay loading a symbol, * Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls @@ -440,6 +439,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO * these registers if the function takes floating point parameters. * This wrapper saves xmm0 - 3 to the stack. */ +#ifdef __arm64ec__ +FARPROC WINAPI __attribute__((naked)) GetProcAddress( HMODULE module, LPCSTR function ) +{ + asm( ".seh_proc \"#GetProcAddress\"\n\t" + "stp x29, x30, [sp, #-48]!\n\t" + ".seh_save_fplr_x 48\n\t" + ".seh_endprologue\n\t" + "stp d0, d1, [sp, #16]\n\t" + "stp d2, d3, [sp, #32]\n\t" + "bl \"#get_proc_address\"\n\t" + "ldp d0, d1, [sp, #16]\n\t" + "ldp d2, d3, [sp, #32]\n\t" + "ldp x29, x30, [sp], #48\n\t" + "ret\n\t" + ".seh_endproc" ); +} +#elif defined(__x86_64__) __ASM_GLOBAL_FUNC( GetProcAddress, ".byte 0x48\n\t" /* hotpatch prolog */ "pushq %rbp\n\t"

1 0

Alexandre Julliard : kernel32: Implement the GetProcAddress wrapper on ARM64EC.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 338df02010be9d219c0496235b04320dc7f2cec7 URL: https://gitlab.winehq.org/wine/wine/-/commit/338df02010be9d219c0496235b0432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:23:50 2024 +0200 kernel32: Implement the GetProcAddress wrapper on ARM64EC. --- dlls/kernel32/module.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 433366d364b..ed15e57c29c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -295,7 +295,6 @@ FARPROC get_proc_address( HMODULE hModule, LPCSTR function ) return fp; } -#ifdef __x86_64__ /* * Work around a Delphi bug on x86_64. When delay loading a symbol, * Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls @@ -305,9 +304,25 @@ FARPROC get_proc_address( HMODULE hModule, LPCSTR function ) * these registers if the function takes floating point parameters. * This wrapper saves xmm0 - 3 to the stack. */ -extern FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ); - -__ASM_GLOBAL_FUNC( get_proc_address_wrapper, +#ifdef __arm64ec__ +FARPROC WINAPI __attribute__((naked)) GetProcAddress( HMODULE module, LPCSTR function ) +{ + asm( ".seh_proc \"#GetProcAddress\"\n\t" + "stp x29, x30, [sp, #-48]!\n\t" + ".seh_save_fplr_x 48\n\t" + ".seh_endprologue\n\t" + "stp d0, d1, [sp, #16]\n\t" + "stp d2, d3, [sp, #32]\n\t" + "bl \"#get_proc_address\"\n\t" + "ldp d0, d1, [sp, #16]\n\t" + "ldp d2, d3, [sp, #32]\n\t" + "ldp x29, x30, [sp], #48\n\t" + "ret\n\t" + ".seh_endproc" ); +} +#elif defined(__x86_64__) +__ASM_GLOBAL_FUNC( GetProcAddress, + ".byte 0x48\n\t" /* hotpatch prolog */ "pushq %rbp\n\t" __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") @@ -335,14 +350,9 @@ __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "ret" ) #else /* __x86_64__ */ -static inline FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ) +FARPROC WINAPI GetProcAddress( HMODULE module, LPCSTR function ) { return get_proc_address( module, function ); } #endif /* __x86_64__ */ - -FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) -{ - return get_proc_address_wrapper( hModule, function ); -}

1 0