Changeset 511 for trunk/src/shell32/initterm.cpp

Timestamp:

Aug 16, 1999, 6:55:33 PM (26 years ago)

Author:

sandervl

Message:

Put back ctordtorinit/Term

File:

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

trunk/src/shell32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.4 1999-08-16 16:28:03 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.5 1999-08-16 16:55:33 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #define  INCL_DOSMODULEMGR
 #define  INCL_DOSPROCESS
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <stdlib.h>
 #include <stdio.h>
@@ -33 +33 @@
 #include <odin.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
+
+extern "C" {
+void CDECL _ctordtorInit( void );
+void CDECL _ctordtorTerm( void );
+}
+
+/*-------------------------------------------------------------------*/
+/* A clean up routine registered with DosExitList must be used if    */
+/* runtime calls are required and the runtime is dynamically linked. */
+/* This will guarantee that this clean up routine is run before the  */
+/* library DLL is terminated.                                        */
+/*-------------------------------------------------------------------*/
+static void APIENTRY cleanup(ULONG reason);
+
 
 /****************************************************************************/
@@ -56 +70 @@
    switch (ulFlag) {
       case 0 :
-         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
+         _ctordtorInit();
+
+         /*******************************************************************/
+         /* A DosExitList routine must be used to clean up if runtime calls */
+         /* are required and the runtime is dynamically linked.             */
+         /*******************************************************************/
+
+         rc = DosExitList(0x0000F000|EXLST_ADD, cleanup);
+         if(rc)
+                return 0UL;
+
          break;
       case 1 :
@@ -69 +93 @@
    return 1UL;
 }
+
+
+static void APIENTRY cleanup(ULONG ulReason)
+{
+   _ctordtorTerm();
+   DosExitList(EXLST_EXIT, cleanup);
+   return ;
+}