Changeset 262 for branches/branch-1-0/src/helpers

Timestamp:

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

Author:

pr

Message:

XWP bug 583

Location:

branches/branch-1-0/src/helpers

Files:

• exeh.c (modified) (1 diff)
• makefile (modified) (3 diffs)

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