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

Timestamp:

Aug 31, 2007, 4:16:27 AM (18 years ago)

Author:

bird

Message:

Dropped kLdrBase.h

File:

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

trunk/kStuff/kLdr/kLdrModPE.c

@@ -201 +201 @@
      */
     cchFilename = kLdrHlpStrLen(kLdrRdrName(pRdr));
-    cb = KLDR_ALIGN_Z(KLDR_OFFSETOF(KLDRMODPE, aShdrs[s.FileHdr.NumberOfSections]), 16)
-       + KLDR_OFFSETOF(KLDRMOD, aSegments[s.FileHdr.NumberOfSections + 1])
+    cb = K_ALIGN_Z(K_OFFSETOF(KLDRMODPE, aShdrs[s.FileHdr.NumberOfSections]), 16)
+       + K_OFFSETOF(KLDRMOD, aSegments[s.FileHdr.NumberOfSections + 1])
        + cchFilename + 1;
     pModPE = (PKLDRMODPE)kldrHlpAlloc(cb);
@@ -210 +210 @@
 
     /* KLDRMOD */
-    pMod = (PKLDRMOD)((KU8 *)pModPE + KLDR_ALIGN_Z(KLDR_OFFSETOF(KLDRMODPE, aShdrs[s.FileHdr.NumberOfSections]), 16));
+    pMod = (PKLDRMOD)((KU8 *)pModPE + K_ALIGN_Z(K_OFFSETOF(KLDRMODPE, aShdrs[s.FileHdr.NumberOfSections]), 16));
     pMod->pvData = pModPE;
     pMod->pRdr = pRdr;
@@ -723 +723 @@
          */
         iExpOrd = iSymbol - pExpDir->Base;
-        if (iExpOrd >= KLDR_MAX(pExpDir->NumberOfNames, pExpDir->NumberOfFunctions))
+        if (iExpOrd >= K_MAX(pExpDir->NumberOfNames, pExpDir->NumberOfFunctions))
             return KLDR_ERR_SYMBOL_NOT_FOUND;
     }
@@ -1403 +1403 @@
                         u;
         const KU16 *poffFixup = (const KU16 *)(pBR + 1);
-        const KU32  cbBlock = KLDR_MIN(cbLeft, pBR->SizeOfBlock) - sizeof(IMAGE_BASE_RELOCATION); /* more caution... */
+        const KU32  cbBlock = K_MIN(cbLeft, pBR->SizeOfBlock) - sizeof(IMAGE_BASE_RELOCATION); /* more caution... */
         KU32        cFixups = cbBlock / sizeof(poffFixup[0]);
         uChunk.pu8 = KLDRMODPE_RVA2TYPE(pvMapping, pBR->VirtualAddress, KU8 *);