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

Timestamp:

May 6, 2016 2:05:29 PM (9 years ago)

Author:

vboxsync

Message:

QtGui: Don't statically instantiate CComModule, it will start using IPRT before we've initialized it! (At least in non-hardened builds.)

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (2 diffs)

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

@@ -181 +181 @@
 
 #ifdef VBOX_WS_WIN
-/* Make sure that ATL is usable in this linking namespace. */
-static ATL::CComModule _Module;
-#endif /* 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 */
@@ -202 +203 @@
     /* Create instance: */
     new VBoxGlobal;
+#ifdef VBOX_WS_WIN
+    _Module = new ATL::CComModule;
+#endif
     /* Prepare instance: */
     m_spInstance->prepare();