Alexandre Julliard : kernelbase: Use the correct machine type for ARM.
Alexandre Julliard
julliard at winehq.org
Wed Mar 3 15:47:28 CST 2021
Module: wine
Branch: master
Commit: 40e1000fc5cfdb002173e9380e791e4cbb8e6d17
URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e1000fc5cfdb002173e9380e791e4cbb8e6d17
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 2 12:04:34 2021 +0100
kernelbase: Use the correct machine type for ARM.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/tests/process.c | 4 ++--
dlls/kernelbase/process.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index ea9cde5facc..0c514f816c1 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -2187,9 +2187,9 @@ static void test_IsWow64Process2(void)
#elif defined __x86_64__
USHORT expect_native = IMAGE_FILE_MACHINE_AMD64;
#elif defined __arm__
- USHORT expect_native = IMAGE_FILE_MACHINE_ARM;
+ USHORT expect_native = IMAGE_FILE_MACHINE_ARMNT;
#elif defined __aarch64__
- USHORT expect_native = IMAGE_FILE_MACHINE_ARM;
+ USHORT expect_native = IMAGE_FILE_MACHINE_ARM64;
#else
USHORT expect_native = 0;
#endif
diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index 98cefc717da..44bf0606c7a 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -1002,7 +1002,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine,
*native_machine = IMAGE_FILE_MACHINE_I386;
break;
case PROCESSOR_ARCHITECTURE_ARM:
- *native_machine = IMAGE_FILE_MACHINE_ARM;
+ *native_machine = IMAGE_FILE_MACHINE_ARMNT;
break;
case PROCESSOR_ARCHITECTURE_AMD64:
*native_machine = IMAGE_FILE_MACHINE_AMD64;
More information about the wine-cvs
mailing list