Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] - Revert r54404

Browse source 
svn path=/trunk/; revision=54413
This commit is contained in:
Rafal Harabien 2011-11-17 22:19:48 +00:00
parent 88f0deaa71
commit 99f8b1fe06
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/win32/shell32/shell32_main.cpp
View file

@ -1377,6 +1377,11 @@ HINSTANCE shell32_hInstance;
HIMAGELIST ShellSmallIconList = 0; HIMAGELIST ShellSmallIconList = 0;
HIMAGELIST ShellBigIconList = 0; HIMAGELIST ShellBigIconList = 0;
void *operator new (size_t, void *buf)
{
return buf;
}
/************************************************************************* /*************************************************************************
* SHELL32 DllMain * SHELL32 DllMain
* *
@ -1388,6 +1393,12 @@ STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad)
TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad);
if (dwReason == DLL_PROCESS_ATTACH) 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; shell32_hInstance = hInstance;
gModule.Init(ObjectMap, hInstance, NULL); gModule.Init(ObjectMap, hInstance, NULL);