Changeset 60865 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 6, 2016 2:43:04 PM (9 years ago)

Author:

vboxsync

Message:

Never use static instances of CComModule as it messes up the log filename by using VBoxRT.dll before it's initialized.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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

@@ -180 +180 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifdef VBOX_WS_WIN
-/** ATL requires a module to be instantiated (set internal global variable).
- * @note Do NOT do this statically as it starts using IPRT before it's ready! */
-static ATL::CComModule *_Module;
-#endif
 
 /* static */
@@ -203 +198 @@
     /* Create instance: */
     new VBoxGlobal;
-#ifdef VBOX_WS_WIN
-    _Module = new ATL::CComModule;
-#endif
     /* Prepare instance: */
     m_spInstance->prepare();

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

@@ -362 +362 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char ** /*envp*/)
 {
+#ifdef RT_OS_WINDOWS
+    ATL::CComModule _Module; /* Required internally by ATL (constructor records instance in global variable). */
+#endif
+
     /* Failed result initially: */
     int iResultCode = 1;