Win64 patch 13/13

Ge van Geldorp ge at gse.nl
Mon Jun 19 13:03:51 CDT 2006


Changelog:
  Ge van Geldorp <ge at gse.nl>
  - Win64 handles AMD64 binaries

Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.85
diff -u -r1.85 virtual.c
--- dlls/ntdll/virtual.c	24 Feb 2006 10:49:52 -0000	1.85
+++ dlls/ntdll/virtual.c	19 Jun 2006 17:50:25 -0000
@@ -883,12 +883,17 @@
 
     /* check the architecture */
 
+#ifdef __i386__
     if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386)
+#elif defined(__x86_64__)
+    if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64)
+#endif
     {
         MESSAGE("Trying to load PE image for unsupported architecture (");
         switch (nt->FileHeader.Machine)
         {
         case IMAGE_FILE_MACHINE_UNKNOWN: MESSAGE("Unknown"); break;
+        case IMAGE_FILE_MACHINE_I386:    MESSAGE("i386"); break;
         case IMAGE_FILE_MACHINE_I860:    MESSAGE("I860"); break;
         case IMAGE_FILE_MACHINE_R3000:   MESSAGE("R3000"); break;
         case IMAGE_FILE_MACHINE_R4000:   MESSAGE("R4000"); break;



More information about the wine-patches mailing list