Changeset 82 in kStuff for trunk

Timestamp:

Aug 22, 2016 9:01:51 PM (8 years ago)

Author:

bird

Message:

kLdrModNative.c: Report the actual section load addresses in the aSegments[].MapAddress members.

Location:

trunk

Files:

• include/k/kLdrFmts/pe.h (modified) (1 diff)
• kHlp/Bare/kHlpBareAssert.c (modified) (2 diffs)
• kLdr/kLdrModNative.c (modified) (7 diffs)

trunk/include/k/kLdrFmts/pe.h

@@ -375 +375 @@
 {
     KU16      Hint;
-    KU8      Name[1];
+    KU8       Name[1];
 } IMAGE_IMPORT_BY_NAME;
 typedef IMAGE_IMPORT_BY_NAME *PIMAGE_IMPORT_BY_NAME;

trunk/kHlp/Bare/kHlpBareAssert.c

@@ -82 +82 @@
         cbWritten = pszNl - pszMsg;
 
-#if K_OS == K_OS_OS2
+# if K_OS == K_OS_OS2
         if (cbWritten)
             DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
         DosWrite((HFILE)2, "\r\n", 2, &cbWritten);
-#else /* K_OS == K_OS_WINDOWS */
+# else /* K_OS == K_OS_WINDOWS */
         if (cbWritten)
             WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
         WriteFile((HANDLE)STD_ERROR_HANDLE, "\r\n", 2, &cbWritten, NULL);
-#endif
+# endif
 
         /* next */
@@ -103 +103 @@
     {
         cbWritten = kHlpStrLen(pszMsg);
-#if K_OS == K_OS_OS2
+# if K_OS == K_OS_OS2
         DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
-#else /* K_OS == K_OS_WINDOWS */
+# else /* K_OS == K_OS_WINDOWS */
         WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
-#endif
+# endif
     }
 

trunk/kLdr/kLdrModNative.c

@@ -239 +239 @@
 {
     KSIZE cb;
-    KSIZE cchFilename;
+    KU32 cchFilename;
     KU32 cSegments;
     PKLDRMOD pMod;
@@ -309 +309 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kHlpStrLen(szFilename);
+    cchFilename = (KU32)kHlpStrLen(szFilename);
     cb = K_ALIGN_Z(sizeof(KLDRMODNATIVE), 16)
        + K_OFFSETOF(KLDRMOD, aSegments[cSegments])
@@ -327 +327 @@
     kHlpMemCopy((char *)pMod->pszFilename, szFilename, cchFilename + 1);
     pMod->pszName = kHlpGetFilename(pMod->pszFilename); /** @todo get soname */
-    pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
+    pMod->cchName = cchFilename - (KU32)(pMod->pszName - pMod->pszFilename);
     pMod->fFlags = 0;
 #if defined(__i386__) || defined(__X86__) || defined(_M_IX86)
@@ -398 +398 @@
     else
         pMod->aSegments[0].cbMapped = pNtHdrs->OptionalHeader.SizeOfHeaders;
-    pMod->aSegments[0].MapAddress = 0;
+    pMod->aSegments[0].MapAddress = uHandle;
 
     /* The section headers. */
@@ -404 +404 @@
     {
         const char *pch;
+        KU32        cchSegName;
 
         /* unused */
         pMod->aSegments[i + 1].pvUser = NULL;
-        pMod->aSegments[i + 1].MapAddress = 0;
 
         /* name */
         pMod->aSegments[i + 1].pchName = pch = &paShdrs[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;
+        cchSegName = IMAGE_SIZEOF_SHORT_NAME;
+        while (    cchSegName > 0
+               && (pch[cchSegName - 1] == ' ' || pch[cchSegName - 1] == '\0'))
+            cchSegName--;
+        pMod->aSegments[i + 1].cchName = cchSegName;
 
         /* size and addresses */
@@ -421 +421 @@
         {
             pMod->aSegments[i + 1].cb          = paShdrs[i].Misc.VirtualSize;
-            pMod->aSegments[i + 1].LinkAddress = paShdrs[i].VirtualAddress
-                                               + pNtHdrs->OptionalHeader.ImageBase;
             pMod->aSegments[i + 1].RVA         = paShdrs[i].VirtualAddress;
+            pMod->aSegments[i + 1].LinkAddress = paShdrs[i].VirtualAddress + pNtHdrs->OptionalHeader.ImageBase;
+            pMod->aSegments[i + 1].MapAddress  = paShdrs[i].VirtualAddress + uHandle;
             pMod->aSegments[i + 1].cbMapped    = paShdrs[i].Misc.VirtualSize;
             if (i + 2 < pMod->cSegments)
-                pMod->aSegments[i + 1].cbMapped= paShdrs[i + 1].VirtualAddress
-                                               - paShdrs[i].VirtualAddress;
+                pMod->aSegments[i + 1].cbMapped = paShdrs[i + 1].VirtualAddress
+                                                - paShdrs[i].VirtualAddress;
         }
         else
@@ -435 +435 @@
             pMod->aSegments[i + 1].LinkAddress = NIL_KLDRADDR;
             pMod->aSegments[i + 1].RVA         = 0;
+            pMod->aSegments[i + 1].MapAddress  = 0;
         }
 
         /* file location */
         pMod->aSegments[i + 1].offFile = paShdrs[i].PointerToRawData;
-        pMod->aSegments[i + 1].cbFile = paShdrs[i].SizeOfRawData;
+        pMod->aSegments[i + 1].cbFile  = paShdrs[i].SizeOfRawData;
         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 */