January 2024 - Wine-commits

Alexandre Julliard : configure: Require a PE compiler for 32-bit ARM.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: 9b8409fce4da18e3d9a914a9e5831d10eb9052de URL: https://gitlab.winehq.org/wine/wine/-/commit/9b8409fce4da18e3d9a914a9e5831d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 31 12:09:02 2024 +0100 configure: Require a PE compiler for 32-bit ARM. --- configure | 16 ++++++++-------- configure.ac | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 0e0d653b21c..ca82387287a 100755 --- a/configure +++ b/configure @@ -10765,7 +10765,7 @@ fi then if test ${enable_archs+y} then : - as_fn_error $? "MinGW $wine_arch compiler not found. + as_fn_error $? "$wine_arch PE cross-compiler not found. This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 fi continue @@ -10813,7 +10813,7 @@ printf "%s\n" "none needed" >&6; } ;; printf "%s\n" "unsupported" >&6; } if test ${enable_archs+y} then : - as_fn_error $? "MinGW $wine_arch compiler supporting C99 not found. + as_fn_error $? "$wine_arch PE cross-compiler supporting C99 not found. This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 fi continue @@ -10865,7 +10865,7 @@ then : else $as_nop if test ${enable_archs+y} then : - as_fn_error $? "The $wine_arch cross-compiler doesn't support SEH directives. + as_fn_error $? "The $wine_arch PE cross-compiler doesn't support SEH directives. This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 fi continue @@ -11964,11 +11964,11 @@ CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS -if test $HOST_ARCH = aarch64 -then - test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 - DLLEXT="" -fi +case $HOST_ARCH in + arm|aarch64) + test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 + DLLEXT="" ;; +esac if test "x$with_system_dllpath" != "x" -a -n "$PE_ARCHS" diff --git a/configure.ac b/configure.ac index edba6e2f0fb..4bf9f76848e 100644 --- a/configure.ac +++ b/configure.ac @@ -922,7 +922,7 @@ do if test -z "$target" then AS_VAR_SET_IF([enable_archs], - [AC_MSG_ERROR([MinGW $wine_arch compiler not found. + [AC_MSG_ERROR([$wine_arch PE cross-compiler not found. This is an error since --enable-archs=$wine_arch was requested.])]) continue fi @@ -946,7 +946,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) x) AC_MSG_RESULT([none needed]) ;; xno) AC_MSG_RESULT([unsupported]) AS_VAR_SET_IF([enable_archs], - [AC_MSG_ERROR([MinGW $wine_arch compiler supporting C99 not found. + [AC_MSG_ERROR([$wine_arch PE cross-compiler supporting C99 not found. This is an error since --enable-archs=$wine_arch was requested.])]) continue ;; @@ -963,7 +963,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) AS_VAR_POPDEF([wine_cv_seh_support]) AS_VAR_IF([res],[yes],[], [AS_VAR_SET_IF([enable_archs], - [AC_MSG_ERROR([The $wine_arch cross-compiler doesn't support SEH directives. + [AC_MSG_ERROR([The $wine_arch PE cross-compiler doesn't support SEH directives. This is an error since --enable-archs=$wine_arch was requested.])]) continue])]) @@ -1040,11 +1040,11 @@ CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS -if test $HOST_ARCH = aarch64 -then - test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) - DLLEXT="" -fi +case $HOST_ARCH in + arm|aarch64) + test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw.]) + DLLEXT="" ;; +esac dnl **** External libraries ****

1 0

Alexandre Julliard : ntdll: Share the is_valid_frame() helper function.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: 202e0b29533ba416c08bc0d7732d95fee3d3273e URL: https://gitlab.winehq.org/wine/wine/-/commit/202e0b29533ba416c08bc0d7732d95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 31 12:12:51 2024 +0100 ntdll: Share the is_valid_frame() helper function. --- dlls/ntdll/ntdll_misc.h | 7 +++++++ dlls/ntdll/signal_arm.c | 11 ----------- dlls/ntdll/signal_arm64.c | 11 ----------- dlls/ntdll/signal_i386.c | 18 ++++-------------- dlls/ntdll/signal_x86_64.c | 12 +++--------- 5 files changed, 14 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 756b19ae649..e4094d341d8 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -58,6 +58,13 @@ extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *r extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ); extern void WINAPI process_breakpoint(void); +static inline BOOL is_valid_frame( ULONG_PTR frame ) +{ + if (frame & (sizeof(void*) - 1)) return FALSE; + return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && + (void *)frame <= NtCurrentTeb()->Tib.StackBase); +} + extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR); extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*); extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC); diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0e6c36e3340..d347004b601 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -82,17 +82,6 @@ static void dump_scope_table( ULONG base, const SCOPE_TABLE *table ) base + table->ScopeRecord[i].JumpTarget ); } -/******************************************************************* - * is_valid_frame - */ -static inline BOOL is_valid_frame( ULONG_PTR frame ) -{ - if (frame & 3) return FALSE; - return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void *)frame <= NtCurrentTeb()->Tib.StackBase); -} - - /******************************************************************* * syscalls */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 82466e926c2..c487e07a336 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -89,17 +89,6 @@ static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) base + table->ScopeRecord[i].JumpTarget ); } -/******************************************************************* - * is_valid_frame - */ -static inline BOOL is_valid_frame( ULONG_PTR frame ) -{ - if (frame & 7) return FALSE; - return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void *)frame <= NtCurrentTeb()->Tib.StackBase); -} - - /******************************************************************* * syscalls */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c4b0c84abfb..3fc961e20ca 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -106,16 +106,6 @@ DEFINE_SYSCALL_HELPER32() #undef SYSCALL_ENTRY -/******************************************************************* - * is_valid_frame - */ -static inline BOOL is_valid_frame( void *frame ) -{ - if ((ULONG_PTR)frame & 3) return FALSE; - return (frame >= NtCurrentTeb()->Tib.StackLimit && - (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); -} - /******************************************************************* * raise_handler * @@ -163,7 +153,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) while (frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) { /* Check frame address */ - if (!is_valid_frame( frame )) + if (!is_valid_frame( (ULONG_PTR)frame )) { rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -433,7 +423,7 @@ void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID ta if (pEndFrame && (frame > pEndFrame)) raise_status( STATUS_INVALID_UNWIND_TARGET, pRecord ); - if (!is_valid_frame( frame )) raise_status( STATUS_BAD_STACK, pRecord ); + if (!is_valid_frame( (ULONG_PTR)frame )) raise_status( STATUS_BAD_STACK, pRecord ); /* Call handler */ TRACE( "calling handler at %p code=%lx flags=%lx\n", @@ -545,13 +535,13 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, while (skip--) { - if (!is_valid_frame( frame )) return 0; + if (!is_valid_frame( (ULONG_PTR)frame )) return 0; frame = (ULONG *)*frame; } for (i = 0; i < count; i++) { - if (!is_valid_frame( frame )) break; + if (!is_valid_frame( (ULONG_PTR)frame )) break; buffer[i] = (void *)frame[1]; if (hash) *hash += frame[1]; frame = (ULONG *)*frame; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e63837d3eac..30014d925d9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -455,9 +455,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex unwind_done: if (!dispatch.EstablisherFrame) break; - if ((dispatch.EstablisherFrame & 7) || - dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || - dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) + if (!is_valid_frame( dispatch.EstablisherFrame )) { ERR_(seh)( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); @@ -1389,9 +1387,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec unwind_done: if (!dispatch.EstablisherFrame) break; - if ((dispatch.EstablisherFrame & 7) || - dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || - dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) + if (!is_valid_frame( dispatch.EstablisherFrame )) { ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); @@ -1634,9 +1630,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, if (!dispatch.EstablisherFrame) break; - if ((dispatch.EstablisherFrame & 7) || - dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || - dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) + if (!is_valid_frame( dispatch.EstablisherFrame )) { ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase );

1 0

Alexandre Julliard : ntdll: Only call TEB handlers for frames inside the current stack.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: 8fe95d29d32533e8fa28383c0211555eb71ea6c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fe95d29d32533e8fa28383c021155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 31 12:13:55 2024 +0100 ntdll: Only call TEB handlers for frames inside the current stack. --- dlls/ntdll/signal_arm.c | 8 +++++--- dlls/ntdll/signal_arm64.c | 8 +++++--- dlls/ntdll/signal_x86_64.c | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index d347004b601..7a6c71927f6 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -445,7 +445,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con } } /* hack: call wine handlers registered in the tib list */ - else while ((DWORD)teb_frame < context.Sp) + else while (is_valid_frame( (ULONG_PTR)teb_frame ) && (DWORD)teb_frame < context.Sp) { TRACE( "found wine frame %p rsp %lx handler %p\n", teb_frame, context.Sp, teb_frame->Handler ); @@ -1294,7 +1294,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) } /* hack: remove no longer accessible TEB frames */ - while ((DWORD)teb_frame < context->Sp) + while (is_valid_frame( (ULONG_PTR)teb_frame ) && (DWORD)teb_frame < context->Sp) { TRACE( "removing TEB frame: %p\n", teb_frame ); teb_frame = __wine_pop_frame( teb_frame ); @@ -1394,7 +1394,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec else /* hack: call builtin handlers registered in the tib list */ { DWORD backup_frame = dispatch.EstablisherFrame; - while ((DWORD)teb_frame < new_context.Sp && (DWORD)teb_frame < (DWORD)end_frame) + while (is_valid_frame( (ULONG_PTR)teb_frame ) && + (DWORD)teb_frame < new_context.Sp && + (DWORD)teb_frame < (DWORD)end_frame) { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); dispatch.EstablisherFrame = (DWORD)teb_frame; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c487e07a336..9e2431a6b33 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -418,7 +418,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con } } /* hack: call wine handlers registered in the tib list */ - else while ((ULONG64)teb_frame < context.Sp) + else while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < context.Sp) { TRACE( "found wine frame %p rsp %I64x handler %p\n", teb_frame, context.Sp, teb_frame->Handler ); @@ -1188,7 +1188,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) } /* hack: remove no longer accessible TEB frames */ - while ((ULONG64)teb_frame < context->Sp) + while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < context->Sp) { TRACE( "removing TEB frame: %p\n", teb_frame ); teb_frame = __wine_pop_frame( teb_frame ); @@ -1295,7 +1295,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec else /* hack: call builtin handlers registered in the tib list */ { DWORD64 backup_frame = dispatch.EstablisherFrame; - while ((ULONG64)teb_frame < new_context.Sp && (ULONG64)teb_frame < (ULONG64)end_frame) + while (is_valid_frame( (ULONG_PTR)teb_frame ) && + (ULONG64)teb_frame < new_context.Sp && + (ULONG64)teb_frame < (ULONG64)end_frame) { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 30014d925d9..998e09179b4 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -491,7 +491,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } } /* hack: call wine handlers registered in the tib list */ - else while ((ULONG64)teb_frame < context.Rsp) + else while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < context.Rsp) { TRACE_(seh)( "found wine frame %p rsp %p handler %p\n", teb_frame, (void *)context.Rsp, teb_frame->Handler ); @@ -1321,7 +1321,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) } /* hack: remove no longer accessible TEB frames */ - while ((ULONG64)teb_frame < context->Rsp) + while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < context->Rsp) { TRACE_(seh)( "removing TEB frame: %p\n", teb_frame ); teb_frame = __wine_pop_frame( teb_frame ); @@ -1422,7 +1422,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec else /* hack: call builtin handlers registered in the tib list */ { DWORD64 backup_frame = dispatch.EstablisherFrame; - while ((ULONG64)teb_frame < new_context.Rsp && (ULONG64)teb_frame < (ULONG64)end_frame) + while (is_valid_frame( (ULONG_PTR)teb_frame ) && + (ULONG64)teb_frame < new_context.Rsp && + (ULONG64)teb_frame < (ULONG64)end_frame) { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame;

1 0

Rémi Bernon : imm32/tests: Also ignore NotifyIME calls when ignoring WM_IME_NOTIFY.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: 8b04d345834f3a7eaef7ab1b05dcecc38f0d67c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b04d345834f3a7eaef7ab1b05dcec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 31 10:51:21 2024 +0100 imm32/tests: Also ignore NotifyIME calls when ignoring WM_IME_NOTIFY. --- dlls/imm32/tests/imm32.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index fe7d966ea09..5cf7b357417 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -557,6 +557,7 @@ static void ok_seq_( const char *file, int line, const struct ime_call *expected } static BOOL check_WM_SHOWWINDOW; +static BOOL ignore_IME_NOTIFY; static BOOL ignore_WM_IME_NOTIFY; static BOOL ignore_WM_IME_REQUEST; @@ -3581,7 +3582,7 @@ static BOOL WINAPI ime_NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD va .func = IME_NOTIFY, .notify = {.action = action, .index = index, .value = value} }; ime_trace( "himc %p, action %#lx, index %lu, value %lu\n", himc, action, index, value ); - ime_calls[ime_call_count++] = call; + if (!ignore_IME_NOTIFY) ime_calls[ime_call_count++] = call; return FALSE; } @@ -7237,6 +7238,7 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) ignore_WM_IME_NOTIFY = TRUE; + ignore_IME_NOTIFY = TRUE; keybd_event( 'Q', 0x10, 0, 0 ); flush_events(); @@ -7249,6 +7251,7 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) ok_seq( key_up_seq ); ignore_WM_IME_NOTIFY = FALSE; + ignore_IME_NOTIFY = FALSE; ok_ret( 1, ImmUnlockIMC( himc ) ); @@ -7606,6 +7609,7 @@ static void test_ga_na_da(void) ignore_WM_IME_NOTIFY = TRUE; + ignore_IME_NOTIFY = TRUE; /* cancelling clears the composition string */ @@ -7680,6 +7684,7 @@ static void test_ga_na_da(void) todo_wine ok_seq( closed_seq ); ignore_WM_IME_NOTIFY = FALSE; + ignore_IME_NOTIFY = FALSE; @@ -7849,6 +7854,7 @@ static void test_nihongo_no(void) for (i = 0; i < ARRAY_SIZE(closed_seq); i++) closed_seq[i].himc = himc; ignore_WM_IME_REQUEST = TRUE; ignore_WM_IME_NOTIFY = TRUE; + ignore_IME_NOTIFY = TRUE; keybd_event( 'N', 0x31, 0, 0 ); @@ -7900,6 +7906,7 @@ static void test_nihongo_no(void) ignore_WM_IME_REQUEST = FALSE; ignore_WM_IME_NOTIFY = FALSE; + ignore_IME_NOTIFY = FALSE; /* Japanese IME doesn't take input from ImmProcessKey */ @@ -7916,6 +7923,7 @@ static void test_nihongo_no(void) ignore_WM_IME_REQUEST = TRUE; ignore_WM_IME_NOTIFY = TRUE; + ignore_IME_NOTIFY = TRUE; /* cancelling clears the composition string */ @@ -7992,6 +8000,7 @@ static void test_nihongo_no(void) ignore_WM_IME_REQUEST = FALSE; ignore_WM_IME_NOTIFY = FALSE; + ignore_IME_NOTIFY = FALSE; ok_ret( 1, ImmSetConversionStatus( himc, 0, IME_SMODE_PHRASEPREDICT ) );

1 0

Rémi Bernon : imm32/tests: Fix some spurious failures with Windows ko_KR IME.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: d8a075dc9130ae1f0b7d85e18ea2ce1e8d63e536 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8a075dc9130ae1f0b7d85e18ea2ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 31 10:51:33 2024 +0100 imm32/tests: Fix some spurious failures with Windows ko_KR IME. Still fails spuriously from time to time as the IME sometimes doesn't kick in, but hopefully less often. --- dlls/imm32/tests/imm32.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 5cf7b357417..7131bc2f6a5 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -7092,11 +7092,11 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) { { .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_PROCESS_KEY, - .process_key = {.vkey = 'Q', .lparam = MAKELONG(1, 0x10)}, + .process_key = {.vkey = VK_RETURN, .lparam = MAKELONG(1, 0x1c)}, }, { .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_TO_ASCII_EX, - .to_ascii_ex = {.vkey = kbd_char_first ? MAKELONG('Q', 'q') : 'Q', .vsc = 0x10}, + .to_ascii_ex = {.vkey = kbd_char_first ? MAKELONG(VK_RETURN, VK_RETURN) : VK_RETURN, .vsc = 0x1c}, }, {0}, }; @@ -7104,11 +7104,11 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) { { .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_PROCESS_KEY, - .process_key = {.vkey = 'Q', .lparam = MAKELONG(1, 0xc010)}, + .process_key = {.vkey = VK_RETURN, .lparam = MAKELONG(1, 0xc01c)}, }, { .hkl = expect_ime, .himc = 0/*himc*/, .func = IME_TO_ASCII_EX, - .to_ascii_ex = {.vkey = 'Q', .vsc = 0xc010}, + .to_ascii_ex = {.vkey = VK_RETURN, .vsc = 0xc01c}, }, {0}, }; @@ -7240,12 +7240,12 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) ignore_WM_IME_NOTIFY = TRUE; ignore_IME_NOTIFY = TRUE; - keybd_event( 'Q', 0x10, 0, 0 ); + keybd_event( VK_RETURN, 0x1c, 0, 0 ); flush_events(); process_messages_( hwnd ); ok_seq( key_down_seq ); - keybd_event( 'Q', 0x10, KEYEVENTF_KEYUP, 0 ); + keybd_event( VK_RETURN, 0x1c, KEYEVENTF_KEYUP, 0 ); flush_events(); process_messages_( hwnd ); ok_seq( key_up_seq ); @@ -7500,6 +7500,9 @@ static void test_ga_na_da(void) ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); flush_events(); + ignore_WM_IME_NOTIFY = TRUE; + ignore_IME_NOTIFY = TRUE; + himc = ImmCreateContext(); ok_ne( NULL, himc, HIMC, "%p" ); ctx = ImmLockIMC( himc ); @@ -7508,6 +7511,15 @@ static void test_ga_na_da(void) ok_ret( 1, ImmSetOpenStatus( himc, TRUE ) ); ok_ret( 1, ImmSetConversionStatus( himc, IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE, IME_SMODE_PHRASEPREDICT ) ); flush_events(); + + keybd_event( 'R', 0x13, 0, 0 ); + flush_events(); + keybd_event( 'R', 0x13, KEYEVENTF_KEYUP, 0 ); + + keybd_event( VK_RETURN, 0x1c, 0, 0 ); + flush_events(); + keybd_event( VK_RETURN, 0x1c, KEYEVENTF_KEYUP, 0 ); + flush_events(); memset( ime_calls, 0, sizeof(ime_calls) ); ime_call_count = 0; @@ -7608,9 +7620,6 @@ static void test_ga_na_da(void) todo_wine ok_seq( partial_return_seq ); - ignore_WM_IME_NOTIFY = TRUE; - ignore_IME_NOTIFY = TRUE; - /* cancelling clears the composition string */ keybd_event( 'R', 0x13, 0, 0 ); @@ -8033,6 +8042,12 @@ START_TEST(imm32) test_ImmEnumInputContext(); + /* run these before installing the custom IME, sometimes it takes a moment + * to uninstall and the default IME doesn't activate immediately + */ + test_ga_na_da(); + test_nihongo_no(); + test_ImmInstallIME(); wineime_hkl = ime_install(); @@ -8084,9 +8099,6 @@ START_TEST(imm32) if (wineime_hkl) ime_cleanup( wineime_hkl, TRUE ); - test_ga_na_da(); - test_nihongo_no(); - if (init()) { test_ImmNotifyIME();

1 0

Rémi Bernon : win32u: Only queue a single IME update during ImeProcessKey.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: e607da943aa6869ba334611ccfd044f2ffe212c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e607da943aa6869ba334611ccfd044… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 19 09:34:54 2024 +0100 win32u: Only queue a single IME update during ImeProcessKey. --- dlls/win32u/imm.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index d612e7ca6e9..d1dc1de8c55 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -61,7 +61,7 @@ struct imm_thread_data UINT window_cnt; WORD ime_process_scan; /* scan code of the key being processed */ WORD ime_process_vkey; /* vkey of the key being processed */ - BOOL ime_process_result; /* result string has been received */ + struct ime_update *update; /* result of ImeProcessKey */ }; static struct list thread_data_list = LIST_INIT( thread_data_list ); @@ -454,18 +454,22 @@ static void post_ime_update( HWND hwnd, UINT cursor_pos, WCHAR *comp_str, WCHAR update->comp_str = comp_str ? memcpy( update->buffer, comp_str, comp_len * sizeof(WCHAR) ) : NULL; update->result_str = result_str ? memcpy( update->buffer + comp_len, result_str, result_len * sizeof(WCHAR) ) : NULL; - pthread_mutex_lock( &imm_mutex ); - update->scan = data->ime_process_scan; if (!(update->vkey = data->ime_process_vkey)) { + pthread_mutex_lock( &imm_mutex ); id = update->scan = ++ime_update_count; update->vkey = VK_PROCESSKEY; - } - list_add_tail( &ime_updates, &update->entry ); - pthread_mutex_unlock( &imm_mutex ); + list_add_tail( &ime_updates, &update->entry ); + pthread_mutex_unlock( &imm_mutex ); - if (!data->ime_process_vkey) NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_COMP_STRING, id ); - if (result_str) data->ime_process_result = TRUE; + NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_COMP_STRING, id ); + } + else + { + update->scan = data->ime_process_scan; + free( data->update ); + data->update = update; + } } static struct ime_update *find_ime_update( WORD vkey, WORD scan ) @@ -581,10 +585,17 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR data->ime_process_scan = HIWORD(lparam) & 0x1ff; data->ime_process_vkey = LOWORD(wparam); - data->ime_process_result = FALSE; res = user_driver->pImeProcessKey( params->himc, wparam, lparam, params->state ); data->ime_process_vkey = data->ime_process_scan = 0; - if (!res) res = data->ime_process_result; + + if (data->update) + { + pthread_mutex_lock( &imm_mutex ); + list_add_tail( &ime_updates, &data->update->entry ); + pthread_mutex_unlock( &imm_mutex ); + data->update = NULL; + res = TRUE; + } TRACE( "processing scan %#x, vkey %#x -> %u\n", LOWORD(wparam), HIWORD(lparam) & 0x1ff, (UINT)res ); return res;

1 0

Jacek Caban : mf: Avoid implicit enum to int pointer casts.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: b4fa0147e3ba8f91052909c71605d8b5f235bc52 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4fa0147e3ba8f91052909c71605d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:02:06 2023 +0100 mf: Avoid implicit enum to int pointer casts. --- dlls/mf/topology_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 806f61f8c33..50d9d3bd74f 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -386,8 +386,8 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME { IMFMediaTypeHandler *down_handler; IMFMediaType *down_type = NULL; - MF_CONNECT_METHOD method; MF_TOPOLOGY_TYPE type; + UINT32 method; DWORD flags; HRESULT hr; @@ -465,7 +465,7 @@ static HRESULT topology_branch_foreach_up_types(IMFTopology *topology, MF_CONNEC static HRESULT topology_branch_connect(IMFTopology *topology, MF_CONNECT_METHOD method_mask, struct topology_branch *branch, BOOL enumerate_source_types) { - MF_CONNECT_METHOD method; + UINT32 method; HRESULT hr; TRACE("topology %p, method_mask %#x, branch %s.\n", topology, method_mask, debugstr_topology_branch(branch));

1 0

Jacek Caban : mfplat: Avoid implicit cast in IMFAttributes_GetUINT32 call.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: e935c242c3c7ef0b274e54d376fa52de93d32396 URL: https://gitlab.winehq.org/wine/wine/-/commit/e935c242c3c7ef0b274e54d376fa52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:14:21 2023 +0100 mfplat: Avoid implicit cast in IMFAttributes_GetUINT32 call. --- dlls/mfplat/sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index a50f81c93d4..4d75924b939 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1423,7 +1423,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u unsigned int i, value; GUID major, subtype; UINT64 frame_size; - D3D11_USAGE usage; + UINT32 usage; HRESULT hr; if (FAILED(hr = IMFMediaType_GetMajorType(media_type, &major)))

1 0

Jacek Caban : mfplat/tests: Use MF_ATTRIBUTE_TYPE type in IMFMediaType_GetItemType call.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: 2e89cb4040bf38d05c76b4770f5e8cf23e1f4118 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e89cb4040bf38d05c76b4770f5e8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:21:34 2023 +0100 mfplat/tests: Use MF_ATTRIBUTE_TYPE type in IMFMediaType_GetItemType call. --- dlls/mfplat/tests/mfplat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d75ad051d35..6897036e9dd 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5069,7 +5069,8 @@ static void test_attributes_serialization(void) static void test_wrapped_media_type(void) { IMFMediaType *mediatype, *mediatype2; - UINT32 count, type; + MF_ATTRIBUTE_TYPE type; + UINT32 count; HRESULT hr; GUID guid;

1 0

Jacek Caban : mfplat: Introduce media_type_get_uint32 helper.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: b8326ad4de6016a77ad0f65c7d59e8c145d22f50 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8326ad4de6016a77ad0f65c7d59e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:19:42 2023 +0100 mfplat: Introduce media_type_get_uint32 helper. --- dlls/mfplat/mediatype.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index e68d7af2c12..66c0aaa2c62 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3221,12 +3221,18 @@ HRESULT WINAPI MFCreateAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID return hr; } +static UINT32 media_type_get_uint32(IMFMediaType *media_type, REFGUID guid) +{ + UINT32 value; + return SUCCEEDED(IMFMediaType_GetUINT32(media_type, guid, &value)) ? value : 0; +} + /*********************************************************************** * MFCreateMFVideoFormatFromMFMediaType (mfplat.@) */ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size) { - UINT32 flags, palette_size = 0, value; + UINT32 palette_size = 0; MFVIDEOFORMAT *format; INT32 stride; GUID guid; @@ -3258,40 +3264,35 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF media_type_get_ratio(media_type, &MF_MT_FRAME_RATE, &format->videoInfo.FramesPerSecond.Numerator, &format->videoInfo.FramesPerSecond.Denominator); - IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_CHROMA_SITING, &format->videoInfo.SourceChromaSubsampling); - IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &format->videoInfo.InterlaceMode); - IMFMediaType_GetUINT32(media_type, &MF_MT_TRANSFER_FUNCTION, &format->videoInfo.TransferFunction); - IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_PRIMARIES, &format->videoInfo.ColorPrimaries); - IMFMediaType_GetUINT32(media_type, &MF_MT_YUV_MATRIX, &format->videoInfo.TransferMatrix); - IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_LIGHTING, &format->videoInfo.SourceLighting); - IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_NOMINAL_RANGE, &format->videoInfo.NominalRange); + format->videoInfo.SourceChromaSubsampling = media_type_get_uint32(media_type, &MF_MT_VIDEO_CHROMA_SITING); + format->videoInfo.InterlaceMode = media_type_get_uint32(media_type, &MF_MT_INTERLACE_MODE); + format->videoInfo.TransferFunction = media_type_get_uint32(media_type, &MF_MT_TRANSFER_FUNCTION); + format->videoInfo.ColorPrimaries = media_type_get_uint32(media_type, &MF_MT_VIDEO_PRIMARIES); + format->videoInfo.TransferMatrix = media_type_get_uint32(media_type, &MF_MT_YUV_MATRIX); + format->videoInfo.SourceLighting = media_type_get_uint32(media_type, &MF_MT_VIDEO_LIGHTING); + format->videoInfo.NominalRange = media_type_get_uint32(media_type, &MF_MT_VIDEO_NOMINAL_RANGE); IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&format->videoInfo.GeometricAperture, sizeof(format->videoInfo.GeometricAperture), NULL); IMFMediaType_GetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)&format->videoInfo.MinimumDisplayAperture, sizeof(format->videoInfo.MinimumDisplayAperture), NULL); /* Video flags. */ - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_PAD_CONTROL_FLAGS, &flags))) - format->videoInfo.VideoFlags |= flags; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_SOURCE_CONTENT_HINT, &flags))) - format->videoInfo.VideoFlags |= flags; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DRM_FLAGS, &flags))) - format->videoInfo.VideoFlags |= flags; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_PAN_SCAN_ENABLED, &flags)) && !!flags) + format->videoInfo.VideoFlags |= media_type_get_uint32(media_type, &MF_MT_PAD_CONTROL_FLAGS); + format->videoInfo.VideoFlags |= media_type_get_uint32(media_type, &MF_MT_SOURCE_CONTENT_HINT); + format->videoInfo.VideoFlags |= media_type_get_uint32(media_type, &MF_MT_DRM_FLAGS); + if (media_type_get_uint32(media_type, &MF_MT_PAN_SCAN_ENABLED)) { format->videoInfo.VideoFlags |= MFVideoFlag_PanScanEnabled; IMFMediaType_GetBlob(media_type, &MF_MT_PAN_SCAN_APERTURE, (UINT8 *)&format->videoInfo.PanScanAperture, sizeof(format->videoInfo.PanScanAperture), NULL); } - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride)) && stride < 0) + stride = media_type_get_uint32(media_type, &MF_MT_DEFAULT_STRIDE); + if (stride < 0) format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &value))) - format->compressedInfo.AvgBitrate = value; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &value))) - format->compressedInfo.AvgBitErrorRate = value; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &value))) - format->compressedInfo.MaxKeyFrameSpacing = value; + format->compressedInfo.AvgBitrate = media_type_get_uint32(media_type, &MF_MT_AVG_BITRATE); + format->compressedInfo.AvgBitErrorRate = media_type_get_uint32(media_type, &MF_MT_AVG_BIT_ERROR_RATE); + format->compressedInfo.MaxKeyFrameSpacing = media_type_get_uint32(media_type, &MF_MT_MAX_KEYFRAME_SPACING); /* Palette. */ if (palette_size)

1 0