Changeset 6375 for trunk/src/ole32/initterm.cpp

Timestamp:

Jul 20, 2001, 5:42:38 PM (24 years ago)

Author:

sandervl

Message:

initterm update

File:

• trunk/src/ole32/initterm.cpp (modified) (2 diffs)

trunk/src/ole32/initterm.cpp

@@ -36 +36 @@
 #include <initdll.h>
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD _Resource_PEResTab;
-}
-static HMODULE dllHandle = 0;
-
-BOOL WINAPI OLE32_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad);
-//******************************************************************************
-//******************************************************************************
-BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
-{
-   switch (fdwReason)
-   {
-   case DLL_PROCESS_ATTACH:
-   case DLL_THREAD_ATTACH:
-   case DLL_THREAD_DETACH:
-        return OLE32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
-
-   case DLL_PROCESS_DETACH:
-        OLE32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
-        ctordtorTerm();
-        return TRUE;
-   }
-   return FALSE;
-}
 /****************************************************************************/
 /* _DLL_InitTerm is the function that gets called by the operating system   */
@@ -88 +63 @@
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab);
-         if(dllHandle == 0) 
-                return 0UL;
-
-         break;
+         return inittermOle32(hModule, ulFlag);
       }
       case 1 :
-         if(dllHandle) {
-                UnregisterLxDll(dllHandle);
-         }
+         inittermOle32(hModule, ulFlag);
+         ctordtorTerm();
          break;