Changeset 3578 for trunk/kStuff/kLdr/kLdrModPE.c

Timestamp:

Sep 2, 2007, 10:55:51 PM (18 years ago)

Author:

bird

Message:

kLdrRdr cleanup.

File:

• trunk/kStuff/kLdr/kLdrModPE.c (modified) (16 diffs)

trunk/kStuff/kLdr/kLdrModPE.c

@@ -105 +105 @@
                                   PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 
-static int  kldrModPEDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODPE *ppMod);
+static int  kldrModPEDoCreate(PKRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODPE *ppMod);
 /*static void kldrModPEDoLoadConfigConversion(PIMAGE_LOAD_CONFIG_DIRECTORY64 pLoadCfg); */
 static int  kLdrModPEDoOptionalHeaderValidation(PKLDRMODPE pModPE);
@@ -134 +134 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModPECreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModPECreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODPE pModPE;
@@ -159 +159 @@
  * simplify cleanup on failure.
  */
-static int kldrModPEDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODPE *ppModPE)
+static int kldrModPEDoCreate(PKRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODPE *ppModPE)
 {
     struct
@@ -178 +178 @@
      * Read the signature and file header.
      */
-    rc = kLdrRdrRead(pRdr, &s, sizeof(s), offNewHdr > 0 ? offNewHdr : 0);
+    rc = kRdrRead(pRdr, &s, sizeof(s), offNewHdr > 0 ? offNewHdr : 0);
     if (rc)
         return rc;
@@ -199 +199 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kRdrName(pRdr));
     cb = K_ALIGN_Z(K_OFFSETOF(KLDRMODPE, aShdrs[s.FileHdr.NumberOfSections]), 16)
        + K_OFFSETOF(KLDRMOD, aSegments[s.FileHdr.NumberOfSections + 1])
@@ -216 +216 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)&pMod->aSegments[pMod->cSegments];
-    kHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
+    kHlpMemCopy((char *)pMod->pszFilename, kRdrName(pRdr), cchFilename + 1);
     pMod->pszName = kHlpGetFilename(pMod->pszFilename);
     pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
@@ -261 +261 @@
      */
     off = pModPE->offHdrs + sizeof(pModPE->Hdrs.Signature) + sizeof(pModPE->Hdrs.FileHeader);
-    rc = kLdrRdrRead(pRdr, &pModPE->Hdrs.OptionalHeader, pModPE->Hdrs.FileHeader.SizeOfOptionalHeader, off);
+    rc = kRdrRead(pRdr, &pModPE->Hdrs.OptionalHeader, pModPE->Hdrs.FileHeader.SizeOfOptionalHeader, off);
     if (rc)
         return rc;
@@ -267 +267 @@
         kldrModPEDoOptionalHeaderConversion(&pModPE->Hdrs.OptionalHeader);
     off += pModPE->Hdrs.FileHeader.SizeOfOptionalHeader;
-    rc = kLdrRdrRead(pRdr, &pModPE->aShdrs[0], sizeof(IMAGE_SECTION_HEADER) * pModPE->Hdrs.FileHeader.NumberOfSections, off);
+    rc = kRdrRead(pRdr, &pModPE->aShdrs[0], sizeof(IMAGE_SECTION_HEADER) * pModPE->Hdrs.FileHeader.NumberOfSections, off);
     if (rc)
         return rc;
@@ -530 +530 @@
     if (pMod->pRdr)
     {
-        rc = kLdrRdrClose(pMod->pRdr);
+        rc = kRdrClose(pMod->pRdr);
         pMod->pRdr = NULL;
     }
@@ -553 +553 @@
 {
     PKLDRMOD    pMod = pModPE->pMod;
-    unsigned    fFixed;
+    KBOOL       fFixed;
     void       *pvBase;
     int         rc;
@@ -575 +575 @@
 
     /* try do the prepare */
-    rc = kLdrRdrMap(pMod->pRdr, &pvBase, pMod->cSegments, pMod->aSegments, fFixed);
+    rc = kRdrMap(pMod->pRdr, &pvBase, pMod->cSegments, pMod->aSegments, fFixed);
     if (rc)
         return rc;
@@ -616 +616 @@
      * Try unmap the image.
      */
-    rc = kLdrRdrUnmap(pMod->pRdr, (void *)pvMapping, pMod->cSegments, pMod->aSegments);
+    rc = kRdrUnmap(pMod->pRdr, (void *)pvMapping, pMod->cSegments, pMod->aSegments);
     if (rc)
         return rc;
@@ -1315 +1315 @@
 
     /* the file provider does it all */
-    return kLdrRdrRefresh(pMod->pRdr, (void *)pModPE->pvMapping, pMod->cSegments, pMod->aSegments);
+    return kRdrRefresh(pMod->pRdr, (void *)pModPE->pvMapping, pMod->cSegments, pMod->aSegments);
 }
 
@@ -1334 +1334 @@
      * Before doing anything we'll have to make all pages writable.
      */
-    rc = kLdrRdrProtect(pMod->pRdr, (void *)pModPE->pvMapping, pMod->cSegments, pMod->aSegments, 1 /* unprotect */);
+    rc = kRdrProtect(pMod->pRdr, (void *)pModPE->pvMapping, pMod->cSegments, pMod->aSegments, 1 /* unprotect */);
     if (rc)
         return rc;
@@ -1353 +1353 @@
      * Restore protection.
      */
-    rc2 = kLdrRdrProtect(pMod->pRdr, (void *)pModPE->pvMapping, pMod->cSegments, pMod->aSegments, 0 /* protect */);
+    rc2 = kRdrProtect(pMod->pRdr, (void *)pModPE->pvMapping, pMod->cSegments, pMod->aSegments, 0 /* protect */);
     if (!rc && rc2)
         rc = rc2;
@@ -1914 +1914 @@
             ||  !pMod->aSegments[i].Alignment)
             continue;
-        rc = kLdrRdrRead(pMod->pRdr,
+        rc = kRdrRead(pMod->pRdr,
                          (KU8 *)pvBits + (pMod->aSegments[i].LinkAddress - pModPE->Hdrs.OptionalHeader.ImageBase),
                          pMod->aSegments[i].cbFile,