commit 8a64b83eb64a859bb50dc611ee236f8e28877ab9
author Ulrich Weigand <weigand@informatik.uni-erlangen.de> Sat Oct 23 14:15:33 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Oct 23 14:15:33 1999 +0000
tree 8910ddef5ceef883e60c23311f0e3f841d152b47
parent ea65e29bdc09f7911d0379d2b1df5c12e77d4168

Bugfix: don't call ExitProcess() before SYSLEVEL_Init().

loader/main.c

diff --git a/loader/main.c b/loader/main.c
index 4a4407e..a1c3115 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -57,14 +57,20 @@
 /***********************************************************************
  *           Main initialisation routine
  */
-BOOL MAIN_MainInit(void)
+BOOL MAIN_MainInit( int *argc, char *argv[] )
 {
+    /* Create the initial process */
+    if (!PROCESS_Init()) return 0;
+
     /* Set server debug level */
     CLIENT_SetDebug( TRACE_ON(server) );
 
     /* Initialize syslevel handling */
     SYSLEVEL_Init();
 
+    /* Parse command line arguments */
+    MAIN_WineInit( argc, argv );
+
     /* Load the configuration file */
     if (!PROFILE_LoadWineIni()) return FALSE;
 
@@ -98,6 +104,10 @@
     /* Read DOS config.sys */
     if (!DOSCONF_ReadConfig()) return FALSE;
 
+    /* Initialize KERNEL */
+    if (!LoadLibrary16( "KRNL386.EXE" )) return FALSE;
+    if (!LoadLibraryA( "KERNEL32" )) return FALSE;
+
     return TRUE;
 }
 
@@ -288,18 +298,8 @@
     OFSTRUCT ofs;
     HMODULE16 hModule;
 
-    /* Create the initial process */
-    if (!PROCESS_Init()) return 0;
-
-    /* Parse command line arguments */
-    MAIN_WineInit( argc, argv );
-
     /* Main initialization */
-    if (!MAIN_MainInit()) return 0;
-
-    /* Initialize KERNEL */
-    if (!LoadLibrary16( "KRNL386.EXE" )) return 0;
-    if (!LoadLibraryA( "KERNEL32" )) return 0;
+    if (!MAIN_MainInit( argc, argv )) return 0;
 
     /* Create and switch to initial task */
     if (!(wm = ELF_CreateDummyModule( argv[0], argv[0] )))