Changeset 46593 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jun 17, 2013 2:32:51 PM (12 years ago)

Author:

vboxsync

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

86471

Message:

updates

Location:

trunk/src/VBox/Runtime/common

Files:

• ldr/ldr.cpp (modified) (1 diff)
• ldr/ldrNative.cpp (modified) (6 diffs)
• misc/thread.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/ldr/ldr.cpp

@@ -94 +94 @@
 
 
+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)
 {

trunk/src/VBox/Runtime/common/ldr/ldrNative.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -63 +63 @@
  * Operations for a native module.
  */
-static const RTLDROPS s_rtldrNativeOps =
+static const RTLDROPS g_rtldrNativeOps =
 {
     "native",
@@ -131 +131 @@
         pMod->Core.u32Magic     = RTLDRMOD_MAGIC;
         pMod->Core.eState       = LDR_STATE_LOADED;
-        pMod->Core.pOps         = &s_rtldrNativeOps;
+        pMod->Core.pOps         = &g_rtldrNativeOps;
         pMod->Core.pReader      = NULL;
         pMod->Core.enmFormat    = RTLDRFMT_NATIVE;
@@ -148 +148 @@
 #endif
         pMod->hNative           = ~(uintptr_t)0;
+        pMod->fFlags            = fFlags;
 
         /*
@@ -171 +172 @@
 
 
+RTDECL(int) RTLdrLoadSystem(const char *pszFilename, bool fNoUnload, PRTLDRMOD phLdrMod)
+{
+    LogFlow(("RTLdrLoadSystem: pszFilename=%p:{%s} fNoUnload=%RTbool phLdrMod=%p\n",
+             pszFilename, pszFilename, fNoUnload, phLdrMod));
+
+    /*
+     * Validate input.
+     */
+    AssertPtrReturn(phLdrMod, VERR_INVALID_PARAMETER);
+    *phLdrMod = NIL_RTLDRMOD;
+    AssertPtrReturn(pszFilename, VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!RTPathHavePath(pszFilename), ("%s\n", pszFilename), VERR_INVALID_PARAMETER);
+
+    /*
+     * Check the filename.
+     */
+    size_t cchFilename = strlen(pszFilename);
+    AssertMsgReturn(cchFilename < (RTPATH_MAX / 4) * 3, ("%zu\n", cchFilename), VERR_INVALID_PARAMETER);
+
+    const char *pszExt = "";
+    if (!RTPathHaveExt(pszFilename))
+        pszExt = RTLdrGetSuff();
+
+    /*
+     * Let the platform specific code do the rest.
+     */
+    int rc = rtldrNativeLoadSystem(pszFilename, pszExt, fNoUnload ? RTLDRLOAD_FLAGS_NO_UNLOAD : 0, phLdrMod);
+    LogFlow(("RTLdrLoadSystem: returns %Rrc\n", rc));
+    return rc;
+}
+
+
+RTDECL(void *) RTLdrGetSystemSymbol(const char *pszFilename, const char *pszSymbol)
+{
+    void    *pvRet = NULL;
+    RTLDRMOD hLdrMod;
+    int rc = RTLdrLoadSystem(pszFilename, true /*fNoUnload*/, &hLdrMod);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTLdrGetSymbol(hLdrMod, pszSymbol, &pvRet);
+        if (RT_FAILURE(rc))
+            pvRet = NULL; /* paranoia */
+        RTLdrClose(hLdrMod);
+    }
+    return pvRet;
+}
+
+
 /**
  * Loads a dynamic load library (/shared object) image file residing in the
@@ -258 +307 @@
 RT_EXPORT_SYMBOL(RTLdrGetSuff);
 
+
+RTDECL(uintptr_t) RTLdrGetNativeHandle(RTLDRMOD hLdrMod)
+{
+    PRTLDRMODNATIVE pThis = (PRTLDRMODNATIVE)hLdrMod;
+    AssertPtrReturn(pThis, ~(uintptr_t)0);
+    AssertReturn(pThis->Core.u32Magic == RTLDRMOD_MAGIC, ~(uintptr_t)0);
+    AssertReturn(pThis->Core.pOps == &g_rtldrNativeOps, ~(uintptr_t)0);
+    return pThis->hNative;
+}
+RT_EXPORT_SYMBOL(RTLdrGetNativeHandle);
+

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -184 +184 @@
     return rc;
 }
+
+
+#ifdef IN_RING3
+/**
+ * Called when IPRT was first initialized in unobtrusive mode and later changed
+ * to obtrustive.
+ *
+ * This is only applicable in ring-3.
+ */
+DECLHIDDEN(void) rtThreadReInitObtrusive(void)
+{
+    rtThreadNativeReInitObtrusive();
+}
+#endif