Changeset 7257 in vbox

Timestamp:

Mar 4, 2008 6:26:33 AM (17 years ago)

Author:

vboxsync

Message:

Load VRDP library from the vbox path.

File:

• trunk/src/VBox/Main/ConsoleVRDPServer.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -26 +26 @@
 #include <iprt/asm.h>
 #include <iprt/ldr.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
 #include <iprt/alloca.h>
 
@@ -1926 +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)
@@ -1933 +1997 @@
     if (!mVRDPLibrary)
     {
-        rc = RTLdrLoad("VBoxVRDP", &mVRDPLibrary);
+        rc = loadLibrary("VBoxVRDP", &mVRDPLibrary);
 
         if (VBOX_SUCCESS(rc))