Maarten Lankhorst : ntdll: Make 64-bits wine only able to load amd64 binaries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 269600bbed6a72be8e78273fd39bd79a8690bfb6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=269600bbed6a72be8e78273fd3...

Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com>
Date:   Tue Nov 25 09:30:17 2008 +0100

ntdll: Make 64-bits wine only able to load 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 c9503de..8d97e2c 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1038,13 +1038,18 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
 
     /* 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_I860:    MESSAGE("I860"); break;
+        case IMAGE_FILE_MACHINE_I386:    MESSAGE("I386"); break;
         case IMAGE_FILE_MACHINE_R3000:   MESSAGE("R3000"); break;
         case IMAGE_FILE_MACHINE_R4000:   MESSAGE("R4000"); break;
         case IMAGE_FILE_MACHINE_R10000:  MESSAGE("R10000"); break;