WebSVN – DevTools – Diff – /core_devl/trunk/UTILS/SH/Sh8.c

     return EXETYPE_UNIX_NATIVE;
 #else
     int                 fd;
     unsigned long       res;
     size_t              len;
     if (pathname == NULL)
         res = EXETYPE_BAD_FILE;
 /* Open the file */
     struct stat                 fstatus;
     if ((read (fd, &OS_Headers, sizeof (struct ExecDosHeader)) !=
                 sizeof (struct ExecDosHeader)) ||
         (OS_Headers.DosHead.e_magic != SIG_DOS))
+    {
         return EXETYPE_UNKNOWN;
+    }
 /*
  * If the header size in the header is not a new header or the relocation
  * section starts before the end of the new header, it must be a DOS program
  */
     if ((OS_Headers.DosHead.e_cparhdr * 16 < sizeof (struct ExecDosHeader)) ||
         (OS_Headers.DosHead.e_lfarlc < sizeof (struct ExecDosHeader)))
+    {
         return EXETYPE_DOS_CUI;
+    }
     if ((fstat (fd, &fstatus) == -1) ||
         (fstatus.st_size < (off_t) OS_Headers.DosHead.e_lfanew))
+    {
         return EXETYPE_DOS_CUI;
+    }
     if ((lseek (fd, (off_t) OS_Headers.DosHead.e_lfanew, SEEK_SET) ==
                 (off_t) -1) ||
         (read (fd, &OS_Headers, sizeof (OS_Headers)) != sizeof (OS_Headers)))
+    {
         return EXETYPE_BAD_IMAGE;
+    }
 /* NT */
     if (OS_Headers.NTHead.Signature == SIG_NT)
+    {
-        if (OS_Headers.NTHead.FileHeader.SizeOfOptionalHeader !=
+        // Note: X64 OptionalHeaderSize is longer
-            NT_OPTIONAL_HEADER)
+        if (OS_Headers.NTHead.FileHeader.SizeOfOptionalHeader < NT_OPTIONAL_HEADER)
             return EXETYPE_UNKNOWN;
         switch (OS_Headers.NTHead.OptionalHeader.Subsystem)
+        {
             default:

Subversion Repositories DevTools

(root)/core_devl/trunk/UTILS/SH/Sh8.c – Rev 227 → 4806