Changeset 35638 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jan 19, 2011 7:10:49 PM (14 years ago)

Author:

vboxsync

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

69546

Message:

Main. QT/FE: fix long standing COM issue

File:

• trunk/src/VBox/Main/glue/initterm.cpp (modified) (4 diffs)

trunk/src/VBox/Main/glue/initterm.cpp

@@ -247 +247 @@
  * @return S_OK on success and a COM result code in case of failure.
  */
-HRESULT Initialize()
+HRESULT Initialize(bool fGui)
 {
     HRESULT rc = E_FAIL;
@@ -253 +253 @@
 #if !defined(VBOX_WITH_XPCOM)
 
-    DWORD flags = COINIT_MULTITHREADED
+    /**
+      * We initialize COM in GUI thread in STA, to be compliant with QT and
+      * OLE requirments (for example to allow D&D), while other threads
+      * initialized in regular MTA. To allow fast proxyless access from
+      * GUI thread to COM objects, we explicitly provide our COM objects 
+      * with free threaded marshaller. 
+      * !!!!! Please think twice before touching this code !!!!! 
+      */
+    DWORD flags = fGui ? 
+                  COINIT_APARTMENTTHREADED
+                | COINIT_SPEED_OVER_MEMORY
+                :
+                  COINIT_MULTITHREADED
                 | COINIT_DISABLE_OLE1DDE
                 | COINIT_SPEED_OVER_MEMORY;
 
     rc = CoInitializeEx(NULL, flags);
-
-    /// @todo the below rough method of changing the apartment type doesn't
-    /// work on some systems for unknown reason (CoUninitialize() simply does
-    /// nothing there, or at least all 10 000 of subsequent CoInitializeEx()
-    /// continue to return RPC_E_CHANGED_MODE there). The problem on those
-    /// systems is related to the "Extend support for advanced text services
-    /// to all programs" checkbox in the advanced language settings dialog,
-    /// i.e. the problem appears when this checkbox is checked and disappears
-    /// if you clear it. For this reason, we disable the code below and
-    /// instead initialize COM in MTA as early as possible, before 3rd party
-    /// libraries we use have done so (i.e. Qt).
-# if 0
-    /* If we fail to set the necessary apartment model, it may mean that some
-     * DLL that was indirectly loaded by the process calling this function has
-     * already initialized COM on the given thread in an incompatible way
-     * which we can't leave with. Therefore, we try to fix this by using the
-     * brute force method: */
-
-    if (rc == RPC_E_CHANGED_MODE)
-    {
-        /* Before we use brute force, we need to check if we are in the
-         * neutral threaded apartment -- in this case there is no need to
-         * worry at all. */
-
-        rc = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-        if (rc == RPC_E_CHANGED_MODE)
-        {
-            /* This is a neutral apartment, reset the error */
-            rc = S_OK;
-
-            LogFlowFunc(("COM is already initialized in neutral threaded "
-                         "apartment mode,\nwill accept it.\n"));
-        }
-        else if (rc == S_FALSE)
-        {
-            /* balance the test CoInitializeEx above */
-            CoUninitialize();
-            rc = RPC_E_CHANGED_MODE;
-
-            LogFlowFunc(("COM is already initialized in single threaded "
-                         "apartment mode,\nwill reinitialize as "
-                         "multi threaded.\n"));
-
-            enum { MaxTries = 10000 };
-            int tries = MaxTries;
-            while (rc == RPC_E_CHANGED_MODE && tries --)
-            {
-                CoUninitialize();
-                rc = CoInitializeEx(NULL, flags);
-                if (rc == S_OK)
-                {
-                    /* We've successfully reinitialized COM; restore the
-                     * initialization reference counter */
-
-                    LogFlowFunc(("Will call CoInitializeEx() %d times.\n",
-                                 MaxTries - tries));
-
-                    while (tries ++ < MaxTries)
-                    {
-                        rc = CoInitializeEx(NULL, flags);
-                        Assert(rc == S_FALSE);
-                    }
-                }
-            }
-        }
-        else
-            AssertMsgFailed(("rc=%08X\n", rc));
-    }
-# endif
 
     /* the overall result must be either S_OK or S_FALSE (S_FALSE means
@@ -342 +285 @@
     else
         fRc = false;
+
+    if (fGui)
+           Assert(RTThreadIsMain(hSelf));
+
     if (!fRc)
     {
@@ -359 +306 @@
 
 #else /* !defined (VBOX_WITH_XPCOM) */
+
+     /* Unused here */
+    (void)fGui;
 
     if (ASMAtomicXchgBool(&gIsXPCOMInitialized, true) == true)