Changeset 8934 for trunk/src/gdi32/initterm.cpp

Timestamp:

Jul 29, 2002, 1:26:49 PM (23 years ago)

Author:

sandervl

Message:

Cleanup fixes (call ctordtorTerm in existlist handler)

File:

• trunk/src/gdi32/initterm.cpp (modified) (4 diffs)

trunk/src/gdi32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.20 2001-09-05 12:53:52 bird Exp $
+/* $Id: initterm.cpp,v 1.21 2002-07-29 11:26:49 sandervl Exp $
  *
  * DLL entry point
@@ -34 +34 @@
 #include <winconst.h>
 #include <odinlx.h>
-#include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
+#include <dbglog.h>
+#include "region.h"
+#include <initdll.h>
+#include <exitlist.h>
+
 #define DBG_LOCALLOG    DBG_initterm
 #include "dbglocal.h"
-#include "region.h"
-#include <initdll.h>
+
+
+/*-------------------------------------------------------------------*/
+/* 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);
 
 /****************************************************************************/
@@ -63 +74 @@
          ctordtorInit();
 
+         /*******************************************************************/
+         /* A DosExitList routine must be used to clean up if runtime calls */
+         /* are required and the runtime is dynamically linked.             */
+         /*******************************************************************/
+
+         rc = DosExitList(EXITLIST_GDI32|EXLST_ADD, cleanup);
+         if (rc)
+            return 0UL;
+
          return inittermGdi32(hModule, ulFlag);
 
@@ -79 +99 @@
 //******************************************************************************
 //******************************************************************************
+static void APIENTRY cleanup(ULONG ulReason)
+{
+    dprintf(("GDI32 exit"));
+    ctordtorTerm();
+
+    DosExitList(EXLST_EXIT, cleanup);
+    return ;
+}
+//******************************************************************************
+//******************************************************************************