Changeset 3909 in vbox

Timestamp:

Jul 27, 2007 5:09:06 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Delete VBoxEnumerateMediaEvents referencing COM objects from the message queue before uninitializing COM (to avoid crashes inside system DLLs on Win32).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (9 diffs)

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

@@ -498 +498 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-static bool vboxGlobal_inited = false;
-static bool vboxGlobal_cleanup = false;
+static bool sVBoxGlobalInited = false;
+static bool sVBoxGlobalInCleanup = false;
 
 /** @internal
@@ -510 +510 @@
 static void vboxGlobalCleanup()
 {
-    Assert (!vboxGlobal_cleanup);
-    vboxGlobal_cleanup = true;
+    Assert (!sVBoxGlobalInCleanup);
+    sVBoxGlobalInCleanup = true;
     vboxGlobal().cleanup();
 }
@@ -626 +626 @@
     static VBoxGlobal vboxGlobal_instance;
 
-    if (!vboxGlobal_inited)
+    if (!sVBoxGlobalInited)
     {
         /* check that a QApplication instance is created */
         if (qApp)
         {
-            vboxGlobal_inited = true;
+            sVBoxGlobalInited = true;
             vboxGlobal_instance.init();
             /* add our cleanup handler to the list of Qt post routines */
@@ -1449 +1449 @@
 
     /* ignore the request during application termination */
-    if (vboxGlobal_cleanup)
+    if (sVBoxGlobalInCleanup)
         return;
 
@@ -1487 +1487 @@
             VBoxMediaList::const_iterator it;
             for (it = mList.begin();
-                 it != mList.end() && !vboxGlobal_cleanup;
+                 it != mList.end() && !sVBoxGlobalInCleanup;
                  ++ it, ++ index)
             {
@@ -1551 +1551 @@
 
             /* post the last message to indicate the end of enumeration */
-            if (!vboxGlobal_cleanup)
+            if (!sVBoxGlobalInCleanup)
                 QApplication::postEvent (target, new VBoxEnumerateMediaEvent());
 
@@ -3404 +3404 @@
 {
     /* sanity check */
-    if (!vboxGlobal_cleanup)
+    if (!sVBoxGlobalInCleanup)
     {
         AssertMsgFailed (("Should never be called directly\n"));
@@ -3419 +3419 @@
     if (media_enum_thread)
     {
-        /* vboxGlobal_cleanup is true here, so just wait for the thread */
+        /* sVBoxGlobalInCleanup is true here, so just wait for the thread */
         media_enum_thread->wait();
         delete media_enum_thread;
@@ -3436 +3436 @@
     /* the last step to ensure we don't use COM any more */
     vbox.detach();
+
+    /* There may be VBoxEnumerateMediaEvent instances still in the message
+     * queue which reference COM objects. Remove them to release those objects
+     * before uninitializing the COM subsystem. */
+    QApplication::removePostedEvents (this);
 
     COMBase::cleanupCOM();