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

Timestamp:

Aug 31, 2007, 6:09:23 AM (18 years ago)

Author:

bird

Message:

kHlp work...

File:

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

trunk/kStuff/kLdr/kLdrModPE.c

@@ -30 +30 @@
 *******************************************************************************/
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
 #include "kLdrInternal.h"
 #include <k/kLdrFmts/pe.h>
@@ -46 +45 @@
  */
 #ifdef KLDRMODPE_STRICT
-# define KLDRMODPE_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRMODPE_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRMODPE_ASSERT(expr)  do {} while (0)
@@ -151 +150 @@
         return 0;
     }
-    kldrHlpFree(pModPE);
+    kHlpFree(pModPE);
     return rc;
 }
@@ -200 +199 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kLdrHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
     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);
+    pModPE = (PKLDRMODPE)kHlpAlloc(cb);
     if (!pModPE)
         return KLDR_ERR_NO_MEMORY;
@@ -217 +216 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)&pMod->aSegments[pMod->cSegments];
-    kLdrHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
-    pMod->pszName = kldrHlpGetFilename(pMod->pszFilename);
+    kHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
+    pMod->pszName = kHlpGetFilename(pMod->pszFilename);
     pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
     switch (s.FileHdr.Machine)
@@ -234 +233 @@
             break;
         default:
-            kldrHlpAssert(0);
+            kHlpAssert(0);
             break;
     }
@@ -410 +409 @@
             case IMAGE_SCN_ALIGN_4096BYTES:     pMod->aSegments[i + 1].Alignment = 4096; break;
             case IMAGE_SCN_ALIGN_8192BYTES:     pMod->aSegments[i + 1].Alignment = 8192; break;
-            default: kldrHlpAssert(0);          pMod->aSegments[i + 1].Alignment = 0; break;
+            default: kHlpAssert(0);          pMod->aSegments[i + 1].Alignment = 0; break;
         }
     }
@@ -536 +535 @@
     pMod->u32Magic = 0;
     pMod->pOps = NULL;
-    kldrHlpFree(pModPE);
+    kHlpFree(pModPE);
     return rc;
 }
@@ -751 +750 @@
                 {
                     pszName = KLDRMODPE_RVA2TYPE(pvBits, paRVANames[i], const char *);
-                    KLDRMODPE_ASSERT(kLdrHlpStrNComp(pszName, pchSymbol, cchSymbol) || pszName[cchSymbol]);
-                    KLDRMODPE_ASSERT(i == 0 || kLdrHlpStrComp(pszName, KLDRMODPE_RVA2TYPE(pvBits, paRVANames[i - 1], const char *)));
+                    KLDRMODPE_ASSERT(kHlpStrNComp(pszName, pchSymbol, cchSymbol) || pszName[cchSymbol]);
+                    KLDRMODPE_ASSERT(i == 0 || kHlpStrComp(pszName, KLDRMODPE_RVA2TYPE(pvBits, paRVANames[i - 1], const char *)));
                 }
 #endif
@@ -760 +759 @@
             i = (iEnd - iStart) / 2 + iStart;
             pszName = KLDRMODPE_RVA2TYPE(pvBits, paRVANames[i - 1], const char *);
-            diff = kLdrHlpStrNComp(pszName, pchSymbol, cchSymbol);
+            diff = kHlpStrNComp(pszName, pchSymbol, cchSymbol);
             if (!diff)
                 diff = pszName[cchSymbol] - 0;
@@ -903 +902 @@
     {
         const char *pszName = KLDRMODPE_RVA2TYPE(pvBits, paImpDir[iImpModule].Name, const char *);
-        KSIZE       cchName = kLdrHlpStrLen(pszName);
+        KSIZE       cchName = kHlpStrLen(pszName);
         if (    (   cchName == cchImpModule
                  || (   cchName > cchImpModule
@@ -911 +910 @@
                      && (pszName[cchImpModule + 3] == 'l' || pszName[cchImpModule + 3] == 'L'))
                 )
-            &&  kLdrHlpMemIComp(pszName, pszForwarder, cchImpModule)
+            &&  kHlpMemIComp(pszName, pszForwarder, cchImpModule)
            )
         {
@@ -918 +917 @@
              */
             rc = pfnGetForwarder(pModPE->pMod, iImpModule, iSymbol, pszSymbol,
-                                 pszSymbol ? kLdrHlpStrLen(pszSymbol) : 0, NULL, puValue, pfKind, pvUser);
+                                 pszSymbol ? kHlpStrLen(pszSymbol) : 0, NULL, puValue, pfKind, pvUser);
             if (!rc && pfKind)
                 *pfKind |= KLDRSYMKIND_FORWARDER;
@@ -989 +988 @@
             fFoundName = 1;
             pszName = KLDRMODPE_RVA2TYPE(pvBits, paRVANames[iName], const char *);
-            rc = pfnCallback(pMod, iFunction + pExpDir->Base, pszName, kLdrHlpStrLen(pszName), NULL,
+            rc = pfnCallback(pMod, iFunction + pExpDir->Base, pszName, kHlpStrLen(pszName), NULL,
                              uValue, fKind, pvUser);
             if (rc)
@@ -1040 +1039 @@
                                   const IMAGE_IMPORT_DESCRIPTOR *);
     pszImportName = KLDRMODPE_RVA2TYPE(pvBits, pImpDesc->Name, const char *);
-    cchImportName = kLdrHlpStrLen(pszImportName);
+    cchImportName = kHlpStrLen(pszImportName);
     if (cchImportName < cchName)
     {
-        kLdrHlpMemCopy(pszName, pszImportName, cchImportName + 1);
+        kHlpMemCopy(pszName, pszImportName, cchImportName + 1);
         rc = 0;
     }
     else
     {
-        kLdrHlpMemCopy(pszName, pszImportName, cchName);
+        kHlpMemCopy(pszName, pszImportName, cchName);
         if (cchName)
             pszName[cchName - 1] = '\0';
@@ -1594 +1593 @@
                 const IMAGE_IMPORT_BY_NAME *pName = KLDRMODPE_RVA2TYPE(pvMapping, pThunk->u1.Ordinal, const IMAGE_IMPORT_BY_NAME *);
                 rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL, (const char *)pName->Name,
-                                  kLdrHlpStrLen((const char *)pName->Name), NULL, &Value, &fKind, pvUser);
+                                  kHlpStrLen((const char *)pName->Name), NULL, &Value, &fKind, pvUser);
             }
             else
@@ -1662 +1661 @@
                 const IMAGE_IMPORT_BY_NAME *pName = KLDRMODPE_RVA2TYPE(pvMapping, pThunk->u1.Ordinal, const IMAGE_IMPORT_BY_NAME *);
                 rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL, (const char *)pName->Name,
-                                  kLdrHlpStrLen((const char *)pName->Name), NULL, &Value, &fKind, pvUser);
+                                  kHlpStrLen((const char *)pName->Name), NULL, &Value, &fKind, pvUser);
             }
             else
@@ -1902 +1901 @@
      * Zero the entire buffer first to simplify things.
      */
-    kLdrHlpMemSet(pvBits, 0, pModPE->Hdrs.OptionalHeader.SizeOfImage);
+    kHlpMemSet(pvBits, 0, pModPE->Hdrs.OptionalHeader.SizeOfImage);
 
     /*