Author: rharabien
Date: Thu Nov 17 14:33:35 2011
New Revision: 54404
URL: http://svn.reactos.org/svn/reactos?rev=54404&view=rev
Log:
[SHELL32] - Remove a not needed hack
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_main.cpp?rev=54404&r1=54403&r2=54404&view=diff
==============================================================================
--- 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
14:33:35 2011
@@ -1377,11 +1377,6 @@
HIMAGELIST ShellSmallIconList = 0;
HIMAGELIST ShellBigIconList = 0;
-void *operator new (size_t, void *buf)
-{
- return buf;
-}
-
/*************************************************************************
* SHELL32 DllMain
*
@@ -1393,12 +1388,6 @@
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);
@@ -1448,7 +1437,7 @@
}
/***********************************************************************
- * DllRegisterServer (BROWSEUI.@)
+ * DllRegisterServer (SHELL32.@)
*/
STDAPI DllRegisterServer()
{
@@ -1463,7 +1452,7 @@
}
/***********************************************************************
- * DllUnregisterServer (BROWSEUI.@)
+ * DllUnregisterServer (SHELL32.@)
*/
STDAPI DllUnregisterServer()
{
