Changeset 6375 for trunk/src/user32/initterm.cpp

Timestamp:

Jul 20, 2001, 5:42:38 PM (24 years ago)

Author:

sandervl

Message:

initterm update

File:

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

trunk/src/user32/initterm.cpp

@@ -37 +37 @@
 #include <winconst.h>
 #include <odinlx.h>
-#include <spy.h>
-#include <monitor.h>
-#include "pmwindow.h"
-#include "win32wdesktop.h"
-#include "syscolor.h"
 #include "initterm.h"
 #include <exitlist.h>
@@ -57 +52 @@
 static void APIENTRY cleanup(ULONG reason);
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD _Resource_PEResTab;
-}
-DWORD hInstanceUser32 = 0;
 BOOL  fVersionWarp3 = FALSE;
 
@@ -87 +77 @@
       case 0 :
          ctordtorInit();
-         ParseLogStatus();
-
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
-
-         hInstanceUser32 = RegisterLxDll(hModule, 0, (PVOID)&_Resource_PEResTab,
-                                         USER32_MAJORIMAGE_VERSION, USER32_MINORIMAGE_VERSION,
-                                         IMAGE_SUBSYSTEM_WINDOWS_GUI);
-         if(hInstanceUser32 == 0)
-                return 0UL;
-
-         dprintf(("user32 init %s %s (%x)", __DATE__, __TIME__, DLLENTRYPOINT_NAME));
 
          rc = DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR, version, sizeof(version));
@@ -115 +95 @@
                 return 0UL;
 
-         //SvL: Try to start communication with our message spy queue server
-         InitSpyQueue();
-
-         //SvL: Init win32 PM classes
-         if(InitPM() == FALSE) {
-                return 0UL;
-         }
-
-         //SvL: 18-7-'98, Register system window classes (button, listbox etc etc)
-         //CB: register internal classes
-         RegisterSystemClasses(hModule);
-
-         //CB: initialize PM monitor driver
-         MONITOR_Initialize(&MONITOR_PrimaryMonitor);
-
+         rc = inittermUser32(hModule, ulFlag);
          break;
       case 1 :
-         if(hInstanceUser32) {
-                UnregisterLxDll(hInstanceUser32);
-         }
+         rc = inittermUser32(hModule, ulFlag);
          break;
       default  :
@@ -148 +112 @@
 static void APIENTRY cleanup(ULONG ulReason)
 {
-   dprintf(("user32 exit\n"));
-//SvL: Causes PM hangs on some (a lot?) machines. Reason unknown.
-////   RestoreCursor();
-   DestroyDesktopWindow();
-   Win32BaseWindow::DestroyAll();
-   UnregisterSystemClasses();
-   Win32WndClass::DestroyAll();
-   MONITOR_Finalize(&MONITOR_PrimaryMonitor);
-   SYSCOLOR_Save();
-   CloseSpyQueue();
+   cleanupUser32(ulReason);
    ctordtorTerm();
-   dprintf(("user32 exit done\n"));
 
    DosExitList(EXLST_EXIT, cleanup);