Win64 patch 6/6 (resend)

Ge van Geldorp ge at gse.nl
Tue Jun 20 02:34:49 CDT 2006


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

 dlls/ntdll/virtual.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 6a94e68..3dacf81 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -884,12 +884,17 @@ static NTSTATUS map_image( HANDLE hmappi
 
     /* check the architecture */
 
+#ifdef __x86_64__
+    if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64)
+#else
     if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386)
+#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;
-- 
1.4.0




More information about the wine-patches mailing list