Changeset 52213 in vbox for trunk/include/iprt

Timestamp:

Jul 28, 2014 5:52:58 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95276

Message:

SUP,IPRT: Implemented forwarder support in RTLdr and cleaned up some the ordinal mess. Resolved imports when doing the process verification/purification runs other than SUPHARDNTVPKIND_CHILD_PURIFICATION. This is necessary since 32-bit windows combine .text with .rdata, and we don't want to overwrite the import table after it has been snapped. Include read-only sections in the verfication runs.

Location:

trunk/include/iprt

Files:

• err.h (modified) (1 diff)
• ldr.h (modified) (4 diffs)
• mangling.h (modified) (1 diff)

trunk/include/iprt/err.h

@@ -2162 +2162 @@
 /** Image hash mismatch. */
 #define VERR_LDRVI_IMAGE_HASH_MISMATCH              (-22929)
+
+/** Cannot resolve symbol because it's a forwarder. */
+#define VERR_LDR_FORWARDER                          (-22950)
+/** The symbol is not a forwarder. */
+#define VERR_LDR_NOT_FORWARDER                      (-22951)
+/** Malformed forwarder entry. */
+#define VERR_LDR_BAD_FORWARDER                      (-22952)
+/** Too long forwarder chain or there is a loop. */
+#define VERR_LDR_FORWARDER_CHAIN_TOO_LONG           (-22953)
+/** Support for forwarders has not been implemented. */
+#define VERR_LDR_FORWARDERS_NOT_SUPPORTED           (-22954)
 /** @} */
 

trunk/include/iprt/ldr.h

@@ -472 +472 @@
  *
  * @returns iprt status code.
+ * @retval  VERR_LDR_FORWARDER forwarder, use pfnQueryForwarderInfo. Buffer size
+ *          hint in @a ppvValue.
  * @param   hLdrMod         The loader module handle.
  * @param   pszSymbol       Symbol name.
@@ -487 +489 @@
  *
  * @returns iprt status code.
+ * @retval  VERR_LDR_FORWARDER forwarder, use pfnQueryForwarderInfo. Buffer size
+ *          hint in @a pValue.
  * @param   hLdrMod         The loader module handle.
  * @param   pvBits          Optional pointer to the loaded image.
@@ -493 +497 @@
  * @param   BaseAddress     Image load address.
  *                          Not supported for RTLdrLoad() images.
+ * @param   iOrdinal        Symbol ordinal number, pass UINT32_MAX if pszSymbol
+ *                          should be used instead.
  * @param   pszSymbol       Symbol name.
  * @param   pValue          Where to store the symbol value.
  */
-RTDECL(int) RTLdrGetSymbolEx(RTLDRMOD hLdrMod, const void *pvBits, RTLDRADDR BaseAddress, const char *pszSymbol,
-                             PRTLDRADDR pValue);
-
+RTDECL(int) RTLdrGetSymbolEx(RTLDRMOD hLdrMod, const void *pvBits, RTLDRADDR BaseAddress,
+                             uint32_t iOrdinal, const char *pszSymbol, PRTLDRADDR pValue);
 
 /**
@@ -511 +516 @@
  */
 RTDECL(PFNRT) RTLdrGetFunction(RTLDRMOD hLdrMod, const char *pszSymbol);
+
+/**
+ * Information about an imported symbol.
+ */
+typedef struct RTLDRIMPORTINFO
+{
+    /** Symbol table entry number, UINT32_MAX if not available. */
+    uint32_t        iSelfOrdinal;
+    /** The ordinal of the imported symbol in szModule, UINT32_MAX if not used. */
+    uint32_t        iOrdinal;
+    /** The symbol name, NULL if not used.  This points to the char immediately
+     *  following szModule when returned by RTLdrQueryForwarderInfo. */
+    const char     *pszSymbol;
+    /** The name of the module being imported from. */
+    char            szModule[1];
+} RTLDRIMPORTINFO;
+/** Pointer to information about an imported symbol. */
+typedef RTLDRIMPORTINFO *PRTLDRIMPORTINFO;
+/** Pointer to const information about an imported symbol. */
+typedef RTLDRIMPORTINFO const *PCRTLDRIMPORTINFO;
+
+/**
+ * Query information about a forwarded symbol.
+ *
+ * @returns IPRT status code.
+ * @param   hLdrMod         The loader module handle.
+ * @param   pvBits          Optional pointer to the loaded image.
+ *                          Set this to NULL if no RTLdrGetBits() processed image bits are available.
+ *                          Not supported for RTLdrLoad() images.
+ * @param   iOrdinal        Symbol ordinal number, pass UINT32_MAX if pszSymbol
+ *                          should be used instead.
+ * @param   pszSymbol       Symbol name.
+ * @param   pInfo           Where to return the forwarder info.
+ * @param   cbInfo          Size of the buffer @a pInfo points to.  For a size
+ *                          hint, see @a pValue when RTLdrGetSymbolEx returns
+ *                          VERR_LDR_FORWARDER.
+ */
+RTDECL(int) RTLdrQueryForwarderInfo(RTLDRMOD hLdrMod, const void *pvBits, uint32_t iOrdinal, const char *pszSymbol,
+                                    PRTLDRIMPORTINFO pInfo, size_t cbInfo);
+
 
 /**

trunk/include/iprt/mangling.h

@@ -691 +691 @@
 # define RTLdrRelocate                                  RT_MANGLER(RTLdrRelocate)
 # define RTLdrRvaToSegOffset                            RT_MANGLER(RTLdrRvaToSegOffset)
+# define RTLdrQueryForwarderInfo                        RT_MANGLER(RTLdrQueryForwarderInfo)
 # define RTLdrQueryProp                                 RT_MANGLER(RTLdrQueryProp)
 # define RTLdrSegOffsetToRva                            RT_MANGLER(RTLdrSegOffsetToRva)