Alexandre Julliard : server: Report a 64-bit CPU for IL-only binaries.

Alexandre Julliard julliard at winehq.org
Wed May 15 14:32:21 CDT 2019


Module: wine
Branch: stable
Commit: 144db807a5cd970d3a31333a14451810936cc204
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=144db807a5cd970d3a31333a14451810936cc204

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Feb 15 15:52:50 2019 +0100

server: Report a 64-bit CPU for IL-only binaries.

Based on a patch by Brendan McGrath.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46319
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 9381da9f1c8a685f806b922383c7f9356f87d94d)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 server/mapping.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/mapping.c b/server/mapping.c
index bc59b21..ea49e1a 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -712,7 +712,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s
         mapping->image.image_flags |= IMAGE_FLAGS_ComPlusILOnly;
         if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC &&
             !(clr.Flags & COMIMAGE_FLAGS_32BITREQUIRED))
+        {
             mapping->image.image_flags |= IMAGE_FLAGS_ComPlusNativeReady;
+            if (cpu_mask & CPU_FLAG(CPU_x86_64)) mapping->image.cpu = CPU_x86_64;
+            else if (cpu_mask & CPU_FLAG(CPU_ARM64)) mapping->image.cpu = CPU_ARM64;
+        }
     }
 
     if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections ))




More information about the wine-cvs mailing list