wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Alexandre Julliard : wow64: Don't update the exception address in raise_exception().
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: c7fcbea4571f98cdc851ed299bf0e3346a79b8b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7fcbea4571f98cdc851ed299bf0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:27:21 2023 +0100 wow64: Don't update the exception address in raise_exception(). --- dlls/wow64/syscall.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 69f2f6c50a5..b6b3c0c2830 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -325,7 +325,6 @@ __ASM_GLOBAL_FUNC( raise_exception, "movq (%rsp),%rcx\n\t" /* original first parameter */ "movq 0x28(%rsp),%rax\n\t" /* return address */ "movq %rax,0xf8(%rdx)\n\t" /* context->Rip */ - "movq %rax,0x10(%rcx)\n\t" /* rec->ExceptionAddress */ "call " __ASM_NAME("NtRaiseException") ) #elif defined(__aarch64__) __ASM_GLOBAL_FUNC( raise_exception, @@ -344,7 +343,6 @@ __ASM_GLOBAL_FUNC( raise_exception, "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ "add x4, sp, #32\n\t" /* orig stack pointer */ "stp x4, x5, [x1, #0x100]\n\t" /* context->Sp, Pc */ - "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ "bl " __ASM_NAME("NtRaiseException") ) #endif

1 0

Alexandre Julliard : wow64: Fixup Eip for breakpoint exceptions.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: ce737601d54f42123c3cd56c2f923d7fe50756c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce737601d54f42123c3cd56c2f923d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:26:24 2023 +0100 wow64: Fixup Eip for breakpoint exceptions. Matching the 32-bit setup_raise_exception(). --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 17cfe337532..69f2f6c50a5 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -215,6 +215,9 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 context = RtlLocateLegacyContext( context_ex, NULL ); *context = ctx; context->ContextFlags = flags; + /* adjust Eip for breakpoints in software emulation (hardware exceptions already adjust Rip) */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && (wow64info->CpuFlags & WOW64_CPUFLAGS_SOFTWARE)) + context->Eip--; stack->context_ptr = PtrToUlong( context ); if (src_ex)

1 0

Alexandre Julliard : wow64: Create the WOW64INFO structure.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 3e3af62be980ff2ed5d2bdce21f78feeedd973ed URL: https://gitlab.winehq.org/wine/wine/-/commit/3e3af62be980ff2ed5d2bdce21f78f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:25:07 2023 +0100 wow64: Create the WOW64INFO structure. --- dlls/wow64/syscall.c | 8 ++++++++ dlls/wow64cpu/cpu.c | 3 +++ include/winternl.h | 14 ++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index d2bb054b6d0..17cfe337532 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -97,6 +97,7 @@ SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; /* wow64win syscall table */ static const SYSTEM_SERVICE_TABLE *psdwhwin32; static HMODULE win32u_module; +static WOW64INFO *wow64info; /* cpu backend dll functions */ static void * (WINAPI *pBTCpuGetBopCode)(void); @@ -783,6 +784,7 @@ static const WCHAR *get_cpu_dll_name(void) */ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { + TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); HMODULE module; UNICODE_STRING str = RTL_CONSTANT_STRING( L"ntdll.dll" ); SYSTEM_BASIC_INFORMATION info; @@ -793,6 +795,11 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ); highest_user_address = (ULONG_PTR)info.HighestUserAddress; default_zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + wow64info = (WOW64INFO *)((PEB32 *)ULongToPtr( teb32->Peb ) + 1); + wow64info->NativeSystemPageSize = 0x1000; + wow64info->NativeMachineType = native_machine; + wow64info->EmulatedMachineType = current_machine; + NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO] = wow64info; #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) @@ -836,6 +843,7 @@ static void thread_init(void) void *cpu_area_ctx; RtlWow64GetCurrentCpuArea( NULL, &cpu_area_ctx, NULL ); + NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO] = wow64info; if (pBTCpuThreadInit) pBTCpuThreadInit(); /* update initial context to jump to 32-bit LdrInitializeThunk (cf. 32-bit call_init_thunk) */ diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 5bcaf9d1c45..7911f7e8b72 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -290,6 +290,7 @@ NTSTATUS WINAPI BTCpuProcessInit(void) HMODULE module; UNICODE_STRING str; void **p__wine_unix_call_dispatcher; + WOW64INFO *wow64info = NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO]; if ((ULONG_PTR)syscall_32to64 >> 32) { @@ -297,6 +298,8 @@ NTSTATUS WINAPI BTCpuProcessInit(void) return STATUS_INVALID_ADDRESS; } + wow64info->CpuFlags |= WOW64_CPUFLAGS_MSFT64; + RtlInitUnicodeString( &str, L"ntdll.dll" ); LdrGetDllHandle( NULL, 0, &str, &module ); p__wine_unix_call_dispatcher = RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ); diff --git a/include/winternl.h b/include/winternl.h index 5a21f167d61..6fd0694b4ce 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1085,6 +1085,7 @@ typedef struct _TEB64 #define WOW64_TLS_USERCALLBACKDATA 5 #define WOW64_TLS_APCLIST 7 #define WOW64_TLS_FILESYSREDIR 8 +#define WOW64_TLS_WOW64INFO 10 #define WOW64_TLS_MAX_NUMBER 19 @@ -3855,6 +3856,19 @@ typedef struct _WOW64_CPU_AREA_INFO USHORT Machine; } WOW64_CPU_AREA_INFO, *PWOW64_CPU_AREA_INFO; +typedef struct _WOW64INFO +{ + ULONG NativeSystemPageSize; + ULONG CpuFlags; + ULONG Wow64ExecuteFlags; + ULONG unknown[5]; + USHORT NativeMachineType; + USHORT EmulatedMachineType; +} WOW64INFO; + +#define WOW64_CPUFLAGS_MSFT64 0x01 +#define WOW64_CPUFLAGS_SOFTWARE 0x02 + /* wow64.dll functions */ void * WINAPI Wow64AllocateTemp(SIZE_T); void WINAPI Wow64ApcRoutine(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*);

1 0

Rémi Bernon : imm32: Reorder control flow in ImmGetConversionListW.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: a8f11bb8f348c38f805bb3f85c3f88f0d86cd136 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8f11bb8f348c38f805bb3f85c3f88… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmGetConversionListW. --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7946b54d689..6a5ee4f2217 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1620,39 +1620,36 @@ DWORD WINAPI ImmGetConversionListA( HKL hkl, HIMC himc, const char *srcA, CANDID /*********************************************************************** * ImmGetConversionListW (IMM32.@) */ -DWORD WINAPI ImmGetConversionListW( - HKL hKL, HIMC hIMC, - LPCWSTR pSrc, LPCANDIDATELIST lpDst, - DWORD dwBufLen, UINT uFlag) +DWORD WINAPI ImmGetConversionListW( HKL hkl, HIMC himc, const WCHAR *srcW, CANDIDATELIST *listW, + DWORD lengthW, UINT flags ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %p, %s, %p, %ld, %d):\n", hKL, hIMC, debugstr_w(pSrc), lpDst, - dwBufLen, uFlag); - if (immHkl->hIME && immHkl->pImeConversionList) + struct ime *ime = IMM_GetImmHkl( hkl ); + DWORD ret; + + TRACE( "hkl %p, himc %p, srcW %s, listW %p, lengthW %lu, flags %#x.\n", hkl, himc, + debugstr_w(srcW), listW, lengthW, flags ); + + if (!ime->hIME || !ime->pImeConversionList) return 0; + + if (is_kbd_ime_unicode( ime )) + ret = ime->pImeConversionList( himc, srcW, listW, lengthW, flags ); + else { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeConversionList(hIMC,pSrc,lpDst,dwBufLen,uFlag); + CANDIDATELIST *listA; + char *srcA = strdupWtoA( srcW ); + DWORD lengthA = ime->pImeConversionList( himc, (const WCHAR *)srcA, NULL, 0, flags ); + + if (!(listA = HeapAlloc( GetProcessHeap(), 0, lengthA ))) ret = 0; else { - LPCANDIDATELIST lpaDst; - DWORD ret = 0, len; - LPSTR paSrc = strdupWtoA(pSrc); - - len = immHkl->pImeConversionList(hIMC, (LPCWSTR)paSrc, NULL, 0, uFlag); - lpaDst = HeapAlloc(GetProcessHeap(), 0, len); - if ( lpaDst ) - { - immHkl->pImeConversionList(hIMC, (LPCWSTR)paSrc, lpaDst, len, uFlag); - ret = convert_candidatelist_AtoW( lpaDst, lpDst, dwBufLen); - HeapFree(GetProcessHeap(), 0, lpaDst); - } - HeapFree(GetProcessHeap(), 0, paSrc); - - return ret; + ime->pImeConversionList( himc, (const WCHAR *)srcA, listA, lengthA, flags ); + ret = convert_candidatelist_AtoW( listA, listW, lengthW ); + HeapFree( GetProcessHeap(), 0, listA ); } + HeapFree( GetProcessHeap(), 0, srcA ); } - else - return 0; + + return ret; } /***********************************************************************

1 0

Rémi Bernon : imm32: Reorder control flow in ImmGetConversionListA.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 27b587d967d0556b18265a7f6b6352ca0a1bfda4 URL: https://gitlab.winehq.org/wine/wine/-/commit/27b587d967d0556b18265a7f6b6352… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmGetConversionListA. --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6fab7c9981b..7946b54d689 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1585,39 +1585,36 @@ HIMC WINAPI ImmGetContext(HWND hWnd) /*********************************************************************** * ImmGetConversionListA (IMM32.@) */ -DWORD WINAPI ImmGetConversionListA( - HKL hKL, HIMC hIMC, - LPCSTR pSrc, LPCANDIDATELIST lpDst, - DWORD dwBufLen, UINT uFlag) +DWORD WINAPI ImmGetConversionListA( HKL hkl, HIMC himc, const char *srcA, CANDIDATELIST *listA, + DWORD lengthA, UINT flags ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %p, %s, %p, %ld, %d):\n", hKL, hIMC, debugstr_a(pSrc), lpDst, - dwBufLen, uFlag); - if (immHkl->hIME && immHkl->pImeConversionList) + struct ime *ime = IMM_GetImmHkl( hkl ); + DWORD ret; + + TRACE( "hkl %p, himc %p, srcA %s, listA %p, lengthA %lu, flags %#x.\n", hkl, himc, + debugstr_a(srcA), listA, lengthA, flags ); + + if (!ime->hIME || !ime->pImeConversionList) return 0; + + if (!is_kbd_ime_unicode( ime )) + ret = ime->pImeConversionList( himc, (const WCHAR *)srcA, listA, lengthA, flags ); + else { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeConversionList(hIMC,(LPCWSTR)pSrc,lpDst,dwBufLen,uFlag); + CANDIDATELIST *listW; + WCHAR *srcW = strdupAtoW( srcA ); + DWORD lengthW = ime->pImeConversionList( himc, srcW, NULL, 0, flags ); + + if (!(listW = HeapAlloc( GetProcessHeap(), 0, lengthW ))) ret = 0; else { - LPCANDIDATELIST lpwDst; - DWORD ret = 0, len; - LPWSTR pwSrc = strdupAtoW(pSrc); - - len = immHkl->pImeConversionList(hIMC, pwSrc, NULL, 0, uFlag); - lpwDst = HeapAlloc(GetProcessHeap(), 0, len); - if ( lpwDst ) - { - immHkl->pImeConversionList(hIMC, pwSrc, lpwDst, len, uFlag); - ret = convert_candidatelist_WtoA( lpwDst, lpDst, dwBufLen); - HeapFree(GetProcessHeap(), 0, lpwDst); - } - HeapFree(GetProcessHeap(), 0, pwSrc); - - return ret; + ime->pImeConversionList( himc, srcW, listW, lengthW, flags ); + ret = convert_candidatelist_WtoA( listW, listA, lengthA ); + HeapFree( GetProcessHeap(), 0, listW ); } + HeapFree( GetProcessHeap(), 0, srcW ); } - else - return 0; + + return ret; } /***********************************************************************

1 0

Rémi Bernon : imm32: Reorder control flow in ImmEscapeW.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: af926f1bdcb952823754cdbd57c60b2943efeb97 URL: https://gitlab.winehq.org/wine/wine/-/commit/af926f1bdcb952823754cdbd57c60b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmEscapeW. --- dlls/imm32/imm.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b87ff211698..6fab7c9981b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1020,36 +1020,33 @@ LRESULT WINAPI ImmEscapeA( HKL hkl, HIMC himc, UINT code, void *data ) /*********************************************************************** * ImmEscapeW (IMM32.@) */ -LRESULT WINAPI ImmEscapeW( - HKL hKL, HIMC hIMC, - UINT uEscape, LPVOID lpData) +LRESULT WINAPI ImmEscapeW( HKL hkl, HIMC himc, UINT code, void *data ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); + struct ime *ime = IMM_GetImmHkl( hkl ); + LRESULT ret; - if (immHkl->hIME && immHkl->pImeEscape) + TRACE( "hkl %p, himc %p, code %u, data %p.\n", hkl, himc, code, data ); + + if (!ime->hIME || !ime->pImeEscape) return 0; + + if (!EscapeRequiresWA( code ) || is_kbd_ime_unicode( ime )) + ret = ime->pImeEscape( himc, code, data ); + else { - if (!EscapeRequiresWA(uEscape) || is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEscape(hIMC,uEscape,lpData); + char buffer[81]; /* largest required buffer should be 80 */ + if (code == IME_ESC_SET_EUDC_DICTIONARY) + { + WideCharToMultiByte( CP_ACP, 0, data, -1, buffer, 81, NULL, NULL ); + ret = ime->pImeEscape( himc, code, buffer ); + } else { - CHAR buffer[81]; /* largest required buffer should be 80 */ - LRESULT rc; - if (uEscape == IME_ESC_SET_EUDC_DICTIONARY) - { - WideCharToMultiByte(CP_ACP,0,lpData,-1,buffer,81, NULL, NULL); - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - } - else - { - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - MultiByteToWideChar(CP_ACP,0,buffer,-1,lpData,80); - } - return rc; + ret = ime->pImeEscape( himc, code, buffer ); + MultiByteToWideChar( CP_ACP, 0, buffer, -1, data, 80 ); } } - else - return 0; + + return ret; } /***********************************************************************

1 0

Rémi Bernon : imm32: Reorder control flow in ImmEscapeA.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: f5c5839bd316438e7f2d59752ab82a83d7d913f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c5839bd316438e7f2d59752ab82a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmEscapeA. --- dlls/imm32/imm.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 448781e7815..b87ff211698 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -988,36 +988,33 @@ static inline BOOL EscapeRequiresWA(UINT uEscape) /*********************************************************************** * ImmEscapeA (IMM32.@) */ -LRESULT WINAPI ImmEscapeA( - HKL hKL, HIMC hIMC, - UINT uEscape, LPVOID lpData) +LRESULT WINAPI ImmEscapeA( HKL hkl, HIMC himc, UINT code, void *data ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); + struct ime *ime = IMM_GetImmHkl( hkl ); + LRESULT ret; - if (immHkl->hIME && immHkl->pImeEscape) + TRACE( "hkl %p, himc %p, code %u, data %p.\n", hkl, himc, code, data ); + + if (!ime->hIME || !ime->pImeEscape) return 0; + + if (!EscapeRequiresWA( code ) || !is_kbd_ime_unicode( ime )) + ret = ime->pImeEscape( himc, code, data ); + else { - if (!EscapeRequiresWA(uEscape) || !is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEscape(hIMC,uEscape,lpData); + WCHAR buffer[81]; /* largest required buffer should be 80 */ + if (code == IME_ESC_SET_EUDC_DICTIONARY) + { + MultiByteToWideChar( CP_ACP, 0, data, -1, buffer, 81 ); + ret = ime->pImeEscape( himc, code, buffer ); + } else { - WCHAR buffer[81]; /* largest required buffer should be 80 */ - LRESULT rc; - if (uEscape == IME_ESC_SET_EUDC_DICTIONARY) - { - MultiByteToWideChar(CP_ACP,0,lpData,-1,buffer,81); - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - } - else - { - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - WideCharToMultiByte(CP_ACP,0,buffer,-1,lpData,80, NULL, NULL); - } - return rc; + ret = ime->pImeEscape( himc, code, buffer ); + WideCharToMultiByte( CP_ACP, 0, buffer, -1, data, 80, NULL, NULL ); } } - else - return 0; + + return ret; } /***********************************************************************

1 0

Rémi Bernon : imm32: Reorder control flow in ImmEnumRegisterWordW.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: c358707a4d3abf1c92b05e473dace2a3f800341b URL: https://gitlab.winehq.org/wine/wine/-/commit/c358707a4d3abf1c92b05e473dace2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmEnumRegisterWordW. --- dlls/imm32/imm.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 942088bd613..448781e7815 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -950,35 +950,29 @@ UINT WINAPI ImmEnumRegisterWordA( HKL hkl, REGISTERWORDENUMPROCA procA, const ch /*********************************************************************** * ImmEnumRegisterWordW (IMM32.@) */ -UINT WINAPI ImmEnumRegisterWordW( - HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, - LPCWSTR lpszReading, DWORD dwStyle, - LPCWSTR lpszRegister, LPVOID lpData) +UINT WINAPI ImmEnumRegisterWordW( HKL hkl, REGISTERWORDENUMPROCW procW, const WCHAR *readingW, + DWORD style, const WCHAR *stringW, void *user ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %p, %s, %ld, %s, %p):\n", hKL, lpfnEnumProc, - debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData); - if (immHkl->hIME && immHkl->pImeEnumRegisterWord) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEnumRegisterWord(lpfnEnumProc, lpszReading, dwStyle, - lpszRegister, lpData); - else - { - LPSTR lpszaReading = strdupWtoA(lpszReading); - LPSTR lpszaRegister = strdupWtoA(lpszRegister); - BOOL rc; + struct ime *ime = IMM_GetImmHkl( hkl ); + UINT ret; - rc = immHkl->pImeEnumRegisterWord(lpfnEnumProc, (LPCWSTR)lpszaReading, - dwStyle, (LPCWSTR)lpszaRegister, lpData); + TRACE( "hkl %p, procW %p, readingW %s, style %lu, stringW %s, user %p.\n", hkl, procW, + debugstr_w(readingW), style, debugstr_w(stringW), user ); - HeapFree(GetProcessHeap(),0,lpszaReading); - HeapFree(GetProcessHeap(),0,lpszaRegister); - return rc; - } - } + if (!ime->hIME || !ime->pImeEnumRegisterWord) return 0; + + if (is_kbd_ime_unicode( ime )) + ret = ime->pImeEnumRegisterWord( procW, readingW, style, stringW, user ); else - return 0; + { + char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW ); + ret = ime->pImeEnumRegisterWord( procW, (const WCHAR *)readingA, style, + (const WCHAR *)stringA, user ); + HeapFree( GetProcessHeap(), 0, readingA ); + HeapFree( GetProcessHeap(), 0, stringA ); + } + + return ret; } static inline BOOL EscapeRequiresWA(UINT uEscape)

1 0

Rémi Bernon : imm32: Reorder control flow in ImmEnumRegisterWordA.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 93938a83df1bd33a3849df1e1c060c053d431643 URL: https://gitlab.winehq.org/wine/wine/-/commit/93938a83df1bd33a3849df1e1c060c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmEnumRegisterWordA. --- dlls/imm32/imm.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 8f1d2822ac9..942088bd613 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -922,36 +922,29 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) /*********************************************************************** * ImmEnumRegisterWordA (IMM32.@) */ -UINT WINAPI ImmEnumRegisterWordA( - HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc, - LPCSTR lpszReading, DWORD dwStyle, - LPCSTR lpszRegister, LPVOID lpData) +UINT WINAPI ImmEnumRegisterWordA( HKL hkl, REGISTERWORDENUMPROCA procA, const char *readingA, + DWORD style, const char *stringA, void *user ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %p, %s, %ld, %s, %p):\n", hKL, lpfnEnumProc, - debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData); - if (immHkl->hIME && immHkl->pImeEnumRegisterWord) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEnumRegisterWord((REGISTERWORDENUMPROCW)lpfnEnumProc, - (LPCWSTR)lpszReading, dwStyle, (LPCWSTR)lpszRegister, lpData); - else - { - LPWSTR lpszwReading = strdupAtoW(lpszReading); - LPWSTR lpszwRegister = strdupAtoW(lpszRegister); - BOOL rc; + struct ime *ime = IMM_GetImmHkl( hkl ); + UINT ret; - rc = immHkl->pImeEnumRegisterWord((REGISTERWORDENUMPROCW)lpfnEnumProc, - lpszwReading, dwStyle, lpszwRegister, - lpData); + TRACE( "hkl %p, procA %p, readingA %s, style %lu, stringA %s, user %p.\n", hkl, procA, + debugstr_a(readingA), style, debugstr_a(stringA), user ); - HeapFree(GetProcessHeap(),0,lpszwReading); - HeapFree(GetProcessHeap(),0,lpszwRegister); - return rc; - } - } + if (!ime->hIME || !ime->pImeEnumRegisterWord) return 0; + + if (!is_kbd_ime_unicode( ime )) + ret = ime->pImeEnumRegisterWord( (REGISTERWORDENUMPROCW)procA, (const WCHAR *)readingA, + style, (const WCHAR *)stringA, user ); else - return 0; + { + WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA ); + ret = ime->pImeEnumRegisterWord( (REGISTERWORDENUMPROCW)procA, readingW, style, stringW, user ); + HeapFree( GetProcessHeap(), 0, readingW ); + HeapFree( GetProcessHeap(), 0, stringW ); + } + + return ret; } /***********************************************************************

1 0

Rémi Bernon : imm32: Reorder control flow in ImmConfigureIMEW.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 38152f893d4a6dd1a7b0e627ff26635d76ee172e URL: https://gitlab.winehq.org/wine/wine/-/commit/38152f893d4a6dd1a7b0e627ff2663… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmConfigureIMEW. --- dlls/imm32/imm.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 64351a8a787..8f1d2822ac9 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -789,36 +789,30 @@ BOOL WINAPI ImmConfigureIMEA( HKL hkl, HWND hwnd, DWORD mode, void *data ) /*********************************************************************** * ImmConfigureIMEW (IMM32.@) */ -BOOL WINAPI ImmConfigureIMEW( - HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) +BOOL WINAPI ImmConfigureIMEW( HKL hkl, HWND hwnd, DWORD mode, void *data ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); + struct ime *ime = IMM_GetImmHkl( hkl ); + BOOL ret; - TRACE("(%p, %p, %ld, %p):\n", hKL, hWnd, dwMode, lpData); + TRACE( "hkl %p, hwnd %p, mode %lu, data %p.\n", hkl, hwnd, mode, data ); - if (dwMode == IME_CONFIG_REGISTERWORD && !lpData) - return FALSE; + if (mode == IME_CONFIG_REGISTERWORD && !data) return FALSE; + if (!ime->hIME || !ime->pImeConfigure) return FALSE; - if (immHkl->hIME && immHkl->pImeConfigure) + if (mode != IME_CONFIG_REGISTERWORD || is_kbd_ime_unicode( ime )) + ret = ime->pImeConfigure( hkl, hwnd, mode, data ); + else { - if (dwMode != IME_CONFIG_REGISTERWORD || is_kbd_ime_unicode(immHkl)) - return immHkl->pImeConfigure(hKL,hWnd,dwMode,lpData); - else - { - REGISTERWORDW *rww = lpData; - REGISTERWORDA rwa; - BOOL rc; - - rwa.lpReading = strdupWtoA(rww->lpReading); - rwa.lpWord = strdupWtoA(rww->lpWord); - rc = immHkl->pImeConfigure(hKL,hWnd,dwMode,&rwa); - HeapFree(GetProcessHeap(),0,rwa.lpReading); - HeapFree(GetProcessHeap(),0,rwa.lpWord); - return rc; - } + REGISTERWORDW *wordW = data; + REGISTERWORDA wordA; + wordA.lpWord = strdupWtoA( wordW->lpWord ); + wordA.lpReading = strdupWtoA( wordW->lpReading ); + ret = ime->pImeConfigure( hkl, hwnd, mode, &wordA ); + HeapFree( GetProcessHeap(), 0, wordA.lpReading ); + HeapFree( GetProcessHeap(), 0, wordA.lpWord ); } - else - return FALSE; + + return ret; } static InputContextData *create_input_context(HIMC default_imc)

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2023