commit 4e951ea25bed3e8e44f930b9e3684823e04b52bf
author Alexandre Julliard <julliard@winehq.org> Wed Nov 08 22:47:53 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Nov 08 22:47:53 2000 +0000
tree 48f82af7b8af48199f819dcac6c73b62fe76ccc2
parent d3576a9f85007834a6cbc5aa33839c85681cf455

Check all Callouts function pointers for NULL before using them.
Don't load USER dll if not needed by the application.

scheduler/process.c

diff --git a/scheduler/process.c b/scheduler/process.c
index 44a56cd..f6bc48a 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -237,39 +237,6 @@
 
 
 /***********************************************************************
- *           load_system_dlls
- *
- * Load system DLLs into the initial process (and initialize them)
- */
-static int load_system_dlls(void)
-{
-    /* Load KERNEL */
-    if (!LoadLibraryA( "KERNEL32" )) return 0;
-
-    /* Get pointers to USER routines called by KERNEL */
-    THUNK_InitCallout();
-
-    /* Call FinalUserInit routine */
-    Callout.FinalUserInit16();
-
-    /* Note: The USIG_PROCESS_CREATE signal is supposed to be sent in the
-     *       context of the parent process.  Actually, the USER signal proc
-     *       doesn't really care about that, but it *does* require that the
-     *       startup parameters are correctly set up, so that GetProcessDword
-     *       works.  Furthermore, before calling the USER signal proc the 
-     *       16-bit stack must be set up, which it is only after TASK_Create
-     *       in the case of a 16-bit process. Thus, we send the signal here.
-     */
-    PROCESS_CallUserSignalProc( USIG_PROCESS_CREATE, 0 );
-    PROCESS_CallUserSignalProc( USIG_THREAD_INIT, 0 );
-    PROCESS_CallUserSignalProc( USIG_PROCESS_INIT, 0 );
-    PROCESS_CallUserSignalProc( USIG_PROCESS_LOADED, 0 );
-
-    return 1;
-}
-
-
-/***********************************************************************
  *           build_command_line
  *
  * Build the command line of a process from the argv array.
@@ -361,14 +328,29 @@
         goto error;
     wm->refCount++;
 
-    /* Load the system dlls */
-    if (!load_system_dlls()) goto error;
-
     EnterCriticalSection( &current_process.crit_section );
     PE_InitTls();
     MODULE_DllProcessAttach( current_process.exe_modref, (LPVOID)1 );
     LeaveCriticalSection( &current_process.crit_section );
 
+    /* Get pointers to USER routines called by KERNEL */
+    THUNK_InitCallout();
+
+    /* Call FinalUserInit routine */
+    if (Callout.FinalUserInit16) Callout.FinalUserInit16();
+
+    /* Note: The USIG_PROCESS_CREATE signal is supposed to be sent in the
+     *       context of the parent process.  Actually, the USER signal proc
+     *       doesn't really care about that, but it *does* require that the
+     *       startup parameters are correctly set up, so that GetProcessDword
+     *       works.  Furthermore, before calling the USER signal proc the 
+     *       16-bit stack must be set up, which it is only after TASK_Create
+     *       in the case of a 16-bit process. Thus, we send the signal here.
+     */
+    PROCESS_CallUserSignalProc( USIG_PROCESS_CREATE, 0 );
+    PROCESS_CallUserSignalProc( USIG_THREAD_INIT, 0 );
+    PROCESS_CallUserSignalProc( USIG_PROCESS_INIT, 0 );
+    PROCESS_CallUserSignalProc( USIG_PROCESS_LOADED, 0 );
     /* Call UserSignalProc ( USIG_PROCESS_RUNNING ... ) only for non-GUI win32 apps */
     if (console_app) PROCESS_CallUserSignalProc( USIG_PROCESS_RUNNING, 0 );