Changeset 3578

Timestamp:

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

Author:

bird

Message:

kLdrRdr cleanup.

Location:

trunk/kStuff

Files:

• include/k/kLdr.h (modified) (5 diffs)
• include/k/kRdr.h (modified) (2 diffs)
• include/k/kTypes.h (modified) (1 diff)
• kHlp/Bare/kHlpBareHeap.c (modified) (1 diff)
• kHlp/Makefile.kmk (modified) (1 diff)
• kLdr/Makefile.kmk (modified) (2 diffs)
• kLdr/kLdr-os2.def (modified) (1 diff)
• kLdr/kLdr-win.def (modified) (1 diff)
• kLdr/kLdrDyldFind.c (modified) (14 diffs)
• kLdr/kLdrDyldMod.c (modified) (3 diffs)
• kLdr/kLdrInternal.h (modified) (3 diffs)
• kLdr/kLdrMod.c (modified) (4 diffs)
• kLdr/kLdrModLX.c (modified) (13 diffs)
• kLdr/kLdrModMachO.c (modified) (21 diffs)
• kLdr/kLdrModNative.c (modified) (1 diff)
• kLdr/kLdrModPE.c (modified) (16 diffs)
• kLdr/kLdrRdr.c (deleted)
• kLdr/kLdrRdrFile.c (deleted)
• kRdr/kRdr.cpp (modified) (16 diffs)
• kRdr/kRdrFile.cpp (modified) (1 diff)
• kRdr/kRdrInternal.h (modified) (1 diff)

trunk/kStuff/include/k/kLdr.h

@@ -161 +161 @@
 typedef const KLDRPU *PCKLDRPU;
 
-
-/** Pointer to a loader segment. */
-typedef struct KLDRSEG *PKLDRSEG;
-/** Pointer to a loader segment. */
-typedef const struct KLDRSEG *PCKLDRSEG;
-
-/** @} */
-
-
-/** @defgroup grp_kLdrRdr   kLdrRdr - The file provider
- * @{ */
-
-/** Pointer to a file provider instance core. */
-typedef struct KLDRRDR *PKLDRRDR;
-/** Pointer to a file provider instance core pointer. */
-typedef struct KLDRRDR **PPKLDRRDR;
-
-/**
- * File provider instance operations.
- */
-typedef struct KLDRRDROPS
-{
-    /** The name of this file provider. */
-    const char *pszName;
-    /** Pointer to the next file provider. */
-    const struct KLDRRDROPS *pNext;
-
-    /** Try create a new file provider instance.
-     *
-     * @returns 0 on success, OS specific error code on failure.
-     * @param   ppRdr       Where to store the file provider instance.
-     * @param   pszFilename The filename to open.
-     */
-    int     (* pfnCreate)(  PPKLDRRDR ppRdr, const char *pszFilename);
-    /** Destroy the file provider instance.
-     *
-     * @returns 0 on success, OS specific error code on failure.
-     *          On failure, the file provider instance will be in an indeterminate state - don't touch it!
-     * @param   pRdr        The file provider instance.
-     */
-    int     (* pfnDestroy)( PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrRead */
-    int     (* pfnRead)(    PKLDRRDR pRdr, void *pvBuf, KSIZE cb, KLDRFOFF off);
-    /** @copydoc kLdrRdrAllMap */
-    int     (* pfnAllMap)(  PKLDRRDR pRdr, const void **ppvBits);
-    /** @copydoc kLdrRdrAllUnmap */
-    int     (* pfnAllUnmap)(PKLDRRDR pRdr, const void *pvBits);
-    /** @copydoc kLdrRdrSize */
-    KLDRFOFF (* pfnSize)(    PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrTell */
-    KLDRFOFF (* pfnTell)(    PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrName */
-    const char * (* pfnName)(PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrPageSize */
-    KSIZE   (* pfnPageSize)(PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrMap */
-    int     (* pfnMap)(     PKLDRRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
-    /** @copydoc kLdrRdrRefresh */
-    int     (* pfnRefresh)( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-    /** @copydoc kLdrRdrProtect */
-    int     (* pfnProtect)( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
-    /** @copydoc kLdrRdrUnmap */
-    int     (* pfnUnmap)(   PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-    /** @copydoc kLdrRdrDone */
-    void    (* pfnDone)(    PKLDRRDR pRdr);
-    /** The usual non-zero dummy that makes sure we've initialized all members. */
-    KU32 u32Dummy;
-} KLDRRDROPS;
-/** Pointer to file provider operations. */
-typedef KLDRRDROPS *PKLDRRDROPS;
-/** Pointer to const file provider operations. */
-typedef const KLDRRDROPS *PCKLDRRDROPS;
-
-
-/**
- * File provider instance core.
- */
-typedef struct KLDRRDR
-{
-    /** Magic number (KLDRRDR_MAGIC). */
-    KU32         u32Magic;
-    /** Pointer to the file provider operations. */
-    PCKLDRRDROPS pOps;
-} KLDRRDR;
-
-/** The magic for KLDRRDR::u32Magic. (Katsu Aki (Katsuaki Nakamura)) */
-#define KLDRRDR_MAGIC   0x19610919
-
-void    kLdrRdrAddProvider(PKLDRRDROPS pAdd);
-
-int     kLdrRdrOpen(    PPKLDRRDR ppRdr, const char *pszFilename);
-int     kLdrRdrClose(   PKLDRRDR pRdr);
-int     kLdrRdrRead(    PKLDRRDR pRdr, void *pvBuf, KSIZE cb, KLDRFOFF off);
-int     kLdrRdrAllMap(  PKLDRRDR pRdr, const void **ppvBits);
-int     kLdrRdrAllUnmap(PKLDRRDR pRdr, const void *pvBits);
-KLDRFOFF kLdrRdrSize(    PKLDRRDR pRdr);
-KLDRFOFF kLdrRdrTell(    PKLDRRDR pRdr);
-const char *kLdrRdrName(PKLDRRDR pRdr);
-KSIZE   kLdrRdrPageSize(PKLDRRDR pRdr);
-int     kLdrRdrMap(     PKLDRRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
-int     kLdrRdrRefresh( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-int     kLdrRdrProtect( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
-int     kLdrRdrUnmap(   PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-void    kLdrRdrDone(    PKLDRRDR pRdr);
-
-/** @} */
-
+/** @} */
 
 
@@ -613 +507 @@
     PCKLDRMODOPS        pOps;
     /** Pointer to the read instance. (Can be NULL after kLdrModDone().)*/
-    PKLDRRDR            pRdr;
+    PKRDR               pRdr;
     /** The module data. */
     void               *pvData;
@@ -798 +692 @@
 
 int     kLdrModOpen(const char *pszFilename, PPKLDRMOD ppMod);
-int     kLdrModOpenFromRdr(PKLDRRDR pRdr, PPKLDRMOD ppMod);
+int     kLdrModOpenFromRdr(PKRDR pRdr, PPKLDRMOD ppMod);
 int     kLdrModOpenNative(const char *pszFilename, PPKLDRMOD ppMod);
 int     kLdrModOpenNativeByHandle(KUPTR uHandle, PPKLDRMOD ppMod);
@@ -865 +759 @@
      * @param   ppMod           Where to store the module instance pointer.
      */
-    int (* pfnCreate)(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod);
+    int (* pfnCreate)(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod);
     /**
      * Destroys an loader module instance.
@@ -911 +805 @@
     int (* pfnAllocTLS)(PKLDRMOD pMod);
     /** @copydoc kLdrModFreeTLS */
-    void (* pfnFreeTLS)(PKLDRMOD pMod);
+    void (*pfnFreeTLS)(PKLDRMOD pMod);
     /** @copydoc kLdrModReload */
     int (* pfnReload)(PKLDRMOD pMod);

trunk/kStuff/include/k/kRdr.h

@@ -46 +46 @@
 #endif
 
-/** Pointer to a file provider instance. */
-typedef struct KRDR *PKRDR;
-/** Pointer to a file provider instance pointer. */
-typedef struct KRDR **PPKRDR;
-
 #ifdef __cplusplus
 extern "C" {
@@ -65 +60 @@
 KRDR_DECL(KIPTR)    kRdrNativeFH( PKRDR pRdr);
 KRDR_DECL(KSIZE)    kRdrPageSize( PKRDR pRdr);
-#ifdef ___k_kLdr___
 KRDR_DECL(int)      kRdrMap(      PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
 KRDR_DECL(int)      kRdrRefresh(  PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
 KRDR_DECL(int)      kRdrProtect(  PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
 KRDR_DECL(int)      kRdrUnmap(    PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-#endif /* !___k_kLdr___ */
 KRDR_DECL(void)     kRdrDone(     PKRDR pRdr);
 

trunk/kStuff/include/k/kTypes.h

@@ -381 +381 @@
 
 
+
+/** @name   Forward Declarations / Handle Types.
+ * @{ */
+
+/** Pointer to a file provider instance. */
+typedef struct KRDR *PKRDR;
+/** Pointer to a file provider instance pointer. */
+typedef struct KRDR **PPKRDR;
+
+/** Pointer to a loader segment. */
+typedef struct KLDRSEG *PKLDRSEG;
+/** Pointer to a loader segment. */
+typedef const struct KLDRSEG *PCKLDRSEG;
+
 /** @} */
 
+/** @} */
+
 #endif
 

trunk/kStuff/kHlp/Bare/kHlpBareHeap.c

@@ -32 +32 @@
 #include <k/kHlpAlloc.h>
 #include <k/kHlpString.h>
+#include <k/kHlpAssert.h>
 
 #if K_OS == K_OS_OS2

trunk/kStuff/kHlp/Makefile.kmk

@@ -31 +31 @@
 # kHlpBaseStatic
 #
-LIBRARIES += kHlpBaseStatic
-kHlpBaseStatic_TEMPLATE = kStuffLIB
-kHlpBaseStatic_SOURCES = \
+LIBRARIES += kHlpBareStatic
+kHlpBareStatic_TEMPLATE = kStuffLIB
+kHlpBareStatic_SOURCES = \
         Generic/kHlpMemChr.c \
         Generic/kHlpMemComp.c \

trunk/kStuff/kLdr/Makefile.kmk

@@ -122 +122 @@
         kLdrErr.c \
         kLdrMisc.c \
-        kLdrRdr.c \
-        kLdrRdrFile.c \
         kLdrMod.c \
         kLdrModLX.c \
@@ -137 +135 @@
         kLdr-win.c
 kLdr_LIBS += \
-        $(PATH_LIB)/kHlpBaseStatic$(SUFF_LIB)
+        $(PATH_LIB)/kRdrStatic$(SUFF_LIB) \
+        $(PATH_LIB)/kHlpBareStatic$(SUFF_LIB)
 
 kLdrErr.c_DEPS = $(PATH_TARGET)/kldrErrConsts.h

trunk/kStuff/kLdr/kLdr-os2.def

@@ -30 +30 @@
 EXPORTS
     ; The file reader API
-    _kLdrRdrAddProvider
-    _kLdrRdrOpen
-    _kLdrRdrClose
-    _kLdrRdrRead
-    _kLdrRdrAllMap
-    _kLdrRdrAllUnmap
-    _kLdrRdrSize
-    _kLdrRdrTell
-    _kLdrRdrName
-    _kLdrRdrPageSize
-    _kLdrRdrMap
-    _kLdrRdrRefresh
-    _kLdrRdrProtect
-    _kLdrRdrUnmap
-    _kLdrRdrDone
+    _kRdrAddProvider
+    _kRdrOpen
+    _kRdrClose
+    _kRdrRead
+    _kRdrAllMap
+    _kRdrAllUnmap
+    _kRdrSize
+    _kRdrTell
+    _kRdrName
+    _kRdrPageSize
+    _kRdrMap
+    _kRdrRefresh
+    _kRdrProtect
+    _kRdrUnmap
+    _kRdrDone
 
     ; The module interpreter API

trunk/kStuff/kLdr/kLdr-win.def

@@ -29 +29 @@
 EXPORTS
     ; The file reader API
-    kLdrRdrAddProvider
-    kLdrRdrOpen
-    kLdrRdrClose
-    kLdrRdrRead
-    kLdrRdrAllMap
-    kLdrRdrAllUnmap
-    kLdrRdrSize
-    kLdrRdrTell
-    kLdrRdrName
-    kLdrRdrPageSize
-    kLdrRdrMap
-    kLdrRdrRefresh
-    kLdrRdrProtect
-    kLdrRdrUnmap
-    kLdrRdrDone
+    kRdrAddProvider
+    kRdrOpen
+    kRdrClose
+    kRdrRead
+    kRdrAllMap
+    kRdrAllUnmap
+    kRdrSize
+    kRdrTell
+    kRdrName
+    kRdrPageSize
+    kRdrMap
+    kRdrRefresh
+    kRdrProtect
+    kRdrUnmap
+    kRdrDone
 
     ; The module interpreter API

trunk/kStuff/kLdr/kLdrDyldFind.c

@@ -94 +94 @@
     KLDRDYLDSEARCH  enmSearch;
     KU32            fFlags;
-    PPKLDRRDR       ppRdr;
+    PPKRDR          ppRdr;
 } KLDRDYLDFINDARGS, *PKLDRDYLDFINDARGS;
 
@@ -201 +201 @@
 *******************************************************************************/
 static int kldrDyldFindDoDllSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
-                                KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr);
+                                KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKRDR ppRdr);
 static int kldrDyldFindDoExeSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
-                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr);
-static int kldrDyldFindTryOpen(const char *pszFilename, PPKLDRRDR ppRdr);
+                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKRDR ppRdr);
+static int kldrDyldFindTryOpen(const char *pszFilename, PPKRDR ppRdr);
 static int kldrDyldFindTryOpenPath(const char *pchPath, KSIZE cchPath, PCKLDRDYLDFINDARGS pArgs);
 static int kldrDyldFindEnumeratePath(const char *pszSearchPath, PCKLDRDYLDFINDARGS pArgs);
@@ -356 +356 @@
 {
     int rc;
-    PKLDRRDR pRdr = NULL;
+    PKRDR pRdr = NULL;
 
     *ppMod = NULL;
@@ -376 +376 @@
         if (fFlags & KLDRYDLD_LOAD_FLAGS_SPECIFIC_MODULE)
         {
-            const char     *pszFilename = kLdrRdrName(pRdr);
+            const char     *pszFilename = kRdrName(pRdr);
             const KSIZE     cchFilename = kHlpStrLen(pszFilename);
             PKLDRDYLDMOD    pCur;
@@ -390 +390 @@
         if (!(fFlags & KLDRYDLD_LOAD_FLAGS_SPECIFIC_MODULE))
         {
-            const char     *pszFilename = kLdrRdrName(pRdr);
+            const char     *pszFilename = kRdrName(pRdr);
             const KSIZE     cchFilename = kHlpStrLen(pszFilename);
             PKLDRDYLDMOD    pCur;
@@ -399 +399 @@
                     &&  !kHlpMemComp(pCur->pMod->pszFilename, pszFilename, cchFilename))
                 {
-                    kLdrRdrClose(pRdr);
+                    kRdrClose(pRdr);
                     kldrDyldModMarkGlobal(pCur);
                     *ppMod = pCur;
@@ -414 +414 @@
         rc = kldrDyldModCreate(pRdr, fFlags, ppMod);
         if (rc)
-            kLdrRdrClose(pRdr);
+            kRdrClose(pRdr);
     }
     return rc;
@@ -434 +434 @@
  */
 static int kldrDyldFindDoDllSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
-                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr)
+                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKRDR ppRdr)
 {
     int rc;
@@ -548 +548 @@
  */
 static int kldrDyldFindDoExeSearch(const char *pszName, const char *pszPrefix, const char *pszSuffix,
-                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKLDRRDR ppRdr)
+                                   KLDRDYLDSEARCH enmSearch, unsigned fFlags, PPKRDR ppRdr)
 {
     int rc;
@@ -609 +609 @@
  * @param   ppRdr           Where to store the pointer to the new module.
  */
-static int kldrDyldFindTryOpen(const char *pszFilename, PPKLDRRDR ppRdr)
+static int kldrDyldFindTryOpen(const char *pszFilename, PPKRDR ppRdr)
 {
     int rc;
@@ -616 +616 @@
      * Try open the file.
      */
-    rc = kLdrRdrOpen(ppRdr, pszFilename);
+    rc = kRdrOpen(ppRdr, pszFilename);
     if (!rc)
         return 0;
@@ -899 +899 @@
        )
     {
-        PKLDRRDR pRdr;
+        PKRDR pRdr;
         if (fOS2LibpathStrict)
             rc = kldrDyldFindDoDllSearch(pszName, pszPrefix, pszSuffix, enmSearch, fFlags, &pRdr);
@@ -907 +907 @@
         {
             /* do a filename based search. */
-            const char     *pszFilename = kLdrRdrName(pRdr);
+            const char     *pszFilename = kRdrName(pRdr);
             const KSIZE     cchFilename = kHlpStrLen(pszFilename);
             PKLDRDYLDMOD    pCur;
@@ -921 +921 @@
                 }
             }
-            kLdrRdrClose(pRdr);
+            kRdrClose(pRdr);
         }
     }

trunk/kStuff/kLdr/kLdrDyldMod.c

@@ -66 +66 @@
  * @param   ppMod   Where to put the pointer to the new module on success.
  */
-int kldrDyldModCreate(PKLDRRDR pRdr, KU32 fFlags, PPKLDRDYLDMOD ppMod)
+int kldrDyldModCreate(PKRDR pRdr, KU32 fFlags, PPKLDRDYLDMOD ppMod)
 {
     PKLDRDYLDMOD pMod;
@@ -81 +81 @@
     rc = kLdrModOpenFromRdr(pRdr, &pRawMod);
     if (rc)
-        return kldrDyldFailure(rc, "%s: %rc", kLdrRdrName(pRdr), rc);
+        return kldrDyldFailure(rc, "%s: %rc", kRdrName(pRdr), rc);
 
     /*
@@ -207 +207 @@
 #ifdef __OS2__
     HMODULE hmod = NULLHANDLE;
-    APIRET rc = DosQueryModuleHandle(kLdrRdrName(pRdr), &hmod);
+    APIRET rc = DosQueryModuleHandle(kRdrName(pRdr), &hmod);
     if (!rc)
 
 #elif defined(__WIN__)
     HMODULE hmod = NULL;
-    if (GetModuleHandle(kLdrRdrName(pRdr))
+    if (GetModuleHandle(kRdrName(pRdr))
 
 #else

trunk/kStuff/kLdr/kLdrInternal.h

@@ -30 +30 @@
 
 #include <k/kHlp.h>
+#include <k/kRdr.h>
 
 #ifdef __cplusplus
@@ -81 +82 @@
  * @{
  */
-
-
-/** Native file provider operations. */
-extern const KLDRRDROPS g_kLdrRdrFileOps;
 
 
@@ -359 +356 @@
 
 
-int kldrDyldModCreate(PKLDRRDR pRdr, KU32 fFlags, PPKLDRDYLDMOD ppMod);
+int kldrDyldModCreate(PKRDR pRdr, KU32 fFlags, PPKLDRDYLDMOD ppMod);
 void kldrDyldModDestroy(PKLDRDYLDMOD pMod);
 void kldrDyldModAddRef(PKLDRDYLDMOD pMod);

trunk/kStuff/kLdr/kLdrMod.c

@@ -111 +111 @@
      * Open the file using a bit provider.
      */
-    PKLDRRDR pRdr;
-    int rc = kLdrRdrOpen(&pRdr, pszFilename);
+    PKRDR pRdr;
+    int rc = kRdrOpen(&pRdr, pszFilename);
     if (!rc)
     {
@@ -118 +118 @@
         if (!rc)
             return 0;
-       kLdrRdrClose(pRdr);
+       kRdrClose(pRdr);
     }
     return rc;
@@ -135 +135 @@
  * @param   ppMod           Where to store the module handle.
  */
-int kLdrModOpenFromRdr(PKLDRRDR pRdr, PPKLDRMOD ppMod)
+int kLdrModOpenFromRdr(PKRDR pRdr, PPKLDRMOD ppMod)
 {
     union
@@ -151 +151 @@
      * Always read the 'new header' if we encounter MZ.
      */
-    rc = kLdrRdrRead(pRdr, &u, sizeof(u), 0);
+    rc = kRdrRead(pRdr, &u, sizeof(u), 0);
     if (rc)
         return rc;
     if (    u.u16 == IMAGE_DOS_SIGNATURE
-        &&  kLdrRdrSize(pRdr) > sizeof(IMAGE_DOS_HEADER))
+        &&  kRdrSize(pRdr) > sizeof(IMAGE_DOS_HEADER))
     {
-        rc = kLdrRdrRead(pRdr, &u, sizeof(u.u32), K_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew));
+        rc = kRdrRead(pRdr, &u, sizeof(u.u32), K_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew));
         if (rc)
             return rc;
-        if ((KLDRFOFF)u.u32 < kLdrRdrSize(pRdr))
+        if ((KLDRFOFF)u.u32 < kRdrSize(pRdr))
         {
             offHdr = u.u32;
-            rc = kLdrRdrRead(pRdr, &u, sizeof(u.u32), offHdr);
+            rc = kRdrRead(pRdr, &u, sizeof(u.u32), offHdr);
             if (rc)
                 return rc;

trunk/kStuff/kLdr/kLdrModLX.c

@@ -115 +115 @@
 static int kldrModLXRelocateBits(PKLDRMOD pMod, void *pvBits, KLDRADDR NewBaseAddress, KLDRADDR OldBaseAddress,
                                  PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
-static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX);
+static int kldrModLXDoCreate(PKRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX);
 static const KU8 *kldrModLXDoNameTableLookupByOrdinal(const KU8 *pbNameTable, KI32 cbNameTable, KU32 iOrdinal);
 static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, KU32 cchSymbol, KU32 *piSymbol);
@@ -145 +145 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModLXCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModLXCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODLX pModLX;
@@ -170 +170 @@
  * simplify cleanup on failure.
  */
-static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX)
+static int kldrModLXDoCreate(PKRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX)
 {
     struct e32_exe Hdr;
@@ -187 +187 @@
      * Read the signature and file header.
      */
-    rc = kLdrRdrRead(pRdr, &Hdr, sizeof(Hdr), offNewHdr > 0 ? offNewHdr : 0);
+    rc = kRdrRead(pRdr, &Hdr, sizeof(Hdr), offNewHdr > 0 ? offNewHdr : 0);
     if (rc)
         return rc;
@@ -205 +205 @@
 
     /* Some rough sanity checks. */
-    offEnd = kLdrRdrSize(pRdr) >= (KLDRFOFF)~(KU32)16 ? ~(KU32)16 : (KU32)kLdrRdrSize(pRdr);
+    offEnd = kRdrSize(pRdr) >= (KLDRFOFF)~(KU32)16 ? ~(KU32)16 : (KU32)kRdrSize(pRdr);
     if (    Hdr.e32_itermap > offEnd
         ||  Hdr.e32_datapage > offEnd
@@ -266 +266 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kRdrName(pRdr));
     cb = K_ALIGN_Z(sizeof(KLDRMODLX), 8)
        + K_ALIGN_Z(K_OFFSETOF(KLDRMOD, aSegments[Hdr.e32_objcnt + 1]), 8)
@@ -284 +284 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)K_ALIGN_P(&pMod->aSegments[pMod->cSegments], 8);
-    kHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
+    kHlpMemCopy((char *)pMod->pszFilename, kRdrName(pRdr), cchFilename + 1);
     pMod->pszName = NULL; /* finalized further down */
     pMod->cchName = 0;
@@ -357 +357 @@
      * Read the loader data.
      */
-    rc = kLdrRdrRead(pRdr, (void *)pModLX->pbLoaderSection, pModLX->Hdr.e32_ldrsize, pModLX->Hdr.e32_objtab + pModLX->offHdr);
+    rc = kRdrRead(pRdr, (void *)pModLX->pbLoaderSection, pModLX->Hdr.e32_ldrsize, pModLX->Hdr.e32_objtab + pModLX->offHdr);
     if (rc)
         return rc;
@@ -527 +527 @@
     if (pMod->pRdr)
     {
-        rc = kLdrRdrClose(pMod->pRdr);
+        rc = kRdrClose(pMod->pRdr);
         pMod->pRdr = NULL;
     }
@@ -941 +941 @@
 
     off = pModLX->Hdr.e32_objtab + pModLX->Hdr.e32_ldrsize;
-    rc = kLdrRdrRead(pModLX->pMod->pRdr, pv, pModLX->Hdr.e32_fixupsize,
+    rc = kRdrRead(pModLX->pMod->pRdr, pv, pModLX->Hdr.e32_fixupsize,
                      off + pModLX->offHdr);
     if (!rc)
@@ -1381 +1381 @@
 static int kldrModLXDoLoadBits(PKLDRMODLX pModLX, void *pvBits)
 {
-    const PKLDRRDR pRdr = pModLX->pMod->pRdr;
+    const PKRDR pRdr = pModLX->pMod->pRdr;
     KU8 *pbTmpPage = NULL;
     int rc = 0;
@@ -1406 +1406 @@
                 case VALID:
                     if (pMap->o32_pagesize == OBJPAGELEN)
-                        rc = kLdrRdrRead(pRdr, pbPage, OBJPAGELEN,
+                        rc = kRdrRead(pRdr, pbPage, OBJPAGELEN,
                                          pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                     else if (pMap->o32_pagesize < OBJPAGELEN)
                     {
-                        rc = kLdrRdrRead(pRdr, pbPage, pMap->o32_pagesize,
+                        rc = kRdrRead(pRdr, pbPage, pMap->o32_pagesize,
                                          pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                         kHlpMemSet(pbPage + pMap->o32_pagesize, 0, OBJPAGELEN - pMap->o32_pagesize);
@@ -1435 +1435 @@
 
                     /* read it and ensure 4 extra zero bytes. */
-                    rc = kLdrRdrRead(pRdr, pbTmpPage, pMap->o32_pagesize,
+                    rc = kRdrRead(pRdr, pbTmpPage, pMap->o32_pagesize,
                                      pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                     if (rc)

trunk/kStuff/kLdr/kLdrModMachO.c

@@ -159 +159 @@
                                     PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 
-static int  kldrModMachODoCreate(PKLDRRDR pRdr, PKLDRMODMACHO *ppMod);
-static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKLDRRDR pRdr,
+static int  kldrModMachODoCreate(PKRDR pRdr, PKLDRMODMACHO *ppMod);
+static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr,
                                              KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool);
 static int  kldrModMachOParseLoadCommands(PKLDRMODMACHO pModMachO, char *pbStringPool, KU32 cbStringPool);
@@ -196 +196 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODMACHO pModMachO;
@@ -225 +225 @@
  * simplify cleanup on failure.
  */
-static int kldrModMachODoCreate(PKLDRRDR pRdr, PKLDRMODMACHO *ppModMachO)
+static int kldrModMachODoCreate(PKRDR pRdr, PKLDRMODMACHO *ppModMachO)
 {
     union
@@ -246 +246 @@
      * Read the Mach-O header.
      */
-    rc = kLdrRdrRead(pRdr, &s, sizeof(s), 0);
+    rc = kRdrRead(pRdr, &s, sizeof(s), 0);
     if (rc)
         return rc;
@@ -260 +260 @@
 
     /* sanity checks. */
-    if (    s.Hdr32.sizeofcmds > kLdrRdrSize(pRdr) - sizeof(mach_header_32_t)
+    if (    s.Hdr32.sizeofcmds > kRdrSize(pRdr) - sizeof(mach_header_32_t)
         ||  s.Hdr32.sizeofcmds < sizeof(load_command_t) * s.Hdr32.ncmds
         ||  (s.Hdr32.flags & ~MH_VALID_FLAGS))
@@ -281 +281 @@
     if (!pbLoadCommands)
         return KLDR_ERR_NO_MEMORY;
-    rc = kLdrRdrRead(pRdr, pbLoadCommands, s.Hdr32.sizeofcmds,
+    rc = kRdrRead(pRdr, pbLoadCommands, s.Hdr32.sizeofcmds,
                         s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE
                      || s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE_OE
@@ -297 +297 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kRdrName(pRdr));
     cb = K_ALIGN_Z(  K_OFFSETOF(KLDRMODMACHO, aSegments[cSegments])
                       + sizeof(KLDRMODMACHOSECT) * cSections, 16)
@@ -318 +318 @@
     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);
@@ -429 +429 @@
  * @param   pcbStringPool   Where to store the string pool size.
  */
-static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKLDRRDR pRdr,
+static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr,
                                              KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool)
 {
@@ -442 +442 @@
         uuid_command_t       *pUuid;
     } u;
-    const KU64 cbFile = kLdrRdrSize(pRdr);
+    const KU64 cbFile = kRdrSize(pRdr);
     KU32 cSegments = 0;
     KU32 cSections = 0;
@@ -670 +670 @@
                       : sizeof(macho_nlist_64_t);
                 if (    u.pSymTab->symoff >= cbFile
-                    ||  (KU64)u.pSymTab->symoff + u.pSymTab->nsyms * cbSym > kLdrRdrSize(pRdr))
+                    ||  (KU64)u.pSymTab->symoff + u.pSymTab->nsyms * cbSym > kRdrSize(pRdr))
                     return KLDR_ERR_MACHO_BAD_LOAD_COMMAND;
                 if (    u.pSymTab->stroff >= cbFile
@@ -1008 +1008 @@
     if (pMod->pRdr)
     {
-        rc = kLdrRdrClose(pMod->pRdr);
+        rc = kRdrClose(pMod->pRdr);
         pMod->pRdr = NULL;
     }
@@ -1572 +1572 @@
     else
     {
-        rc = kLdrRdrMap(pMod->pRdr, &pvBase, pMod->cSegments, pMod->aSegments, fFixed);
+        rc = kRdrMap(pMod->pRdr, &pvBase, pMod->cSegments, pMod->aSegments, fFixed);
         if (rc)
             return rc;
@@ -1611 +1611 @@
     else
     {
-        rc = kLdrRdrUnmap(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
+        rc = kRdrUnmap(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
         if (rc)
             return rc;
@@ -1659 +1659 @@
 
     /* the file provider does it all */
-    return kLdrRdrRefresh(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
+    return kRdrRefresh(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
 }
 
@@ -1682 +1682 @@
     else
     {
-        rc = kLdrRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 1 /* unprotect */);
+        rc = kRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 1 /* unprotect */);
         if (rc)
             return rc;
@@ -1699 +1699 @@
         rc2 = KLDR_ERR_TODO; /* deal with this if it ever occurs. */
     else
-        rc2 = kLdrRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 0 /* protect */);
+        rc2 = kRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 0 /* protect */);
     if (!rc && rc2)
         rc = rc2;
@@ -2151 +2151 @@
             {
                 /* read */
-                rc = kLdrRdrRead(pModMachO->pMod->pRdr, pvSyms, cbSyms, pModMachO->offSymbols);
+                rc = kRdrRead(pModMachO->pMod->pRdr, pvSyms, cbSyms, pModMachO->offSymbols);
                 if (!rc && pModMachO->cchStrings)
-                    rc = kLdrRdrRead(pModMachO->pMod->pRdr, pvStrings, pModMachO->cchStrings, pModMachO->offStrings);
+                    rc = kRdrRead(pModMachO->pMod->pRdr, pvStrings, pModMachO->cchStrings, pModMachO->offStrings);
                 if (!rc)
                 {
@@ -2224 +2224 @@
 
     /* read the fixups. */
-    rc = kLdrRdrRead(pModMachO->pMod->pRdr, paFixups, cbFixups, offFixups);
+    rc = kRdrRead(pModMachO->pMod->pRdr, paFixups, cbFixups, offFixups);
     if (!rc)
     {
@@ -2258 +2258 @@
     int rc = 0;
     if (!pModMachO->pvBits)
-        rc = kLdrRdrAllMap(pModMachO->pMod->pRdr, &pModMachO->pvBits);
+        rc = kRdrAllMap(pModMachO->pMod->pRdr, &pModMachO->pvBits);
     return rc;
 }
@@ -2323 +2323 @@
                 ||  !pMod->aSegments[i].Alignment)
                 continue;
-            rc = kLdrRdrRead(pMod->pRdr,
+            rc = kRdrRead(pMod->pRdr,
                              (KU8 *)pvBits + (pMod->aSegments[i].LinkAddress - pModMachO->LinkAddress),
                              pMod->aSegments[i].cbFile,

trunk/kStuff/kLdr/kLdrModNative.c

@@ -153 +153 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModNativeCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
-{
-    int rc = kLdrModOpenNative(kLdrRdrName(pRdr), ppMod);
+static int kldrModNativeCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+{
+    int rc = kLdrModOpenNative(kRdrName(pRdr), ppMod);
     if (rc)
         return rc;
-    rc = kLdrRdrClose(pRdr);
+    rc = kRdrClose(pRdr);
     KLDRMODNATIVE_ASSERT(!rc);
     return 0;

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,

trunk/kStuff/kRdr/kRdr.cpp

@@ -44 +44 @@
  * @param   pAdd        The new file provider.
  */
-void kRdrAddProvider(PKRDROPS pAdd)
+KRDR_DECL(void) kRdrAddProvider(PKRDROPS pAdd)
 {
     pAdd->pNext = g_pRdrHead;
@@ -58 +58 @@
  * @param   pszFilename     The filename.
  */
-int kRdrOpen(PPKRDR ppRdr, const char *pszFilename)
+KRDR_DECL(int) kRdrOpen(PPKRDR ppRdr, const char *pszFilename)
 {
     int             rc = -1;
@@ -79 +79 @@
  * @param   pRdr        The file provider instance.
  */
-int kRdrClose(PKRDR pRdr)
+KRDR_DECL(int) kRdrClose(PKRDR pRdr)
 {
     KRDR_VALIDATE(pRdr);
@@ -94 +94 @@
  * @param   off         Where to start reading.
  */
-int kRdrRead(PKRDR pRdr, void *pvBuf, KSIZE cb, KFOFF off)
+KRDR_DECL(int) kRdrRead(PKRDR pRdr, void *pvBuf, KSIZE cb, KFOFF off)
 {
     KRDR_VALIDATE(pRdr);
@@ -108 +108 @@
  *                      The size can be obtained using pfnSize.
  */
-int kRdrAllMap(PKRDR pRdr, const void **ppvBits)
+KRDR_DECL(int) kRdrAllMap(PKRDR pRdr, const void **ppvBits)
 {
     KRDR_VALIDATE(pRdr);
@@ -121 +121 @@
  * @param   pvBits      The mapping address.
  */
-int kRdrAllUnmap(PKRDR pRdr, const void *pvBits)
+KRDR_DECL(int) kRdrAllUnmap(PKRDR pRdr, const void *pvBits)
 {
     KRDR_VALIDATE(pRdr);
@@ -133 +133 @@
  * @param   pRdr        The file provider instance.
  */
-KFOFF kRdrSize(PKRDR pRdr)
+KRDR_DECL(KFOFF) kRdrSize(PKRDR pRdr)
 {
     KRDR_VALIDATE(pRdr);
@@ -145 +145 @@
  * @param   pRdr        The file provider instance.
  */
-KFOFF kRdrTell(PKRDR pRdr)
+KRDR_DECL(KFOFF) kRdrTell(PKRDR pRdr)
 {
     KRDR_VALIDATE(pRdr);
@@ -157 +157 @@
  * @param   pRdr        The file provider instance.
  */
-const char *kRdrName(PKRDR pRdr)
+KRDR_DECL(const char *) kRdrName(PKRDR pRdr)
 {
     KRDR_VALIDATE_EX(pRdr, NULL);
@@ -169 +169 @@
  * @param   pRdr        The file provider instance.
  */
-KIPTR kRdrNativeFH(PKRDR pRdr)
+KRDR_DECL(KIPTR) kRdrNativeFH(PKRDR pRdr)
 {
     KRDR_VALIDATE_EX(pRdr, -1);
@@ -182 +182 @@
  * @param   pRdr        The file provider instance.
  */
-KSIZE kRdrPageSize(PKRDR pRdr)
+KRDR_DECL(KSIZE) kRdrPageSize(PKRDR pRdr)
 {
     KRDR_VALIDATE_EX(pRdr, 0x10000);
@@ -203 +203 @@
  * @param   fFixed      If set, the address at *ppvBase should be the base address of the mapping.
  */
-int kRdrMap(PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed)
+KRDR_DECL(int) kRdrMap(PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed)
 {
     KRDR_VALIDATE(pRdr);
@@ -219 +219 @@
  * @param   paSegments  The segments thats going to be mapped.
  */
-int kRdrRefresh(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments)
+KRDR_DECL(int) kRdrRefresh(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments)
 {
     KRDR_VALIDATE(pRdr);
@@ -240 +240 @@
  *                                  When clean the segment protection is restored.
  */
-int kRdrProtect(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect)
+KRDR_DECL(int) kRdrProtect(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect)
 {
     KRDR_VALIDATE(pRdr);
@@ -256 +256 @@
  * @param   paSegments  The segments thats going to be mapped.
  */
-int kRdrUnmap(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments)
+KRDR_DECL(int) kRdrUnmap(PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments)
 {
     KRDR_VALIDATE(pRdr);
@@ -271 +271 @@
  * @param   pRdr        The file provider instance.
  */
-void kRdrDone(PKRDR pRdr)
+KRDR_DECL(void) kRdrDone(PKRDR pRdr)
 {
     KRDR_VALIDATE_VOID(pRdr);

trunk/kStuff/kRdr/kRdrFile.cpp

@@ -1172 +1172 @@
      * Initialize it and return successfully.
      */
-    pRdrFile->Core.u32Magic = KLDRRDR_MAGIC;
+    pRdrFile->Core.u32Magic = KRDR_MAGIC;
     pRdrFile->Core.pOps = &g_kRdrFileOps;
     pRdrFile->File = File;

trunk/kStuff/kRdr/kRdrInternal.h

@@ -25 +25 @@
  */
 
-#ifndef ___kRdrInternal_h__
-#define ___kRdrInternal_h__
+#ifndef ___kRdrInternal_h___
+#define ___kRdrInternal_h___
 
 #include <k/kHlpAssert.h>