Changeset 2854 for trunk/kLdr/kLdrMod.c

Timestamp:

Nov 3, 2006, 4:39:12 AM (19 years ago)

Author:

bird

Message:

Hacking away on the PE module interpreter.

File:

• trunk/kLdr/kLdrMod.c (modified) (5 diffs)

trunk/kLdr/kLdrMod.c

@@ -2 +2 @@
 /** @file
  *
- * kLdr - The Dynamic Loader, The module interpreter.
+ * kLdr - The Module Interpreter.
  *
  * Copyright (c) 2006 knut st. osmundsen <bird-kbuild-src@anduin.net>
@@ -262 +262 @@
  * @param   uSymbol         The symbol ordinal. (optional)
  * @param   pszSymbol       The symbol name. (optional)
+ * @param   pfnGetForwarder The callback to use when resolving a forwarder symbol. This is optional
+ *                          and if not specified KLDR_ERR_FORWARDER is returned instead.
+ * @param   pvUser          The user argument for the pfnGetForwarder callback.
  * @param   puValue         Where to store the symbol value. (optional)
  * @param   pfKind          Where to store the symbol kind. (optional)
  */
 int     kLdrModQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t uSymbol,
-                           const char *pszSymbol, PKLDRADDR puValue, uint32_t *pfKind)
+                           const char *pszSymbol, PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser,
+                           PKLDRADDR puValue, uint32_t *pfKind)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -275 +279 @@
     if (pfKind)
         *pfKind = 0;
-    return pMod->pOps->pfnDestroy(pMod);
+    return pMod->pOps->pfnQuerySymbol(pMod, pvBits, BaseAddress, uSymbol, pszSymbol, pfnGetForwarder, pvUser, puValue, pfKind);
 }
 
@@ -284 +288 @@
  * @returns 0 on success and non-zero a status code on failure.
  * @param   pMod            The module which symbols should be enumerated.
- * @param   fFlags          The enumeration flags. A combination of the KLDRMOD_ENUM_SYMS_FLAGS_* \#defines.
  * @param   pvBits          Optional pointer to bits returned by kLdrModGetBits() currently located at BaseAddress.
  *                          This can be used by some module interpreters to reduce memory consumption.
@@ -290 +293 @@
  *                          There are two special values that could be can:
  *                              KLDRMOD_BASEADDRESS_LINK and KLDRMOD_BASEADDRESS_MAP.
+ * @param   fFlags          The enumeration flags. A combination of the KLDRMOD_ENUM_SYMS_FLAGS_* \#defines.
  * @param   pfnCallback     The enumeration callback function.
  * @param   pvUser          The user argument to the callback function.
  */
-int     kLdrModEnumSymbols(PKLDRMOD pMod, uint32_t fFlags, const void *pvBits, KLDRADDR BaseAddress,
+int     kLdrModEnumSymbols(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t fFlags,
                            PFNKLDRMODENUMSYMS pfnCallback, void *pvUser)
 {
     KLDRMOD_VALIDATE(pMod);
     KLDRHLP_VALIDATE_FLAGS(fFlags, KLDRMOD_ENUM_SYMS_FLAGS_ALL);
-    return pMod->pOps->pfnEnumSymbols(pMod, fFlags, pvBits, BaseAddress, pfnCallback, pvUser);
+    return pMod->pOps->pfnEnumSymbols(pMod, pvBits, BaseAddress, fFlags, pfnCallback, pvUser);
 }