Got rid of main.h.

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;
 

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

include/main.h

-/*
- * 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 */

loader/main.c

@@ -2,15 +2,19 @@
  * Main initialization code
  */
 
+#include <locale.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <string.h>
+#ifdef MALLOC_DEBUGGING
+# include <malloc.h>
+#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;
 }
 

misc/main.c

@@ -12,9 +12,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef MALLOC_DEBUGGING
-# include <malloc.h>
-#endif
 
 #include "windef.h"
 #include "winbase.h"
@@ -181,33 +178,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)
  */
 BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur )

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"

ole/ole2nls.c

@@ -22,7 +22,6 @@
 #include "winreg.h"
 #include "winerror.h"
 #include "debugtools.h"
-#include "main.h"
 
 DEFAULT_DEBUG_CHANNEL(string);
 

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"

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