Changeset 4110 for branches/GRACE/src

Timestamp:

Aug 29, 2000, 6:08:24 AM (25 years ago)

Author:

bird

Message:

Fixed a relocation bug. Check for empty chunks.

File:

• branches/GRACE/src/win32k/pe2lx/pe2lx.cpp (modified) (9 diffs)

branches/GRACE/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.18.4.9 2000-08-27 03:38:28 bird Exp $
+/* $Id: pe2lx.cpp,v 1.18.4.10 2000-08-29 04:08:24 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -481 +481 @@
         dumpSectionHeader(&paSections[i]);
 
-        /* 8a. Convert characteristics to flags */
+        /* 8a. Convert characteristics to flags and check/fix incompatible flags! */
         for (j = 0; j < (sizeof(paSecChars2Flags)/sizeof(paSecChars2Flags[0])); j++)
             if ((paSections[i].Characteristics & paSecChars2Flags[j].Characteristics) == paSecChars2Flags[j].Characteristics)
                 flFlags |= paSecChars2Flags[j].flFlags;
+        if ((flFlags & (OBJEXEC | OBJWRITE)) == (OBJEXEC | OBJWRITE))
+            flFlags &= (ULONG)~OBJEXEC;
 
         /* 8b. Virtual/physical size */
@@ -553 +555 @@
     /* 11.Align section. (Fix which is applied to EXEs/Dlls which contain no fixups and has an
      *    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;
     if (fAllInOneObject)
@@ -681 +684 @@
     Yield();
     _res_heapmin();
-    #if 0 /* testing */
+    #ifndef RING0
+    #if 1 /* testing */
     testApplyFixups();
+    #endif
     #endif
 
@@ -1101 +1106 @@
 
         while ((unsigned)pbr - (unsigned)pBaseRelocs + 8 < cbBaseRelocs /* 8= VirtualAddress and SizeOfBlock members */
+               && pbr->SizeOfBlock >= 8
                && pbr->VirtualAddress < ulRVAPage + PAGESIZE)
         {
@@ -1585 +1591 @@
     NOREF(pLdrLv);
     NOREF(pful);
+    NOREF(fOdin32PathValid);
     return ERROR_NOT_SUPPORTED;
     #endif
@@ -1622 +1629 @@
     }
 
-    rc = readAtRVA(0x00000000, &achPage[0], PAGESIZE);
-    if (rc != NO_ERROR)
-    {
-        printErr(("readAtRVA failed with rc=%d\n"));
-        return rc;
-    }
-    rc = applyFixups(&mte, 0, ~0UL, &achPage[0], 0x125D0000, NULL);
-
-    rc = readAtRVA(0x00001000, &achPage[0], PAGESIZE);
-    if (rc != NO_ERROR)
-    {
-        printErr(("readAtRVA failed with rc=%d\n"));
-        return rc;
-    }
-    rc = applyFixups(&mte, 1, 1, &achPage[0], 0x125E0000, NULL);
+    /*
+     * Test load and apply all (internal) fixups.
+     */
+    for (i = 0; i < cObjects; i++)
+    {
+        ULONG ulAddress = smte.smte_objtab[i].ote_base;
+        ULONG ulRVA = paObjects[i].ulRVA;
+        LONG  cbObject = paObjects[i].cbVirtual;
+        for (i=i; cbObject > 0; cbObject -= PAGESIZE, ulAddress += PAGESIZE, ulRVA += PAGESIZE)
+        {
+            rc = readAtRVA(ulRVA, &achPage[0], PAGESIZE);
+            if (rc != NO_ERROR)
+            {
+                printErr(("readAtRVA failed with rc=%d\n"));
+                return rc;
+            }
+            rc = applyFixups(&mte, 1, 1, &achPage[0], ulAddress, NULL);
+            if (rc != NO_ERROR)
+            {
+                printErr(("applyFixups failed with rc=%d\n"));
+                return rc;
+            }
+        }
+    }
 
     return rc;
@@ -1690 +1706 @@
         {
             ULONG cbToRead = min(cbLXFile, sizeof(achReadBuffer));
-            rc = read(offLXFile, &achReadBuffer[0], cbToRead, 0UL, NULL);
+            rc = read(offLXFile, &achReadBuffer[0], 0UL, cbToRead, NULL);
             if (rc != NO_ERROR)
             {
@@ -3108 +3124 @@
             {
                 PIMAGE_BASE_RELOCATION pbrCur = pBaseRelocs;
-                while ((void*)pbrCur < (void*)((unsigned)pBaseRelocs + cbBaseRelocs))
+                while ((void*)pbrCur < (void*)((unsigned)pBaseRelocs + cbBaseRelocs)
+                       && pbrCur->SizeOfBlock >= 8)
                 {
                     if ((unsigned)pbrCur->SizeOfBlock + (unsigned)pbrCur > (unsigned)pBaseRelocs + cbBaseRelocs)