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

Timestamp:

Jan 21, 2003, 12:20:36 PM (23 years ago)

Author:

sandervl

Message:

Removed dependency on dive.dll. Load it on demand.

File:

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

trunk/src/ddraw/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.19 2001-09-05 12:50:39 bird Exp $
+/* $Id: initterm.cpp,v 1.20 2003-01-21 11:20:35 sandervl Exp $
  *
  * DLL entry point
@@ -40 +40 @@
 
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD _Resource_PEResTab;
-}
-
-char ddrawPath[CCHMAXPATH] = "";
-static HMODULE dllHandle = 0;
-
 static void APIENTRY cleanup(ULONG ulReason);
 
@@ -82 +74 @@
                                    ulFlag)
 {
+   APIRET rc;
 
    /*-------------------------------------------------------------------------*/
@@ -92 +85 @@
       case 0 :
       {
-         APIRET rc;
-
 #ifdef __IBMCPP__
          ctordtorInit();
 #endif
-         DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
-         char *endofpath = strrchr(ddrawPath, '\\');
-         if (endofpath)
-            *(endofpath+1) = '\0';
 
-         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
-
-         dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab,
-                                   DDRAW_MAJORIMAGE_VERSION, DDRAW_MINORIMAGE_VERSION,
-                                   IMAGE_SUBSYSTEM_WINDOWS_GUI);
-         if (dllHandle == 0)
-            return 0UL;
-
+#ifdef FULLSCREEN_DDRAW
          rc = DosExitList(EXITLIST_NONCOREDLL | EXLST_ADD, cleanup);
          if (rc)
             return 0UL;
+#endif
 
+         rc = inittermDDraw(hModule, ulFlag);
          break;
       }
       case 1 :
-         if(dllHandle) {
-            UnregisterLxDll(dllHandle);
-         }
+#ifdef __IBMCPP__
+         ctordtorTerm();
+#endif
+         
+         rc = inittermDDraw(hModule, ulFlag);
          break;
       default  :
@@ -128 +112 @@
    /* A non-zero value must be returned to indicate success.  */
    /***********************************************************/
-   return 1UL;
+   return rc;
 }
 //******************************************************************************
 //******************************************************************************
-
+#ifdef FULLSCREEN_DDRAW
 static void APIENTRY cleanup(ULONG ulReason)
 {
@@ -143 +127 @@
 //******************************************************************************
 //******************************************************************************
+#endif