March 2023 - Wine-Commits - list.winehq.org

Vijay Kiran Kamuju : msvcr100: Add _UnrealizedChore::_CheckTaskCollection stub.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 8426109a439c35334f72fbf12aa15948366b2fb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8426109a439c35334f72fbf12aa159… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Mar 17 13:19:19 2023 +0000 msvcr100: Add _UnrealizedChore::_CheckTaskCollection stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53794 --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 8 ++++++++ 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 8ddf2255f31..f2b2789a5e2 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -440,9 +440,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e2107055c24..3e2839b3908 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -313,8 +313,8 @@ @ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=win32 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ thiscall -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=win32 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_Assert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPBD0H(a)Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4fc5a069fbb..c23293ea658 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -493,9 +493,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b379830d4b..6eac1937227 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -490,9 +490,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) _UnrealizedChore__CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) _UnrealizedChore__CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 37282fc54f8..aad6ece8acc 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -487,9 +487,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ(ptr) msvcr120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ(ptr) msvcr120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ(ptr) msvcr120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index fe156938e3a..01ba54308f0 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2224,6 +2224,14 @@ bool __thiscall _StructuredTaskCollection__IsCanceling( return FALSE; } +/* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ */ +/* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_UnrealizedChore__CheckTaskCollection, 4) +void __thiscall _UnrealizedChore__CheckTaskCollection(_UnrealizedChore *this) +{ + FIXME("() stub\n"); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Alexandre Julliard : ntdll: Only fall back to start.exe when using a different loader.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: e588e218f0c8a3160ca81b010b401ccf44ea7d51 URL: https://gitlab.winehq.org/wine/wine/-/commit/e588e218f0c8a3160ca81b010b401c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 11:58:30 2023 +0200 ntdll: Only fall back to start.exe when using a different loader. --- dlls/ntdll/unix/env.c | 9 ++++++++- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 1e951877ab7..3c178350f2b 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1932,8 +1932,15 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params( void **module ) status = load_main_exe( NULL, main_argv[1], curdir, &image, module ); if (!status) { + char *loader; + if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; - if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; + /* if we have to use a different loader, fall back to start.exe */ + if ((loader = get_alternate_wineloader( main_image_info.Machine ))) + { + free( loader ); + status = STATUS_INVALID_IMAGE_FORMAT; + } } if (status) /* try launching it through start.exe */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0d719979046..16c044d502e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -656,7 +656,7 @@ static void init_paths( char *argv[] ) /*********************************************************************** * get_alternate_wineloader */ -static char *get_alternate_wineloader( WORD machine ) +char *get_alternate_wineloader( WORD machine ) { char *ret = NULL; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 57b8f01641c..b803b1cef46 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -175,6 +175,7 @@ extern void init_startup_info(void) DECLSPEC_HIDDEN; extern void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; +extern char *get_alternate_wineloader( WORD machine ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; extern NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, void **addr_ptr, SIZE_T *size_ptr, ULONG_PTR zero_bits ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : imm32: Introduce a new imc_select_hkl helper.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 9c8b3e6f421fa1c5a0158f596b33bd3861c28cf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c8b3e6f421fa1c5a0158f596b33bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 12:49:06 2023 +0200 imm32: Introduce a new imc_select_hkl helper. --- dlls/imm32/imm.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 803fb555786..473f1927753 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -564,6 +564,23 @@ static void ime_release( struct ime *ime ) LeaveCriticalSection( &ime_cs ); } +static void imc_select_hkl( struct imc *imc, HKL hkl ) +{ + if (imc->ime) + { + if (imc->ime->hkl == hkl) return; + imc->ime->pImeSelect( imc->handle, FALSE ); + ime_release( imc->ime ); + } + + if (!hkl) + imc->ime = NULL; + else if (!(imc->ime = ime_acquire( hkl ))) + WARN( "Failed to acquire IME for HKL %p\n", hkl ); + else + imc->ime->pImeSelect( imc->handle, TRUE ); +} + static BOOL CALLBACK enum_activate_layout( HIMC himc, LPARAM lparam ) { if (ImmLockIMC( himc )) ImmUnlockIMC( himc ); @@ -3026,20 +3043,8 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD TRACE("%p %p %x %x %lx\n",hwnd, hKL, vKey, (UINT)lKeyData, unknown); if (!(data = get_imc_data( imc ))) return FALSE; - - /* Make sure we are inputting to the correct keyboard */ - if (data->ime->hkl != hKL) - { - struct ime *new_hkl; - - if (!(new_hkl = ime_acquire( hKL ))) return FALSE; - - data->ime->pImeSelect( imc, FALSE ); - ime_release( data->ime ); - - data->ime = new_hkl; - data->ime->pImeSelect( imc, TRUE ); - } + imc_select_hkl( data, hKL ); + if (!data->ime) return FALSE; GetKeyboardState(state); if (data->ime->pImeProcessKey( imc, vKey, lKeyData, state ))

1 0

Rémi Bernon : imm32: Update HIMC private data when selecting IME.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: de4323611a232fd0cd25c59625ff08af91c75a8f URL: https://gitlab.winehq.org/wine/wine/-/commit/de4323611a232fd0cd25c59625ff08… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 28 09:27:28 2023 +0200 imm32: Update HIMC private data when selecting IME. --- dlls/imm32/imm.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 473f1927753..04bfc461658 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -571,6 +571,7 @@ static void imc_select_hkl( struct imc *imc, HKL hkl ) if (imc->ime->hkl == hkl) return; imc->ime->pImeSelect( imc->handle, FALSE ); ime_release( imc->ime ); + ImmDestroyIMCC( imc->IMC.hPrivate ); } if (!hkl) @@ -578,7 +579,13 @@ static void imc_select_hkl( struct imc *imc, HKL hkl ) else if (!(imc->ime = ime_acquire( hkl ))) WARN( "Failed to acquire IME for HKL %p\n", hkl ); else + { + if (!(imc->IMC.hPrivate = ImmCreateIMCC( imc->ime->info.dwPrivateDataSize ))) + WARN( "Failed to allocate IME private data for IMC %p\n", imc ); + imc->IMC.fdwConversion = imc->ime->info.fdwConversionCaps; + imc->IMC.fdwSentence = imc->ime->info.fdwSentenceCaps; imc->ime->pImeSelect( imc->handle, TRUE ); + } } static BOOL CALLBACK enum_activate_layout( HIMC himc, LPARAM lparam ) @@ -872,15 +879,7 @@ static struct imc *create_input_context( HIMC default_imc ) LPCANDIDATEINFO ci; int i; - new_context = calloc( 1, sizeof(*new_context) ); - - /* Load the IME */ - if (!(new_context->ime = ime_acquire( GetKeyboardLayout( 0 ) ))) - { - TRACE("IME dll could not be loaded\n"); - free( new_context ); - return 0; - } + if (!(new_context = calloc( 1, sizeof(*new_context) ))) return NULL; /* the HIMCCs are never NULL */ new_context->IMC.hCompStr = ImmCreateBlankCompStr(); @@ -899,12 +898,6 @@ static struct imc *create_input_context( HIMC default_imc ) for (i = 0; i < ARRAY_SIZE(new_context->IMC.cfCandForm); i++) new_context->IMC.cfCandForm[i].dwIndex = ~0u; - /* Initialize the IME Private */ - new_context->IMC.hPrivate = ImmCreateIMCC( new_context->ime->info.dwPrivateDataSize ); - - new_context->IMC.fdwConversion = new_context->ime->info.fdwConversionCaps; - new_context->IMC.fdwSentence = new_context->ime->info.fdwSentenceCaps; - if (!default_imc) new_context->handle = NtUserCreateInputContext((UINT_PTR)new_context); else if (NtUserUpdateInputContext(default_imc, NtUserInputContextClientPtr, (UINT_PTR)new_context)) @@ -915,12 +908,7 @@ static struct imc *create_input_context( HIMC default_imc ) return 0; } - if (!new_context->ime->pImeSelect( new_context->handle, TRUE )) - { - TRACE("Selection of IME failed\n"); - IMM_DestroyContext(new_context); - return 0; - } + imc_select_hkl( new_context, GetKeyboardLayout( 0 ) ); SendMessageW( GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->ime ); TRACE("Created context %p\n", new_context);

1 0

Alexandre Julliard : ntdll: Add a helper function to return the alternate 32/64 loader.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: bdc11ee079878fdd3fa3ed8ac274cbd6effba59d URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc11ee079878fdd3fa3ed8ac274cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 11:57:34 2023 +0200 ntdll: Add a helper function to return the alternate 32/64 loader. --- dlls/ntdll/unix/loader.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 119de56e204..0d719979046 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -653,6 +653,32 @@ static void init_paths( char *argv[] ) } +/*********************************************************************** + * get_alternate_wineloader + */ +static char *get_alternate_wineloader( WORD machine ) +{ + char *ret = NULL; + + if (machine == current_machine) return NULL; + + if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */ + { + size_t len = strlen(wineloader); + + if (len <= 2 || strcmp( wineloader + len - 2, "64" )) + { + ret = malloc( len + 3 ); + strcpy( ret, wineloader ); + strcat( ret, "64" ); + } + return ret; + } + + return remove_tail( wineloader, "64" ); +} + + static void preloader_exec( char **argv ) { if (use_preloader) @@ -686,22 +712,7 @@ static void preloader_exec( char **argv ) /* exec the appropriate wine loader for the specified machine */ static NTSTATUS loader_exec( char **argv, WORD machine ) { - if (machine != current_machine) - { - if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */ - { - size_t len = strlen(wineloader); - - if (len <= 2 || strcmp( wineloader + len - 2, "64" )) - { - argv[1] = malloc( len + 3 ); - strcpy( argv[1], wineloader ); - strcat( argv[1], "64" ); - preloader_exec( argv ); - } - } - else if ((argv[1] = remove_tail( wineloader, "64" ))) preloader_exec( argv ); - } + if (((argv[1] = get_alternate_wineloader( machine )))) preloader_exec( argv ); argv[1] = strdup( wineloader ); preloader_exec( argv );

1 0

Rémi Bernon : imm32: Enumerate input contexts in ImmActivateLayout.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 0aa3b85b9795f2e18e16589c60e4bb1ed418e108 URL: https://gitlab.winehq.org/wine/wine/-/commit/0aa3b85b9795f2e18e16589c60e4bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 12:48:51 2023 +0200 imm32: Enumerate input contexts in ImmActivateLayout. --- dlls/imm32/imm.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ee9e673233b..803fb555786 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -564,13 +564,21 @@ static void ime_release( struct ime *ime ) LeaveCriticalSection( &ime_cs ); } +static BOOL CALLBACK enum_activate_layout( HIMC himc, LPARAM lparam ) +{ + if (ImmLockIMC( himc )) ImmUnlockIMC( himc ); + return TRUE; +} + BOOL WINAPI ImmActivateLayout( HKL hkl ) { - FIXME( "hkl %p semi-stub!\n", hkl ); + TRACE( "hkl %p\n", hkl ); if (hkl == GetKeyboardLayout( 0 )) return TRUE; if (!ActivateKeyboardLayout( hkl, 0 )) return FALSE; + ImmEnumInputContext( 0, enum_activate_layout, 0 ); + return TRUE; }

1 0

Rémi Bernon : imm32/tests: Test ActivateKeyboardLayout with an existing window.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 462d5ca257db7ac6a8a7f6dcee0344d6ea99547b URL: https://gitlab.winehq.org/wine/wine/-/commit/462d5ca257db7ac6a8a7f6dcee0344… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 25 13:47:20 2023 +0100 imm32/tests: Test ActivateKeyboardLayout with an existing window. --- dlls/imm32/tests/imm32.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index dffb90b9872..8340d67deae 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3869,6 +3869,44 @@ static void test_ImmActivateLayout(void) CHECK_CALLED( ImeDestroy ); ok_seq( empty_sequence ); + + /* when there's a window, ActivateKeyboardLayout calls ImeInquire */ + + if (!(hkl = ime_install())) goto cleanup; + + hwnd = CreateWindowW( L"static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 100, 100, NULL, NULL, NULL, NULL ); + ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); + ok_seq( empty_sequence ); + + SET_EXPECT( ImeInquire ); + ok_eq( old_hkl, ActivateKeyboardLayout( hkl, 0 ), HKL, "%p" ); + todo_wine + CHECK_CALLED( ImeInquire ); + ok_seq( activate_seq ); + + ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); + + ok_eq( hkl, ActivateKeyboardLayout( old_hkl, 0 ), HKL, "%p" ); + ok_seq( deactivate_seq ); + + ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); + + ime_cleanup( hkl ); + ok_seq( empty_sequence ); + + /* ImmActivateLayout leaks the IME, we need to free it manually */ + + SET_EXPECT( ImeDestroy ); + ret = ImmFreeLayout( hkl ); + ok( ret, "ImmFreeLayout returned %u\n", ret ); + todo_wine + CHECK_CALLED( ImeDestroy ); + ok_seq( empty_sequence ); + + ok_ret( 1, DestroyWindow( hwnd ) ); + + cleanup: SET_ENABLE( ImeInquire, FALSE ); SET_ENABLE( ImeDestroy, FALSE );

1 0

Rémi Bernon : imm32: Call ImeSelect from ImmLockIMC with current IME.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 61219f1b8be1f827b99dd2ffc5c5046b751d664c URL: https://gitlab.winehq.org/wine/wine/-/commit/61219f1b8be1f827b99dd2ffc5c504… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 28 09:27:28 2023 +0200 imm32: Call ImeSelect from ImmLockIMC with current IME. --- dlls/imm32/imm.c | 15 +++++++++------ dlls/imm32/tests/imm32.c | 20 ++++++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 04bfc461658..2c3af063ac5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2829,14 +2829,17 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC himc, DWORD flags, DWORD type, IMEMENUITE /*********************************************************************** * ImmLockIMC(IMM32.@) */ -LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC hIMC) +INPUTCONTEXT *WINAPI ImmLockIMC( HIMC himc ) { - struct imc *data = get_imc_data( hIMC ); + struct imc *imc = get_imc_data( himc ); - if (!data) - return NULL; - data->dwLock++; - return &data->IMC; + TRACE( "himc %p\n", himc ); + + if (!imc) return NULL; + imc->dwLock++; + + imc_select_hkl( imc, GetKeyboardLayout( 0 ) ); + return &imc->IMC; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8340d67deae..e8116081f52 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3798,7 +3798,6 @@ static void test_ImmActivateLayout(void) { .hkl = expect_ime, .himc = default_himc, .func = IME_SELECT, .select = 1, - .todo = TRUE, }, {0}, }; @@ -3816,6 +3815,15 @@ static void test_ImmActivateLayout(void) }, {0}, }; + const struct ime_call activate_with_window_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_SELECT, .select = 1, + .todo = TRUE, + }, + {0}, + }; HKL hkl, old_hkl = GetKeyboardLayout( 0 ); UINT ret; @@ -3843,7 +3851,6 @@ static void test_ImmActivateLayout(void) SET_EXPECT( ImeInquire ); ok_ret( 1, ImmActivateLayout( hkl ) ); ok_seq( activate_seq ); - todo_wine CHECK_CALLED( ImeInquire ); ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); @@ -3851,8 +3858,10 @@ static void test_ImmActivateLayout(void) ok_ret( 1, ImmActivateLayout( hkl ) ); ok_seq( empty_sequence ); + todo_ImeDestroy = TRUE; /* Wine doesn't leak the IME */ ok_ret( 1, ImmActivateLayout( old_hkl ) ); ok_seq( deactivate_seq ); + todo_ImeDestroy = FALSE; ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); @@ -3865,7 +3874,6 @@ static void test_ImmActivateLayout(void) SET_EXPECT( ImeDestroy ); ret = ImmFreeLayout( hkl ); ok( ret, "ImmFreeLayout returned %u\n", ret ); - todo_wine CHECK_CALLED( ImeDestroy ); ok_seq( empty_sequence ); @@ -3883,7 +3891,7 @@ static void test_ImmActivateLayout(void) ok_eq( old_hkl, ActivateKeyboardLayout( hkl, 0 ), HKL, "%p" ); todo_wine CHECK_CALLED( ImeInquire ); - ok_seq( activate_seq ); + ok_seq( activate_with_window_seq ); ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); @@ -3919,12 +3927,12 @@ static void test_ImmCreateInputContext(void) { .hkl = expect_ime, .himc = default_himc, .func = IME_SELECT, .select = 1, - .todo = TRUE, .flaky_himc = TRUE, + .flaky_himc = TRUE, }, { .hkl = expect_ime, .himc = 0/*himc[0]*/, .func = IME_SELECT, .select = 1, - .todo = TRUE, .flaky_himc = TRUE, + .flaky_himc = TRUE, }, {0}, };

1 0

Rémi Bernon : win32u: Allow LANG_INVARIANT in NtUserActivateKeyboardLayout.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 4571456e703b944cdb7bc193ddb26da63635ff6e URL: https://gitlab.winehq.org/wine/wine/-/commit/4571456e703b944cdb7bc193ddb26d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 14:45:00 2023 +0200 win32u: Allow LANG_INVARIANT in NtUserActivateKeyboardLayout. --- dlls/win32u/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index a49376d96a9..34f6727d66e 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1207,7 +1207,8 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) return 0; } - if (NtQueryDefaultLocale( TRUE, &locale ) || LOWORD(layout) != locale) + if (LOWORD(layout) != MAKELANGID(LANG_INVARIANT, SUBLANG_DEFAULT) && + (NtQueryDefaultLocale( TRUE, &locale ) || LOWORD(layout) != locale)) { RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); FIXME_(keyboard)( "Changing user locale is not supported\n" );

1 0

Rémi Bernon : imm32/tests: Test ImmCreateInputContext et al.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: c2c27e7927a573199dbfc927d6caae2e57676ace URL: https://gitlab.winehq.org/wine/wine/-/commit/c2c27e7927a573199dbfc927d6caae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 15:23:11 2023 +0200 imm32/tests: Test ImmCreateInputContext et al. --- dlls/imm32/tests/imm32.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 204c805f748..dffb90b9872 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2519,6 +2519,7 @@ struct ime_call }; BOOL todo; + BOOL flaky_himc; }; struct ime_call empty_sequence[] = {{0}}; @@ -2531,7 +2532,9 @@ static void ok_call_( const char *file, int line, const struct ime_call *expecte int ret; if ((ret = expected->func - received->func)) goto done; - if ((ret = (UINT_PTR)expected->himc - (UINT_PTR)received->himc)) goto done; + /* Wine doesn't allocate HIMC in a deterministic order, ignore them when they are enumerated */ + if (expected->flaky_himc && (ret = !!(UINT_PTR)expected->himc - !!(UINT_PTR)received->himc)) goto done; + if (!expected->flaky_himc && (ret = (UINT_PTR)expected->himc - (UINT_PTR)received->himc)) goto done; if ((ret = (UINT)(UINT_PTR)expected->hkl - (UINT)(UINT_PTR)received->hkl)) goto done; switch (expected->func) { @@ -2598,7 +2601,6 @@ static void ok_seq_( const char *file, int line, const struct ime_call *expected static LRESULT CALLBACK ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { ime_trace( "hwnd %p, msg %#x, wparam %#Ix, lparam %#Ix\n", hwnd, msg, wparam, lparam ); - ok( 0, "unexpected call\n" ); return DefWindowProcW( hwnd, msg, wparam, lparam ); } @@ -3872,6 +3874,160 @@ cleanup: SET_ENABLE( ImeDestroy, FALSE ); } +static void test_ImmCreateInputContext(void) +{ + struct ime_call activate_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_SELECT, .select = 1, + .todo = TRUE, .flaky_himc = TRUE, + }, + { + .hkl = expect_ime, .himc = 0/*himc[0]*/, + .func = IME_SELECT, .select = 1, + .todo = TRUE, .flaky_himc = TRUE, + }, + {0}, + }; + struct ime_call select1_seq[] = + { + { + .hkl = expect_ime, .himc = 0/*himc[1]*/, + .func = IME_SELECT, .select = 1, + .todo = TRUE, + }, + {0}, + }; + struct ime_call select0_seq[] = + { + { + .hkl = expect_ime, .himc = 0/*himc[1]*/, + .func = IME_SELECT, .select = 0, + }, + {0}, + }; + struct ime_call deactivate_seq[] = + { + { + .hkl = expect_ime, .himc = default_himc, + .func = IME_NOTIFY, .notify = {.action = NI_COMPOSITIONSTR, .index = CPS_CANCEL, .value = 0}, + .todo = TRUE, .flaky_himc = TRUE, + }, + { + .hkl = expect_ime, .himc = 0/*himc[0]*/, + .func = IME_NOTIFY, .notify = {.action = NI_COMPOSITIONSTR, .index = CPS_CANCEL, .value = 0}, + .todo = TRUE, .flaky_himc = TRUE, + }, + { + .hkl = default_hkl, .himc = default_himc, + .func = IME_SELECT, .select = 0, + .todo = TRUE, .flaky_himc = TRUE, + }, + { + .hkl = default_hkl, .himc = 0/*himc[0]*/, + .func = IME_SELECT, .select = 0, + .todo = TRUE, .flaky_himc = TRUE, + }, + {0}, + }; + HKL hkl, old_hkl = GetKeyboardLayout( 0 ); + INPUTCONTEXT *ctx; + HIMC himc[2]; + HWND hwnd; + + ctx = ImmLockIMC( default_himc ); + ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); + ok_ret( 0, IsWindow( ctx->hWnd ) ); + ok_ret( 1, ImmUnlockIMC( default_himc ) ); + + + /* new input contexts cannot be locked before IME window has been created */ + + himc[0] = ImmCreateContext(); + ok( !!himc[0], "ImmCreateContext failed, error %lu\n", GetLastError() ); + ctx = ImmLockIMC( himc[0] ); + todo_wine + ok( !ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); + if (ctx) ImmUnlockIMCC( himc[0] ); + + hwnd = CreateWindowW( L"static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 100, 100, NULL, NULL, NULL, NULL ); + ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); + + ctx = ImmLockIMC( default_himc ); + ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); + ok_ret( 1, ImmUnlockIMC( default_himc ) ); + + ctx = ImmLockIMC( himc[0] ); + ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); + ok_ret( 1, ImmUnlockIMC( himc[0] ) ); + + + ime_info.fdwProperty = IME_PROP_END_UNLOAD | IME_PROP_UNICODE; + ime_info.dwPrivateDataSize = 123; + + if (!(hkl = ime_install())) goto cleanup; + + + /* Activating the layout calls ImeSelect 1 on existing HIMC */ + + ok_seq( empty_sequence ); + ok_ret( 1, ImmActivateLayout( hkl ) ); + activate_seq[1].himc = himc[0]; + ok_seq( activate_seq ); + + ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); + + ctx = ImmLockIMC( default_himc ); + ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); + ok_ret( 1, ImmUnlockIMC( default_himc ) ); + + ctx = ImmLockIMC( himc[0] ); + ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); + ok_ret( 1, ImmUnlockIMC( himc[0] ) ); + + + /* ImmLockIMC triggers the ImeSelect call, to allocate private data */ + + himc[1] = ImmCreateContext(); + ok( !!himc[1], "ImmCreateContext failed, error %lu\n", GetLastError() ); + + todo_wine + ok_seq( empty_sequence ); + ctx = ImmLockIMC( himc[1] ); + ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() ); + select1_seq[0].himc = himc[1]; + ok_seq( select1_seq ); + + ok_ret( 1, ImmUnlockIMC( himc[1] ) ); + + ok_seq( empty_sequence ); + ok_ret( 1, ImmDestroyContext( himc[1] ) ); + select0_seq[0].himc = himc[1]; + ok_seq( select0_seq ); + + + /* Deactivating the layout calls ImeSelect 0 on existing HIMC */ + + ok_ret( 1, ImmActivateLayout( old_hkl ) ); + deactivate_seq[1].himc = himc[0]; + deactivate_seq[3].himc = himc[0]; + ok_seq( deactivate_seq ); + + ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); + + ok_ret( 1, ImmFreeLayout( hkl ) ); + ime_cleanup( hkl ); + ok_seq( empty_sequence ); + +cleanup: + ok_ret( 1, ImmDestroyContext( himc[0] ) ); + ok_ret( 1, DestroyWindow( hwnd ) ); + + ime_info.dwPrivateDataSize = 0; +} + START_TEST(imm32) { default_hkl = GetKeyboardLayout( 0 ); @@ -3904,6 +4060,7 @@ START_TEST(imm32) test_ImmUnregisterWord( TRUE ); test_ImmActivateLayout(); + test_ImmCreateInputContext(); if (init()) {

1 0