Changeset 3567 for trunk/kStuff/kLdr/kLdrModNative.c

Timestamp:

Aug 27, 2007, 9:54:05 PM (18 years ago)

Author:

bird

Message:

Use the new type system.

File:

• trunk/kStuff/kLdr/kLdrModNative.c (modified) (27 diffs)

trunk/kStuff/kLdr/kLdrModNative.c

@@ -94 +94 @@
  */
 # define KLDRMODNATIVE_RVA2TYPE(pvBits, uRVA, type) \
-        ( (type) ((uintptr_t)(pvBits) + (uRVA)) )
+        ( (type) ((KUPTR)(pvBits) + (uRVA)) )
 
 #endif /* PE OSes */
@@ -111 +111 @@
     PKLDRMOD                    pMod;
     /** Reserved flags. */
-    uint32_t                    f32Reserved;
+    KU32                        f32Reserved;
     /** The number of imported modules.
-     * If ~(uint32_t)0 this hasn't been determined yet. */
-    uint32_t                    cImportModules;
+     * If ~(KU32)0 this hasn't been determined yet. */
+    KU32                        cImportModules;
 #ifdef __OS2__
     /** The module handle. */
@@ -140 +140 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int32_t kldrModNativeNumberOfImports(PKLDRMOD pMod, const void *pvBits);
+static KI32 kldrModNativeNumberOfImports(PKLDRMOD pMod, const void *pvBits);
 
 
@@ -186 +186 @@
     if (rc)
         return rc;
-    rc = kLdrModOpenNativeByHandle((uintptr_t)hmod, ppMod);
+    rc = kLdrModOpenNativeByHandle((KUPTR)hmod, ppMod);
     if (rc)
         DosFreeModule(hmod);
@@ -196 +196 @@
     if (!hmod)
         return GetLastError();
-    rc = kLdrModOpenNativeByHandle((uintptr_t)hmod, ppMod);
+    rc = kLdrModOpenNativeByHandle((KUPTR)hmod, ppMod);
     if (rc)
         FreeLibrary(hmod);
@@ -206 +206 @@
     if (!pvMod)
         return ENOENT;
-    rc = kLdrModOpenNativeByHandle((uintptr_t)pvMod, ppMod);
+    rc = kLdrModOpenNativeByHandle((KUPTR)pvMod, ppMod);
     if (rc)
         dlclose(pvMod);
@@ -227 +227 @@
  * @remark  This will not make the native loader increment the load count.
  */
-int kLdrModOpenNativeByHandle(uintptr_t uHandle, PPKLDRMOD ppMod)
-{
-    size_t cb;
-    size_t cchFilename;
-    uint32_t cSegments;
+int kLdrModOpenNativeByHandle(KUPTR uHandle, PPKLDRMOD ppMod)
+{
+    KSIZE cb;
+    KSIZE cchFilename;
+    KU32 cSegments;
     PKLDRMOD pMod;
     PKLDRMODNATIVE pModNative;
@@ -273 +273 @@
     /* get the segment count. */
     if (pDosHdr->e_magic == IMAGE_DOS_SIGNATURE)
-        pNtHdrs = (const IMAGE_NT_HEADERS *)((uintptr_t)pDosHdr + pDosHdr->e_lfanew);
+        pNtHdrs = (const IMAGE_NT_HEADERS *)((KUPTR)pDosHdr + pDosHdr->e_lfanew);
     else
         pNtHdrs = (const IMAGE_NT_HEADERS *)pDosHdr;
@@ -309 +309 @@
 
     /* KLDRMOD */
-    pMod = (PKLDRMOD)((uint8_t *)pModNative + KLDR_ALIGN_Z(sizeof(KLDRMODNATIVE), 16));
+    pMod = (PKLDRMOD)((KU8 *)pModNative + KLDR_ALIGN_Z(sizeof(KLDRMODNATIVE), 16));
     pMod->pvData = pModNative;
     pMod->pRdr = NULL;
@@ -337 +337 @@
     pModNative->pMod = pMod;
     pModNative->f32Reserved = 0;
-    pModNative->cImportModules = ~(uint32_t)0;
+    pModNative->cImportModules = ~(KU32)0;
 
     /*
@@ -541 +541 @@
 
 /** @copydoc kLdrModQuerySymbol */
-static int kldrModNativeQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
-                                    const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
-                                    PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind)
+static int kldrModNativeQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, KU32 iSymbol,
+                                    const char *pchSymbol, KSIZE cchSymbol, const char *pszVersion,
+                                    PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, KU32 *pfKind)
 {
     PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
@@ -579 +579 @@
         if (rc)
             return rc == ERROR_PROC_NOT_FOUND ? KLDR_ERR_SYMBOL_NOT_FOUND : rc;
-        *puValue = (uintptr_t)pfn;
+        *puValue = (KUPTR)pfn;
     }
     if (pfKind)
@@ -602 +602 @@
         return KLDR_ERR_SYMBOL_NOT_FOUND;
 
-    pfn = GetProcAddress(pModNative->hmod, pszSymbol ? pszSymbol : (const char *)(uintptr_t)iSymbol);
+    pfn = GetProcAddress(pModNative->hmod, pszSymbol ? pszSymbol : (const char *)(KUPTR)iSymbol);
     if (puValue)
-        *puValue = (uintptr_t)pfn;
+        *puValue = (KUPTR)pfn;
     if (pfKind)
         *pfKind = (pModNative->pNtHdrs->FileHeader.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32)
@@ -618 +618 @@
         return KLDR_ERR_SYMBOL_NOT_FOUND;
     if (puValue)
-        *puValue = (uintptr_t)pfn;
+        *puValue = (KUPTR)pfn;
     if (pfKind)
-        *pfKind = (sizeof(uintptr_t) == 4 ? KLDRSYMKIND_32BIT : KLDRSYMKIND_64BIT)
+        *pfKind = (sizeof(KUPTR) == 4 ? KLDRSYMKIND_32BIT : KLDRSYMKIND_64BIT)
                 | KLDRSYMKIND_NO_TYPE;
 
@@ -633 +633 @@
 /** @copydoc kLdrModEnumSymbols */
 static int kldrModNativeEnumSymbols(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress,
-                                    uint32_t fFlags, PFNKLDRMODENUMSYMS pfnCallback, void *pvUser)
+                                    KU32 fFlags, PFNKLDRMODENUMSYMS pfnCallback, void *pvUser)
 {
     PKLDRMODNATIVE                  pModNative = (PKLDRMODNATIVE)pMod->pvData;
@@ -643 +643 @@
 
 #elif defined(__WIN__) || defined(__NT__)
-    const uint32_t                 *paFunctions;
+    const KU32                     *paFunctions;
     const IMAGE_EXPORT_DIRECTORY   *pExpDir;
-    const uint32_t                 *paRVANames;
-    const uint16_t                 *paOrdinals;
-    uint32_t                        iFunction;
-    uint32_t                        cFunctions;
-    uint32_t                        cNames;
+    const KU32                     *paRVANames;
+    const KU16                     *paOrdinals;
+    KU32                            iFunction;
+    KU32                            cFunctions;
+    KU32                            cNames;
     int                             rc;
 
@@ -666 +666 @@
      * Enumerate the ordinal exports.
      */
-    paRVANames = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pExpDir->AddressOfNames, const uint32_t *);
-    paOrdinals = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pExpDir->AddressOfNameOrdinals, const uint16_t *);
-    paFunctions = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pExpDir->AddressOfFunctions, const uint32_t *);
+    paRVANames = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pExpDir->AddressOfNames, const KU32 *);
+    paOrdinals = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pExpDir->AddressOfNameOrdinals, const KU16 *);
+    paFunctions = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pExpDir->AddressOfFunctions, const KU32 *);
     cFunctions = pExpDir->NumberOfFunctions;
     cNames = pExpDir->NumberOfNames;
@@ -674 +674 @@
     {
         unsigned        fFoundName;
-        uint32_t        iName;
-        const uint32_t  uRVA = paFunctions[iFunction];
+        KU32            iName;
+        const KU32      uRVA = paFunctions[iFunction];
         const KLDRADDR  uValue = BaseAddress + uRVA;
-        uint32_t        fKind = (pModNative->pNtHdrs->FileHeader.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32)
+        KU32            fKind = (pModNative->pNtHdrs->FileHeader.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32)
                               ? KLDRSYMKIND_32BIT : KLDRSYMKIND_64BIT)
                               | KLDRSYMKIND_NO_TYPE;
@@ -727 +727 @@
 
 /** @copydoc kLdrModGetImport */
-static int kldrModNativeGetImport(PKLDRMOD pMod, const void *pvBits, uint32_t iImport, char *pszName, size_t cchName)
+static int kldrModNativeGetImport(PKLDRMOD pMod, const void *pvBits, KU32 iImport, char *pszName, KSIZE cchName)
 {
     PKLDRMODNATIVE                  pModNative = (PKLDRMODNATIVE)pMod->pvData;
@@ -739 +739 @@
     const IMAGE_IMPORT_DESCRIPTOR  *pImpDesc;
     const char                     *pszImportName;
-    size_t                          cchImportName;
+    KSIZE                           cchImportName;
     int                             rc;
 
@@ -745 +745 @@
      * Simple bounds check.
      */
-    if (iImport >= (uint32_t)kldrModNativeNumberOfImports(pMod, pvBits))
+    if (iImport >= (KU32)kldrModNativeNumberOfImports(pMod, pvBits))
         return KLDR_ERR_IMPORT_ORDINAL_OUT_OF_BOUNDS;
 
@@ -784 +784 @@
 
 /** @copydoc kLdrModNumberOfImports */
-static int32_t kldrModNativeNumberOfImports(PKLDRMOD pMod, const void *pvBits)
+static KI32 kldrModNativeNumberOfImports(PKLDRMOD pMod, const void *pvBits)
 {
     PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
@@ -794 +794 @@
 
 #elif defined(__WIN__) || defined(__NT__)
-    if (pModNative->cImportModules == ~(uint32_t)0)
+    if (pModNative->cImportModules == ~(KU32)0)
     {
         /*
@@ -898 +898 @@
 #elif defined(__WIN__) || defined(__NT__)
     const IMAGE_DEBUG_DIRECTORY    *pDbgDir;
-    uint32_t                        iDbgInfo;
-    uint32_t                        cb;
+    KU32                            iDbgInfo;
+    KU32                            cb;
     int                             rc;
 
@@ -1039 +1039 @@
 
 /** @copydoc kLdrModCallInit */
-static int kldrModNativeCallInit(PKLDRMOD pMod, uintptr_t uHandle)
+static int kldrModNativeCallInit(PKLDRMOD pMod, KUPTR uHandle)
 {
     return 0;
@@ -1046 +1046 @@
 
 /** @copydoc kLdrModCallTerm */
-static int kldrModNativeCallTerm(PKLDRMOD pMod, uintptr_t uHandle)
+static int kldrModNativeCallTerm(PKLDRMOD pMod, KUPTR uHandle)
 {
     return 0;
@@ -1053 +1053 @@
 
 /** @copydoc kLdrModCallThread */
-static int kldrModNativeCallThread(PKLDRMOD pMod, uintptr_t uHandle, unsigned fAttachingOrDetaching)
+static int kldrModNativeCallThread(PKLDRMOD pMod, KUPTR uHandle, unsigned fAttachingOrDetaching)
 {
     return 0;