From 751625e089499b16c0db56573b65cd15b54aa645 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 12 Dec 2000 00:50:19 +0000 Subject: [PATCH] Got rid of main.h. --- dlls/kernel/kernel_main.c | 4 ++++ if1632/relay.c | 2 +- include/main.h | 18 ------------------ loader/main.c | 27 ++++++++++++++++++++++----- misc/main.c | 30 ------------------------------ misc/options.c | 1 - ole/ole2nls.c | 1 - relay32/builtin32.c | 1 - scheduler/process.c | 3 ++- 9 files changed, 29 insertions(+), 58 deletions(-) delete mode 100644 include/main.h diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index b3467446aa8..4ef0e3a2f89 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -15,6 +15,7 @@ #include "global.h" extern void CODEPAGE_Init(void); +extern BOOL RELAY_Init(void); extern BOOL THUNK_Init(void); extern void COMM_Init(void); @@ -31,6 +32,9 @@ static BOOL process_attach(void) /* Setup codepage info */ CODEPAGE_Init(); + /* Initialize relay entry points */ + if (!RELAY_Init()) return FALSE; + /* Initialize thunking */ if (!THUNK_Init()) return FALSE; diff --git a/if1632/relay.c b/if1632/relay.c index c2d770a2699..f7ace86c048 100644 --- a/if1632/relay.c +++ b/if1632/relay.c @@ -16,7 +16,6 @@ #include "task.h" #include "syslevel.h" #include "debugtools.h" -#include "main.h" #include "callback.h" DEFAULT_DEBUG_CHANNEL(relay); @@ -137,6 +136,7 @@ DWORD WINAPI CALL32_CBClientEx( FARPROC proc, LPWORD args, DWORD *esi, INT *nArg /* from relay32/relay386.c */ extern char **debug_relay_excludelist,**debug_relay_includelist; +extern int RELAY_ShowDebugmsgRelay(const char *func); /*********************************************************************** * RELAY_DebugCallFrom16 diff --git a/include/main.h b/include/main.h deleted file mode 100644 index 3a90d17df91..00000000000 --- a/include/main.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Wine initialization definitions - */ - -#ifndef __WINE_MAIN_H -#define __WINE_MAIN_H - -#include "windef.h" - -extern BOOL MAIN_MainInit(void); -extern void MAIN_WineInit(void); - -extern BOOL RELAY_Init(void); -extern int RELAY_ShowDebugmsgRelay(const char *func); - -extern void SHELL_LoadRegistry(void); - -#endif /* __WINE_MAIN_H */ diff --git a/loader/main.c b/loader/main.c index ea396b986c3..52f19813676 100644 --- a/loader/main.c +++ b/loader/main.c @@ -2,15 +2,19 @@ * Main initialization code */ +#include #include #include #include #include #include +#include #include +#ifdef MALLOC_DEBUGGING +# include +#endif #include "windef.h" #include "wine/winbase16.h" -#include "main.h" #include "drive.h" #include "file.h" #include "options.h" @@ -20,12 +24,28 @@ DEFAULT_DEBUG_CHANNEL(server); +extern void SHELL_LoadRegistry(void); + /*********************************************************************** * Main initialisation routine */ BOOL MAIN_MainInit(void) { - MAIN_WineInit(); +#ifdef MALLOC_DEBUGGING + char *trace; + + mcheck(NULL); + if (!(trace = getenv("MALLOC_TRACE"))) + MESSAGE( "MALLOC_TRACE not set. No trace generated\n" ); + else + { + MESSAGE( "malloc trace goes to %s\n", trace ); + mtrace(); + } +#endif + setbuf(stdout,NULL); + setbuf(stderr,NULL); + setlocale(LC_CTYPE,""); /* Load the configuration file */ if (!PROFILE_LoadWineIni()) return FALSE; @@ -45,9 +65,6 @@ BOOL MAIN_MainInit(void) /* Initialize module loadorder */ if (!MODULE_InitLoadOrder()) return FALSE; - /* Initialize relay code */ - if (!RELAY_Init()) return FALSE; - return TRUE; } diff --git a/misc/main.c b/misc/main.c index 04d7fde3372..c6d4e00662e 100644 --- a/misc/main.c +++ b/misc/main.c @@ -12,9 +12,6 @@ #include #include #include -#ifdef MALLOC_DEBUGGING -# include -#endif #include "windef.h" #include "winbase.h" @@ -180,33 +177,6 @@ void MAIN_ParseDebugOptions( const char *arg ) } #endif -/*********************************************************************** - * MAIN_WineInit - * - * Wine initialisation - */ -void MAIN_WineInit(void) -{ -#ifdef MALLOC_DEBUGGING - char *trace; - - mcheck(NULL); - if (!(trace = getenv("MALLOC_TRACE"))) - { - MESSAGE( "MALLOC_TRACE not set. No trace generated\n" ); - } - else - { - MESSAGE( "malloc trace goes to %s\n", trace ); - mtrace(); - } -#endif - - setbuf(stdout,NULL); - setbuf(stderr,NULL); - setlocale(LC_CTYPE,""); -} - /*********************************************************************** * Beep (KERNEL32.11) */ diff --git a/misc/options.c b/misc/options.c index a7b135a5f6a..22b9fb4cf1f 100644 --- a/misc/options.c +++ b/misc/options.c @@ -10,7 +10,6 @@ #include "winbase.h" #include "wine/library.h" -#include "main.h" #include "options.h" #include "version.h" #include "debugtools.h" diff --git a/ole/ole2nls.c b/ole/ole2nls.c index a374c72d866..c7c2cd4db97 100644 --- a/ole/ole2nls.c +++ b/ole/ole2nls.c @@ -22,7 +22,6 @@ #include "winreg.h" #include "winerror.h" #include "debugtools.h" -#include "main.h" DEFAULT_DEBUG_CHANNEL(string); diff --git a/relay32/builtin32.c b/relay32/builtin32.c index b5dec5ec4d7..8b9d9745d0b 100644 --- a/relay32/builtin32.c +++ b/relay32/builtin32.c @@ -25,7 +25,6 @@ #include "module.h" #include "file.h" #include "heap.h" -#include "main.h" #include "winerror.h" #include "server.h" #include "debugtools.h" diff --git a/scheduler/process.c b/scheduler/process.c index c3a2aaa8717..c14a9f58d2d 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -16,7 +16,6 @@ #include "wine/exception.h" #include "wine/library.h" #include "drive.h" -#include "main.h" #include "module.h" #include "file.h" #include "global.h" @@ -107,6 +106,8 @@ extern struct _ENVDB *ENV_BuildEnvironment(void); extern BOOL ENV_BuildCommandLine( char **argv ); extern STARTUPINFOA current_startupinfo; +extern BOOL MAIN_MainInit(void); + /*********************************************************************** * PROCESS_CallUserSignalProc