[NTDLL] Allow shimdata to override the process manifest.

[reactos.git] / dll / shellext / stobject / stobject.cpp

diff --git a/dll/shellext/stobject/stobject.cpp b/dll/shellext/stobject/stobject.cpp
index 3ba6c53..455bf70 100644 (file)
--- a/dll/shellext/stobject/stobject.cpp
+++ b/dll/shellext/stobject/stobject.cpp
@@ -1,19 +1,14 @@
 /*
  * PROJECT:     ReactOS system libraries
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dll\win32\stobject\stobject.cpp
+ * FILE:        dll/shellext/stobject/stobject.cpp
  * PURPOSE:     COM registration services for STobject.dll
  * PROGRAMMERS: Robert Naumann
- David Quintana <gigaherz@gmail.com>
+ *              David Quintana <gigaherz@gmail.com>
  */
 
 #include "precomp.h"
 
-#include <olectl.h>
-#include <atlwin.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(stobject);
-
 BEGIN_OBJECT_MAP(ObjectMap)
     OBJECT_ENTRY(CLSID_SysTray, CSysTray)
 END_OBJECT_MAP()
@@ -21,11 +16,6 @@ END_OBJECT_MAP()
 HINSTANCE  g_hInstance;
 CComModule g_Module;
 
-void *operator new (size_t, void *buf)
-{
-    return buf;
-}
-
 STDAPI_(BOOL)
 DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
@@ -34,12 +24,6 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
         g_hInstance = hinstDLL;
         DisableThreadLibraryCalls(g_hInstance);
 
-        /* HACK - the global constructors don't run, so I placement new them here */
-        new (&g_Module) CComModule;
-        new (&_AtlWinModule) CAtlWinModule;
-        new (&_AtlBaseModule) CAtlBaseModule;
-        new (&_AtlComModule) CAtlComModule;
-
         g_Module.Init(ObjectMap, g_hInstance, NULL);
     }
     else if (fdwReason == DLL_PROCESS_DETACH)