Changeset 6953 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Feb 14, 2008 2:35:14 PM (17 years ago)

Author:

vboxsync

Message:

HGCM tries to load service libs from specific locations (VBoxBFE).

File:

• trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp

@@ -30 +30 @@
 #include <iprt/critsect.h>
 #include <iprt/asm.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
 #include <iprt/ldr.h>
 #include <iprt/string.h>
@@ -231 +233 @@
 
 
+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
+     *   - default system LIBPATH.
+     */
+    int rc = VINF_SUCCESS;
+    
+    if (RTPathHavePath (pszName))
+    {
+        /* Path specified, respect it. */
+        rc = RTLdrLoad (pszName, phLdrMod);
+    }
+    else
+    {
+        if (strlen (pszName) >= RTPATH_MAX)
+        {
+            return VERR_FILENAME_TOO_LONG;
+        }
+    
+        /* Try default locations. */
+        char szBase[RTPATH_MAX];
+        
+        /* Get the appropriate base path. */
+        int i;
+        for (i = 0; i < 3; i++)
+        {
+            if (i == 0)
+            {
+                rc = RTPathAppPrivateArch(szBase, sizeof (szBase));
+            }
+            else if (i == 1)
+            {
+                rc = RTPathSharedLibs(szBase, sizeof (szBase));
+            }
+            else
+            {
+                szBase[0] = 0;
+                rc = VINF_SUCCESS;
+            }
+            
+            if (RT_SUCCESS(rc))
+            {
+                char szPath[RTPATH_MAX];
+        
+                /* szPath = pszBase + pszName */
+                if (szBase[0] != 0)
+                {
+                    rc = RTPathAbsEx (szBase, pszName, szPath, sizeof (szPath));
+                }
+                else
+                {
+                    strcpy (szPath, pszName);
+                }
+            
+                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.
@@ -247 +323 @@
     int rc = VINF_SUCCESS;
 
-    rc = RTLdrLoad (m_pszSvcLibrary, &m_hLdrMod);
+    rc = loadLibrary (m_pszSvcLibrary, &m_hLdrMod);
 
     if (VBOX_SUCCESS(rc))