Changeset 35722 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jan 26, 2011 4:37:16 PM (14 years ago)

Author:

vboxsync

Message:

Main: reworked listener objects creation, fixes Win problems with events, few cleanups

Location:

trunk/src/VBox/Main/src-server

Files:

• VirtualBoxImpl.cpp (modified) (2 diffs)
• win/svcmain.cpp (modified) (3 diffs)

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

@@ -4392 +4392 @@
 
     AssertReturn(pvUser, VERR_INVALID_POINTER);
+    
+    com::Initialize();
 
     // create an event queue for the current thread
@@ -4406 +4408 @@
 
     delete eventQ;
+
+    com::Shutdown();
+
 
     LogFlowFuncLeave();

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -20 +20 @@
 #include "VBox/com/defs.h"
 
+#include "VBox/com/com.h"
+
 #include "VBox/com/VirtualBox.h"
 
@@ -157 +159 @@
     lpCmdLine = GetCommandLine(); /* this line necessary for _ATL_MIN_CRT */
 
-#if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
-    HRESULT hRes = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-#else
-    HRESULT hRes = CoInitialize(NULL);
-#endif
+    HRESULT hRes = com::Initialize();
+
     _ASSERTE(SUCCEEDED(hRes));
     _Module.Init(ObjectMap, hInstance, &LIBID_VirtualBox);
@@ -277 +276 @@
 
     _Module.Term();
-    CoUninitialize();
+
+    com::Shutdown();
+
     Log(("SVCMAIN: Returning, COM server process ends.\n"));
     return nRet;