Changeset 5130 for trunk/src/riched32/initterm.cpp

Timestamp:

Feb 14, 2001, 12:41:04 PM (25 years ago)

Author:

sandervl

Message:

initterm call fixes

File:

• trunk/src/riched32/initterm.cpp (modified) (5 diffs)

trunk/src/riched32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.2 2000-08-11 10:56:24 sandervl Exp $ */
-
 /*
  * DLL entry point
@@ -37 +35 @@
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
 #include <twain.h>
+#include <initdll.h>
 
 extern "C" {
-void CDECL _ctordtorInit( void );
-void CDECL _ctordtorTerm( void );
-
 //Win32 resource table (produced by wrc)
 extern DWORD _Resource_PEResTab;
@@ -52 +48 @@
 //******************************************************************************
 BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
-{
+{ 
+ BOOL ret;
+
    switch (fdwReason)
    {
@@ -63 +61 @@
 
    case DLL_PROCESS_DETACH:
-        _ctordtorTerm();
-        return RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
+        ret = RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
+        __ctordtorTerm();
+        return ret;
    }
    return FALSE;
@@ -91 +90 @@
    switch (ulFlag) {
       case 0 :
-         _ctordtorInit();
+         __ctordtorInit();
 
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/