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

Timestamp:

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

Author:

bird

Message:

kHlp work...

File:

• trunk/kStuff/kLdr/kLdrRdrFile.c (modified) (14 diffs)

trunk/kStuff/kLdr/kLdrRdrFile.c

@@ -153 +153 @@
 
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
 
 
@@ -167 +166 @@
  */
 #ifdef KLDRRDRFILE_STRICT
-# define KLDRRDRFILE_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRRDRFILE_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRRDRFILE_ASSERT(expr)  do {} while (0)
@@ -377 +376 @@
 {
     kldrRdrFileGenericProtect(pRdr, pPrep, cSegments, paSegments, 1 /* unprotect */);
-    return kldrHlpPageFree(pPrep->pv, pPrep->cb);
+    return kHlpPageFree(pPrep->pv, pPrep->cb);
 }
 
@@ -452 +451 @@
         pv = (KU8 *)pPrep->pv + paSegments[i].RVA;
 
-        rc = kldrHlpPageProtect(pv, paSegments[i].cbMapped, enmProt);
+        rc = kHlpPageProtect(pv, paSegments[i].cbMapped, enmProt);
         if (rc)
             break;
@@ -502 +501 @@
      */
     /** @todo only zero the areas not covered by raw file bits. */
-    kLdrHlpMemSet(pPrep->pv, 0, pPrep->cb);
+    kHlpMemSet(pPrep->pv, 0, pPrep->cb);
 
     /*
@@ -769 +768 @@
 
     /*
-     * Generic mapping code using kldrHlpPageAlloc(), kldrHlpPageFree() and kldrHlpPageProtect().
-     */
-    rc = kldrHlpPageAlloc(&pPrep->pv, pPrep->cb, KPROT_EXECUTE_READWRITE, fFixed);
+     * Generic mapping code using kHlpPageAlloc(), kHlpPageFree() and kHlpPageProtect().
+     */
+    rc = kHlpPageAlloc(&pPrep->pv, pPrep->cb, KPROT_EXECUTE_READWRITE, fFixed);
     if (rc)
         return rc;
@@ -804 +803 @@
 
     /* bailout */
-    kldrHlpPageFree(pPrep->pv, pPrep->cb);
+    kHlpPageFree(pPrep->pv, pPrep->cb);
     return rc;
 }
@@ -896 +895 @@
     if (!--pRdrFile->cMappings)
     {
-        kldrHlpFree(pRdrFile->pvMapping);
+        kHlpFree(pRdrFile->pvMapping);
         pRdrFile->pvMapping = NULL;
     }
@@ -917 +916 @@
         KLDRFOFF cb = pRdrFile->Core.pOps->pfnSize(pRdr);
 
-        pRdrFile->pvMapping = kldrHlpAlloc(cb);
+        pRdrFile->pvMapping = kHlpAlloc(cb);
         if (!pRdrFile->pvMapping)
 #if defined(__OS2__) || defined(__WIN__)
@@ -927 +926 @@
         if (rc)
         {
-            kldrHlpFree(pRdrFile->pvMapping);
+            kHlpFree(pRdrFile->pvMapping);
             pRdrFile->pvMapping = NULL;
             return rc;
@@ -1047 +1046 @@
     if (pRdrFile->pvMapping)
     {
-        kldrHlpFree(pRdrFile->pvMapping);
+        kHlpFree(pRdrFile->pvMapping);
         pRdrFile->pvMapping = NULL;
     }
 
-    kldrHlpFree(pRdr);
+    kHlpFree(pRdr);
     return rc;
 }
@@ -1076 +1075 @@
     {
         char *psz;
-        cchFilename = kLdrHlpStrLen(szFilename);
-        psz = (char *)kLdrHlpAllocA(cchFilename + 1);
-        kLdrHlpMemCopy(psz, pszFilename, cchFilename + 1);
+        cchFilename = kHlpStrLen(szFilename);
+        psz = (char *)kHlpAllocA(cchFilename + 1);
+        kHlpMemCopy(psz, pszFilename, cchFilename + 1);
         pszFilename = psz;
     }
@@ -1147 +1146 @@
      * Allocate the reader instance.
      */
-    cchFilename = kLdrHlpStrLen(szFilename);
-    pRdrFile = (PKLDRRDRFILE)kldrHlpAlloc(sizeof(*pRdrFile) + cchFilename);
+    cchFilename = kHlpStrLen(szFilename);
+    pRdrFile = (PKLDRRDRFILE)kHlpAlloc(sizeof(*pRdrFile) + cchFilename);
     if (!pRdrFile)
 #if defined(__OS2__)
@@ -1174 +1173 @@
     pRdrFile->cMappings = 0;
     pRdrFile->cPreps = 0;
-    kLdrHlpMemCopy(&pRdrFile->szFilename[0], szFilename, cchFilename + 1);
+    kHlpMemCopy(&pRdrFile->szFilename[0], szFilename, cchFilename + 1);
 
     *ppRdr = &pRdrFile->Core;