From: Brendan Shanks <bshanks@codeweavers.com> --- server/object.h | 5 ++--- server/registry.c | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/object.h b/server/object.h index cab8ad25a59..4d96740de03 100644 --- a/server/object.h +++ b/server/object.h @@ -287,9 +287,8 @@ static inline int is_machine_64bit( unsigned short machine ) } static inline int is_machine_supported( unsigned short machine ) { - unsigned int i; - for (i = 0; i < supported_machines_count; i++) if (supported_machines[i] == machine) return 1; - if (native_machine == IMAGE_FILE_MACHINE_ARM64) return machine == IMAGE_FILE_MACHINE_AMD64; + for (unsigned int i = 0; i < supported_machines_count; i++) + if (supported_machines[i] == machine) return 1; return 0; } diff --git a/server/registry.c b/server/registry.c index a367d70c7ee..91b3265e8f7 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1877,6 +1877,7 @@ static void init_supported_machines(void) supported_machines[count++] = IMAGE_FILE_MACHINE_ARM64; supported_machines[count++] = IMAGE_FILE_MACHINE_I386; if (supports_aarch32()) supported_machines[count++] = IMAGE_FILE_MACHINE_ARMNT; + supported_machines[count++] = IMAGE_FILE_MACHINE_AMD64; } #else #error Unsupported machine -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10526