[PATCH 0/1] MR110: ntdll: Generalize check for IMAGE_FILE_MACHINE_AMD64 to other 64-bit archs in loader_exec.

[Jinoh Kang (＠iamahuman)]

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/110

[PATCH 1/1] ntdll: Generalize check for IMAGE_FILE_MACHINE_AMD64 to other 64-bit archs in loader_exec.

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com>
---
 dlls/ntdll/unix/loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 7f85582adf3..9e86b6b9a28 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -686,7 +686,7 @@ static NTSTATUS loader_exec( const char *loader, char **argv, WORD machine )
 
     if (build_dir)
     {
-        argv[1] = build_path( build_dir, (machine == IMAGE_FILE_MACHINE_AMD64) ? "loader/wine64" : "loader/wine" );
+        argv[1] = build_path( build_dir, is_machine_64bit(machine) ? "loader/wine64" : "loader/wine" );
         preloader_exec( argv );
         return STATUS_INVALID_IMAGE_FORMAT;
     }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/110

[Alexandre Julliard (＠julliard)]

Other 64-bit archs use "wine" as the loader name.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/110#note_1161

[PATCH 0/1] MR110: ntdll: Generalize check for IMAGE_FILE_MACHINE_AMD64 to other 64-bit archs in loader_exec. - closed

[Jinoh Kang (＠iamahuman)]

This merge request was closed by Jinoh Kang.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/110