Moved codepage functions to dlls/kernel.

dlls/kernel/Makefile.in

@@ -24,7 +24,6 @@ C_SRCS = \
 	$(TOPOBJDIR)/files/file.c \
 	$(TOPOBJDIR)/files/smb.c \
 	$(TOPOBJDIR)/loader/module.c \
-	$(TOPOBJDIR)/memory/codepage.c \
 	$(TOPOBJDIR)/memory/environ.c \
 	$(TOPOBJDIR)/memory/virtual.c \
 	$(TOPOBJDIR)/misc/cpu.c \

dlls/kernel/kernel_main.c

@@ -47,7 +47,7 @@
 #include "kernel_private.h"
 #include "console_private.h"
 
-extern void LOCALE_Init(void);
+extern void LOCALE_InitRegistry(void);
 extern void COMPUTERNAME_Init(void);
 
 extern  int __wine_set_signal_handler(unsigned, int (*)(unsigned));
@@ -115,8 +115,8 @@ static BOOL process_attach(void)
     FILE_umask = umask(0777);
     umask( FILE_umask );
 
-    /* Setup codepage info */
-    LOCALE_Init();
+    /* Setup registry locale information */
+    LOCALE_InitRegistry();
 
     /* Initialize 16-bit thunking entry points */
     if (!WOWTHUNK_Init()) return FALSE;

dlls/kernel/process.c

@@ -72,6 +72,7 @@ static const WCHAR winevdmW[] = {'w','i','n','e','v','d','m','.','e','x','e',0};
 extern void SHELL_LoadRegistry(void);
 extern void VERSION_Init( const WCHAR *appname );
 extern void MODULE_InitLoadPath(void);
+extern void LOCALE_Init(void);
 
 /***********************************************************************
  *           contains_path
@@ -684,6 +685,8 @@ static BOOL process_init( char *argv[], char **environ )
         params->hStdError  = hstderr;
     }
 
+    LOCALE_Init();
+
     /* Copy the parent environment */
     if (!build_initial_environment( environ )) return FALSE;
 
@@ -758,7 +761,6 @@ void __wine_kernel_init(void)
 
         if (!__wine_main_argv[0]) OPTIONS_Usage();
 
-        /* FIXME: locale info not loaded yet */
         MultiByteToWideChar( CP_UNIXCP, 0, __wine_main_argv[0], -1, exe_nameW, MAX_PATH );
         if (!find_exe_file( exe_nameW, buffer, MAX_PATH, &main_exe_file ))
         {