ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] - Remove a not needed hack

Browse Source 
svn path=/trunk/; revision=54404
This commit is contained in:
Rafal Harabien
2011-11-17 14:33:35 +00:00
parent 602b5f5ddd
commit c09009c2be
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/shell32/shell32_main.cpp
+2 -13
View File
@@ -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()
{