Changeset 36439 in vbox for trunk

Timestamp:

Mar 25, 2011 4:19:12 PM (14 years ago)

Author:

vboxsync

Message:

Init COM for all EMTS and PDMThreads.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• include/VirtualBoxBase.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (5 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -591 +591 @@
 
     static DECLCALLBACK(int)    vmm2User_SaveState(PCVMM2USERMETHODS pThis, PUVM pUVM);
+    static DECLCALLBACK(void)   vmm2User_NotifyEmtInit(PCVMM2USERMETHODS pThis, PUVM pUVM, PUVMCPU pUVCpu);
     static DECLCALLBACK(void)   vmm2User_NotifyEmtTerm(PCVMM2USERMETHODS pThis, PUVM pUVM, PUVMCPU pUVCpu);
+    static DECLCALLBACK(void)   vmm2User_NotifyPdmtInit(PCVMM2USERMETHODS pThis, PUVM pUVM);
     static DECLCALLBACK(void)   vmm2User_NotifyPdmtTerm(PCVMM2USERMETHODS pThis, PUVM pUVM);
 

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -754 +754 @@
     HRESULT setErrorNoLog(HRESULT aResultCode, const char *pcsz, ...);
 
+
+    /** Initialize COM for a new thread. */
+    static HRESULT initializeComForThread(void)
+    {
+#ifndef VBOX_WITH_XPCOM
+        HRESULT hrc = CoInitializeEx(NULL, COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE | COINIT_SPEED_OVER_MEMORY);
+        AssertComRCReturn(hrc, hrc);
+#endif
+        return S_OK;
+    }
+
+    /** Uninitializes COM for a dying thread. */
+    static void uninitializeComForThread(void)
+    {
+#ifndef VBOX_WITH_XPCOM
+        CoUninitialize();
+#endif
+    }
+
+
 private:
 

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -397 +397 @@
     pVmm2UserMethods->u32Version        = VMM2USERMETHODS_VERSION;
     pVmm2UserMethods->pfnSaveState      = Console::vmm2User_SaveState;
-    pVmm2UserMethods->pfnNotifyEmtInit  = NULL;
+    pVmm2UserMethods->pfnNotifyEmtInit  = Console::vmm2User_NotifyEmtInit;
     pVmm2UserMethods->pfnNotifyEmtTerm  = Console::vmm2User_NotifyEmtTerm;
-    pVmm2UserMethods->pfnNotifyPdmtInit = NULL;
+    pVmm2UserMethods->pfnNotifyPdmtInit = Console::vmm2User_NotifyPdmtInit;
     pVmm2UserMethods->pfnNotifyPdmtTerm = Console::vmm2User_NotifyPdmtTerm;
     pVmm2UserMethods->u32EndMagic       = VMM2USERMETHODS_MAGIC;
@@ -7823 +7823 @@
     AssertReturn(!task->mProgress.isNull(), VERR_INVALID_PARAMETER);
 
-#if defined(RT_OS_WINDOWS)
-    {
-        /* initialize COM */
-        HRESULT hrc = CoInitializeEx(NULL,
-                                     COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE |
-                                     COINIT_SPEED_OVER_MEMORY);
-        LogFlowFunc(("CoInitializeEx()=%Rhrc\n", hrc));
-    }
-#endif
+    VirtualBoxBase::initializeComForThread();
 
     HRESULT rc = S_OK;
@@ -8810 +8802 @@
 
 /**
+ * @interface_method_impl{VMM2USERMETHODS,pfnNotifyEmtInit}
+ */
+/*static*/ DECLCALLBACK(void)
+Console::vmm2User_NotifyEmtInit(PCVMM2USERMETHODS pThis, PUVM pUVM, PUVMCPU pUVCpu)
+{
+    NOREF(pThis); NOREF(pUVM); NOREF(pUVCpu);
+    VirtualBoxBase::initializeComForThread();
+}
+
+/**
  * @interface_method_impl{VMM2USERMETHODS,pfnNotifyEmtTerm}
  */
@@ -8816 +8818 @@
 {
     NOREF(pThis); NOREF(pUVM); NOREF(pUVCpu);
-#ifdef RT_OS_WINDOWS
-    CoUninitialize();
-#endif
+    VirtualBoxBase::uninitializeComForThread();
+}
+
+/**
+ * @interface_method_impl{VMM2USERMETHODS,pfnNotifyPdmtInit}
+ */
+/*static*/ DECLCALLBACK(void)
+Console::vmm2User_NotifyPdmtInit(PCVMM2USERMETHODS pThis, PUVM pUVM)
+{
+    NOREF(pThis); NOREF(pUVM);
+    VirtualBoxBase::initializeComForThread();
 }
 
@@ -8828 +8838 @@
 {
     NOREF(pThis); NOREF(pUVM);
-#ifdef RT_OS_WINDOWS
-    CoUninitialize();
-#endif
+    VirtualBoxBase::uninitializeComForThread();
 }
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -585 +585 @@
 {
     LogFlowFuncEnter();
-
-#if !defined(VBOX_WITH_XPCOM)
-    {
-        /* initialize COM */
-        HRESULT hrc = CoInitializeEx(NULL,
-                                     COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE |
-                                     COINIT_SPEED_OVER_MEMORY);
-        LogFlow(("Console::configConstructor(): CoInitializeEx()=%08X\n", hrc));
-        AssertComRCReturn(hrc, VERR_GENERAL_FAILURE);
-    }
-#endif
 
     AssertReturn(pvConsole, VERR_GENERAL_FAILURE);

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -3955 +3955 @@
     size_t cntSpawned = 0;
 
+    VirtualBoxBase::initializeComForThread();
+
 #if defined(RT_OS_WINDOWS)
 
-    HRESULT hrc = CoInitializeEx(NULL,
-                                 COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE |
-                                 COINIT_SPEED_OVER_MEMORY);
-    AssertComRC(hrc);
+    HRESULT hrc;
 
     /// @todo (dmik) processes reaping!
@@ -4413 +4412 @@
 #endif
 
+    VirtualBoxBase::uninitializeComForThread();
     LogFlowFuncLeave();
     return 0;