From: Brendan Shanks <bshanks@codeweavers.com> --- dlls/kernelbase/memory.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index c0a3d65d341..fd06bddb543 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -209,18 +209,16 @@ void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) { SYSTEM_BASIC_INFORMATION basic_info; SYSTEM_CPU_INFORMATION cpu_info; + USHORT current_machine, native_machine; - if (is_wow64) - { - USHORT current_machine, native_machine; + RtlWow64GetProcessMachines( 0, ¤t_machine, &native_machine ); - RtlWow64GetProcessMachines( 0, ¤t_machine, &native_machine ); - if (native_machine != IMAGE_FILE_MACHINE_AMD64) - { - GetSystemInfo( si ); + if (!is_wow64 || native_machine != IMAGE_FILE_MACHINE_AMD64) + { + GetSystemInfo( si ); + if (is_wow64 && native_machine != IMAGE_FILE_MACHINE_AMD64) si->wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; - return; - } + return; } if (!set_ntstatus( RtlGetNativeSystemInformation( SystemBasicInformation, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10210