André Hentschel : ntdll: Add Support for loading ARM PEs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 186ada5472a05705fce6d81b6d9e63a593ecb376
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=186ada5472a05705fce6d81b6d...

Author: André Hentschel 
Date:   Mon Nov  1 21:57:57 2010 +0100

ntdll: Add Support for loading ARM PEs.

---

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

diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index a1faabf..b97bdd2 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1097,6 +1097,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz

#ifdef __x86_64__
     if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64)
+#elif defined(__ARMEL__)
+    if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_ARM &&
+        nt->FileHeader.Machine != IMAGE_FILE_MACHINE_THUMB)
 #else
     if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386)
 #endif
@@ -1116,6 +1119,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
         case IMAGE_FILE_MACHINE_ALPHA64: MESSAGE("Alpha-64"); break;
         case IMAGE_FILE_MACHINE_AMD64:   MESSAGE("AMD-64"); break;
         case IMAGE_FILE_MACHINE_ARM:     MESSAGE("ARM"); break;
+        case IMAGE_FILE_MACHINE_THUMB:   MESSAGE("ARM Thumb"); break;
         case IMAGE_FILE_MACHINE_SPARC:   MESSAGE("SPARC"); break;
         default: MESSAGE("Unknown-%04x", nt->FileHeader.Machine); break;
         }