Changeset 2891 for trunk/kLdr/kLdrModPE.c

Timestamp:

Nov 21, 2006, 10:40:45 PM (19 years ago)

Author:

bird

Message:

interface adjustment (in progress).

File:

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

trunk/kLdr/kLdrModPE.c

@@ -685 +685 @@
 /** @copydoc kLdrModQuerySymbol */
 static int kldrModPEQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
-                                const char *pszSymbol, PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser,
-                                PKLDRADDR puValue, uint32_t *pfKind)
+                                const char *pchSymbol, size_t cchSymbol, const char *pszVersion, 
+                                PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind)
+
 {
     PKLDRMODPE                      pModPE = (PKLDRMODPE)pMod->pvData;
@@ -704 +705 @@
         <   sizeof(IMAGE_EXPORT_DIRECTORY))
         return KLDR_ERR_SYMBOL_NOT_FOUND;
+    if (pszVersion && *pszVersion)
+        return KLDR_ERR_SYMBOL_NOT_FOUND;
 
     pExpDir = KLDRMODPE_RVA2TYPE(pvBits,
                                  pModPE->Hdrs.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress,
                                  PIMAGE_EXPORT_DIRECTORY);
-    if (!pszSymbol)
+    if (!pchSymbol)
     {
         /*
@@ -742 +745 @@
                 {
                     pszName = KLDRMODPE_RVA2TYPE(pvBits, paRVANames[i], const char *);
-                    KLDRMODPE_ASSERT(kLdrHlpStrComp(pszName, pszSymbol));
+                    KLDRMODPE_ASSERT(kLdrHlpStrNComp(pszName, pchSymbol, cchSymbol) || pszName[cchSymbol]);
                     KLDRMODPE_ASSERT(i == 0 || kLdrHlpStrComp(pszName, KLDRMODPE_RVA2TYPE(pvBits, paRVANames[i - 1], const char *)));
                 }
@@ -751 +754 @@
             i = (iEnd - iStart) / 2 + iStart;
             pszName = KLDRMODPE_RVA2TYPE(pvBits, paRVANames[i - 1], const char *);
-            diff = kLdrHlpStrComp(pszName, pszSymbol);
+            diff = kLdrHlpStrNComp(pszName, pchSymbol, cchSymbol);
+            if (!diff)
+                diff = pszName[cchSymbol] - 0;
             if (diff < 0)
                 iStart = i + 1;     /* The symbol must be after the current name. */
@@ -906 +911 @@
              * Now the rest is up to the callback (almost).
              */
-            rc = pfnGetForwarder(pModPE->pMod, iImpModule, iSymbol, pszSymbol, puValue, pfKind, pvUser);
+            rc = pfnGetForwarder(pModPE->pMod, iImpModule, iSymbol, pszSymbol, 
+                                 pszSymbol ? kLdrHlpStrLen(pszSymbol) : 0, NULL, puValue, pfKind, pvUser);
             if (!rc && pfKind)
                 *pfKind |= KLDRSYMKIND_FORWARDER;
@@ -972 +978 @@
         for (iName = 0; iName < cNames; iName++)
         {
+            const char *pszName;
             if (paOrdinals[iName] != iFunction)
                 continue;
             fFoundName = 1;
-            rc = pfnCallback(pMod, iFunction + pExpDir->Base, KLDRMODPE_RVA2TYPE(pvBits, paRVANames[iName], const char *),
+            pszName = KLDRMODPE_RVA2TYPE(pvBits, paRVANames[iName], const char *);
+            rc = pfnCallback(pMod, iFunction + pExpDir->Base, pszName, kLdrHlpStrLen(pszName), NULL,
                              uValue, fKind, pvUser);
             if (rc)
@@ -986 +994 @@
         if (!fFoundName)
         {
-            rc = pfnCallback(pMod, iFunction + pExpDir->Base, NULL, uValue, fKind, pvUser);
+            rc = pfnCallback(pMod, iFunction + pExpDir->Base, NULL, 0, NULL, uValue, fKind, pvUser);
             if (rc)
                 return rc;
@@ -1575 +1583 @@
             /* Ordinal or name import? */
             if (IMAGE_SNAP_BY_ORDINAL32(pThunk->u1.Ordinal))
-                rc = pfnGetImport(pMod, iImp, IMAGE_ORDINAL32(pThunk->u1.Ordinal), NULL, &Value, &fKind, pvUser);
+                rc = pfnGetImport(pMod, iImp, IMAGE_ORDINAL32(pThunk->u1.Ordinal), NULL, 0, NULL, &Value, &fKind, pvUser);
             else if (KLDRMODPE_VALID_RVA(pModPE, pThunk->u1.Ordinal))
             {
                 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, (const char *)pName->Name, &Value, &fKind, pvUser);
+                rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL, (const char *)pName->Name, 
+                                  kLdrHlpStrLen((const char *)pName->Name), NULL, &Value, &fKind, pvUser);
             }
             else
@@ -1640 +1649 @@
             /* Ordinal or name import? */
             if (IMAGE_SNAP_BY_ORDINAL64(pThunk->u1.Ordinal))
-                rc = pfnGetImport(pMod, iImp, (uint32_t)IMAGE_ORDINAL64(pThunk->u1.Ordinal), NULL, &Value, &fKind, pvUser);
+                rc = pfnGetImport(pMod, iImp, (uint32_t)IMAGE_ORDINAL64(pThunk->u1.Ordinal), NULL, 0, NULL, &Value, &fKind, pvUser);
             else if (KLDRMODPE_VALID_RVA(pModPE, pThunk->u1.Ordinal))
-                rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL,
-                                  KLDRMODPE_RVA2TYPE(pvMapping, pThunk->u1.Ordinal, const char *),
-                                  &Value, &fKind, pvUser);
+            {
+                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, (const char *)pName->Name, 
+                                  kLdrHlpStrLen((const char *)pName->Name), NULL, &Value, &fKind, pvUser);
+            }
             else
             {
@@ -1944 +1955 @@
     kldrModPEGetStackInfo,
     kldrModPEQueryMainEntrypoint,
+    NULL, /** @todo resources */
+    NULL, /** @todo resources */
     kldrModPEEnumDbgInfo,
     kldrModPEHasDbgInfo,
@@ -1958 +1971 @@
     kldrModPEGetBits,
     kldrModPERelocateBits,
+    NULL, /** @todo mostly done */
     42 /* the end */
 };