Sync to Wine-20050524:

[reactos.git] / reactos / lib / ole32 / ole32_main.c

diff --git a/reactos/lib/ole32/ole32_main.c b/reactos/lib/ole32/ole32_main.c
index a258d19..8ba8d52 100644 (file)
--- a/reactos/lib/ole32/ole32_main.c
+++ b/reactos/lib/ole32/ole32_main.c
@@ -27,13 +27,11 @@
 #include "wingdi.h"\r
 #include "winuser.h"\r
 #include "winnls.h"\r
-#include "ole32_main.h"\r
+#include "objbase.h"\r
 #include "wine/debug.h"\r
 \r
 WINE_DEFAULT_DEBUG_CHANNEL(ole);\r
 \r
-HINSTANCE OLE32_hInstance = 0;\r
-\r
 /***********************************************************************\r
  *             OleMetafilePictFromIconAndLabel (OLE32.@)\r
  */\r
@@ -110,33 +108,3 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel,
 \r
        return hmem;\r
 }\r
-\r
-\r
-/***********************************************************************\r
- *             DllMain (OLE32.@)\r
- */\r
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)\r
-{\r
-    TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);\r
-\r
-    switch(fdwReason) {\r
-    case DLL_PROCESS_ATTACH:\r
-        OLE32_hInstance = hinstDLL;\r
-        COMPOBJ_InitProcess();\r
-       if (TRACE_ON(ole)) CoRegisterMallocSpy((LPVOID)-1);\r
-       break;\r
-\r
-    case DLL_PROCESS_DETACH:\r
-        if (TRACE_ON(ole)) CoRevokeMallocSpy();\r
-        COMPOBJ_UninitProcess();\r
-        OLE32_hInstance = 0;\r
-       break;\r
-\r
-    case DLL_THREAD_DETACH:\r
-        COM_TlsDestroy();\r
-        break;\r
-    }\r
-    return TRUE;\r
-}\r
-\r
-/* NOTE: DllRegisterServer and DllUnregisterServer are in regsvr.c */\r