Changeset 5050 for trunk/src/win32k/pe2lx/pe2lx.cpp

Timestamp:

Feb 2, 2001, 9:35:54 AM (25 years ago)

Author:

bird

Message:

All-in-one-object fix is now implmented thru an option. (-1<+|[*]>)

File:

• trunk/src/win32k/pe2lx/pe2lx.cpp (modified) (2 diffs)

trunk/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.23 2000-12-18 14:19:24 bird Exp $
+/* $Id: pe2lx.cpp,v 1.24 2001-02-02 08:35:54 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -558 +558 @@
      *    alignment which is not a multiple of 64Kb. The sections are concatenated into one big object. */
     /* TODO! this test has to be enhanced a bit. WWPack32, new Borland++ depends on image layout. */
-    fAllInOneObject = (pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) == IMAGE_FILE_RELOCS_STRIPPED;
-    fAllInOneObject = 1; /* KSO Fri 22.09.2000: for the time beeing we'll allways apply the alignment fix.
-                          * There are just too many apps failing because of missing baserelocations.
-                          * When I have explored the VDM flag of VMAllocMem I'll remove this.
-                          */
+    fAllInOneObject =  !isPEOneObjectDisabled() 
+                       && (   isPEOneObjectForced()
+                           || (pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) == IMAGE_FILE_RELOCS_STRIPPED
+                           );
     if (fAllInOneObject)
     {
         printInf(("All-In-One-Object fix is applied.\n"));
-        if (pNtHdrs->OptionalHeader.ImageBase >= 0x04000000UL)
+        if (pNtHdrs->OptionalHeader.ImageBase >= 0x04000000UL && !(pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_DLL))
             printWar(("ImageBase >= 64MB this object may not be runnable! (ImageBase=%#8x)\n",
                      pNtHdrs->OptionalHeader.ImageBase));