- Wine-Commits - list.winehq.org

Piotr Caban : wineps: Handle EMR_SETWINDOWORGEX record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 706569086fb6d9b82f6900f31af1ed30559ea582 URL: https://gitlab.winehq.org/wine/wine/-/commit/706569086fb6d9b82f6900f31af1ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:56:14 2023 +0200 wineps: Handle EMR_SETWINDOWORGEX record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 03f46a98616..49d2a401e23 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -514,6 +514,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_SETWINDOWEXTEX: + case EMR_SETWINDOWORGEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM:

1 0

Piotr Caban : wineps: Handle EMR_PAINTRGN record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 9e09705d494188a644f075e82532537a8654ce88 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e09705d494188a644f075e8253253… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:54:20 2023 +0200 wineps: Handle EMR_PAINTRGN record in spool files. --- dlls/wineps.drv/printproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 97af61664ac..702e04b3f63 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -356,6 +356,16 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } return ret; } + case EMR_PAINTRGN: + { + const EMRPAINTRGN *p = (const EMRPAINTRGN *)rec; + HRGN rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); + int ret; + + ret = PSDRV_PaintRgn(&data->pdev->dev, rgn); + DeleteObject(rgn); + return ret; + } case EMR_POLYBEZIER16: { const EMRPOLYBEZIER16 *p = (const EMRPOLYBEZIER16 *)rec;

1 0

Piotr Caban : wineps: Handle EMR_ANGLEARC record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: f4d6b054efd5617b52598bcc527b244468ba4693 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4d6b054efd5617b52598bcc527b24… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:53:12 2023 +0200 wineps: Handle EMR_ANGLEARC record in spool files. --- dlls/wineps.drv/printproc.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 71db4488b41..97af61664ac 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> #include <stdlib.h> #include <windows.h> @@ -131,6 +132,11 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } +static inline INT GDI_ROUND(double val) +{ + return (int)floor(val + 0.5); +} + static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const ENHMETARECORD *rec, int n, LPARAM arg) { @@ -242,6 +248,32 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return 1; } } + case EMR_ANGLEARC: + { + const EMRANGLEARC *p = (const EMRANGLEARC *)rec; + int arc_dir = SetArcDirection(data->pdev->dev.hdc, + p->eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE); + EMRARCTO arcto; + int ret; + + arcto.emr.iType = EMR_ARCTO; + arcto.rclBox.left = p->ptlCenter.x - p->nRadius; + arcto.rclBox.top = p->ptlCenter.y - p->nRadius; + arcto.rclBox.right = p->ptlCenter.x + p->nRadius; + arcto.rclBox.bottom = p->ptlCenter.y + p->nRadius; + arcto.ptlStart.x = GDI_ROUND(p->ptlCenter.x + + cos(p->eStartAngle * M_PI / 180) * p->nRadius); + arcto.ptlStart.y = GDI_ROUND(p->ptlCenter.y - + sin(p->eStartAngle * M_PI / 180) * p->nRadius); + arcto.ptlEnd.x = GDI_ROUND(p->ptlCenter.x + + cos((p->eStartAngle + p->eSweepAngle) * M_PI / 180) * p->nRadius); + arcto.ptlEnd.y = GDI_ROUND(p->ptlCenter.y - + sin((p->eStartAngle + p->eSweepAngle) * M_PI / 180) * p->nRadius); + + ret = hmf_proc(hdc, htable, (ENHMETARECORD *)&arcto, n, arg); + SetArcDirection(data->pdev->dev.hdc, arc_dir); + return ret; + } case EMR_ELLIPSE: { const EMRELLIPSE *p = (const EMRELLIPSE *)rec;

1 0

Piotr Caban : wineps: Support arc direction in PSDRV_DrawArc.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: dbf901a4da32b5f6ff613c4d2e09b057fcf67010 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbf901a4da32b5f6ff613c4d2e09b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:50:39 2023 +0200 wineps: Support arc direction in PSDRV_DrawArc. --- dlls/wineps.drv/graphics.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 3ea663ccb2d..94ae51d5764 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -226,7 +226,10 @@ static BOOL PSDRV_DrawArc( PHYSDEV dev, INT left, INT top, else PSDRV_WriteNewPath( dev ); - PSDRV_WriteArc(dev, x, y, w, h, start_angle, end_angle); + if(GetArcDirection(dev->hdc) == AD_COUNTERCLOCKWISE) + PSDRV_WriteArc(dev, x, y, w, h, start_angle, end_angle); + else + PSDRV_WriteArc(dev, x, y, w, h, end_angle, start_angle); if(lines == 1 || lines == 2) { /* chord or pie */ PSDRV_WriteClosePath(dev); PSDRV_Brush(dev,0);

1 0

Piotr Caban : wineps: Handle EMR_SETWINDOWEXTEX record in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: f6aa74e3b7a77fda1149637524db836112c6f3fb URL: https://gitlab.winehq.org/wine/wine/-/commit/f6aa74e3b7a77fda1149637524db83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:55:42 2023 +0200 wineps: Handle EMR_SETWINDOWEXTEX record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 702e04b3f63..03f46a98616 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -513,6 +513,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return 1; } + case EMR_SETWINDOWEXTEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM:

1 0

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