Changeset 2899

Timestamp:

Dec 24, 2006, 4:20:40 AM (19 years ago)

Author:

bird

Message:

Made it build (version + name length).

Location:

trunk/kLdr

Files:

• Makefile.kmk (modified) (1 diff)
• kLdrHlp-gcc.c (modified) (1 diff)
• kLdrModPE.c (modified) (3 diffs)
• tstkLdrMod.c (modified) (8 diffs)

trunk/kLdr/Makefile.kmk

@@ -58 +58 @@
   TEMPLATE_TST_LIBS = gcc
  endif
- TEMPLATE_TST_CFLAGS = -Wall -pedantic -g
+ TEMPLATE_TST_CFLAGS = -Wall -pedantic -g -std=gnu99
  TEMPLATE_TST_CFLAGS.release = -O2
  TEMPLATE_TST_LDFLAGS =

trunk/kLdr/kLdrHlp-gcc.c

@@ -179 +179 @@
 }
 
+
+int strncmp(const char *psz1, const char *psz2, size_t cch)
+{
+    while (cch-- > 0)
+    {
+        const char ch1 = *psz1++;
+        const char ch2 = *psz2++;
+        if (ch1 != ch2)
+            return (int)ch1 - (int)ch2;
+        if (!ch1)
+            break;
+    }
+    return 0;
+}
+
 char *strchr(const char *psz, int ch)
 {

trunk/kLdr/kLdrModPE.c

@@ -107 +107 @@
 
 static int  kldrModPEDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODPE *ppMod);
-static void kldrModPEDoLoadConfigConversion(PIMAGE_LOAD_CONFIG_DIRECTORY64 pLoadCfg);
+/*static void kldrModPEDoLoadConfigConversion(PIMAGE_LOAD_CONFIG_DIRECTORY64 pLoadCfg); */
 static int  kLdrModPEDoOptionalHeaderValidation(PKLDRMODPE pModPE);
 static int  kLdrModPEDoSectionHeadersValidation(PKLDRMODPE pModPE);
@@ -457 +457 @@
 
 
+#if 0
 /**
  * Converts a 32-bit load config directory to a 64 bit one.
@@ -487 +488 @@
     /* the remainder matches. */
 }
+#endif
 
 

trunk/kLdr/tstkLdrMod.c

@@ -70 +70 @@
 
 /** Dummy import resolver callback. */
-static int BasicTestsGetImport(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol, const char *pszSymbol,
-                               PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
+static int BasicTestsGetImport(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol, const char *pchSymbol, size_t cchSymbol,
+                               const char *pszVersion, PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
 {
     *puValue = 0xdeadface;
@@ -197 +197 @@
  * Dump symbols and check that we can query each of them recursivly.
  */
-static int BasicTestsEnumSymCallback(PKLDRMOD pMod, uint32_t iSymbol, const char *pszSymbol,
-                                     KLDRADDR uValue, uint32_t fKind, void *pvUser)
+static int BasicTestsEnumSymCallback(PKLDRMOD pMod, uint32_t iSymbol, const char *pchSymbol, size_t cchSymbol,
+                                     const char *pszVersion, KLDRADDR uValue, uint32_t fKind, void *pvUser)
 {
     KLDRADDR    uValue2;
@@ -206 +206 @@
     /* dump */
     printf("#0x%08x: %016" PRI_KLDRADDR " %#08x", iSymbol, uValue, fKind);
-    if (pszSymbol)
-        printf(" %s", pszSymbol);
+    if (pchSymbol)
+        printf(" %.*s", cchSymbol, pchSymbol);
     printf("\n");
 
@@ -213 +213 @@
     if (iSymbol != NIL_KLDRMOD_SYM_ORDINAL)
     {
-        rc = kLdrModQuerySymbol(pMod, pvUser, MY_BASEADDRESS, iSymbol, NULL, NULL, NULL,
+        rc = kLdrModQuerySymbol(pMod, pvUser, MY_BASEADDRESS, iSymbol, NULL, 0, NULL, NULL, NULL,
                                 &uValue2, &fKind2);
         if (rc)
-            return Failure("Couldn't find symbol %#x (%s) by ordinal. rc=%d", iSymbol, pszSymbol, rc);
+            return Failure("Couldn't find symbol %#x (%.*s) by ordinal. rc=%d", iSymbol, cchSymbol, pchSymbol, rc);
         if (uValue != uValue2)
-            return Failure("Symbol %#x (%s): Value mismatch %016" PRI_KLDRADDR " != %016" PRI_KLDRADDR " (enum!=query/ord)  pvBits=%p",
-                           iSymbol, pszSymbol, uValue, uValue2, pvUser);
+            return Failure("Symbol %#x (%.*s): Value mismatch %016" PRI_KLDRADDR " != %016" PRI_KLDRADDR " (enum!=query/ord)  pvBits=%p",
+                           iSymbol, cchSymbol, pchSymbol, uValue, uValue2, pvUser);
         if (fKind != fKind2)
-            return Failure("Symbol %#x (%s): Kind mismatch %#x != %#x (enum!=query/ord) pvBits=%p",
-                           iSymbol, pszSymbol, fKind, fKind2, pvUser);
+            return Failure("Symbol %#x (%.*s): Kind mismatch %#x != %#x (enum!=query/ord) pvBits=%p",
+                           iSymbol, cchSymbol, pchSymbol, fKind, fKind2, pvUser);
     }
 
     /* query by name. */
-    if (pszSymbol)
-    {
-        rc = kLdrModQuerySymbol(pMod, pvUser, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL, pszSymbol, NULL, NULL,
-                                &uValue2, &fKind2);
+    if (pchSymbol)
+    {
+        rc = kLdrModQuerySymbol(pMod, pvUser, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL, pchSymbol, cchSymbol, pszVersion,
+                                NULL, NULL, &uValue2, &fKind2);
         if (rc)
-            return Failure("Couldn't find symbol %#x (%s) by name. rc=%d", iSymbol, pszSymbol, rc);
+            return Failure("Couldn't find symbol %#x (%.*s) by name. rc=%d", iSymbol, cchSymbol, pchSymbol, rc);
         if (uValue != uValue2)
-            return Failure("Symbol %#x (%s): Value mismatch %016" PRI_KLDRADDR " != %016" PRI_KLDRADDR " (enum!=query/name) pvBits=%p",
-                           iSymbol, pszSymbol, uValue, uValue2, pvUser);
+            return Failure("Symbol %#x (%.*s): Value mismatch %016" PRI_KLDRADDR " != %016" PRI_KLDRADDR " (enum!=query/name) pvBits=%p",
+                           iSymbol, cchSymbol, pchSymbol, uValue, uValue2, pvUser);
         if (fKind != fKind2)
-            return Failure("Symbol %#x (%s): Kind mismatch %#x != %#x (enum!=query/name) pvBits=%p",
-                           iSymbol, pszSymbol, fKind, fKind2, pvUser);
+            return Failure("Symbol %#x (%.*s): Kind mismatch %#x != %#x (enum!=query/name) pvBits=%p",
+                           iSymbol, cchSymbol, pchSymbol, fKind, fKind2, pvUser);
     }
 
@@ -353 +353 @@
     fKind = 0xdeadf00d;
     Value = 0x0badc0de;
-    rc = kLdrModQuerySymbol(pMod, pvBits, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL - 20, NULL, NULL,  NULL,
+    rc = kLdrModQuerySymbol(pMod, pvBits, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL - 20, NULL, 0, NULL, NULL, NULL,
                             &Value, &fKind);
     if (rc)
@@ -365 +365 @@
     fKind = 0xdeadf00d;
     Value = 0x0badc0de;
-    rc = kLdrModQuerySymbol(pMod, pvBits, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL, NULL, NULL,  NULL,
+    rc = kLdrModQuerySymbol(pMod, pvBits, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL, NULL, 0, NULL, NULL, NULL,
                             &Value, &fKind);
     if (!rc)
@@ -404 +404 @@
      * Check/dump the module structure.
      */
-    printf("pMod=%p u32Magic=%#x cSegments=%d\n", pMod, pMod->u32Magic, pMod->cSegments);
+    printf("pMod=%p u32Magic=%#x cSegments=%d\n", (void *)pMod, pMod->u32Magic, pMod->cSegments);
     printf("enmType=%d enmFmt=%d enmArch=%d enmCpu=%d enmEndian=%d\n",
            pMod->enmType, pMod->enmFmt, pMod->enmArch, pMod->enmCpu, pMod->enmEndian);
@@ -436 +436 @@
                pMod->aSegments[i].LinkAddress, pMod->aSegments[i].cb, pMod->aSegments[i].Alignment);
         printf("        RVA: %016" PRI_KLDRADDR " cbMapped: %016" PRI_KLDRSIZE " MapAddress=%p\n",
-               pMod->aSegments[i].RVA, (KLDRSIZE)pMod->aSegments[i].cbMapped, pMod->aSegments[i].MapAddress);
+               pMod->aSegments[i].RVA, (KLDRSIZE)pMod->aSegments[i].cbMapped, (void *)pMod->aSegments[i].MapAddress);
         printf("    offFile: %016" PRI_KLDRADDR "   cbFile: %016" PRI_KLDRSIZE "\n",
                (KLDRADDR)pMod->aSegments[i].offFile, (KLDRSIZE)pMod->aSegments[i].cbFile);