- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use get_wow_teb() and wow_peb in more places.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: 1939f7c27cbf04f70de4cfaa4cb118eb54c93087 URL: https://gitlab.winehq.org/wine/wine/-/commit/1939f7c27cbf04f70de4cfaa4cb118… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 14:20:41 2023 +0100 ntdll: Use get_wow_teb() and wow_peb in more places. --- dlls/ntdll/unix/env.c | 7 ++----- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 21 ++++++++++----------- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 79dc7ffc5c3..1e951877ab7 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2410,11 +2410,8 @@ void WINAPI RtlSetLastWin32Error( DWORD err ) { TEB *teb = NtCurrentTeb(); #ifdef _WIN64 - if (teb->WowTebOffset) - { - TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); - teb32->LastErrorValue = err; - } + WOW_TEB *wow_teb = get_wow_teb( teb ); + if (wow_teb) wow_teb->LastErrorValue = err; #endif teb->LastErrorValue = err; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1cadd2b10b6..119de56e204 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1914,7 +1914,7 @@ static void load_apiset_dll(void) map->Version == 6 && map->Size <= sec->Misc.VirtualSize) { - NtCurrentTeb()->Peb->ApiSetMap = map; + peb->ApiSetMap = map; if (wow_peb) wow_peb->ApiSetMap = PtrToUlong(map); TRACE( "loaded %s apiset at %p\n", debugstr_w(path), map ); return; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 186054af546..2736c43e3b5 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1617,7 +1617,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B { i386_context->ContextFlags = CONTEXT_I386_ALL; i386_context->Eax = (ULONG_PTR)entry; - i386_context->Ebx = (arg == peb ? get_wow_teb( teb )->Peb : (ULONG_PTR)arg); + i386_context->Ebx = (arg == peb ? (ULONG_PTR)wow_peb : (ULONG_PTR)arg); i386_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; i386_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; i386_context->SegCs = 0x23; @@ -1634,7 +1634,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B { arm_context->ContextFlags = CONTEXT_ARM_ALL; arm_context->R0 = (ULONG_PTR)entry; - arm_context->R1 = (arg == peb ? get_wow_teb( teb )->Peb : (ULONG_PTR)arg); + arm_context->R1 = (arg == peb ? (ULONG_PTR)wow_peb : (ULONG_PTR)arg); arm_context->Sp = get_wow_teb( teb )->Tib.StackBase; arm_context->Pc = pLdrSystemDllInitBlock->pRtlUserThreadStart; if (arm_context->Pc & 1) arm_context->Cpsr |= 0x20; /* thumb mode */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2152b5e1a77..f8a90d3caec 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2317,15 +2317,15 @@ void signal_init_threading(void) NTSTATUS signal_alloc_thread( TEB *teb ) { struct amd64_thread_data *thread_data = (struct amd64_thread_data *)&teb->GdiTebBatch; + WOW_TEB *wow_teb = get_wow_teb( teb ); - if (teb->WowTebOffset) + if (wow_teb) { if (!fs32_sel) { - void *teb32 = (char *)teb + teb->WowTebOffset; sigset_t sigset; int idx; - LDT_ENTRY entry = ldt_make_entry( teb32, page_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); + LDT_ENTRY entry = ldt_make_entry( wow_teb, page_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); server_enter_uninterrupted_section( &ldt_mutex, &sigset ); for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) @@ -2423,6 +2423,7 @@ static void *mac_thread_gsbase(void) void signal_init_process(void) { struct sigaction sig_act; + WOW_TEB *wow_teb = get_wow_teb( NtCurrentTeb() ); void *ptr, *kernel_stack = (char *)ntdll_get_thread_data()->kernel_stack + kernel_stack_size; amd64_thread_data()->syscall_frame = (struct syscall_frame *)kernel_stack - 1; @@ -2436,13 +2437,12 @@ void signal_init_process(void) if (xstate_compaction_enabled) syscall_flags |= SYSCALL_HAVE_XSAVEC; #ifdef __linux__ - if (NtCurrentTeb()->WowTebOffset) + if (wow_teb) { - void *teb32 = (char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset; int sel; cs32_sel = 0x23; - if ((sel = alloc_fs_sel( -1, teb32 )) != -1) + if ((sel = alloc_fs_sel( -1, wow_teb )) != -1) { amd64_thread_data()->fs = fs32_sel = (sel << 3) | 3; syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; @@ -2453,14 +2453,13 @@ void signal_init_process(void) else ERR_(seh)( "failed to allocate %%fs selector\n" ); } #elif defined(__APPLE__) - if (NtCurrentTeb()->WowTebOffset) + if (wow_teb) { - void *teb32 = (char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset; LDT_ENTRY cs32_entry, fs32_entry; int idx; cs32_entry = ldt_make_entry( NULL, -1, LDT_FLAGS_CODE | LDT_FLAGS_32BIT ); - fs32_entry = ldt_make_entry( teb32, page_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); + fs32_entry = ldt_make_entry( wow_teb, page_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) { @@ -2520,7 +2519,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); - if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, (char *)teb + teb->WowTebOffset ); + if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, get_wow_teb( teb )); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) @@ -2556,7 +2555,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B { wow_context->ContextFlags = CONTEXT_I386_ALL; wow_context->Eax = (ULONG_PTR)entry; - wow_context->Ebx = (arg == peb ? get_wow_teb( teb )->Peb : (ULONG_PTR)arg); + wow_context->Ebx = (arg == peb ? (ULONG_PTR)wow_peb : (ULONG_PTR)arg); wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; wow_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; wow_context->SegCs = cs32_sel;

1 0

Piotr Caban : wineps: Move more code into create_psdrv_physdev helper.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: e5c7e3648946f89fc5283f218970808d990573be URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c7e3648946f89fc5283f21897080… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 5 13:09:45 2023 +0100 wineps: Move more code into create_psdrv_physdev helper. --- dlls/wineps.drv/init.c | 85 ++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 579e59e621b..1fc861dc924 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -338,25 +338,50 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) physDev->horzRes, physDev->vertRes); } -static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi ) +static PSDRV_PDEVICE *create_psdrv_physdev( HDC hdc, const WCHAR *device, + const PSDRV_DEVMODE *devmode ) { - PSDRV_PDEVICE *physDev; + PRINTERINFO *pi = PSDRV_FindPrinterInfo( device ); + PSDRV_PDEVICE *pdev; - physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ); - if (!physDev) return NULL; + if (!pi) return NULL; + if (!pi->Fonts) + { + RASTERIZER_STATUS status; + if (!GetRasterizerCaps( &status, sizeof(status) ) || + !(status.wFlags & TT_AVAILABLE) || + !(status.wFlags & TT_ENABLED)) + { + MESSAGE( "Disabling printer %s since it has no builtin fonts and " + "there are no TrueType fonts available.\n", debugstr_w(device) ); + return FALSE; + } + } - physDev->Devmode = HeapAlloc( GetProcessHeap(), 0, sizeof(PSDRV_DEVMODE) ); - if (!physDev->Devmode) + pdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pdev) ); + if (!pdev) return NULL; + + pdev->Devmode = HeapAlloc( GetProcessHeap(), 0, sizeof(PSDRV_DEVMODE) ); + if (!pdev->Devmode) { - HeapFree( GetProcessHeap(), 0, physDev ); + HeapFree( GetProcessHeap(), 0, pdev ); return NULL; } - *physDev->Devmode = *pi->Devmode; - physDev->pi = pi; - physDev->logPixelsX = pi->ppd->DefaultResolution; - physDev->logPixelsY = pi->ppd->DefaultResolution; - return physDev; + *pdev->Devmode = *pi->Devmode; + pdev->pi = pi; + pdev->logPixelsX = pi->ppd->DefaultResolution; + pdev->logPixelsY = pi->ppd->DefaultResolution; + + if (devmode) + { + dump_devmode( &devmode->dmPublic ); + PSDRV_MergeDevmodes( pdev->Devmode, devmode, pi ); + } + + PSDRV_UpdateDevCaps( pdev ); + SelectObject( hdc, PSDRV_DefaultFont ); + return pdev; } /********************************************************************** @@ -366,35 +391,12 @@ static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, const DEVMODEW *initData ) { PSDRV_PDEVICE *physDev; - PRINTERINFO *pi; TRACE("(%s %s %p)\n", debugstr_w(device), debugstr_w(output), initData); if (!device) return FALSE; - pi = PSDRV_FindPrinterInfo( device ); - if(!pi) return FALSE; - - if(!pi->Fonts) { - RASTERIZER_STATUS status; - if(!GetRasterizerCaps(&status, sizeof(status)) || - !(status.wFlags & TT_AVAILABLE) || - !(status.wFlags & TT_ENABLED)) { - MESSAGE("Disabling printer %s since it has no builtin fonts and there are no TrueType fonts available.\n", - debugstr_w(device)); - return FALSE; - } - } - - if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - - if(initData) - { - dump_devmode(initData); - PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)initData, pi); - } - - PSDRV_UpdateDevCaps(physDev); - SelectObject( (*pdev)->hdc, PSDRV_DefaultFont ); + if (!(physDev = create_psdrv_physdev( (*pdev)->hdc, device, + (const PSDRV_DEVMODE *)initData ))) return FALSE; push_dc_driver( pdev, &physDev->dev, &psdrv_funcs ); return TRUE; } @@ -405,15 +407,10 @@ static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, */ static BOOL CDECL PSDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) { - HDC hdc = (*pdev)->hdc; PSDRV_PDEVICE *physDev, *orig_dev = get_psdrv_dev( orig ); - PRINTERINFO *pi = PSDRV_FindPrinterInfo( orig_dev->pi->friendly_name ); - if (!pi) return FALSE; - if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - PSDRV_MergeDevmodes( physDev->Devmode, orig_dev->Devmode, pi ); - PSDRV_UpdateDevCaps(physDev); - SelectObject( hdc, PSDRV_DefaultFont ); + if (!(physDev = create_psdrv_physdev( (*pdev)->hdc, orig_dev->pi->friendly_name, + orig_dev->Devmode ))) return FALSE; push_dc_driver( pdev, &physDev->dev, &psdrv_funcs ); return TRUE; }

1 0

Alexandre Julliard : ntdll: Add a helper function to check for old-style Wow64 mode.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: f3d90fd55b5d320304022ba72aba8c6887183e51 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3d90fd55b5d320304022ba72aba8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 14:18:59 2023 +0100 ntdll: Add a helper function to check for old-style Wow64 mode. --- dlls/ntdll/unix/file.c | 2 +- dlls/ntdll/unix/process.c | 4 +--- dlls/ntdll/unix/server.c | 8 +------- dlls/ntdll/unix/signal_i386.c | 12 ++++++------ dlls/ntdll/unix/system.c | 4 +--- dlls/ntdll/unix/thread.c | 10 +++------- dlls/ntdll/unix/unix_private.h | 9 ++++++--- dlls/ntdll/unix/virtual.c | 6 +++--- 8 files changed, 22 insertions(+), 33 deletions(-)

1 0

Alexandre Julliard : ntdll: Add a helper function to check for Wow64 mode.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: dd7b4431a6d0e377e9b044b3194f7a4328779d21 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd7b4431a6d0e377e9b044b3194f7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 14:20:08 2023 +0100 ntdll: Add a helper function to check for Wow64 mode. --- dlls/ntdll/unix/process.c | 6 ++--- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/system.c | 2 +- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 56 ++++++++++++++++++++++-------------------- dlls/ntdll/unix/virtual.c | 5 ++-- 6 files changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 01dcba2a6cc..93fe8ec76ff 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1434,7 +1434,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (size != len) ret = STATUS_INFO_LENGTH_MISMATCH; else if (!info) ret = STATUS_ACCESS_VIOLATION; else if (!handle) ret = STATUS_INVALID_HANDLE; - else if (handle == GetCurrentProcess()) *(ULONG_PTR *)info = !!NtCurrentTeb()->WowTebOffset; + else if (handle == GetCurrentProcess()) *(ULONG_PTR *)info = is_wow64(); else { ULONG_PTR val = 0; @@ -1476,7 +1476,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class len = sizeof(ULONG); if (size != len) ret = STATUS_INFO_LENGTH_MISMATCH; - else if (is_win64 && !NtCurrentTeb()->WowTebOffset) + else if (is_win64 && !is_wow64()) *(ULONG *)info = MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | MEM_EXECUTE_OPTION_PERMANENT; @@ -1639,7 +1639,7 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, break; case ProcessExecuteFlags: - if ((is_win64 && !NtCurrentTeb()->WowTebOffset) || size != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; + if ((is_win64 && !is_wow64()) || size != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; if (execute_flags & MEM_EXECUTE_OPTION_PERMANENT) return STATUS_ACCESS_DENIED; else { diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 41f9e94a9e7..275a8fa62ef 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -419,7 +419,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO }; SYSTEM_BASIC_INFORMATION sbi; - virtual_get_system_info( &sbi, !!NtCurrentTeb()->WowTebOffset ); + virtual_get_system_info( &sbi, is_wow64() ); result->type = call->type; addr = wine_server_get_ptr( call->virtual_alloc_ex.addr ); size = call->virtual_alloc_ex.size; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index f16b2417755..3eecccc4972 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2998,7 +2998,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { SYSTEM_BASIC_INFORMATION sbi; - virtual_get_system_info( &sbi, !!NtCurrentTeb()->WowTebOffset ); + virtual_get_system_info( &sbi, is_wow64() ); len = sizeof(sbi); if (size == len) { diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index aff58db75ca..bf025a38188 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1130,7 +1130,7 @@ void *get_cpu_area( USHORT machine ) WOW64_CPURESERVED *cpu; ULONG align; - if (!NtCurrentTeb()->WowTebOffset) return NULL; + if (!is_wow64()) return NULL; #ifdef _WIN64 cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; #else diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d9427d44cfd..57b8f01641c 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -52,6 +52,34 @@ static inline BOOL is_machine_64bit( WORD machine ) return (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); } +#ifdef _WIN64 +typedef TEB32 WOW_TEB; +typedef PEB32 WOW_PEB; +static inline TEB64 *NtCurrentTeb64(void) { return NULL; } +#else +typedef TEB64 WOW_TEB; +typedef PEB64 WOW_PEB; +static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } +#endif + +extern WOW_PEB *wow_peb DECLSPEC_HIDDEN; + +static inline WOW_TEB *get_wow_teb( TEB *teb ) +{ + return teb->WowTebOffset ? (WOW_TEB *)((char *)teb + teb->WowTebOffset) : NULL; +} + +static inline BOOL is_wow64(void) +{ + return !!wow_peb; +} + +/* check for old-style Wow64 (using a 32-bit ntdll.so) */ +static inline BOOL is_old_wow64(void) +{ + return !is_win64 && wow_peb; +} + /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ struct ntdll_thread_data { @@ -366,10 +394,7 @@ static inline NTSTATUS wait_async( HANDLE handle, BOOL alertable ) static inline BOOL in_wow64_call(void) { -#ifdef _WIN64 - return !!NtCurrentTeb()->WowTebOffset; -#endif - return FALSE; + return is_win64 && is_wow64(); } static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR info ) @@ -426,29 +451,6 @@ static inline client_ptr_t iosb_client_ptr( IO_STATUS_BLOCK *io ) return wine_server_client_ptr( io ); } -#ifdef _WIN64 -typedef TEB32 WOW_TEB; -typedef PEB32 WOW_PEB; -static inline TEB64 *NtCurrentTeb64(void) { return NULL; } -#else -typedef TEB64 WOW_TEB; -typedef PEB64 WOW_PEB; -static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } -#endif - -extern WOW_PEB *wow_peb DECLSPEC_HIDDEN; - -static inline WOW_TEB *get_wow_teb( TEB *teb ) -{ - return teb->WowTebOffset ? (WOW_TEB *)((char *)teb + teb->WowTebOffset) : NULL; -} - -/* check for old-style Wow64 (using a 32-bit ntdll.so) */ -static inline BOOL is_old_wow64(void) -{ - return !is_win64 && wow_peb; -} - enum loadorder { LO_INVALID, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index c9226e73019..1d07744ed1a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2974,7 +2974,6 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void *ptr = NULL; NTSTATUS status = STATUS_SUCCESS; SIZE_T block_size = signal_stack_mask + 1; - BOOL is_wow = !!NtCurrentTeb()->WowTebOffset; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if (next_free_teb) @@ -2989,7 +2988,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow64() ? 0x7fffffff : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3002,7 +3001,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, is_wow ); + *ret_teb = teb = init_teb( ptr, is_wow64() ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb )))

1 0

Alexandre Julliard : ntdll: Fixup CPU information for old Wow64 mode.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: da7411fdb3b87dc4549470c70f6fe73562c78b9e URL: https://gitlab.winehq.org/wine/wine/-/commit/da7411fdb3b87dc4549470c70f6fe7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 13:17:52 2023 +0100 ntdll: Fixup CPU information for old Wow64 mode. --- dlls/ntdll/tests/wow64.c | 15 +++++++++++---- dlls/ntdll/unix/system.c | 9 +++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index eff3ff59dc2..8ecbbe68c12 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -68,6 +68,17 @@ static void init(void) if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + if (is_wow64) + { + TEB64 *teb64 = ULongToPtr( NtCurrentTeb()->GdiBatchCount ); + + if (teb64) + { + PEB64 *peb64 = ULongToPtr(teb64->Peb); + old_wow64 = !peb64->LdrData; + } + } + #define GET_PROC(func) p##func = (void *)GetProcAddress( ntdll, #func ) GET_PROC( NtQuerySystemInformation ); GET_PROC( NtQuerySystemInformationEx ); @@ -102,10 +113,6 @@ static void init(void) case PROCESSOR_ARCHITECTURE_AMD64: native_machine = IMAGE_FILE_MACHINE_AMD64; break; - case PROCESSOR_ARCHITECTURE_INTEL: - old_wow64 = TRUE; - native_machine = IMAGE_FILE_MACHINE_AMD64; - break; } } diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 54fd72e56ba..0ba38f88038 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2570,8 +2570,13 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemCpuInformation: /* 1 */ if (size >= (len = sizeof(cpu_info))) { - if (!info) ret = STATUS_ACCESS_VIOLATION; - else memcpy(info, &cpu_info, len); + SYSTEM_CPU_INFORMATION cpu = cpu_info; + +#ifndef _WIN64 + if (is_wow64 && cpu.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + cpu.ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; +#endif + memcpy(info, &cpu, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; break;

1 0

Rémi Bernon : imm32: Rename InputContextData to struct imc.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: 8f52d8a4e1f2c94e6613f77a6cd351db92b26ecd URL: https://gitlab.winehq.org/wine/wine/-/commit/8f52d8a4e1f2c94e6613f77a6cd351… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 9 12:30:24 2023 +0100 imm32: Rename InputContextData to struct imc. --- dlls/imm32/imm.c | 114 +++++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 57 deletions(-)

1 0

Rémi Bernon : imm32: Use NtUserQueryInputContext to check cross-thread access.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: 1d40658afa139b94f540e32587bd1123853e0d1f URL: https://gitlab.winehq.org/wine/wine/-/commit/1d40658afa139b94f540e32587bd11… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 11 12:11:21 2023 +0100 imm32: Use NtUserQueryInputContext to check cross-thread access. --- dlls/imm32/imm.c | 46 +++++++++++----------------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 26ec7c00140..8c3f2b448ad 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -90,7 +90,6 @@ typedef struct tagInputContextData HIMC handle; DWORD dwLock; INPUTCONTEXT IMC; - DWORD threadID; struct ime *ime; UINT lastVK; @@ -682,17 +681,6 @@ static HIMCC ImmCreateBlankCompStr(void) return rc; } -static BOOL IMM_IsCrossThreadAccess(HIMC hIMC) -{ - InputContextData *data; - - data = get_imc_data(hIMC); - if (data && data->threadID != GetCurrentThreadId()) - return TRUE; - - return FALSE; -} - /*********************************************************************** * ImmSetActiveContext (IMM32.@) */ @@ -898,7 +886,6 @@ static InputContextData *create_input_context(HIMC default_imc) IMM_DestroyContext(new_context); return 0; } - new_context->threadID = GetCurrentThreadId(); SendMessageW( GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->ime ); TRACE("Created context %p\n", new_context); @@ -937,10 +924,8 @@ static BOOL IMM_DestroyContext(HIMC hIMC) BOOL WINAPI ImmDestroyContext(HIMC hIMC) { if ((UINT_PTR)hIMC == NtUserGetThreadInfo()->default_imc) return FALSE; - if (!IMM_IsCrossThreadAccess(hIMC)) - return IMM_DestroyContext(hIMC); - else - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; + return IMM_DestroyContext(hIMC); } /*********************************************************************** @@ -2239,8 +2224,7 @@ BOOL WINAPI ImmSetCandidateWindow( if (!data || !lpCandidate) return FALSE; - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; TRACE("\t%lx, %lx, %s, %s\n", lpCandidate->dwIndex, lpCandidate->dwStyle, @@ -2271,8 +2255,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) return FALSE; } - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, @@ -2297,8 +2280,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) return FALSE; } - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; data->IMC.lfFont.W = *lplf; ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); @@ -2328,8 +2310,7 @@ BOOL WINAPI ImmSetCompositionStringA( if (!data) return FALSE; - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; if (!(dwIndex == SCS_SETSTR || dwIndex == SCS_CHANGEATTR || @@ -2385,8 +2366,7 @@ BOOL WINAPI ImmSetCompositionStringW( if (!data) return FALSE; - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; if (!(dwIndex == SCS_SETSTR || dwIndex == SCS_CHANGEATTR || @@ -2446,8 +2426,7 @@ BOOL WINAPI ImmSetCompositionWindow( return FALSE; } - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; data->IMC.cfCompForm = *lpCompForm; @@ -2482,8 +2461,7 @@ BOOL WINAPI ImmSetConversionStatus( return FALSE; } - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; if ( fdwConversion != data->IMC.fdwConversion ) { @@ -2518,8 +2496,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) return FALSE; } - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; if (data->ime->ui_hwnd == NULL) { @@ -2555,8 +2532,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) return FALSE; } - if (IMM_IsCrossThreadAccess(hIMC)) - return FALSE; + if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; TRACE("\t%s\n", wine_dbgstr_point(lpptPos));

1 0

Rémi Bernon : imm32: Remove unnecessary threadDefault InputContextData member.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: 29e51aa333ace47109fe46fc4b0f7e75e2293389 URL: https://gitlab.winehq.org/wine/wine/-/commit/29e51aa333ace47109fe46fc4b0f7e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 11 12:13:28 2023 +0100 imm32: Remove unnecessary threadDefault InputContextData member. --- dlls/imm32/imm.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28344b909d6..06d82671040 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -94,7 +94,6 @@ typedef struct tagInputContextData struct ime *ime; UINT lastVK; - BOOL threadDefault; } InputContextData; #define WINE_IMC_VALID_MAGIC 0x56434D49 @@ -404,16 +403,6 @@ static void imm_coinit_thread(void) InitOnceExecuteOnce(&init_ole32_once, init_ole32_funcs, NULL, NULL); } -static BOOL IMM_IsDefaultContext(HIMC imc) -{ - InputContextData *data = get_imc_data(imc); - - if (!data) - return FALSE; - - return data->threadDefault; -} - static InputContextData *query_imc_data(HIMC handle) { InputContextData *ret; @@ -868,7 +857,6 @@ static InputContextData *create_input_context(HIMC default_imc) new_context = calloc( 1, sizeof(InputContextData) ); /* Load the IME */ - new_context->threadDefault = !!default_imc; if (!(new_context->ime = ime_acquire( GetKeyboardLayout( 0 ) ))) { TRACE("IME dll could not be loaded\n"); @@ -953,7 +941,8 @@ static BOOL IMM_DestroyContext(HIMC hIMC) */ BOOL WINAPI ImmDestroyContext(HIMC hIMC) { - if (!IMM_IsDefaultContext(hIMC) && !IMM_IsCrossThreadAccess(NULL, hIMC)) + if ((UINT_PTR)hIMC == NtUserGetThreadInfo()->default_imc) return FALSE; + if (!IMM_IsCrossThreadAccess(NULL, hIMC)) return IMM_DestroyContext(hIMC); else return FALSE;

1 0

Rémi Bernon : imm32: Remove unused IMM_IsCrossThreadAccess hwnd parameter.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: c66ea947a5ad7ccd106471488b6d3031e118df63 URL: https://gitlab.winehq.org/wine/wine/-/commit/c66ea947a5ad7ccd106471488b6d30… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 11 12:08:49 2023 +0100 imm32: Remove unused IMM_IsCrossThreadAccess hwnd parameter. --- dlls/imm32/imm.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 06d82671040..26ec7c00140 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -682,15 +682,10 @@ static HIMCC ImmCreateBlankCompStr(void) return rc; } -static BOOL IMM_IsCrossThreadAccess(HWND hWnd, HIMC hIMC) +static BOOL IMM_IsCrossThreadAccess(HIMC hIMC) { InputContextData *data; - if (hWnd) - { - DWORD thread = GetWindowThreadProcessId(hWnd, NULL); - if (thread != GetCurrentThreadId()) return TRUE; - } data = get_imc_data(hIMC); if (data && data->threadID != GetCurrentThreadId()) return TRUE; @@ -942,7 +937,7 @@ static BOOL IMM_DestroyContext(HIMC hIMC) BOOL WINAPI ImmDestroyContext(HIMC hIMC) { if ((UINT_PTR)hIMC == NtUserGetThreadInfo()->default_imc) return FALSE; - if (!IMM_IsCrossThreadAccess(NULL, hIMC)) + if (!IMM_IsCrossThreadAccess(hIMC)) return IMM_DestroyContext(hIMC); else return FALSE; @@ -2244,7 +2239,7 @@ BOOL WINAPI ImmSetCandidateWindow( if (!data || !lpCandidate) return FALSE; - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; TRACE("\t%lx, %lx, %s, %s\n", @@ -2276,7 +2271,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) return FALSE; } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); @@ -2302,7 +2297,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) return FALSE; } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; data->IMC.lfFont.W = *lplf; @@ -2333,7 +2328,7 @@ BOOL WINAPI ImmSetCompositionStringA( if (!data) return FALSE; - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; if (!(dwIndex == SCS_SETSTR || @@ -2390,7 +2385,7 @@ BOOL WINAPI ImmSetCompositionStringW( if (!data) return FALSE; - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; if (!(dwIndex == SCS_SETSTR || @@ -2451,7 +2446,7 @@ BOOL WINAPI ImmSetCompositionWindow( return FALSE; } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; data->IMC.cfCompForm = *lpCompForm; @@ -2487,7 +2482,7 @@ BOOL WINAPI ImmSetConversionStatus( return FALSE; } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; if ( fdwConversion != data->IMC.fdwConversion ) @@ -2523,7 +2518,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) return FALSE; } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; if (data->ime->ui_hwnd == NULL) @@ -2560,7 +2555,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) return FALSE; } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + if (IMM_IsCrossThreadAccess(hIMC)) return FALSE; TRACE("\t%s\n", wine_dbgstr_point(lpptPos));

1 0

Rémi Bernon : imm32: Implement ImmEnumInputContext.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: a7c2f4e5bac800785b1584d9ab48b74336a35dd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7c2f4e5bac800785b1584d9ab48b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 11 10:15:05 2023 +0100 imm32: Implement ImmEnumInputContext. --- dlls/imm32/imm.c | 21 ++++++++++++++++++--- dlls/imm32/tests/imm32.c | 7 ++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 682fb748f2f..28344b909d6 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3033,10 +3033,25 @@ BOOL WINAPI ImmDisableTextFrameService(DWORD idThread) * ImmEnumInputContext(IMM32.@) */ -BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam) +BOOL WINAPI ImmEnumInputContext( DWORD thread, IMCENUMPROC callback, LPARAM lparam ) { - FIXME("Stub\n"); - return FALSE; + HIMC buffer[256]; + NTSTATUS status; + UINT i, size; + + TRACE( "thread %lu, callback %p, lparam %#Ix\n", thread, callback, lparam ); + + if ((status = NtUserBuildHimcList( thread, ARRAY_SIZE(buffer), buffer, &size ))) + { + RtlSetLastWin32Error( RtlNtStatusToDosError( status ) ); + WARN( "NtUserBuildHimcList returned %#lx\n", status ); + return FALSE; + } + + if (size == ARRAY_SIZE(buffer)) FIXME( "NtUserBuildHimcList returned %u handles\n", size ); + for (i = 0; i < size; i++) if (!callback( buffer[i], lparam )) return FALSE; + + return TRUE; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 301480090cd..93185402441 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2930,18 +2930,19 @@ static void test_ImmEnumInputContext(void) { HIMC himc; - todo_wine ok_ret( 1, ImmEnumInputContext( 0, enum_get_context, (LPARAM)&default_himc ) ); + ok_ret( 1, ImmEnumInputContext( -1, enum_find_context, 0 ) ); + ok_ret( 1, ImmEnumInputContext( GetCurrentThreadId(), enum_find_context, 0 ) ); + + todo_wine ok_ret( 0, ImmEnumInputContext( 1, enum_find_context, 0 ) ); todo_wine - ok_ret( 1, ImmEnumInputContext( GetCurrentThreadId(), enum_find_context, 0 ) ); ok_ret( 0, ImmEnumInputContext( GetCurrentProcessId(), enum_find_context, 0 ) ); himc = ImmCreateContext(); ok_ne( NULL, himc, HIMC, "%p" ); ok_ret( 0, ImmEnumInputContext( GetCurrentThreadId(), enum_find_context, (LPARAM)himc ) ); ok_ret( 1, ImmDestroyContext( himc ) ); - todo_wine ok_ret( 1, ImmEnumInputContext( GetCurrentThreadId(), enum_find_context, (LPARAM)himc ) ); }

1 0