Changeset 89 in kStuff

Timestamp:

Sep 7, 2016 1:32:53 PM (8 years ago)

Author:

bird

Message:

kLdrModPE.cpp: warnings.

File:

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

trunk/kLdr/kLdrModPE.c

@@ -230 +230 @@
     pMod->pOps = NULL;      /* set upon success. */
     pMod->cSegments = s.FileHdr.NumberOfSections + 1;
-    pMod->cchFilename = cchFilename;
+    pMod->cchFilename = (KU32)cchFilename;
     pMod->pszFilename = (char *)&pMod->aSegments[pMod->cSegments];
     kHlpMemCopy((char *)pMod->pszFilename, kRdrName(pRdr), cchFilename + 1);
     pMod->pszName = kHlpGetFilename(pMod->pszFilename);
-    pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
+    pMod->cchName = (KU32)(cchFilename - (pMod->pszName - pMod->pszFilename));
     pMod->fFlags = 0;
     switch (s.FileHdr.Machine)
@@ -325 +325 @@
     {
         const char *pch;
+        KU32        cb2;
 
         /* unused */
@@ -335 +336 @@
         /* name */
         pMod->aSegments[i + 1].pchName = pch = (const char *)&pModPE->aShdrs[i].Name[0];
-        cb = IMAGE_SIZEOF_SHORT_NAME;
-        while (   cb > 0
-               && (pch[cb - 1] == ' ' || pch[cb - 1] == '\0'))
-            cb--;
-        pMod->aSegments[i + 1].cchName = cb;
+        cb2 = IMAGE_SIZEOF_SHORT_NAME;
+        while (   cb2 > 0
+               && (pch[cb2 - 1] == ' ' || pch[cb2 - 1] == '\0'))
+            cb2--;
+        pMod->aSegments[i + 1].cchName = cb2;
 
         /* size and addresses */
@@ -345 +346 @@
         {
             /* Kluge to deal with wlink ".reloc" sections that has a VirtualSize of 0 bytes. */
-            KU32 cb = pModPE->aShdrs[i].Misc.VirtualSize;
-            if (!cb)
-                cb = K_ALIGN_Z(pModPE->aShdrs[i].SizeOfRawData, pModPE->Hdrs.OptionalHeader.SectionAlignment);
+            cb2 = pModPE->aShdrs[i].Misc.VirtualSize;
+            if (!cb2)
+                cb2 = K_ALIGN_Z(pModPE->aShdrs[i].SizeOfRawData, pModPE->Hdrs.OptionalHeader.SectionAlignment);
             pMod->aSegments[i + 1].cb          = pModPE->aShdrs[i].Misc.VirtualSize;
             pMod->aSegments[i + 1].LinkAddress = pModPE->aShdrs[i].VirtualAddress
                                                + pModPE->Hdrs.OptionalHeader.ImageBase;
             pMod->aSegments[i + 1].RVA         = pModPE->aShdrs[i].VirtualAddress;
-            pMod->aSegments[i + 1].cbMapped    = cb;
+            pMod->aSegments[i + 1].cbMapped    = cb2;
             if (i + 2 < pMod->cSegments)
                 pMod->aSegments[i + 1].cbMapped= pModPE->aShdrs[i + 1].VirtualAddress
@@ -370 +371 @@
         if (    pMod->aSegments[i + 1].cbMapped > 0 /* if mapped */
             &&  (KLDRSIZE)pMod->aSegments[i + 1].cbFile > pMod->aSegments[i + 1].cbMapped)
-            pMod->aSegments[i + 1].cbFile = pMod->aSegments[i + 1].cbMapped;
+            pMod->aSegments[i + 1].cbFile = (KLDRFOFF)(pMod->aSegments[i + 1].cbMapped);
 
         /* protection */
@@ -859 +860 @@
     if (!*pszSymbol)
         return KLDR_ERR_PE_BAD_FORWARDER;
-    cchImpModule = pszSymbol - pszForwarder;
+    cchImpModule = (KU32)(pszSymbol - pszForwarder);
 
     pszSymbol++;                        /* skip the dot */
@@ -1296 +1297 @@
     if (pvMapping == KLDRMOD_INT_MAP)
     {
-        pvMapping = pModPE->pvMapping;
+        pvMapping = (void *)pModPE->pvMapping;
         if (!pvMapping)
             return KLDR_ERR_NOT_MAPPED;
@@ -1322 +1323 @@
     if (pvMapping == KLDRMOD_INT_MAP)
     {
-        pvMapping = pModPE->pvMapping;
+        pvMapping = (void *)pModPE->pvMapping;
         if (!pvMapping)
             return;
@@ -1731 +1732 @@
     if (pvMapping == KLDRMOD_INT_MAP)
     {
-        pvMapping = pModPE->pvMapping;
+        pvMapping = (void *)pModPE->pvMapping;
         if (!pvMapping)
             return KLDR_ERR_NOT_MAPPED;
@@ -1889 +1890 @@
     if (pvMapping == KLDRMOD_INT_MAP)
     {
-        pvMapping = pModPE->pvMapping;
+        pvMapping = (void *)pModPE->pvMapping;
         if (!pvMapping)
             return KLDR_ERR_NOT_MAPPED;
@@ -1917 +1918 @@
     if (pvMapping == KLDRMOD_INT_MAP)
     {
-        pvMapping = pModPE->pvMapping;
+        pvMapping = (void *)pModPE->pvMapping;
         if (!pvMapping)
             return KLDR_ERR_NOT_MAPPED;