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

Timestamp:

Sep 22, 2000, 5:47:37 AM (25 years ago)

Author:

bird

Message:

Corrected bug in applyFixups which caused fixups not to be applied when
fAllInOneObject was set.
Force all-in-one-object (alignment) fix.

File:

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

trunk/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.19 2000-09-02 21:08:16 bird Exp $
+/* $Id: pe2lx.cpp,v 1.20 2000-09-22 03:47:37 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -559 +559 @@
     /* 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.
+                          */
     if (fAllInOneObject)
     {
@@ -1079 +1083 @@
             fDeltaOnly = TRUE;          /* IMPORTANT: Later code assumes that this is true when fAllInOneObject is true. */
             if (fAllInOneObject)
-                fApplyFixups = ulImageBase == pSMTE->smte_objtab[0].ote_base;
+                fApplyFixups = ulImageBase != pSMTE->smte_objtab[0].ote_base;
             else
             {
@@ -1261 +1265 @@
                             {
                                 case IMAGE_REL_BASED_HIGHLOW:
+                                    printInfA(("IMAGE_REL_BASED_HIGHLOW offset=0x%08x\n", offFixup));
                                     if (fDeltaOnly)
                                         *pul += ulDelta;
@@ -1283 +1288 @@
                                 case IMAGE_REL_BASED_HIGHADJ:   /* According to M$ docs these seems to be the same fixups. */
                                 case IMAGE_REL_BASED_HIGH3ADJ:
-                                    printInf(("IMAGE_REL_BASED_HIGH offset=0x%08x\n", offFixup));
+                                    printInfA(("IMAGE_REL_BASED_HIGH offset=0x%08x\n", offFixup));
                                     *(PUSHORT)pul += (USHORT)(ulDelta >> 16);
                                     break;
                                 /* Will probably not work very well until the 64KB object alignment is gone! */
                                 case IMAGE_REL_BASED_LOW:
-                                    printInf(("IMAGE_REL_BASED_LOW  offset=0x%08x\n", offFixup));
+                                    printInfA(("IMAGE_REL_BASED_LOW  offset=0x%08x\n", offFixup));
                                     *(PUSHORT)pul += (USHORT)ulDelta;
                                     break;
@@ -1644 +1649 @@
         for (i=i; cbObject > 0; cbObject -= PAGESIZE, ulAddress += PAGESIZE, ulRVA += PAGESIZE)
         {
+            printInf(("Page at RVA 0x%08x\n", ulRVA));
             rc = readAtRVA(ulRVA, &achPage[0], PAGESIZE);
             if (rc != NO_ERROR)