Changeset 4557 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 6, 2007 6:59:25 AM (17 years ago)

Author:

vboxsync

Message:

Main: Attempted to fix the CoInitializeEx race condition (#2304).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/COMDefs.cpp (modified) (1 diff)

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

@@ -90 +90 @@
     LogFlowFuncEnter();
 
-    HRESULT rc = S_OK;
-
-#if !defined (VBOX_WITH_XPCOM)
-
-    /* disable this damn CoInitialize* somehow made by Qt during
-     * creation of the QApplication instance (didn't explore deeply
-     * why does it do this) */
-    CoUninitialize();
-
-#endif /* !defined (VBOX_WITH_XPCOM) */
-
-    rc = com::Initialize();
+    /* Note: On Win32, Qt somehow calls CoInitialize[Ex]() during creation of
+     * the QApplication instance (didn't explore deeply why it does so) with
+     * different flags which is incompatible with our multithreaded
+     * apartment. com::Initialize() will properly care of this situation. */
+
+    HRESULT rc = com::Initialize();
 
 #if defined (VBOX_WITH_XPCOM)