commit 1467bbd5a4796c2b328368fec9e22fb24e3cd8de
author Dmitry Timoshkov <dmitry@baikal.ru> Tue Aug 27 00:34:41 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 27 00:34:41 2002 +0000
tree f3c14db1890d9aca27b8799e548bbc43611011f2
parent 155710ce62cd527e862249bd785d116bbad227f8

Relax a bit PE consistency checks.
Return BINARY_DOS type if extended header was not recognized.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index e291b0d..9f40952 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -635,15 +635,14 @@
          */
         if (!memcmp( magic, "PE\0\0", 4 ))
         {
-            IMAGE_NT_HEADERS nt;
+            IMAGE_FILE_HEADER FileHeader;
 
-            if (SetFilePointer( hfile, header.mz.e_lfanew, NULL, SEEK_SET ) != -1 &&
-                ReadFile( hfile, &nt, sizeof(nt), &len, NULL ) && len == sizeof(nt))
+            if (ReadFile( hfile, &FileHeader, sizeof(FileHeader), &len, NULL ) && len == sizeof(FileHeader))
             {
-                if (nt.FileHeader.Characteristics & IMAGE_FILE_DLL) return BINARY_PE_DLL;
+                if (FileHeader.Characteristics & IMAGE_FILE_DLL) return BINARY_PE_DLL;
                 return BINARY_PE_EXE;
             }
-            return BINARY_UNKNOWN;
+            return BINARY_DOS;
         }
 
         if (!memcmp( magic, "NE", 2 ))
@@ -666,7 +665,7 @@
                 }
             }
             /* Couldn't read header, so abort. */
-            return BINARY_UNKNOWN;
+            return BINARY_DOS;
         }
 
         /* Unknown extended header, but this file is nonetheless DOS-executable. */