Changeset 17570 in vbox for trunk

Timestamp:

Mar 9, 2009 12:37:00 PM (16 years ago)

Author:

vboxsync

Message:

VBoxCGlueTerm and VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME fixes.

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxXPCOMCGlue.c (modified) (5 diffs)
• xpcidl.xsl (modified) (1 diff)

trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c

@@ -122 +122 @@
             sprintf(g_szVBoxErrMsg, "dlsym(%.80s/%.32s): %128s",
                     pszBuf, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror());
+        if (rc != 0)
+            dlclose(g_hVBoxXPCOMC);
+        g_hVBoxXPCOMC = NULL;
     }
     else
@@ -147 +150 @@
      * If the user specifies the location, try only that.
      */
-
     const char *pszHome = getenv("VBOX_APP_HOME");
     if (pszHome)
@@ -155 +157 @@
      * Try the known standard locations.
      */
-
 #if defined(__gnu__linux__) || defined(__linux__)
     if (tryLoadOne("/opt/VirtualBox", pszMsgPrefix) == 0)
@@ -176 +177 @@
      * Finally try the dynamic linker search path.
      */
-
     if (tryLoadOne(NULL, pszMsgPrefix) == 0)
         return 0;
@@ -192 +192 @@
 void VBoxCGlueTerm(void)
 {
-    /* later */
+    if (g_hVBoxXPCOMC)
+    {
+        dlclose(g_hVBoxXPCOMC);
+        g_hVBoxXPCOMC = NULL;
+    }
+    g_pVBoxFuncs = NULL;
 }
 

trunk/src/VBox/Main/cbinding/xpcidl.xsl

@@ -603 +603 @@
 
 /** The symbol name of VBoxGetXPCOMCFunctions. */
-#if defined(__APPLE__) || defined(__OS2__)
+#if defined(__OS2__)
 # define VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME   "_VBoxGetXPCOMCFunctions"
 #else