[PATCH 0/1] MR715: wow64: Take all ARM32 machine types into account
From: Andr�� Zwing <nerv(a)dawncrow.de> --- dlls/wow64/syscall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 8cb5f92c245..8783aa64da1 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -553,6 +553,8 @@ static const WCHAR *get_cpu_dll_name(void) case IMAGE_FILE_MACHINE_I386: return (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_THUMB: + case IMAGE_FILE_MACHINE_ARMNT: return L"wowarmhw.dll"; default: ERR( "unsupported machine %04x\n", current_machine ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/715
This cannot happen, ARM32 is always reported as IMAGE_FILE_MACHINE_ARMNT. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/715#note_6934
This merge request was closed by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/715
On Thu Aug 25 18:50:13 2022 +0000, Alexandre Julliard wrote:
This cannot happen, ARM32 is always reported as IMAGE_FILE_MACHINE_ARMNT. Right, but the current code is using `IMAGE_FILE_MACHINE_ARM`.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/715#note_6937
On Thu Aug 25 18:50:13 2022 +0000, Huw Davies wrote:
Right, but the current code is using `IMAGE_FILE_MACHINE_ARM`. My bad, indeed that should be changed.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/715#note_6944
participants (3)
-
Alexandre Julliard (＠julliard) -
André Zwing
-
Huw Davies (＠huw)