1 files changed, 54 insertions, 27 deletions

diff --git a/src/VBox/Runtime/common/ldr/ldr.cpp b/src/VBox/Runtime/common/ldr/ldr.cpp
index fda1e437..218b4105 100644
--- a/src/VBox/Runtime/common/ldr/ldr.cpp
+++ b/src/VBox/Runtime/common/ldr/ldr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -40,14 +40,6 @@
 #include "internal/ldr.h"
 
 
-/**
- * Checks if a library is loadable or not.
- *
- * This may attempt load and unload the library.
- *
- * @returns true/false accordingly.
- * @param   pszFilename     Image filename.
- */
 RTDECL(bool) RTLdrIsLoadable(const char *pszFilename)
 {
     /*
@@ -65,15 +57,6 @@ RTDECL(bool) RTLdrIsLoadable(const char *pszFilename)
 RT_EXPORT_SYMBOL(RTLdrIsLoadable);
 
 
-/**
- * Gets the address of a named exported symbol.
- *
- * @returns iprt status code.
- * @param   hLdrMod         The loader module handle.
- * @param   pszSymbol       Symbol name.
- * @param   ppvValue        Where to store the symbol value. Note that this is restricted to the
- *                          pointer size used on the host!
- */
 RTDECL(int) RTLdrGetSymbol(RTLDRMOD hLdrMod, const char *pszSymbol, void **ppvValue)
 {
     LogFlow(("RTLdrGetSymbol: hLdrMod=%RTldrm pszSymbol=%p:{%s} ppvValue=%p\n",
@@ -110,15 +93,53 @@ RTDECL(int) RTLdrGetSymbol(RTLDRMOD hLdrMod, const char *pszSymbol, void **ppvVa
 RT_EXPORT_SYMBOL(RTLdrGetSymbol);
 
 
-/**
- * Closes a loader module handle.
- *
- * The handle can be obtained using any of the RTLdrLoad(), RTLdrOpen()
- * and RTLdrOpenBits() functions.
- *
- * @returns iprt status code.
- * @param   hLdrMod         The loader module handle.
- */
+RTDECL(PFNRT) RTLdrGetFunction(RTLDRMOD hLdrMod, const char *pszSymbol)
+{
+    PFNRT pfn;
+    int rc = RTLdrGetSymbol(hLdrMod, pszSymbol, (void **)&pfn);
+    if (RT_SUCCESS(rc))
+        return pfn;
+    return NULL;
+}
+RT_EXPORT_SYMBOL(RTLdrGetFunction);
+
+
+RTDECL(RTLDRFMT) RTLdrGetFormat(RTLDRMOD hLdrMod)
+{
+    AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), RTLDRFMT_INVALID);
+    PRTLDRMODINTERNAL pMod = (PRTLDRMODINTERNAL)hLdrMod;
+    return pMod->enmFormat;
+}
+RT_EXPORT_SYMBOL(RTLdrGetFormat);
+
+
+RTDECL(RTLDRTYPE) RTLdrGetType(RTLDRMOD hLdrMod)
+{
+    AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), RTLDRTYPE_INVALID);
+    PRTLDRMODINTERNAL pMod = (PRTLDRMODINTERNAL)hLdrMod;
+    return pMod->enmType;
+}
+RT_EXPORT_SYMBOL(RTLdrGetType);
+
+
+RTDECL(RTLDRENDIAN) RTLdrGetEndian(RTLDRMOD hLdrMod)
+{
+    AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), RTLDRENDIAN_INVALID);
+    PRTLDRMODINTERNAL pMod = (PRTLDRMODINTERNAL)hLdrMod;
+    return pMod->enmEndian;
+}
+RT_EXPORT_SYMBOL(RTLdrGetEndian);
+
+
+RTDECL(RTLDRARCH) RTLdrGetArch(RTLDRMOD hLdrMod)
+{
+    AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), RTLDRARCH_INVALID);
+    PRTLDRMODINTERNAL pMod = (PRTLDRMODINTERNAL)hLdrMod;
+    return pMod->enmArch;
+}
+RT_EXPORT_SYMBOL(RTLdrGetArch);
+
+
 RTDECL(int) RTLdrClose(RTLDRMOD hLdrMod)
 {
     LogFlow(("RTLdrClose: hLdrMod=%RTldrm\n", hLdrMod));
@@ -137,6 +158,12 @@ RTDECL(int) RTLdrClose(RTLDRMOD hLdrMod)
     AssertRC(rc);
     pMod->eState = LDR_STATE_INVALID;
     pMod->u32Magic++;
+    if (pMod->pReader)
+    {
+        rc = pMod->pReader->pfnDestroy(pMod->pReader);
+        AssertRC(rc);
+        pMod->pReader = NULL;
+    }
     RTMemFree(pMod);
 
     LogFlow(("RTLdrClose: returns VINF_SUCCESS\n"));