Changeset 1013 in vbox

Timestamp:

Feb 21, 2007 5:09:53 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18868

Message:

FE/Qt: Fixed a segfault after showing the message box on startup when the VBoxSVC server is not running.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/COMDefs.cpp (modified) (11 diffs)

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

@@ -116 +116 @@
 HRESULT COMBase::initializeCOM()
 {
-    LogFlow (("COMBase::initializeCOM(): BEGIN\n"));
+    LogFlowFuncEnter();
 
 #if defined (Q_OS_WIN32)
 
-    // disable this damn CoInitialize* somehow made by Qt during creation of
-    // the QApplication instance (didn't explore deeply why does it do this)
+    /* disable this damn CoInitialize* somehow made by Qt during
+     * creation of the QApplication instance (didn't explore deeply
+     * why does it do this) */
     CoUninitialize();
-    CoInitializeEx (
-        NULL, COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE | COINIT_SPEED_OVER_MEMORY
-    );
-
-    LogFlow (("COMBase::initializeCOM(): END\n"));
+    CoInitializeEx (NULL, COINIT_MULTITHREADED |
+                          COINIT_DISABLE_OLE1DDE |
+                          COINIT_SPEED_OVER_MEMORY);
+
+    LogFlowFuncLeave();
     return S_OK;
 
@@ -134 +135 @@
     if (gComponentManager)
     {
-        LogFlow (("COMBase::initializeCOM(): END\n"));
+        LogFlowFuncLeave();
         return S_OK;
     }
@@ -143 +144 @@
     nsCOMPtr <nsIServiceManager> serviceManager;
 
-    // create a file object containing the path to the executable
+    /* create a file object containing the path to the executable */
     QCString appDir;
 #ifdef DEBUG
@@ -160 +161 @@
         if (SUCCEEDED( rc ))
         {
-            // initialize XPCOM and get the service manager
+            /* initialize XPCOM and get the service manager */
             rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager), fAppDir, nsnull);
         }
@@ -167 +168 @@
     if (SUCCEEDED (rc))
     {
-        // get the registrar
+        /* get the registrar */
         nsCOMPtr <nsIComponentRegistrar> registrar =
             do_QueryInterface (serviceManager, &rc);
         if (SUCCEEDED (rc))
         {
-            // autoregister components from a component directory
+            /* autoregister components from a component directory */
             registrar->AutoRegister (nsnull);
 
-            // get the component manager
+            /* get the component manager */
             rc = registrar->QueryInterface (NS_GET_IID (nsIComponentManager),
                                             (void**) &gComponentManager);
             if (SUCCEEDED (rc))
             {
-                // get the main thread's event queue (afaik, the dconnect service always
-                // gets created upon XPCOM startup, so it will use the main (this)
-                // thread's event queue to receive IPC events)
+                /* get the main thread's event queue (afaik, the
+                 * dconnect service always gets created upon XPCOM
+                 * startup, so it will use the main (this) thread's
+                 * event queue to receive IPC events) */
                 rc = NS_GetMainEventQ (&gEventQ);
 #ifdef DEBUG
@@ -193 +195 @@
 # endif
 
-                // get the IPC service
+                /* 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
+                    /* get the VirtualBox out-of-proc server ID */
                     rc = ipcServ->ResolveClientName ("VirtualBoxServer",
                                                      &gVBoxServerID);
                     if (SUCCEEDED (rc))
                     {
-                        // get the DConnect service
+                        /* get the DConnect service */
                         rc = serviceManager->
                             GetServiceByContractID (IPC_DCONNECTSERVICE_CONTRACTID,
@@ -217 +219 @@
         cleanupCOM();
 
-    LogFlow (("COMBase::initializeCOM(): END: rc=%08X\n", rc));
+    LogFlowFuncLeave();
     return rc;
 
@@ -228 +230 @@
 HRESULT COMBase::cleanupCOM()
 {
-    LogFlow (("COMBase::cleanupCOM(): BEGIN\n"));
+    LogFlowFuncEnter();
 
 #if defined (Q_OS_WIN32)
@@ -241 +243 @@
         if (isOnCurrentThread)
         {
-            LogFlow (("COMBase::cleanupCOM(): doing cleanup...\n"));
+            LogFlowFunc (("Doing cleanup...\n"));
 # if !defined (__DARWIN__) && !defined (__OS2__)
             if (gSocketListener)
@@ -247 +249 @@
 # endif
             if (gDConnectService)
+            {
                 gDConnectService->Release();
+                gDConnectService = nsnull;
+            }
             if (gEventQ)
+            {
                 gEventQ->Release();
+                gEventQ = nsnull;
+            }
             gComponentManager->Release();
+            gComponentManager = nsnull;
+            /* note: gComponentManager = nsnull indicates that we're
+             * cleaned up */
             NS_ShutdownXPCOM (nsnull);
             XPCOMGlueShutdown();
@@ -257 +268 @@
 #endif
 
-    LogFlow (("COMBase::cleanupCOM(): END\n"));
+    LogFlowFuncLeave();
     return S_OK;
 }