- Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Allow export_key() to return TRUE.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: f5fe9a6cf9121004ecdf5c0b285fcd88ec8a0d94 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5fe9a6cf9121004ecdf5c0b285fcd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 9 21:22:48 2023 +1100 regedit: Allow export_key() to return TRUE. We don't handle errors in export_registry_data() anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54491 --- programs/regedit/framewnd.c | 2 +- programs/regedit/regproc.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d821d4dad77..3bc60ee0f75 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -500,7 +500,7 @@ static BOOL ExportRegistryFile(HWND hWnd) BOOL result; result = export_registry_key(ofn.lpstrFile, (LPWSTR)ofn.lCustData, ofn.nFilterIndex); if (!result) { - /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ + FIXME("Registry export failed.\n"); return FALSE; } } else { diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4f84c5883be..30106380241 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1328,7 +1328,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) #define MAX_SUBKEY_LEN 257 -static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) +static void export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) { LONG rc; DWORD max_value_len = 256, value_len; @@ -1398,7 +1398,6 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) } free(subkey_name); - return 0; } static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) @@ -1450,7 +1449,6 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) HKEY key_class, key; WCHAR *subkey; FILE *fp; - BOOL ret; if (!(key_class = parse_key_name(path, &subkey))) { @@ -1463,12 +1461,12 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; fp = REGPROC_open_export_file(file_name, unicode); - ret = export_registry_data(fp, key, path, unicode); + export_registry_data(fp, key, path, unicode); export_newline(fp, unicode); fclose(fp); RegCloseKey(key); - return ret; + return TRUE; } static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode)

1 0

Piotr Caban : gdi32: Improve EMR_CREATEDIBPATTERNBRUSHPT playback.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 065fbd206df31a2fd975460d0da4923645c43049 URL: https://gitlab.winehq.org/wine/wine/-/commit/065fbd206df31a2fd975460d0da492… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 9 14:34:58 2023 +0100 gdi32: Improve EMR_CREATEDIBPATTERNBRUSHPT playback. It makes the lbHatch data available after PlayEnhMetaFileRecord returns. --- dlls/gdi32/enhmetafile.c | 20 +++----------------- dlls/gdi32/tests/metafile.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 336f2d389fd..178f7b0e132 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1825,7 +1825,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_CREATEDIBPATTERNBRUSHPT: { const EMRCREATEDIBPATTERNBRUSHPT *lpCreate = (const EMRCREATEDIBPATTERNBRUSHPT *)mr; - LPVOID lpPackedStruct; /* Check that offsets and data are contained within the record * (including checking for wrap-arounds). @@ -1839,28 +1838,15 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } - /* This is a BITMAPINFO struct followed directly by bitmap bits */ - lpPackedStruct = HeapAlloc( GetProcessHeap(), 0, - lpCreate->cbBmi + lpCreate->cbBits ); - if(!lpPackedStruct) + if (lpCreate->offBmi + lpCreate->cbBmi != lpCreate->offBits) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("Invalid data in EMR_CREATEDIBPATTERNBRUSHPT record\n"); break; } - /* Now pack this structure */ - memcpy( lpPackedStruct, - ((const BYTE *)lpCreate) + lpCreate->offBmi, - lpCreate->cbBmi ); - memcpy( ((BYTE*)lpPackedStruct) + lpCreate->cbBmi, - ((const BYTE *)lpCreate) + lpCreate->offBits, - lpCreate->cbBits ); - (handletable->objectHandle)[lpCreate->ihBrush] = - CreateDIBPatternBrushPt( lpPackedStruct, + CreateDIBPatternBrushPt( (const BYTE *)lpCreate + lpCreate->offBmi, (UINT)lpCreate->iUsage ); - - HeapFree(GetProcessHeap(), 0, lpPackedStruct); break; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 004ad98d949..2b7e53b2529 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4183,6 +4183,38 @@ static void test_mf_PatternBrush(void) HeapFree (GetProcessHeap(), 0, orig_lb); } +static int CALLBACK pattern_brush_emf_enum_proc(HDC hdc, HANDLETABLE *htable, + const ENHMETARECORD *rec, int n, LPARAM arg) +{ + LOGBRUSH brush; + BOOL ret; + + switch (rec->iType) + { + case EMR_HEADER: + case EMR_SELECTOBJECT: + case EMR_EOF: + case EMR_CREATEMONOBRUSH: + return 1; + case EMR_CREATEDIBPATTERNBRUSHPT: + ok(!htable->objectHandle[2], "objectHandle[2] already used\n"); + ret = PlayEnhMetaFileRecord(hdc, htable, rec, n); + ok(ret, "PlayEnhMetaFileRecord failed\n"); + ok(htable->objectHandle[2] != NULL, "objectHandle[2] not created\n"); + + ret = GetObjectW(htable->objectHandle[2], sizeof(brush), &brush); + ok(ret, "GetObjectW failed\n"); + ok(brush.lbStyle == BS_DIBPATTERN, "brush.lbStyle = %d\n", brush.lbStyle); + ok(brush.lbHatch > (ULONG_PTR)rec && brush.lbHatch < (ULONG_PTR)rec + rec->nSize, + "brush.lbHatch = %p, not in %p-%p range\n", + (void *)brush.lbHatch, rec, (const BYTE *)rec + rec->nSize); + return 1; + default: + ok(0, "unexpected record %lu\n", rec->iType); + return 0; + } +} + static void test_emf_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + (2 + 32 * 32 / 8) * sizeof(RGBQUAD)]; @@ -4237,8 +4269,6 @@ static void test_emf_pattern_brush(void) dump_emf_records(emf, "emf_pattern_brush"); } - ret = DeleteEnhMetaFile(emf); - ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); ret = DeleteObject(bitmap_brush); ok(ret, "DeleteObject failed\n"); ret = DeleteObject(dib_brush); @@ -4246,6 +4276,11 @@ static void test_emf_pattern_brush(void) ret = DeleteObject((HBITMAP)orig_lb->lbHatch); ok(ret, "DeleteObject failed\n"); HeapFree(GetProcessHeap(), 0, orig_lb); + + ret = EnumEnhMetaFile(NULL, emf, pattern_brush_emf_enum_proc, NULL, NULL); + ok(ret, "EnumEnhMetaFile error %ld\n", GetLastError()); + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); } static void test_mf_palette_brush(void)

1 0

Alexandre Julliard : wow64: Implement Wow64RaiseException().
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 37628a77324f4393e92e8fbd007e5a2e132a9bbe URL: https://gitlab.winehq.org/wine/wine/-/commit/37628a77324f4393e92e8fbd007e5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:28:12 2023 +0100 wow64: Implement Wow64RaiseException(). --- dlls/wow64/syscall.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++---- dlls/wow64/wow64.spec | 2 +- include/winternl.h | 1 + 3 files changed, 117 insertions(+), 11 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index b6b3c0c2830..d1c7421fabd 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -151,6 +151,20 @@ static EXCEPTION_RECORD *exception_record_32to64( const EXCEPTION_RECORD32 *rec3 } +static void exception_record_64to32( EXCEPTION_RECORD32 *rec32, const EXCEPTION_RECORD *rec ) +{ + unsigned int i; + + rec32->ExceptionCode = rec->ExceptionCode; + rec32->ExceptionFlags = rec->ExceptionFlags; + rec32->ExceptionRecord = PtrToUlong( rec->ExceptionRecord ); + rec32->ExceptionAddress = PtrToUlong( rec->ExceptionAddress ); + rec32->NumberParameters = rec->NumberParameters; + for (i = 0; i < rec->NumberParameters; i++) + rec32->ExceptionInformation[i] = rec->ExceptionInformation[i]; +} + + static NTSTATUS get_context_return_value( void *wow_context ) { switch (current_machine) @@ -1185,17 +1199,108 @@ void WINAPI Wow64PrepareForException( EXCEPTION_RECORD *rec, CONTEXT *context ) */ void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ) { - EXCEPTION_RECORD *rec = ptrs->ExceptionRecord; EXCEPTION_RECORD32 rec32; - ULONG i; - - rec32.ExceptionCode = rec->ExceptionCode; - rec32.ExceptionFlags = rec->ExceptionFlags; - rec32.ExceptionRecord = PtrToUlong( rec->ExceptionRecord ); - rec32.ExceptionAddress = PtrToUlong( rec->ExceptionAddress ); - rec32.NumberParameters = rec->NumberParameters; - for (i = 0; i < rec->NumberParameters; i++) - rec32.ExceptionInformation[i] = rec->ExceptionInformation[i]; + exception_record_64to32( &rec32, ptrs->ExceptionRecord ); call_user_exception_dispatcher( &rec32, NULL, ptrs->ContextRecord ); } + + +/********************************************************************** + * Wow64RaiseException (wow64.@) + */ +NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) +{ + EXCEPTION_RECORD32 rec32; + CONTEXT context; + BOOL first_chance = TRUE; + union + { + I386_CONTEXT i386; + ARM_CONTEXT arm; + } ctx32 = { 0 }; + + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + EXCEPTION_RECORD int_rec = { 0 }; + + ctx32.i386.ContextFlags = CONTEXT_I386_ALL; + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + if (code == -1) break; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + switch (code) + { + case 0x00: /* division by zero */ + int_rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; + break; + case 0x01: /* single-step */ + int_rec.ExceptionCode = EXCEPTION_SINGLE_STEP; + break; + case 0x03: /* breakpoint */ + int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)(ctx32.i386.Eip + 1); + int_rec.NumberParameters = 1; + break; + case 0x04: /* overflow */ + int_rec.ExceptionCode = EXCEPTION_INT_OVERFLOW; + break; + case 0x05: /* array bounds */ + int_rec.ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; + break; + case 0x06: /* invalid opcode */ + int_rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; + case 0x09: /* coprocessor segment overrun */ + int_rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + break; + case 0x0c: /* stack fault */ + int_rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; + break; + case 0x29: /* __fastfail */ + int_rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + int_rec.ExceptionFlags = EH_NONCONTINUABLE; + int_rec.NumberParameters = 1; + int_rec.ExceptionInformation[0] = ctx32.i386.Ecx; + first_chance = FALSE; + break; + case 0x2d: /* debug service */ + ctx32.i386.Eip++; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + int_rec.NumberParameters = 1; + int_rec.ExceptionInformation[0] = ctx32.i386.Eax; + break; + default: + ctx32.i386.Eip -= 2; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + int_rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + int_rec.NumberParameters = 2; + int_rec.ExceptionInformation[1] = 0xffffffff; + break; + } + *rec = int_rec; + break; + } + + case IMAGE_FILE_MACHINE_ARMNT: + ctx32.arm.ContextFlags = CONTEXT_ARM_ALL; + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.arm ); + break; + } + + exception_record_64to32( &rec32, rec ); + __TRY + { + raise_exception( rec, &context, first_chance ); + } + __EXCEPT_ALL + { + call_user_exception_dispatcher( &rec32, &ctx32, NULL ); + } + __ENDTRY + return STATUS_SUCCESS; +} diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index e05a608d319..1f09e1411bb 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -16,7 +16,7 @@ @ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach @ stdcall Wow64PrepareForException(ptr ptr) -@ stub Wow64RaiseException +@ stdcall Wow64RaiseException(long ptr) @ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC @ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC @ stub Wow64ShallowThunkSIZE_T32TO64 diff --git a/include/winternl.h b/include/winternl.h index 6fd0694b4ce..f59fcec05dd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3875,6 +3875,7 @@ void WINAPI Wow64ApcRoutine(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*); NTSTATUS WINAPI Wow64KiUserCallbackDispatcher(ULONG,void*,ULONG,void**,ULONG*); void WINAPI Wow64PassExceptionToGuest(EXCEPTION_POINTERS*); void WINAPI Wow64PrepareForException(EXCEPTION_RECORD*,CONTEXT*); +NTSTATUS WINAPI Wow64RaiseException(int,EXCEPTION_RECORD*); NTSTATUS WINAPI Wow64SystemServiceEx(UINT,UINT*); #ifdef __WINESRC__

1 0

Alexandre Julliard : wow64: Don't update the exception address in raise_exception().
by Alexandre Julliard March 9, 2023

March 9, 2023

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 March 9, 2023

March 9, 2023

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 March 9, 2023

March 9, 2023

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 March 9, 2023

March 9, 2023

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 ImmEnumRegisterWordA.
by Alexandre Julliard March 9, 2023

March 9, 2023

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 ImmEscapeA.
by Alexandre Julliard March 9, 2023

March 9, 2023

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 ImmConfigureIMEW.
by Alexandre Julliard March 9, 2023

March 9, 2023

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