Changeset 262 for branches

Timestamp:

Oct 25, 2004, 12:02:36 AM (21 years ago)

Author:

pr

Message:

XWP bug 583

Location:

branches/branch-1-0

Files:

• include/helpers/exeh.h (modified) (3 diffs)
• src/helpers/exeh.c (modified) (1 diff)
• src/helpers/makefile (modified) (3 diffs)

branches/branch-1-0/include/helpers/exeh.h

@@ -63 +63 @@
          USHORT usIPStartup;            // 14: IP at startup
          USHORT usCodeSegOfs;           // 16: code segment offset from EXE start
-         USHORT usRelocTableOfs;        // 18: reloc table ofs.header (Win: >= 0x40)
+         USHORT usRelocTableOfs;        // 18: reloc table ofs.header (Win: >= 0x40 || 0)
          USHORT usOverlayNo;            // 1a: overlay no.
          USHORT usLinkerVersion;        // 1c: linker version (if 0x18 > 0x28)
@@ -77 +77 @@
          ULONG  ulUnused6;              // 34:
          ULONG  ulUnused7;              // 38:
-         ULONG  ulNewHeaderOfs;         // 3c: new header ofs (if 0x18 > 0x40)
+         ULONG  ulNewHeaderOfs;         // 3c: new header ofs (if 0x18 >= 0x40 || 0)
                     // fixed this from USHORT, thanks Martin Lafaix
                     // V0.9.7 (2000-12-20) [umoeller]
@@ -231 +231 @@
     typedef struct _LXHEADER
     {
-        CHAR        achLX[2];           // 00: e32_magic  "LX" or "LE" magic
+        CHAR      achLX[2];             // 00: e32_magic  "LX" or "LE" magic
             // this is "LX" for 32-bit OS/2 programs, but
             // "LE" for MS-DOS progs which use this format

branches/branch-1-0/src/helpers/exeh.c

@@ -292 +292 @@
             else
             {
+                // V1.0.3 (2004-10-24) [pr]: Some non-DOS EXEs have a relocation table
+                // offset which is 0 - these were previously identified as DOS EXEs.
                 // we have a DOS header:
-                if (pExec->pDosExeHeader->usRelocTableOfs < 0x40)
-                {
-                    // neither LX nor PE nor NE:
-                    pExec->ulOS = EXEOS_DOS3;
-                    pExec->ulExeFormat = EXEFORMAT_OLDDOS;
-                }
-                else
+                if (   (   (pExec->pDosExeHeader->usRelocTableOfs == 0)
+                        || (pExec->pDosExeHeader->usRelocTableOfs >= sizeof(DOSEXEHEADER))
+                       )
+                    && (pExec->pDosExeHeader->ulNewHeaderOfs != 0)
+                   )
                 {
                     // we have a new header offset:
                     fLoadNewHeader = TRUE;
                     ulNewHeaderOfs = pExec->pDosExeHeader->ulNewHeaderOfs;
+                }
+                else
+                {
+                    // else DOS:
+                    pExec->ulOS = EXEOS_DOS3;
+                    pExec->ulExeFormat = EXEFORMAT_OLDDOS;
                 }
             }

branches/branch-1-0/src/helpers/makefile

@@ -157 +157 @@
 +$(OBJS: =&^
 );
-<<KEEP
+<<
 !endif
 
@@ -169 +169 @@
 +$(CPOBJS: =&^
 );
-<<KEEP
+<<
 !endif
 
@@ -181 +181 @@
 +$(PLAINCOBJS: =&^
 );
-<<KEEP
+<<
 !endif