Changeset 1473 in vbox for trunk/src/VBox

Timestamp:

Mar 14, 2007 3:00:01 PM (18 years ago)

Author:

vboxsync

Message:

Main: XPCOM: Initial implementation of auto-startable "out-of-proc" VirtualBox component (VBoxSVC).

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (1 diff)
• VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• VirtualBox/src/COMDefs.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -6086 +6086 @@
     ComPtr <ISession> session;
 
-    rc = virtualBox.createLocalObject (CLSID_VirtualBox,
-                                       "VirtualBoxServer");
+    rc = virtualBox.createLocalObject (CLSID_VirtualBox);
     if (FAILED(rc))
     {

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -833 +833 @@
     bool sessionOpened = false;
 
-    rc = virtualBox.createLocalObject (CLSID_VirtualBox,
-                                       "VirtualBoxServer");
+    rc = virtualBox.createLocalObject (CLSID_VirtualBox);
     if (FAILED(rc))
     {

trunk/src/VBox/Frontends/VirtualBox/src/COMDefs.cpp

@@ -195 +195 @@
 # endif
 
-                /* get the IPC service */
-                nsCOMPtr <ipcIService> ipcServ =
-                    do_GetService (IPC_SERVICE_CONTRACTID, serviceManager, &rc);
-                if (SUCCEEDED (rc))
-                {
-                    /* get the VirtualBox out-of-proc server ID */
-                    rc = ipcServ->ResolveClientName ("VirtualBoxServer",
-                                                     &gVBoxServerID);
-                    if (SUCCEEDED (rc))
-                    {
-                        /* get the DConnect service */
-                        rc = serviceManager->
-                            GetServiceByContractID (IPC_DCONNECTSERVICE_CONTRACTID,
-                                                    NS_GET_IID (ipcIDConnectService),
-                                                    (void **) &gDConnectService);
-                    }
-                }
+/// @todo remove the below code and corresponding variables etc. when
+/// the server autostart feature is finished and well tested.
+///
+//                /* get the IPC service */
+//                 nsCOMPtr <ipcIService> ipcServ =
+//                     do_GetService (IPC_SERVICE_CONTRACTID, serviceManager, &rc);
+//                 if (SUCCEEDED (rc))
+//                 {
+//                     /* get the VirtualBox out-of-proc server ID */
+//                     rc = ipcServ->ResolveClientName ("VirtualBoxServer",
+//                                                      &gVBoxServerID);
+//                     if (SUCCEEDED (rc))
+//                     {
+//                         /* get the DConnect service */
+//                         rc = serviceManager->
+//                             GetServiceByContractID (IPC_DCONNECTSERVICE_CONTRACTID,
+//                                                     NS_GET_IID (ipcIDConnectService),
+//                                                     (void **) &gDConnectService);
+//                     }
+//                 }
             }
         }
@@ -219 +222 @@
         cleanupCOM();
 
+    LogFlowFunc (("rc=%08X\n", rc));
     LogFlowFuncLeave();
     return rc;