Changeset 2883 for trunk/kLdr/kLdrModPE.c

Timestamp:

Nov 18, 2006, 12:21:33 PM (19 years ago)

Author:

bird

Message:

cleanup.

File:

• trunk/kLdr/kLdrModPE.c (modified) (10 diffs)

trunk/kLdr/kLdrModPE.c

@@ -58 +58 @@
  */
 #define KLDRMODPE_RVA2TYPE(pvBits, uRVA, type) \
-        ( (type) ((uintptr_t)(pvBits) + (uRVA)) )
+        ( (type) ((uintptr_t)(pvBits) + (uintptr_t)(uRVA)) )
 
 /** @def KLDRMODPE_VALID_RVA
@@ -119 +119 @@
                                     PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 static int  kldrModPEDoImports(PKLDRMODPE pModPE, void *pvMapping, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
-static int  kldrModPEDoImportsFor32BitArch(PKLDRMODPE pModPE, void *pvMapping, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
-static int  kldrModPEDoImportsFor64BitArch(PKLDRMODPE pModPE, void *pvMapping, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 static int  kldrModPEDoCallDLL(PKLDRMODPE pModPE, unsigned uOp, uintptr_t uHandle);
 static int  kldrModPEDoCallTLS(PKLDRMODPE pModPE, unsigned uOp, uintptr_t uHandle);
@@ -188 +186 @@
 
     /* sanity checks. */
-    if (    s.FileHdr.NumberOfSections > 1024*1024
+    if (    s.FileHdr.NumberOfSections > 4096
         ||  (   s.FileHdr.SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER32)
              && s.FileHdr.SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER64))
@@ -309 +307 @@
     for (i = 0; i < pModPE->Hdrs.FileHeader.NumberOfSections; i++)
     {
-        char *pch;
+        const char *pch;
 
         /* unused */
@@ -316 +314 @@
 
         /* name */
-        pMod->aSegments[i + 1].pchName = pch = &pModPE->aShdrs[i].Name[0];
+        pMod->aSegments[i + 1].pchName = pch = (const char *)&pModPE->aShdrs[i].Name[0];
         cb = IMAGE_SIZEOF_SHORT_NAME;
         while (     cb > 0
@@ -607 +605 @@
 {
     PKLDRMOD    pMod = pModPE->pMod;
-    size_t      cb = (size_t)pMod->pOps->pfnSize(pModPE->pMod);
     int         rc;
     uint32_t    i;
@@ -1029 +1026 @@
                                   const IMAGE_IMPORT_DESCRIPTOR *);
     pszImportName = KLDRMODPE_RVA2TYPE(pvBits, pImpDesc->Name, const char *);
-    cchImportName = strlen(pszImportName);
+    cchImportName = kLdrHlpStrLen(pszImportName);
     if (cchImportName < cchName)
     {
@@ -1154 +1151 @@
             case IMAGE_DEBUG_TYPE_UNKNOWN:
             case IMAGE_DEBUG_TYPE_FPO:
-            case IMAGE_DEBUG_TYPE_COFF: //stabs dialect??
+            case IMAGE_DEBUG_TYPE_COFF: /*stabs dialect??*/
             case IMAGE_DEBUG_TYPE_MISC:
             case IMAGE_DEBUG_TYPE_EXCEPTION:
@@ -1440 +1437 @@
                 /* 5 - 32-bit MIPS JMPADDR, no implemented. */
                 case IMAGE_REL_BASED_MIPS_JMPADDR:
-                    *u.pu32 = *u.pu32 & 0xc0000000
+                    *u.pu32 = (*u.pu32 & 0xc0000000)
                             | ((uint32_t)((*u.pu32 << 2) + (uint32_t)Delta) >> 2);
                     break;
@@ -1582 +1579 @@
             {
                 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, pName->Name, &Value, &fKind, pvUser);
+                rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL, (const char *)pName->Name, &Value, &fKind, pvUser);
             }
             else