January 2024 - Wine-Commits

Martin Storsjö : ntdll: Remove libunwind support for aarch64.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 57b8d4c01982e68f2ce538fec40ce69413f1400d URL: https://gitlab.winehq.org/wine/wine/-/commit/57b8d4c01982e68f2ce538fec40ce6… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Jan 24 15:26:30 2024 +0200 ntdll: Remove libunwind support for aarch64. Libunwind hasn't been necessary for unwinding through the ELF bits since 03d4ba67f4a0b75548f27eb4bf1c4715888de07d. This reduces the number of potential build configurations to keep track of. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm64.c | 153 +++-------------------------------------- 1 file changed, 8 insertions(+), 145 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index f96ec330796..62886c74515 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -50,10 +50,6 @@ #ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> #endif -#ifdef HAVE_LIBUNWIND -# define UNW_LOCAL_ONLY -# include <libunwind.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -332,140 +328,6 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *conte } -#ifdef HAVE_LIBUNWIND -static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEXT *context, - PEXCEPTION_ROUTINE *handler, void **handler_data ) -{ - unw_context_t unw_context; - unw_cursor_t cursor; - unw_proc_info_t info; - int rc; - -#ifdef __APPLE__ - rc = unw_getcontext( &unw_context ); - if (rc == UNW_ESUCCESS) - rc = unw_init_local( &cursor, &unw_context ); - if (rc == UNW_ESUCCESS) - { - int i; - for (i = 0; i <= 28; i++) - unw_set_reg( &cursor, UNW_ARM64_X0 + i, context->X[i] ); - unw_set_reg( &cursor, UNW_ARM64_FP, context->Fp ); - unw_set_reg( &cursor, UNW_ARM64_LR, context->Lr ); - unw_set_reg( &cursor, UNW_ARM64_SP, context->Sp ); - unw_set_reg( &cursor, UNW_REG_IP, context->Pc ); - } -#else - memcpy( unw_context.uc_mcontext.regs, context->X, sizeof(context->X) ); - unw_context.uc_mcontext.sp = context->Sp; - unw_context.uc_mcontext.pc = context->Pc; - - rc = unw_init_local( &cursor, &unw_context ); -#endif - if (rc != UNW_ESUCCESS) - { - WARN( "setup failed: %d\n", rc ); - return STATUS_INVALID_DISPOSITION; - } - rc = unw_get_proc_info( &cursor, &info ); - if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) - { - WARN( "failed to get info: %d\n", rc ); - return STATUS_INVALID_DISPOSITION; - } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) - { - TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", - ip, info.start_ip, info.end_ip ); - *handler = NULL; - *frame = context->Sp; - context->Pc = context->Lr; - context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; - return STATUS_SUCCESS; - } - - TRACE( "ip %#lx function %#lx-%#lx personality %#lx lsda %#lx fde %#lx\n", - ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler, - (unsigned long)info.lsda, (unsigned long)info.unwind_info ); - - rc = unw_step( &cursor ); - if (rc < 0) - { - WARN( "failed to unwind: %d %d\n", rc, UNW_ENOINFO ); - return STATUS_INVALID_DISPOSITION; - } - - *handler = (void *)info.handler; - *handler_data = (void *)info.lsda; - *frame = context->Sp; -#ifdef __APPLE__ - { - int i; - for (i = 0; i <= 28; i++) - unw_get_reg( &cursor, UNW_ARM64_X0 + i, (unw_word_t *)&context->X[i] ); - } - unw_get_reg( &cursor, UNW_ARM64_FP, (unw_word_t *)&context->Fp ); - unw_get_reg( &cursor, UNW_ARM64_X30, (unw_word_t *)&context->Lr ); - unw_get_reg( &cursor, UNW_ARM64_SP, (unw_word_t *)&context->Sp ); -#else - unw_get_reg( &cursor, UNW_AARCH64_X0, (unw_word_t *)&context->X0 ); - unw_get_reg( &cursor, UNW_AARCH64_X1, (unw_word_t *)&context->X1 ); - unw_get_reg( &cursor, UNW_AARCH64_X2, (unw_word_t *)&context->X2 ); - unw_get_reg( &cursor, UNW_AARCH64_X3, (unw_word_t *)&context->X3 ); - unw_get_reg( &cursor, UNW_AARCH64_X4, (unw_word_t *)&context->X4 ); - unw_get_reg( &cursor, UNW_AARCH64_X5, (unw_word_t *)&context->X5 ); - unw_get_reg( &cursor, UNW_AARCH64_X6, (unw_word_t *)&context->X6 ); - unw_get_reg( &cursor, UNW_AARCH64_X7, (unw_word_t *)&context->X7 ); - unw_get_reg( &cursor, UNW_AARCH64_X8, (unw_word_t *)&context->X8 ); - unw_get_reg( &cursor, UNW_AARCH64_X9, (unw_word_t *)&context->X9 ); - unw_get_reg( &cursor, UNW_AARCH64_X10, (unw_word_t *)&context->X10 ); - unw_get_reg( &cursor, UNW_AARCH64_X11, (unw_word_t *)&context->X11 ); - unw_get_reg( &cursor, UNW_AARCH64_X12, (unw_word_t *)&context->X12 ); - unw_get_reg( &cursor, UNW_AARCH64_X13, (unw_word_t *)&context->X13 ); - unw_get_reg( &cursor, UNW_AARCH64_X14, (unw_word_t *)&context->X14 ); - unw_get_reg( &cursor, UNW_AARCH64_X15, (unw_word_t *)&context->X15 ); - unw_get_reg( &cursor, UNW_AARCH64_X16, (unw_word_t *)&context->X16 ); - unw_get_reg( &cursor, UNW_AARCH64_X17, (unw_word_t *)&context->X17 ); - unw_get_reg( &cursor, UNW_AARCH64_X18, (unw_word_t *)&context->X18 ); - unw_get_reg( &cursor, UNW_AARCH64_X19, (unw_word_t *)&context->X19 ); - unw_get_reg( &cursor, UNW_AARCH64_X20, (unw_word_t *)&context->X20 ); - unw_get_reg( &cursor, UNW_AARCH64_X21, (unw_word_t *)&context->X21 ); - unw_get_reg( &cursor, UNW_AARCH64_X22, (unw_word_t *)&context->X22 ); - unw_get_reg( &cursor, UNW_AARCH64_X23, (unw_word_t *)&context->X23 ); - unw_get_reg( &cursor, UNW_AARCH64_X24, (unw_word_t *)&context->X24 ); - unw_get_reg( &cursor, UNW_AARCH64_X25, (unw_word_t *)&context->X25 ); - unw_get_reg( &cursor, UNW_AARCH64_X26, (unw_word_t *)&context->X26 ); - unw_get_reg( &cursor, UNW_AARCH64_X27, (unw_word_t *)&context->X27 ); - unw_get_reg( &cursor, UNW_AARCH64_X28, (unw_word_t *)&context->X28 ); - unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->Fp ); - unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->Lr ); - unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); -#endif - unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); - context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; - - TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); - TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", - context->X0, context->X1, context->X2, context->X3 ); - TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n", - context->X4, context->X5, context->X6, context->X7 ); - TRACE(" x8=%016lx x9=%016lx x10=%016lx x11=%016lx\n", - context->X8, context->X9, context->X10, context->X11 ); - TRACE(" x12=%016lx x13=%016lx x14=%016lx x15=%016lx\n", - context->X12, context->X13, context->X14, context->X15 ); - TRACE(" x16=%016lx x17=%016lx x18=%016lx x19=%016lx\n", - context->X16, context->X17, context->X18, context->X19 ); - TRACE(" x20=%016lx x21=%016lx x22=%016lx x23=%016lx\n", - context->X20, context->X21, context->X22, context->X23 ); - TRACE(" x24=%016lx x25=%016lx x26=%016lx x27=%016lx\n", - context->X24, context->X25, context->X26, context->X27 ); - TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", - context->X28, context->Fp, context->Lr, context->Sp ); - return STATUS_SUCCESS; -} -#endif - /*********************************************************************** * unwind_builtin_dll * @@ -482,13 +344,14 @@ NTSTATUS unwind_builtin_dll( void *args ) if (fde) return dwarf_virtual_unwind( context->Pc, &dispatch->EstablisherFrame, context, fde, &bases, &dispatch->LanguageHandler, &dispatch->HandlerData ); -#ifdef HAVE_LIBUNWIND - return libunwind_virtual_unwind( context->Pc, &dispatch->EstablisherFrame, context, - &dispatch->LanguageHandler, &dispatch->HandlerData ); -#else - ERR("libunwind not available, unable to unwind\n"); - return STATUS_INVALID_DISPOSITION; -#endif + + TRACE( "no info found for %lx, assuming leaf function\n", + context->Pc ); + dispatch->LanguageHandler = NULL; + dispatch->EstablisherFrame = context->Sp; + context->Pc = context->Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return STATUS_SUCCESS; }

1 0

Martin Storsjö : ntdll: Remove libunwind support for ARM.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 4e9838fbc2d9ccca1e8b5a80d0e9000bfacc4938 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e9838fbc2d9ccca1e8b5a80d0e900… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Jan 24 13:36:07 2024 +0200 ntdll: Remove libunwind support for ARM. Building for ARM with libunwind available has been broken since 89f3c59739e6a879b6f362dfd29d41347590449d, due to references to raise_func_trampoline that were left behind. In Linux builds, libunwind isn't practically needed since a27b202a4ddc314e3e856c10f2e5d010c4a88ee0 (which implemented an internal EHABI unwinder). That unwinder currently only supports Linux, due to relying on dl_iterate_phdr, but if necessary, we could also try to detect support for dl_iterate_phdr in configure for other OSes. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm.c | 116 +++++-------------------------------------- 1 file changed, 12 insertions(+), 104 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 5115fa7ec3a..68c8f0c0486 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -51,10 +51,6 @@ #ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> #endif -#ifdef HAVE_LIBUNWIND -# define UNW_LOCAL_ONLY -# include <libunwind.h> -#endif #ifdef HAVE_LINK_H # include <link.h> #endif @@ -260,8 +256,6 @@ static BOOL is_inside_syscall( ucontext_t *sigcontext ) (char *)SP_sig(sigcontext) <= (char *)arm_thread_data()->syscall_frame); } -extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher ); - struct exidx_entry { uint32_t addr; @@ -559,11 +553,6 @@ static NTSTATUS ehabi_virtual_unwind( UINT ip, DWORD *frame, CONTEXT *context, if (!set_pc) context->Pc = context->Lr; - /* There's no need to check for raise_func_trampoline and manually restore - * Lr separately from Pc like with libunwind; the EHABI unwind info - * describes how both of them are restored separately, and as long as - * the unwind info restored Pc, it doesn't have to be set from Lr. */ - TRACE( "next function pc=%08lx\n", context->Pc ); TRACE(" r0=%08lx r1=%08lx r2=%08lx r3=%08lx\n", context->R0, context->R1, context->R2, context->R3 ); @@ -672,94 +661,6 @@ static const struct exidx_entry *find_exidx_entry( void *ip ) } #endif -#ifdef HAVE_LIBUNWIND -static NTSTATUS libunwind_virtual_unwind( DWORD ip, DWORD *frame, CONTEXT *context, - PEXCEPTION_ROUTINE *handler, void **handler_data ) -{ - unw_context_t unw_context; - unw_cursor_t cursor; - unw_proc_info_t info; - int rc, i; - - for (i = 0; i <= 12; i++) - unw_context.regs[i] = (&context->R0)[i]; - unw_context.regs[13] = context->Sp; - unw_context.regs[14] = context->Lr; - unw_context.regs[15] = context->Pc; - rc = unw_init_local( &cursor, &unw_context ); - - if (rc != UNW_ESUCCESS) - { - WARN( "setup failed: %d\n", rc ); - return STATUS_INVALID_DISPOSITION; - } - rc = unw_get_proc_info( &cursor, &info ); - if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) - { - WARN( "failed to get info: %d\n", rc ); - return STATUS_INVALID_DISPOSITION; - } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) - { - NTSTATUS status = context->Pc != context->Lr ? - STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; - TRACE( "no info found for %x ip %x-%x, %s\n", - ip, info.start_ip, info.end_ip, status == STATUS_SUCCESS ? - "assuming leaf function" : "error, stuck" ); - *handler = NULL; - *frame = context->Sp; - context->Pc = context->Lr; - context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; - return status; - } - - TRACE( "ip %#x function %#lx-%#lx personality %#lx lsda %#lx fde %#lx\n", - ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler, - (unsigned long)info.lsda, (unsigned long)info.unwind_info ); - - rc = unw_step( &cursor ); - if (rc < 0) - { - WARN( "failed to unwind: %d %d\n", rc, UNW_ENOINFO ); - return STATUS_INVALID_DISPOSITION; - } - - *handler = (void *)info.handler; - *handler_data = (void *)info.lsda; - *frame = context->Sp; - - for (i = 0; i <= 12; i++) - unw_get_reg( &cursor, UNW_ARM_R0 + i, (unw_word_t *)&(&context->R0)[i] ); - unw_get_reg( &cursor, UNW_ARM_R13, (unw_word_t *)&context->Sp ); - unw_get_reg( &cursor, UNW_ARM_R14, (unw_word_t *)&context->Lr ); - unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); - context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; - - if ((info.start_ip & ~(unw_word_t)1) == - ((unw_word_t)raise_func_trampoline & ~(unw_word_t)1)) { - /* raise_func_trampoline stores the original Lr at the bottom of the - * stack. The unwinder normally can't restore both Pc and Lr to - * individual values, thus do that manually here. - * (The function we unwind to might be a leaf function that hasn't - * backed up its own original Lr value on the stack.) */ - const DWORD *orig_lr = (const DWORD *) *frame; - context->Lr = *orig_lr; - } - - TRACE( "next function pc=%08lx%s\n", context->Pc, rc ? "" : " (last frame)" ); - TRACE(" r0=%08lx r1=%08lx r2=%08lx r3=%08lx\n", - context->R0, context->R1, context->R2, context->R3 ); - TRACE(" r4=%08lx r5=%08lx r6=%08lx r7=%08lx\n", - context->R4, context->R5, context->R6, context->R7 ); - TRACE(" r8=%08lx r9=%08lx r10=%08lx r11=%08lx\n", - context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%08lx sp=%08lx lr=%08lx pc=%08lx\n", - context->R12, context->Sp, context->Lr, context->Pc ); - return STATUS_SUCCESS; -} -#endif - /*********************************************************************** * unwind_builtin_dll */ @@ -771,16 +672,23 @@ NTSTATUS unwind_builtin_dll( void *args ) DWORD ip = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0); #ifdef linux const struct exidx_entry *entry = find_exidx_entry( (void *)ip ); + NTSTATUS status; if (entry) return ehabi_virtual_unwind( ip, &dispatch->EstablisherFrame, context, entry, &dispatch->LanguageHandler, &dispatch->HandlerData ); -#endif -#ifdef HAVE_LIBUNWIND - return libunwind_virtual_unwind( ip, &dispatch->EstablisherFrame, context, - &dispatch->LanguageHandler, &dispatch->HandlerData ); + + status = context->Pc != context->Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + TRACE( "no info found for %lx, %s\n", ip, status == STATUS_SUCCESS ? + "assuming leaf function" : "error, stuck" ); + dispatch->LanguageHandler = NULL; + dispatch->EstablisherFrame = context->Sp; + context->Pc = context->Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return status; #else - ERR("libunwind not available, unable to unwind\n"); + ERR("ARM EHABI unwinding available, unable to unwind\n"); return STATUS_INVALID_DISPOSITION; #endif }

1 0

Rémi Bernon : imm32: Complete the composition string when the IME is closed.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 46c5c2d41a014253f51d89c092d7e008f9f29575 URL: https://gitlab.winehq.org/wine/wine/-/commit/46c5c2d41a014253f51d89c092d7e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 19 15:46:44 2024 +0100 imm32: Complete the composition string when the IME is closed. --- dlls/imm32/ime.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 60672b366ab..24270e89291 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -653,11 +653,7 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) } break; case IMC_SETOPENSTATUS: - if (!ctx->fOpen) - { - input_context_set_comp_str( ctx, NULL, 0 ); - if ((msg = ime_set_composition_status( himc, FALSE ))) ime_send_message( himc, msg, 0, 0 ); - } + if (!ctx->fOpen) ImmNotifyIME( himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0 ); NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen ); break; } @@ -691,12 +687,12 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) if (flags) ime_send_message( himc, WM_IME_COMPOSITION, wchr, flags ); } - ImmSetOpenStatus( himc, FALSE ); - break; + /* fallthrough */ } case CPS_CANCEL: input_context_set_comp_str( ctx, NULL, 0 ); - ImmSetOpenStatus( himc, FALSE ); + if ((msg = ime_set_composition_status( himc, FALSE ))) + ime_send_message( himc, msg, 0, 0 ); break; default: FIXME( "himc %p, action %#lx, index %#lx, value %#lx stub!\n", himc, action, index, value );

1 0

Rémi Bernon : imm32/tests: Test the effect of CPS_CANCEL and CPS_COMPLETE.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 0d9e6adadad911f7d26d962492210db6f3a2a95f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d9e6adadad911f7d26d962492210d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 19 14:47:31 2024 +0100 imm32/tests: Test the effect of CPS_CANCEL and CPS_COMPLETE. --- dlls/imm32/tests/imm32.c | 290 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 290 insertions(+)

1 0

Rémi Bernon : win32u: Also pass WM_KEYUP messages to ImmProcessKey.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: faa342a2f1689824a174a83aaf3780b1c9911ad7 URL: https://gitlab.winehq.org/wine/wine/-/commit/faa342a2f1689824a174a83aaf3780… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 10 17:28:16 2024 +0100 win32u: Also pass WM_KEYUP messages to ImmProcessKey. And to ImmTranslateMessage if they have been processed. --- dlls/imm32/tests/imm32.c | 2 +- dlls/win32u/message.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a306a7a065b..d59103b165e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -7246,7 +7246,7 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) keybd_event( 'Q', 0x10, KEYEVENTF_KEYUP, 0 ); flush_events(); process_messages_( hwnd ); - todo_wine ok_seq( key_up_seq ); + ok_seq( key_up_seq ); ignore_WM_IME_NOTIFY = FALSE; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 21d3af8c5fc..0cd20684b4e 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2397,7 +2397,7 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, } msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); - if (remove && msg->message == WM_KEYDOWN) + if (remove && (msg->message == WM_KEYDOWN || msg->message == WM_KEYUP)) if (ImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), msg->wParam, msg->lParam, 0 )) msg->wParam = VK_PROCESSKEY; @@ -4399,6 +4399,11 @@ BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ) if (flags) FIXME( "unsupported flags %x\n", flags ); if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE; + if (msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP) + { + if (msg->wParam != VK_PROCESSKEY) return TRUE; + return ImmTranslateMessage( msg->hwnd, msg->message, msg->wParam, msg->lParam ); + } if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE; TRACE_(key)( "Translating key %s (%04x), scancode %04x\n",

1 0

Rémi Bernon : imm32/tests: Test that WM_KEYUP are passed to ImeProcessKey.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 08bfeeeb0d9f6c2a6eb615807b06eab50e6674cd URL: https://gitlab.winehq.org/wine/wine/-/commit/08bfeeeb0d9f6c2a6eb615807b06ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 10 17:25:10 2024 +0100 imm32/tests: Test that WM_KEYUP are passed to ImeProcessKey. --- dlls/imm32/tests/imm32.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 16f9412f56a..a306a7a065b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -7087,6 +7087,30 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) }, {0}, }; + struct ime_call key_down_seq[] = + { + { + .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_PROCESS_KEY, + .process_key = {.vkey = 'Q', .lparam = MAKELONG(1, 0x10)}, + }, + { + .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_TO_ASCII_EX, + .to_ascii_ex = {.vkey = kbd_char_first ? MAKELONG('Q', 'q') : 'Q', .vsc = 0x10}, + }, + {0}, + }; + struct ime_call key_up_seq[] = + { + { + .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_PROCESS_KEY, + .process_key = {.vkey = 'Q', .lparam = MAKELONG(1, 0xc010)}, + }, + { + .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_TO_ASCII_EX, + .to_ascii_ex = {.vkey = 'Q', .vsc = 0xc010}, + }, + {0}, + }; struct ime_call post_messages[] = { {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 1}}, @@ -7169,6 +7193,8 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) for (i = 0; i < ARRAY_SIZE(to_ascii_ex_3); i++) to_ascii_ex_3[i].himc = himc; for (i = 0; i < ARRAY_SIZE(post_messages); i++) post_messages[i].himc = himc; for (i = 0; i < ARRAY_SIZE(sent_messages); i++) sent_messages[i].himc = himc; + for (i = 0; i < ARRAY_SIZE(key_down_seq); i++) key_down_seq[i].himc = himc; + for (i = 0; i < ARRAY_SIZE(key_up_seq); i++) key_up_seq[i].himc = himc; memset( ime_calls, 0, sizeof(ime_calls) ); ime_call_count = 0; @@ -7209,6 +7235,22 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) ok_ret( 1, ImmGenerateMessage( himc ) ); ok_seq( empty_sequence ); + + ignore_WM_IME_NOTIFY = TRUE; + + keybd_event( 'Q', 0x10, 0, 0 ); + flush_events(); + process_messages_( hwnd ); + ok_seq( key_down_seq ); + + keybd_event( 'Q', 0x10, KEYEVENTF_KEYUP, 0 ); + flush_events(); + process_messages_( hwnd ); + todo_wine ok_seq( key_up_seq ); + + ignore_WM_IME_NOTIFY = FALSE; + + ok_ret( 1, ImmUnlockIMC( himc ) ); ok_ret( 1, ImmDestroyContext( himc ) );

1 0

Rémi Bernon : imm32: Mask the scancode before passing it to ImeToAsciiEx.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: f522c58ce69f8a859812b5f210c97a63c313f9ae URL: https://gitlab.winehq.org/wine/wine/-/commit/f522c58ce69f8a859812b5f210c97a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 19 15:53:46 2024 +0100 imm32: Mask the scancode before passing it to ImeToAsciiEx. --- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index cc843ce4a8e..94de6c0f6d7 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3099,7 +3099,7 @@ BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar if ((vkey = data->vkey) == VK_PROCESSKEY) return FALSE; data->vkey = VK_PROCESSKEY; GetKeyboardState( state ); - scan = lparam >> 0x10; + scan = (lparam >> 0x10) & 0xffff; if (ime->info.fdwProperty & IME_PROP_KBD_CHAR_FIRST) { diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 0b38d70ad8a..16f9412f56a 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -7044,7 +7044,6 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) .hkl = expect_ime, .himc = default_himc, .func = IME_TO_ASCII_EX, /* FIXME what happened to kbd_char_first here!? */ .to_ascii_ex = {.vkey = 'Q', .vsc = 0xc010}, - .todo_value = TRUE, }, {0}, };

1 0

Rémi Bernon : imm32/tests: Adjust todo_wine for the new Wine CJK keyboard layouts.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 961e01e51782597bf771611599ff20decadb27c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/961e01e51782597bf771611599ff20… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 07:47:35 2024 +0100 imm32/tests: Adjust todo_wine for the new Wine CJK keyboard layouts. We don't return 0xe001 high word anymore, so the tests are now failing. --- dlls/imm32/tests/imm32.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 488afbd34a9..0b38d70ad8a 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3890,7 +3890,7 @@ static void test_ImmGetProperty(void) { .fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET, }; - static const IMEINFO expect_ime_info_0411 = /* MS Japanese IME */ + static const IMEINFO expect_ime_info_ja_JP = /* MS Japanese IME */ { .fdwProperty = IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA, @@ -3899,7 +3899,7 @@ static void test_ImmGetProperty(void) .fdwSelectCaps = SELECT_CAP_CONVERSION | SELECT_CAP_SENTENCE, .fdwUICaps = UI_CAP_ROT90, }; - static const IMEINFO expect_ime_info_0412 = /* MS Korean IME */ + static const IMEINFO expect_ime_info_ko_KR = /* MS Korean IME */ { .fdwProperty = IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE, @@ -3908,7 +3908,7 @@ static void test_ImmGetProperty(void) .fdwSelectCaps = SELECT_CAP_CONVERSION, .fdwUICaps = UI_CAP_ROT90, }; - static const IMEINFO expect_ime_info_0804 = /* MS Chinese IME */ + static const IMEINFO expect_ime_info_zh_CN = /* MS Chinese IME */ { .fdwProperty = IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa, .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE, @@ -3926,21 +3926,24 @@ static void test_ImmGetProperty(void) ok_ret( 0, ImmGetProperty( 0, 0 ) ); ok_ret( 0, ImmGetProperty( hkl, 0 ) ); - if (hkl == (HKL)0x04110411) expect = &expect_ime_info_0411; - else if (hkl == (HKL)0x04120412) expect = &expect_ime_info_0412; - else if (hkl == (HKL)0x08040804) expect = &expect_ime_info_0804; + if (hkl == (HKL)0x04110411) expect = &expect_ime_info_ja_JP; + else if (hkl == (HKL)0x04120412) expect = &expect_ime_info_ko_KR; + else if (hkl == (HKL)0x08040804) expect = &expect_ime_info_zh_CN; else expect = &expect_ime_info; /* IME_PROP_COMPLETE_ON_UNSELECT seems to be sometimes set on CJK locales IMEs, sometimes not */ + todo_wine_if( expect != &expect_ime_info ) ok_ret( expect->fdwProperty, ImmGetProperty( hkl, IGP_PROPERTY ) & ~IME_PROP_COMPLETE_ON_UNSELECT ); - todo_wine + todo_wine_if( expect != &expect_ime_info_zh_CN && expect != &expect_ime_info_ko_KR ) ok_ret( expect->fdwConversionCaps, ImmGetProperty( hkl, IGP_CONVERSION ) ); todo_wine ok_ret( expect->fdwSentenceCaps, ImmGetProperty( hkl, IGP_SENTENCE ) ); + todo_wine_if( expect != &expect_ime_info ) ok_ret( expect->fdwSCSCaps, ImmGetProperty( hkl, IGP_SETCOMPSTR ) ); - todo_wine + todo_wine_if( expect != &expect_ime_info_ko_KR ) ok_ret( expect->fdwSelectCaps, ImmGetProperty( hkl, IGP_SELECT ) ); ok_ret( IMEVER_0400, ImmGetProperty( hkl, IGP_GETIMEVERSION ) ); + todo_wine_if( expect != &expect_ime_info ) ok_ret( expect->fdwUICaps, ImmGetProperty( hkl, IGP_UI ) ); todo_wine ok_ret( 0xdeadbeef, GetLastError() ); @@ -7370,7 +7373,7 @@ static void test_ga_na_da(void) UINT i; /* this test doesn't work on Win32 / WoW64 */ - if (sizeof(void *) == 4 || default_hkl != (HKL)0x04120412 /* MS Korean IME */) + if (broken(sizeof(void *) == 4) || default_hkl != (HKL)0x04120412 /* MS Korean IME */) { skip( "Got hkl %p, skipping Korean IME-specific test\n", default_hkl ); process_messages(); @@ -7572,7 +7575,7 @@ static void test_nihongo_no(void) UINT i; /* this test doesn't work on Win32 / WoW64 */ - if (sizeof(void *) == 4 || default_hkl != (HKL)0x04110411 /* MS Japanese IME */) + if (broken(sizeof(void *) == 4) || default_hkl != (HKL)0x04110411 /* MS Japanese IME */) { skip( "Got hkl %p, skipping Japanese IME-specific test\n", default_hkl ); return;

1 0

Rémi Bernon : windows.gaming.input: Stub IRawGameController2 interface.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: e2b637c8dcd39f6174a36e0b7ab2632f4b88aae7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2b637c8dcd39f6174a36e0b7ab263… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 21 15:18:15 2022 +0100 windows.gaming.input: Stub IRawGameController2 interface. --- dlls/dinput/tests/joystick8.c | 32 ++++++++++-------- dlls/windows.gaming.input/controller.c | 60 ++++++++++++++++++++++++++++++++++ include/windows.devices.haptics.idl | 3 ++ 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 34c3f94e07c..38e20072962 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5069,7 +5069,6 @@ static void test_windows_gaming_input(void) check_interface( raw_controller, &IID_IInspectable, TRUE ); check_interface( raw_controller, &IID_IAgileObject, TRUE ); check_interface( raw_controller, &IID_IRawGameController, TRUE ); - todo_wine check_interface( raw_controller, &IID_IRawGameController2, TRUE ); check_interface( raw_controller, &IID_IGameController, TRUE ); check_interface( raw_controller, &IID_IGamepad, FALSE ); @@ -5082,7 +5081,6 @@ static void test_windows_gaming_input(void) check_interface( game_controller, &IID_IInspectable, TRUE ); check_interface( game_controller, &IID_IAgileObject, TRUE ); check_interface( game_controller, &IID_IRawGameController, TRUE ); - todo_wine check_interface( game_controller, &IID_IRawGameController2, TRUE ); check_interface( game_controller, &IID_IGameController, TRUE ); check_interface( game_controller, &IID_IGamepad, FALSE ); @@ -5100,23 +5098,31 @@ static void test_windows_gaming_input(void) IGameController_Release( game_controller ); hr = IRawGameController_QueryInterface( raw_controller, &IID_IRawGameController2, (void **)&raw_controller2 ); - todo_wine ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); - if (hr != S_OK) goto skip_tests; hr = IRawGameController2_get_DisplayName( raw_controller2, &str ); + todo_wine ok( hr == S_OK, "get_DisplayName returned %#lx\n", hr ); - buffer = pWindowsGetStringRawBuffer( str, &length ); - ok( !wcscmp( buffer, L"HID-compliant game controller" ), - "get_DisplayName returned %s\n", debugstr_wn( buffer, length ) ); - pWindowsDeleteString( str ); + if (hr == S_OK) + { + buffer = pWindowsGetStringRawBuffer( str, &length ); + todo_wine + ok( !wcscmp( buffer, L"HID-compliant game controller" ), + "get_DisplayName returned %s\n", debugstr_wn( buffer, length ) ); + pWindowsDeleteString( str ); + } hr = IRawGameController2_get_NonRoamableId( raw_controller2, &str ); + todo_wine ok( hr == S_OK, "get_NonRoamableId returned %#lx\n", hr ); - buffer = pWindowsGetStringRawBuffer( str, &length ); - ok( !wcsncmp( buffer, L"{wgi/nrid/", 10 ), - "get_NonRoamableId returned %s\n", debugstr_wn( buffer, length ) ); - pWindowsDeleteString( str ); + if (hr == S_OK) + { + buffer = pWindowsGetStringRawBuffer( str, &length ); + todo_wine + ok( !wcsncmp( buffer, L"{wgi/nrid/", 10 ), + "get_NonRoamableId returned %s\n", debugstr_wn( buffer, length ) ); + pWindowsDeleteString( str ); + } /* FIXME: What kind of HID reports are needed to make this work? */ hr = IRawGameController2_get_SimpleHapticsControllers( raw_controller2, &haptics_controllers ); @@ -5127,8 +5133,6 @@ static void test_windows_gaming_input(void) IVectorView_SimpleHapticsController_Release( haptics_controllers ); IRawGameController2_Release( raw_controller2 ); - -skip_tests: IRawGameController_Release( raw_controller ); hr = IRawGameControllerStatics_remove_RawGameControllerAdded( controller_statics, controller_added_token ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index bd3d441c445..e1749a3032d 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -61,6 +61,7 @@ struct controller IGameControllerImpl IGameControllerImpl_iface; IGameControllerInputSink IGameControllerInputSink_iface; IRawGameController IRawGameController_iface; + IRawGameController2 IRawGameController2_iface; IGameController *IGameController_outer; LONG ref; @@ -99,6 +100,12 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF return S_OK; } + if (IsEqualGUID( iid, &IID_IRawGameController2 )) + { + IInspectable_AddRef( (*out = &impl->IRawGameController2_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -330,6 +337,58 @@ static const struct IRawGameControllerVtbl raw_controller_vtbl = raw_controller_GetSwitchKind, }; +DEFINE_IINSPECTABLE_OUTER( raw_controller_2, IRawGameController2, struct controller, IGameController_outer ) + +static HRESULT WINAPI raw_controller_2_get_SimpleHapticsControllers( IRawGameController2 *iface, IVectorView_SimpleHapticsController** value) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_SimpleHapticsController, + .view = &IID_IVectorView_SimpleHapticsController, + .iterable = &IID_IIterable_SimpleHapticsController, + .iterator = &IID_IIterator_SimpleHapticsController, + }; + IVector_SimpleHapticsController *vector; + HRESULT hr; + + FIXME( "iface %p, value %p stub!\n", iface, value ); + + if (SUCCEEDED(hr = vector_create( &iids, (void **)&vector ))) + { + hr = IVector_SimpleHapticsController_GetView( vector, value ); + IVector_SimpleHapticsController_Release( vector ); + } + + return hr; +} + +static HRESULT WINAPI raw_controller_2_get_NonRoamableId( IRawGameController2 *iface, HSTRING* value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_2_get_DisplayName( IRawGameController2 *iface, HSTRING* value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IRawGameController2Vtbl raw_controller_2_vtbl = +{ + raw_controller_2_QueryInterface, + raw_controller_2_AddRef, + raw_controller_2_Release, + /* IInspectable methods */ + raw_controller_2_GetIids, + raw_controller_2_GetRuntimeClassName, + raw_controller_2_GetTrustLevel, + /* IRawGameController2 methods */ + raw_controller_2_get_SimpleHapticsControllers, + raw_controller_2_get_NonRoamableId, + raw_controller_2_get_DisplayName, +}; + struct controller_statics { IActivationFactory IActivationFactory_iface; @@ -525,6 +584,7 @@ static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameContro impl->IGameControllerImpl_iface.lpVtbl = &controller_vtbl; impl->IGameControllerInputSink_iface.lpVtbl = &input_sink_vtbl; impl->IRawGameController_iface.lpVtbl = &raw_controller_vtbl; + impl->IRawGameController2_iface.lpVtbl = &raw_controller_2_vtbl; impl->ref = 1; TRACE( "created RawGameController %p\n", impl ); diff --git a/include/windows.devices.haptics.idl b/include/windows.devices.haptics.idl index c056ab4941c..506525a6d3c 100644 --- a/include/windows.devices.haptics.idl +++ b/include/windows.devices.haptics.idl @@ -30,7 +30,10 @@ namespace Windows.Devices.Haptics { runtimeclass SimpleHapticsController; declare { + interface Windows.Foundation.Collections.IIterator<Windows.Devices.Haptics.SimpleHapticsController *>; + interface Windows.Foundation.Collections.IIterable<Windows.Devices.Haptics.SimpleHapticsController *>; interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsController *>; + interface Windows.Foundation.Collections.IVector<Windows.Devices.Haptics.SimpleHapticsController *>; interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsControllerFeedback *>; }

1 0

Rémi Bernon : dinput/tests: Relax the mouse move count test.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: dcfba0a2aa505645cf3bab6e7cb0f9a6724726ed URL: https://gitlab.winehq.org/wine/wine/-/commit/dcfba0a2aa505645cf3bab6e7cb0f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 07:41:46 2024 +0100 dinput/tests: Relax the mouse move count test. It is prone to spurious failures and we don't really care about it being precise yet. --- dlls/dinput/tests/device8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 0f586c69f6a..d6d3a03b7bd 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1744,7 +1744,7 @@ static void test_hid_mouse(void) ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ todo_wine - ok( mouse_move_count == 1, "got mouse_move_count %u\n", mouse_move_count ); + ok( mouse_move_count >= 1, "got mouse_move_count %u\n", mouse_move_count ); GetCursorPos( &pos ); todo_wine

1 0