From c09009c2be4248e65481ef2d06622ed01d5be818 Mon Sep 17 00:00:00 2001 From: Rafal Harabien Date: Thu, 17 Nov 2011 14:33:35 +0000 Subject: [PATCH] [SHELL32] - Remove a not needed hack svn path=/trunk/; revision=54404 --- reactos/dll/win32/shell32/shell32_main.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/reactos/dll/win32/shell32/shell32_main.cpp b/reactos/dll/win32/shell32/shell32_main.cpp index cd125a001c4..9577cf22cc5 100644 --- a/reactos/dll/win32/shell32/shell32_main.cpp +++ b/reactos/dll/win32/shell32/shell32_main.cpp @@ -1377,11 +1377,6 @@ HINSTANCE shell32_hInstance; HIMAGELIST ShellSmallIconList = 0; HIMAGELIST ShellBigIconList = 0; -void *operator new (size_t, void *buf) -{ - return buf; -} - /************************************************************************* * SHELL32 DllMain * @@ -1393,12 +1388,6 @@ STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) 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 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) } /*********************************************************************** - * DllRegisterServer (BROWSEUI.@) + * DllRegisterServer (SHELL32.@) */ STDAPI DllRegisterServer() { @@ -1463,7 +1452,7 @@ STDAPI DllRegisterServer() } /*********************************************************************** - * DllUnregisterServer (BROWSEUI.@) + * DllUnregisterServer (SHELL32.@) */ STDAPI DllUnregisterServer() {