Changeset 19081 in vbox for trunk/src/VBox

Timestamp:

Apr 21, 2009 2:17:41 PM (16 years ago)

Author:

vboxsync

Message:

Main/cbindings: VBOXXPCOMC::pfnComInitialize needs to know which interface versions to return, outlined the change.

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxXPCOMC.cpp (modified) (7 diffs)
• tstXPCOMCGlue.c (modified) (1 diff)
• xpcidl.xsl (modified) (1 diff)

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

@@ -77 +77 @@
 
 static void
-VBoxComInitialize(IVirtualBox **virtualBox, ISession **session)
+VBoxComInitialize(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox,
+                  const char *pszSessionIID, ISession **ppSession)
 {
     nsresult rc;
 
-    *session    = NULL;
-    *virtualBox = NULL;
-
-    Session     = *session;
-    Ivirtualbox = *virtualBox;
+    *ppSession    = NULL;
+    *ppVirtualBox = NULL;
+
+    /** @todo r=bird: what exactly is this supposed to acomplish? */
+    Session     = *ppSession;
+    Ivirtualbox = *ppVirtualBox;
 
     rc = com::Initialize();
     if (NS_FAILED(rc))
     {
-        Log(("Cbinding: XPCOM could not be initialized! rc=%Rhrc\n",rc));
+        Log(("Cbinding: XPCOM could not be initialized! rc=%Rhrc\n", rc));
         VBoxComUninitialize();
         return;
@@ -98 +100 @@
     if (NS_FAILED(rc))
     {
-        Log(("Cbinding: Could not get component manager! rc=%Rhrc\n",rc));
+        Log(("Cbinding: Could not get component manager! rc=%Rhrc\n", rc));
         VBoxComUninitialize();
         return;
@@ -106 +108 @@
     if (NS_FAILED(rc))
     {
-        Log(("Cbinding: Could not get xpcom event queue! rc=%Rhrc\n",rc));
+        Log(("Cbinding: Could not get xpcom event queue! rc=%Rhrc\n", rc));
         VBoxComUninitialize();
         return;
@@ -113 +115 @@
     rc = manager->CreateInstanceByContractID(NS_VIRTUALBOX_CONTRACTID,
                                              nsnull,
-                                             NS_GET_IID(IVirtualBox),
-                                             (void **)virtualBox);
+                                             NS_GET_IID(IVirtualBox), /** @todo Use pszVirtualBoxIID here! */
+                                             (void **)ppVirtualBox);
     if (NS_FAILED(rc))
     {
@@ -126 +128 @@
     rc = manager->CreateInstanceByContractID (NS_SESSION_CONTRACTID,
                                               nsnull,
-                                              NS_GET_IID(ISession),
-                                              (void **)session);
+                                              NS_GET_IID(ISession), /** @todo Use */
+                                              (void **)ppSession);
     if (NS_FAILED(rc))
     {
@@ -136 +138 @@
 
     Log(("Cbinding: ISession object created.\n"));
+}
+
+static void
+VBoxComInitializeV1(IVirtualBox **ppVirtualBox, ISession **ppSession)
+{
+    /* stub that always fails. */
+    *ppVirtualBox = NULL;
+    *ppSession = NULL;
 }
 
@@ -233 +243 @@
         VBoxVersion,
 
-        VBoxComInitialize,
+        VBoxComInitializeV1,
         VBoxComUninitialize,
 

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

@@ -326 +326 @@
     }
 
-    g_pVBoxFuncs->pfnComInitialize(&vbox, &session);
+    g_pVBoxFuncs->pfnComInitialize(IVIRTUALBOX_IID_STR, &vbox,
+                                   ISESSION_IID_STR, &session);
     if (vbox == NULL)
     {

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

@@ -960 +960 @@
     unsigned int (*pfnGetVersion)(void);
 
-    void  (*pfnComInitialize)(IVirtualBox **virtualBox, ISession **session);
-    void  (*pfnComUninitialize)(void);
+    void  (*pfnComInitialize)(const char *pszVirtualBoxIID,
+                              IVirtualBox **ppVirtualBox,
+                              const char *pszSessionIID,
+                              ISession **ppSession);
+    void (*pfnComUninitialize)(void);
 
     void  (*pfnComUnallocMem)(void *pv);