Changeset 5326 for trunk/src/ddraw/initterm.cpp

Timestamp:

Mar 18, 2001, 10:44:46 PM (24 years ago)

Author:

mike

Message:

Merged DDRAW and DDRAW\NEW

File:

• trunk/src/ddraw/initterm.cpp (modified) (7 diffs)

trunk/src/ddraw/initterm.cpp

@@ -33 +33 @@
 #include <winconst.h>
 #include <odinlx.h>
+#include <exitlist.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
 #include <initdll.h>
+#include "os2fsdd.h"    // For RestorePM()
+
 
 extern "C" {
@@ -44 +47 @@
 static HMODULE dllHandle = 0;
 
+static void APIENTRY cleanup(ULONG ulReason);
+
 //******************************************************************************
 //******************************************************************************
-BOOL WINAPI OdinLibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
    switch (fdwReason)
@@ -58 +63 @@
 
    case DLL_PROCESS_DETACH:
+#ifdef __IBMCPP__
         ctordtorTerm();
+#endif
         return TRUE;
    }
@@ -71 +78 @@
 /* calling this function.                                                   */
 /****************************************************************************/
-ULONG DLLENTRYPOINT_CCONV DLLENTRYPOINT_NAME(ULONG hModule, ULONG ulFlag)
+unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long
+                                   ulFlag)
 {
 
@@ -83 +91 @@
       case 0 :
       {
+             APIRET rc;
+                
+#ifdef __IBMCPP__
+         ctordtorInit();
+#endif
          DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
          char *endofpath = strrchr(ddrawPath, '\\');
-         if(endofpath) *(endofpath+1) = 0;
-
-         ctordtorInit();
+         if (endofpath)
+                        *(endofpath+1) = '\0';
 
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab,
+         dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab,
                                    DDRAW_MAJORIMAGE_VERSION, DDRAW_MINORIMAGE_VERSION,
                                    IMAGE_SUBSYSTEM_WINDOWS_GUI);
-         if(dllHandle == 0)
-                return 0UL;
+         if (dllHandle == 0)
+                        return 0UL;
+
+         rc = DosExitList(EXITLIST_NONCOREDLL | EXLST_ADD, cleanup);
+         if (rc)
+                        return 0UL;
 
          break;
@@ -101 +117 @@
       case 1 :
          if(dllHandle) {
-                UnregisterLxDll(dllHandle);
+                        UnregisterLxDll(dllHandle);
          }
          break;
@@ -115 +131 @@
 //******************************************************************************
 //******************************************************************************
+
+static void APIENTRY cleanup(ULONG ulReason)
+{
+   dprintf(("DDRAW processing exitlist"));
+   RestorePM();
+   dprintf(("DDRAW exitlist done"));
+
+   DosExitList(EXLST_EXIT, cleanup);
+}
+//******************************************************************************
+//******************************************************************************