Changeset 2974 for trunk

Timestamp:

Feb 14, 2007, 11:12:44 AM (18 years ago)

Author:

bird

Message:

off_t -> KLDRFOFF.

Location:

trunk/kLdr

Files:

• kLdr.h (modified) (7 diffs)
• kLdrMod.c (modified) (8 diffs)
• kLdrModLX.c (modified) (15 diffs)
• kLdrModMachO.c (modified) (9 diffs)
• kLdrModNative.c (modified) (1 diff)
• kLdrModPE.c (modified) (5 diffs)
• kLdrRdr.c (modified) (3 diffs)
• kLdrRdrFile.c (modified) (11 diffs)
• tstkLdrMod.c (modified) (1 diff)

trunk/kLdr/kLdr.h

@@ -114 +114 @@
 
 
+/** The kLdr file offset type. */
+typedef long KLDRFOFF;
+/** Pointer to a kLdr file offset type. */
+typedef KLDRFOFF *PKLDRFOFF;
+/** Pointer to a const kLdr file offset type. */
+typedef const KLDRFOFF *PCKLDRFOFF;
+
+/** @def PRI_KLDRFOFF
+ * printf format type. */
+#define PRI_KLDRFOFF     "lx"
+
+
 /**
  * Union of all the integer types.
@@ -258 +270 @@
     int     (* pfnDestroy)( PKLDRRDR pRdr);
     /** @copydoc kLdrRdrRead */
-    int     (* pfnRead)(    PKLDRRDR pRdr, void *pvBuf, size_t cb, off_t off);
+    int     (* pfnRead)(    PKLDRRDR pRdr, void *pvBuf, size_t cb, KLDRFOFF off);
     /** @copydoc kLdrRdrAllMap */
     int     (* pfnAllMap)(  PKLDRRDR pRdr, const void **ppvBits);
@@ -264 +276 @@
     int     (* pfnAllUnmap)(PKLDRRDR pRdr, const void *pvBits);
     /** @copydoc kLdrRdrSize */
-    off_t   (* pfnSize)(    PKLDRRDR pRdr);
+    KLDRFOFF (* pfnSize)(    PKLDRRDR pRdr);
     /** @copydoc kLdrRdrTell */
-    off_t   (* pfnTell)(    PKLDRRDR pRdr);
+    KLDRFOFF (* pfnTell)(    PKLDRRDR pRdr);
     /** @copydoc kLdrRdrName */
     const char * (* pfnName)(PKLDRRDR pRdr);
@@ -308 +320 @@
 int     kLdrRdrOpen(    PPKLDRRDR ppRdr, const char *pszFilename);
 int     kLdrRdrClose(   PKLDRRDR pRdr);
-int     kLdrRdrRead(    PKLDRRDR pRdr, void *pvBuf, size_t cb, off_t off);
+int     kLdrRdrRead(    PKLDRRDR pRdr, void *pvBuf, size_t cb, KLDRFOFF off);
 int     kLdrRdrAllMap(  PKLDRRDR pRdr, const void **ppvBits);
 int     kLdrRdrAllUnmap(PKLDRRDR pRdr, const void *pvBits);
-off_t   kLdrRdrSize(    PKLDRRDR pRdr);
-off_t   kLdrRdrTell(    PKLDRRDR pRdr);
+KLDRFOFF kLdrRdrSize(    PKLDRRDR pRdr);
+KLDRFOFF kLdrRdrTell(    PKLDRRDR pRdr);
 const char *kLdrRdrName(PKLDRRDR pRdr);
 size_t  kLdrRdrPageSize(PKLDRRDR pRdr);
@@ -523 +535 @@
     /** File offset of the segment.
      * Set to -1 if no file backing (like BSS). */
-    off_t           offFile;
+    KLDRFOFF        offFile;
     /** Size of the file bits of the segment.
      * Set to -1 if no file backing (like BSS). */
-    off_t           cbFile;
+    KLDRFOFF        cbFile;
     /** The relative virtual address when mapped.
      * Set to NIL_KLDRADDR if the segment isn't supposed to be mapped. */
@@ -810 +822 @@
  */
 typedef int FNKLDRENUMDBG(PKLDRMOD pMod, uint32_t iDbgInfo, KLDRDBGINFOTYPE enmType, int16_t iMajorVer, int16_t iMinorVer,
-                          off_t offFile, KLDRADDR LinkAddress, KLDRSIZE cb, const char *pszExtFile, void *pvUser);
+                          KLDRFOFF offFile, KLDRADDR LinkAddress, KLDRSIZE cb, const char *pszExtFile, void *pvUser);
 /** Pointer to a debug info enumerator callback. */
 typedef FNKLDRENUMDBG *PFNKLDRENUMDBG;
@@ -932 +944 @@
      * @param   ppMod           Where to store the module instance pointer.
      */
-    int (* pfnCreate)(PCKLDRMODOPS pOps, PKLDRRDR pRdr, off_t offNewHdr, PPKLDRMOD ppMod);
+    int (* pfnCreate)(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod);
     /**
      * Destroys an loader module instance.

trunk/kLdr/kLdrMod.c

@@ -144 +144 @@
         uint16_t    au16[2];
         uint8_t     au8[4];
-    }       u;
-    off_t   offHdr = 0;
-    int     rc;
+    }           u;
+    KLDRFOFF    offHdr = 0;
+    int         rc;
 
     /*
@@ -161 +161 @@
         if (rc)
             return rc;
-        if ((off_t)u.u32 < kLdrRdrSize(pRdr))
+        if ((KLDRFOFF)u.u32 < kLdrRdrSize(pRdr))
         {
             offHdr = u.u32;
@@ -259 +259 @@
  */
 int     kLdrModQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
-                           const char *pchSymbol, size_t cchSymbol, const char *pszVersion, 
+                           const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
                            PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind)
 {
@@ -269 +269 @@
     if (pfKind)
         KLDRHLP_VALIDATE_FLAGS(*pfKind, KLDRSYMKIND_REQ_SEGMENTED);
-    return pMod->pOps->pfnQuerySymbol(pMod, pvBits, BaseAddress, iSymbol, pchSymbol, cchSymbol, pszVersion, 
+    return pMod->pOps->pfnQuerySymbol(pMod, pvBits, BaseAddress, iSymbol, pchSymbol, cchSymbol, pszVersion,
                                       pfnGetForwarder, pvUser, puValue, pfKind);
 }
@@ -394 +394 @@
 /**
  * Queries info about a resource.
- * 
- * If there are multiple resources matching the criteria, the best or 
- * first match will be return. 
- * 
- * 
+ *
+ * If there are multiple resources matching the criteria, the best or
+ * first match will be return.
+ *
+ *
  * @returns 0 on success.
  * @returns Whatever non-zero status returned by pfnCallback (enumeration was stopped).
  * @returns non-zero kLdr or native status code on failure.
- * 
+ *
  * @param   pMod            The module.
  * @param   pvBits          Optional pointer to bits returned by kLdrModGetBits() currently located at BaseAddress.
@@ -433 +433 @@
 /**
  * Enumerates the resources matching the specfied criteria.
- * 
- * 
+ *
+ *
  * @returns 0 on success.
  * @returns Whatever non-zero status returned by pfnCallback (enumeration was stopped).
  * @returns non-zero kLdr or native status code on failure.
- * 
+ *
  * @param   pMod            The module.
  * @param   pvBits          Optional pointer to bits returned by kLdrModGetBits() currently located at BaseAddress.
@@ -453 +453 @@
  * @param   pvUser          The user argument for the callback.
  */
-int     kLdrModEnumResources(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t idType, const char *pszType, 
+int     kLdrModEnumResources(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t idType, const char *pszType,
                              uint32_t idName, const char *pszName, uint32_t idLang, PFNKLDRENUMRSRC pfnCallback, void *pvUser)
 {
@@ -497 +497 @@
 /**
  * May free up some resources held by the module.
- * 
+ *
  * @todo define exactly what it possible to do after this call.
- * 
+ *
  * @returns 0 on success, KLDR_ERR_* on failure.
  * @param   pMod    The module.

trunk/kLdr/kLdrModLX.c

@@ -70 +70 @@
 
     /** The offset of the LX header. */
-    off_t                   offHdr;
+    KLDRFOFF                offHdr;
     /** Copy of the LX header. */
     struct e32_exe          Hdr;
@@ -116 +116 @@
 static int kldrModLXRelocateBits(PKLDRMOD pMod, void *pvBits, KLDRADDR NewBaseAddress, KLDRADDR OldBaseAddress,
                                  PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
-static int kldrModLXDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODLX *ppModLX);
+static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX);
 static const uint8_t *kldrModLXDoNameTableLookupByOrdinal(const uint8_t *pbNameTable, int32_t cbNameTable, uint32_t iOrdinal);
 static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, uint32_t cchSymbol, uint32_t *piSymbol);
@@ -133 +133 @@
 static int kldrModLXDoLoadFixupSection(PKLDRMODLX pModLX);
 static int32_t kldrModLXDoCall(uintptr_t uEntrypoint, uintptr_t uHandle, uint32_t uOp, void *pvReserved);
-static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc, 
+static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc,
                             int iSelector, KLDRADDR uValue, uint32_t fKind);
 
@@ -148 +148 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModLXCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, off_t offNewHdr, PPKLDRMOD ppMod)
+static int kldrModLXCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODLX pModLX;
@@ -173 +173 @@
  * simplify cleanup on failure.
  */
-static int kldrModLXDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODLX *ppModLX)
+static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX)
 {
     struct e32_exe Hdr;
@@ -208 +208 @@
 
     /* Some rough sanity checks. */
-    offEnd = kLdrRdrSize(pRdr) >= (off_t)~(uint32_t)16 ? ~(uint32_t)16 : (uint32_t)kLdrRdrSize(pRdr);
+    offEnd = kLdrRdrSize(pRdr) >= (KLDRFOFF)~(uint32_t)16 ? ~(uint32_t)16 : (uint32_t)kLdrRdrSize(pRdr);
     if (    Hdr.e32_itermap > offEnd
         ||  Hdr.e32_datapage > offEnd
@@ -249 +249 @@
         &&  (Hdr.e32_fpagetab < off || Hdr.e32_fpagetab > offEnd))
     {
-        /* 
+        /*
          * wlink mixes the fixup section and the loader section.
          */
@@ -2105 +2105 @@
                         else
                             uValue = pMod->aSegments[iSeg].MapAddress;
-                        if (    (u.prlc->nr_stype & NRALIAS) 
+                        if (    (u.prlc->nr_stype & NRALIAS)
                             ||  (pMod->aSegments[iSeg].fFlags & KLDRSEG_FLAG_16BIT))
                             iSelector = pMod->aSegments[iSeg].Sel16bit;
@@ -2242 +2242 @@
 
                     /* common / simple */
-                    if (    (u.prlc->nr_stype & NRSRCMASK) == NROFF32 
-                        &&  off >= 0 
+                    if (    (u.prlc->nr_stype & NRSRCMASK) == NROFF32
+                        &&  off >= 0
                         &&  off <= OBJPAGELEN - 4)
                         *(uint32_t *)&pbPage[off] = uValue;
-                    else if (    (u.prlc->nr_stype & NRSRCMASK) == NRSOFF32 
-                            &&  off >= 0 
+                    else if (    (u.prlc->nr_stype & NRSRCMASK) == NRSOFF32
+                            &&  off >= 0
                             &&  off <= OBJPAGELEN - 4)
                         *(uint32_t *)&pbPage[off] = uValue - (PageAddress + off);
@@ -2321 +2321 @@
 /**
  * Applies the relocation to one 'source' in a page.
- * 
- * This takes care of the more esotic case while the common cases 
+ *
+ * This takes care of the more esotic case while the common cases
  * are dealt with seperately.
  *
@@ -2331 +2331 @@
  * @param   fKind       The target kind.
  */
-static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc, 
+static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc,
                             int iSelector, KLDRADDR uValue, uint32_t fKind)
 {
-    static const uint8_t s_acb[16] = 
+    static const uint8_t s_acb[16] =
     {
         1, /* 0: NRSBYT */
@@ -2340 +2340 @@
         2, /* 2: NRSSEG - selector */
         4, /* 3: NRSPTR - 16:16 */
-        0, 
+        0,
         2, /* 5: NRSOFF - 16-bit offset */
         6, /* 6: NRPTR48 - 16:32 */
@@ -2348 +2348 @@
     };
 #pragma pack(1) /* just to be sure */
-    union 
+    union
     {
         uint8_t     ab[6];
@@ -2354 +2354 @@
         uint16_t    off16;
         uint8_t     off8;
-        struct 
+        struct
         {
             uint16_t off;
             uint16_t Sel;
         }           Far16;
-        struct 
+        struct
         {
             uint32_t off;
@@ -2375 +2375 @@
     switch (prlc->nr_stype & NRSRCMASK)
     {
-        case NRSBYT:        
+        case NRSBYT:
             uData.off8 = (uint8_t)uValue;
             cb = 1;

trunk/kLdr/kLdrModMachO.c

@@ -68 +68 @@
     /** The file offset of this section.
      * This is -1 if the section doesn't have a file backing. */
-    off_t                   offFile;
+    KLDRFOFF                offFile;
     /** The number of fixups. */
     uint32_t                cFixups;
@@ -75 +75 @@
     /** The file offset of the fixups for this section.
      * This is -1 if the section doesn't have any fixups. */
-    off_t                   offFixups;
+    KLDRFOFF                offFixups;
     /** Mach-O section flags. */
     uint32_t                fFlags;
@@ -128 +128 @@
 
     /** The offset of the symbol table. */
-    off_t                   offSymbols;
+    KLDRFOFF                offSymbols;
     /** The number of symbols. */
     uint32_t                cSymbols;
@@ -134 +134 @@
     void                   *pvaSymbols;
     /** The offset of the string table. */
-    off_t                   offStrings;
+    KLDRFOFF                offStrings;
     /** The size of the of the string table. */
     uint32_t                cchStrings;
@@ -168 +168 @@
 /*static int  kldrModMachOLoadLoadCommands(PKLDRMODMACHO pModMachO);*/
 static int  kldrModMachOLoadObjSymTab(PKLDRMODMACHO pModMachO);
-static int  kldrModMachOLoadFixups(PKLDRMODMACHO pModMachO, off_t offFixups, uint32_t cFixups, macho_relocation_info_t **ppaFixups);
+static int  kldrModMachOLoadFixups(PKLDRMODMACHO pModMachO, KLDRFOFF offFixups, uint32_t cFixups, macho_relocation_info_t **ppaFixups);
 static int  kldrModMachOMapVirginBits(PKLDRMODMACHO pModMachO);
 
@@ -197 +197 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, off_t offNewHdr, PPKLDRMOD ppMod)
+static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODMACHO pModMachO;
@@ -602 +602 @@
                     if (    pSect->nreloc
                         &&  (   pSect->reloff > cbFile
-                             || (uint64_t)pSect->reloff + (off_t)pSect->nreloc * sizeof(macho_relocation_info_t)) > cbFile)
+                             || (uint64_t)pSect->reloff + (KLDRFOFF)pSect->nreloc * sizeof(macho_relocation_info_t)) > cbFile)
                         return KLDR_ERR_MACHO_BAD_SECTION;
 
@@ -904 +904 @@
                                     /* more checks? */
                                     if (fOk)
-                                        pSeg[-1].cbFile = (off_t)(pSect->addr - pSeg[-1].LinkAddress) + pSect->size;
+                                        pSeg[-1].cbFile = (KLDRFOFF)(pSect->addr - pSeg[-1].LinkAddress) + pSect->size;
                                     else
                                     {
@@ -2205 +2205 @@
  * @param   ppaFixups       Where to put the pointer to the allocated fixup array.
  */
-static int  kldrModMachOLoadFixups(PKLDRMODMACHO pModMachO, off_t offFixups, uint32_t cFixups, macho_relocation_info_t **ppaFixups)
+static int  kldrModMachOLoadFixups(PKLDRMODMACHO pModMachO, KLDRFOFF offFixups, uint32_t cFixups, macho_relocation_info_t **ppaFixups)
 {
     macho_relocation_info_t *paFixups;

trunk/kLdr/kLdrModNative.c

@@ -154 +154 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModNativeCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, off_t offNewHdr, PPKLDRMOD ppMod)
+static int kldrModNativeCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     int rc = kLdrModOpenNative(kLdrRdrName(pRdr), ppMod);

trunk/kLdr/kLdrModPE.c

@@ -91 +91 @@
     uint32_t                cImportModules;
     /** The offset of the NT headers. */
-    off_t                   offHdrs;
+    KLDRFOFF                offHdrs;
     /** Copy of the NT headers. */
     IMAGE_NT_HEADERS64      Hdrs;
@@ -106 +106 @@
                                   PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 
-static int  kldrModPEDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODPE *ppMod);
+static int  kldrModPEDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODPE *ppMod);
 /*static void kldrModPEDoLoadConfigConversion(PIMAGE_LOAD_CONFIG_DIRECTORY64 pLoadCfg); */
 static int  kLdrModPEDoOptionalHeaderValidation(PKLDRMODPE pModPE);
@@ -135 +135 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModPECreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, off_t offNewHdr, PPKLDRMOD ppMod)
+static int kldrModPECreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODPE pModPE;
@@ -160 +160 @@
  * simplify cleanup on failure.
  */
-static int kldrModPEDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODPE *ppModPE)
+static int kldrModPEDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODPE *ppModPE)
 {
     struct
@@ -171 +171 @@
     size_t cb;
     size_t cchFilename;
-    off_t  off;
+    KLDRFOFF off;
     uint32_t i;
     int rc;

trunk/kLdr/kLdrRdr.c

@@ -139 +139 @@
  * @param   off         Where to start reading.
  */
-int kLdrRdrRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, off_t off)
+int kLdrRdrRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, KLDRFOFF off)
 {
     KLDRRDR_VALIDATE(pRdr);
@@ -178 +178 @@
  * @param   pRdr        The file provider instance.
  */
-off_t kLdrRdrSize(PKLDRRDR pRdr)
+KLDRFOFF kLdrRdrSize(PKLDRRDR pRdr)
 {
     KLDRRDR_VALIDATE(pRdr);
@@ -190 +190 @@
  * @param   pRdr        The file provider instance.
  */
-off_t kLdrRdrTell(PKLDRRDR pRdr)
+KLDRFOFF kLdrRdrTell(PKLDRRDR pRdr)
 {
     KLDRRDR_VALIDATE(pRdr);

trunk/kLdr/kLdrRdrFile.c

@@ -207 +207 @@
 #endif
     /** The current file offset. */
-    off_t               off;
+    KLDRFOFF            off;
     /** The file size. */
-    off_t               cb;
+    KLDRFOFF            cb;
     /** Array where we stuff the mapping area data. */
     KLDRRDRFILEPREP     aPreps[4];
@@ -237 +237 @@
 static size_t   kldrRdrFilePageSize(PKLDRRDR pRdr);
 static const char *kldrRdrFileName(PKLDRRDR pRdr);
-static off_t    kldrRdrFileTell(PKLDRRDR pRdr);
-static off_t    kldrRdrFileSize(PKLDRRDR pRdr);
+static KLDRFOFF kldrRdrFileTell(PKLDRRDR pRdr);
+static KLDRFOFF kldrRdrFileSize(PKLDRRDR pRdr);
 static int      kldrRdrFileAllUnmap(PKLDRRDR pRdr, const void *pvBits);
 static int      kldrRdrFileAllMap(PKLDRRDR pRdr, const void **ppvBits);
-static int      kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, off_t off);
+static int      kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, KLDRFOFF off);
 static int      kldrRdrFileDestroy(PKLDRRDR pRdr);
 static int      kldrRdrFileCreate(PPKLDRRDR ppRdr, const char *pszFilename);
@@ -836 +836 @@
 
 /** @copydoc KLDRRDR::pfnTell */
-static off_t kldrRdrFileTell(PKLDRRDR pRdr)
+static KLDRFOFF kldrRdrFileTell(PKLDRRDR pRdr)
 {
     PKLDRRDRFILE pRdrFile = (PKLDRRDRFILE)pRdr;
@@ -862 +862 @@
         if (rc)
             return -1;
-        pRdrFile->off = ((off_t)offHigh << 32) | offLow;
+        pRdrFile->off = ((KLDRFOFF)offHigh << 32) | offLow;
 
 #else
@@ -873 +873 @@
 
 /** @copydoc KLDRRDR::pfnSize */
-static off_t kldrRdrFileSize(PKLDRRDR pRdr)
+static KLDRFOFF kldrRdrFileSize(PKLDRRDR pRdr)
 {
     PKLDRRDRFILE pRdrFile = (PKLDRRDRFILE)pRdr;
@@ -915 +915 @@
     {
         int rc;
-        off_t cb = pRdrFile->Core.pOps->pfnSize(pRdr);
+        KLDRFOFF cb = pRdrFile->Core.pOps->pfnSize(pRdr);
 
         pRdrFile->pvMapping = kldrHlpAlloc(cb);
@@ -941 +941 @@
 
 /** @copydoc KLDRRDR::pfnRead */
-static int kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, off_t off)
+static int kldrRdrFileRead(PKLDRRDR pRdr, void *pvBuf, size_t cb, KLDRFOFF off)
 {
     PKLDRRDRFILE pRdrFile = (PKLDRRDRFILE)pRdr;
@@ -965 +965 @@
         LONG offLow;
 
-        offHigh = sizeof(off_t) == 4 ? 0 : (off >> 32);
+        offHigh = sizeof(KLDRFOFF) == 4 ? 0 : (off >> 32);
         offLow = SetFilePointer(pRdrFile->File, (LONG)off, &offHigh, FILE_BEGIN);
         if (    offLow != (LONG)off
-            ||  offHigh != (LONG)(sizeof(off_t) == 4 ? 0 : (off >> 32)))
+            ||  offHigh != (LONG)(sizeof(KLDRFOFF) == 4 ? 0 : (off >> 32)))
         {
             int rc = GetLastError();
@@ -1070 +1070 @@
     APIRET          rc;
     HFILE           File = 0;
-    off_t           cb;
+    KLDRFOFF        cb;
     char            szFilename[CCHMAXPATH];
 
@@ -1109 +1109 @@
     int                 rc;
     HANDLE              File;
-    off_t               cb;
+    KLDRFOFF            cb;
     char                szFilename[MAX_PATH];
 
@@ -1134 +1134 @@
         return rc;
     }
-    if (sizeof(off_t) == 4)
+    if (sizeof(KLDRFOFF) == 4)
         cb = High ? 0x7fffffff : Low;
     else
-        cb = ((off_t)High << 32) | Low;
+        cb = ((KLDRFOFF)High << 32) | Low;
 
 #else

trunk/kLdr/tstkLdrMod.c

@@ -250 +250 @@
  */
 static int BasicTestEnumDbgInfoCallback(PKLDRMOD pMod, uint32_t iDbgInfo, KLDRDBGINFOTYPE enmType,
-                                        int16_t iMajorVer, int16_t iMinorVer, off_t offFile, KLDRADDR LinkAddress,
+                                        int16_t iMajorVer, int16_t iMinorVer, KLDRFOFF offFile, KLDRADDR LinkAddress,
                                         KLDRSIZE cb, const char *pszExtFile, void *pvUser)
 {