mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 22:47:28 +00:00
[SHELL32] - Revert r54404
svn path=/trunk/; revision=54413
This commit is contained in:
parent
88f0deaa71
commit
99f8b1fe06
|
@ -1377,6 +1377,11 @@ HINSTANCE shell32_hInstance;
|
|||
HIMAGELIST ShellSmallIconList = 0;
|
||||
HIMAGELIST ShellBigIconList = 0;
|
||||
|
||||
void *operator new (size_t, void *buf)
|
||||
{
|
||||
return buf;
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
* SHELL32 DllMain
|
||||
*
|
||||
|
@ -1388,6 +1393,12 @@ 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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue