Changeset 7761 in vbox

Timestamp:

Apr 5, 2008 6:32:54 PM (17 years ago)

Author:

vboxsync

Message:

Use RTLdrLoadAppSharedLib for VRDP and HGCM libraries.

Location:

trunk/src/VBox/Main

Files:

• ConsoleVRDPServer.cpp (modified) (2 diffs)
• hgcm/HGCM.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -1928 +1928 @@
 
 #ifdef VBOX_VRDP
-static int loadLibrary (const char *pszName, PRTLDRMOD phLdrMod)
-{
-    /* Load the specified library.
-     * If the full path is specified, only this path is used.
-     * If only library name is specified, then try to load it from:
-     *   - RTPathAppPrivateArch
-     *   - RTPathSharedLibs (legacy)
-     */
-    int rc = VERR_FILE_NOT_FOUND;
-
-    if (RTPathHavePath (pszName))
-    {
-        /* Path specified, respect it. */
-        rc = RTLdrLoad (pszName, phLdrMod);
-    }
-    else
-    {
-        /* Try default locations. */
-        int i;
-        for (i = 0;; i++)
-        {
-            char szBase[RTPATH_MAX];
-
-            /* Get the appropriate base path. */
-            if (i == 0)
-            {
-                rc = RTPathAppPrivateArch(szBase, sizeof (szBase));
-            }
-            else if (i == 1)
-            {
-                rc = RTPathSharedLibs(szBase, sizeof (szBase));
-            }
-            else
-            {
-                break;
-            }
-
-            if (RT_SUCCESS(rc))
-            {
-                char szPath[RTPATH_MAX];
-
-                /* szPath = pszBase + pszName */
-                rc = RTPathAbsEx(szBase, pszName, szPath, sizeof (szPath));
-
-                if (RT_SUCCESS(rc))
-                {
-                    rc = RTLdrLoad(szPath, phLdrMod);
-
-                    if (RT_SUCCESS(rc))
-                    {
-                        /* Successfully loaded a library. */
-                        LogFlow(("Library loaded: [%s]\n", szPath));
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return rc;
-}
-
 /* note: static function now! */
 bool ConsoleVRDPServer::loadVRDPLibrary (void)
@@ -1997 +1935 @@
     if (!mVRDPLibrary)
     {
-        rc = loadLibrary("VBoxVRDP", &mVRDPLibrary);
+        rc = RTLdrLoadAppSharedLib ("VBoxVRDP", &mVRDPLibrary);
 
         if (VBOX_SUCCESS(rc))

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -234 +234 @@
 
 
-static int loadLibrary (const char *pszName, PRTLDRMOD phLdrMod)
-{
-    /* Load the specified library.
-     * If the full path is specified, only this path is used.
-     * If only library name is specified, then try to load it from:
-     *   - RTPathAppPrivateArch
-     *   - RTPathSharedLibs (legacy)
-     */
-    int rc = VINF_SUCCESS;
-
-    if (RTPathHavePath (pszName))
-    {
-        /* Path specified, respect it. */
-        rc = RTLdrLoad (pszName, phLdrMod);
-    }
-    else
-    {
-        /* Try default locations. */
-        char szBase[RTPATH_MAX];
-
-        /* Get the appropriate base path. */
-        int i;
-        for (i = 0; i < 2; i++)
-        {
-            if (i == 0)
-            {
-                rc = RTPathAppPrivateArch(szBase, sizeof (szBase));
-            }
-            else
-            {
-                rc = RTPathSharedLibs(szBase, sizeof (szBase));
-            }
-
-            if (RT_SUCCESS(rc))
-            {
-                char szPath[RTPATH_MAX];
-
-                /* szPath = pszBase + pszName */
-                rc = RTPathAbsEx (szBase, pszName, szPath, sizeof (szPath));
-
-                if (RT_SUCCESS(rc))
-                {
-                    rc = RTLdrLoad (szPath, phLdrMod);
-
-                    if (RT_SUCCESS(rc))
-                    {
-                        /* Successfully loaded a library. */
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return rc;
-}
-
 /** Helper function to load a local service DLL.
  *
@@ -304 +247 @@
     }
 
-    int rc = VINF_SUCCESS;
-
-    rc = loadLibrary (m_pszSvcLibrary, &m_hLdrMod);
+    int rc = RTLdrLoadAppSharedLib (m_pszSvcLibrary, &m_hLdrMod);
 
     if (VBOX_SUCCESS(rc))