Changeset 17837 in vbox

Timestamp:

Mar 13, 2009 3:28:59 PM (16 years ago)

Author:

vboxsync

Message:

Cbinding: added a function to get vbox version.

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxXPCOMC.cpp (modified) (3 diffs)
• VBoxXPCOMCGlue.c (modified) (1 diff)
• xpcidl.xsl (modified) (1 diff)

trunk/src/VBox/Main/cbinding/VBoxXPCOMC.cpp

@@ -31 +31 @@
 #include "VBoxCAPI_v2_2.h"
 #include "VBox/com/com.h"
+#include "VBox/version.h"
 
 using namespace std;
@@ -143 +144 @@
 }
 
+uint32_t
+VBoxVersion(void)
+{
+    uint32_t version = 0;
+
+    version = (VBOX_VERSION_MAJOR * 1000 * 1000) + (VBOX_VERSION_MINOR * 1000) + (VBOX_VERSION_BUILD);
+
+    return version;
+}
 
 VBOXXPCOMC_DECL(PCVBOXXPCOM)
@@ -152 +162 @@
         sizeof(VBOXXPCOMC),
         VBOX_XPCOMC_VERSION,
+
+        VBoxVersion,
 
         VBoxComInitialize,

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

@@ -190 +190 @@
     if (g_hVBoxXPCOMC)
     {
-        dlclose(g_hVBoxXPCOMC);
+        /* VBoxRT.so doesn't like being reloaded and it asserts at:
+         * Expression: g_szrtProcExePath[0] != '\0'
+         * Location  : src/VBox/Runtime/r3/process.cpp(100) char* RTProcGetExecutableName(char*, size_t)
+         * so for time being not comment the following line
+         */
+        /* dlclose(g_hVBoxXPCOMC); */
         g_hVBoxXPCOMC = NULL;
     }

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

@@ -600 +600 @@
     /** The structure version. */
     unsigned uVersion;
+
+    unsigned int (*pfnGetVersion)(void);
+
     void  (*pfnComInitialize)(IVirtualBox **virtualBox, ISession **session);
     void  (*pfnComUninitialize)(void);