[ros-diffs] [rharabien] 54413: [SHELL32] - Revert r54404

Author: rharabien
Date: Thu Nov 17 22:19:48 2011
New Revision: 54413

URL: http://svn.reactos.org/svn/reactos?rev=54413&view=rev
Log:
[SHELL32] - Revert r54404

Modified:
    trunk/reactos/dll/win32/shell32/shell32_main.cpp

Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Thu Nov 17 22:19:48
2011
@@ -1377,6 +1377,11 @@
 HIMAGELIST   ShellSmallIconList = 0;
 HIMAGELIST   ShellBigIconList = 0;
 
+void *operator new (size_t, void *buf)
+{
+    return buf;
+}
+
 /*************************************************************************
  * SHELL32 DllMain
  *
@@ -1388,6 +1393,12 @@
     TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad);
     if (dwReason == DLL_PROCESS_ATTACH)
     {
+        /* HACK - the global constructors don't run, so I placement new them here */
+        new (&gModule) CShell32Module;
+        new (&_AtlWinModule) CAtlWinModule;
+        new (&_AtlBaseModule) CAtlBaseModule;
+        new (&_AtlComModule) CAtlComModule;
+
         shell32_hInstance = hInstance;
         gModule.Init(ObjectMap, hInstance, NULL);