Changeset 2891 for trunk/kLdr/kLdrMod.c

Timestamp:

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

Author:

bird

Message:

interface adjustment (in progress).

File:

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

trunk/kLdr/kLdrMod.c

@@ -238 +238 @@
  *                              KLDRMOD_BASEADDRESS_LINK and KLDRMOD_BASEADDRESS_MAP.
  * @param   iSymbol         The symbol ordinal. (optional)
- * @param   pszSymbol       The symbol name. (optional)
+ * @param   pchSymbol       The symbol name. (optional)
+ *                          Important, this doesn't have to be a null-terminated string.
+ * @param   cchSymbol       The length of the symbol name.
+ * @param   pszVersion      The symbol version. NULL if not versioned.
  * @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)
+ * @param   pfKind          On input one of the KLDRSYMKIND_REQ_* #defines.
+ *                          On output the symbol kind. (optional)
  */
 int     kLdrModQuerySymbol(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)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -255 +259 @@
         *puValue = 0;
     if (pfKind)
-        *pfKind = 0;
-    return pMod->pOps->pfnQuerySymbol(pMod, pvBits, BaseAddress, iSymbol, pszSymbol, pfnGetForwarder, pvUser, puValue, pfKind);
+        KLDRHLP_VALIDATE_FLAGS(*pfKind, KLDRSYMKIND_REQ_SEGMENTED);
+    return pMod->pOps->pfnQuerySymbol(pMod, pvBits, BaseAddress, iSymbol, pchSymbol, cchSymbol, pszVersion, 
+                                      pfnGetForwarder, pvUser, puValue, pfKind);
 }
 
@@ -379 +384 @@
 
 /**
+ * Queries info about a resource.
+ * 
+ * If there are multiple resources matching the criteria, the best or 
+ * first match will be return. 
+ * 
+ * 
+ * @returns 0 on success.
+ * @returns Whatever non-zero status returned by pfnCallback (enumeration was stopped).
+ * @returns non-zero kLdr or native status code on failure.
+ * 
+ * @param   pMod            The module.
+ * @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.
+ * @param   BaseAddress     The module base address to use when calculating the resource addresses.
+ *                          There are two special values that can be used:
+ *                              KLDRMOD_BASEADDRESS_LINK and KLDRMOD_BASEADDRESS_MAP.
+ * @param   idType          The resource type id to match if not NIL_KLDRMOD_RSRC_TYPE_ID.
+ * @param   pszType         The resource type name to match if no NULL.
+ * @param   idName          The resource name id to match if not NIL_KLDRMOD_RSRC_NAME_ID.
+ * @param   pszName         The resource name to match if not NULL.
+ * @param   idLang          The language id to match.
+ * @param   pfnCallback     The callback function.
+ * @param   pvUser          The user argument for the callback.
+ */
+int     kLdrModQueryResource(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t idType, const char *pszType,
+                             uint32_t idName, const char *pszName, uint32_t idLang, PKLDRADDR pAddrRsrc, size_t *pcbRsrc)
+{
+    KLDRMOD_VALIDATE(pMod);
+    if (!pAddrRsrc && !pcbRsrc)
+        return KLDR_ERR_INVALID_PARAMETER;
+    if (pAddrRsrc)
+        *pAddrRsrc = NIL_KLDRADDR;
+    if (pcbRsrc)
+        *pcbRsrc = 0;
+    return pMod->pOps->pfnQueryResource(pMod, pvBits, BaseAddress, idType, pszType, idName, pszName, idLang, pAddrRsrc, pcbRsrc);
+}
+
+
+/**
+ * Enumerates the resources matching the specfied criteria.
+ * 
+ * 
+ * @returns 0 on success.
+ * @returns Whatever non-zero status returned by pfnCallback (enumeration was stopped).
+ * @returns non-zero kLdr or native status code on failure.
+ * 
+ * @param   pMod            The module.
+ * @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.
+ * @param   BaseAddress     The module base address to use when calculating the resource addresses.
+ *                          There are two special values that can be used:
+ *                              KLDRMOD_BASEADDRESS_LINK and KLDRMOD_BASEADDRESS_MAP.
+ * @param   idType          The resource type id to match if not NIL_KLDRMOD_RSRC_TYPE_ID.
+ * @param   pszType         The resource type name to match if no NULL.
+ * @param   idName          The resource name id to match if not NIL_KLDRMOD_RSRC_NAME_ID.
+ * @param   pszName         The resource name to match if not NULL.
+ * @param   idLang          The language id to match.
+ * @param   pfnCallback     The callback function.
+ * @param   pvUser          The user argument for the callback.
+ */
+int     kLdrModEnumResources(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t idType, const char *pszType, 
+                             uint32_t idName, const char *pszName, uint32_t idLang, PFNKLDRENUMRSRC pfnCallback, void *pvUser)
+{
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnEnumResources(pMod, pvBits, BaseAddress, idType, pszType, idName, pszName, idLang, pfnCallback, pvUser);
+}
+
+
+/**
  * Enumerate the debug info formats contained in the executable image.
  *