kernel32: Use MultiByteToWideChar() and WideCharToMultiByte() from kernelbase.

dlls/kernel32/kernel32.spec

@@ -1096,7 +1096,7 @@
 @ stdcall MoveFileWithProgressA(str str ptr ptr long)
 @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long)
 @ stdcall MulDiv(long long long)
-@ stdcall MultiByteToWideChar(long long str long ptr long)
+@ stdcall -import MultiByteToWideChar(long long str long ptr long)
 @ stdcall -import NeedCurrentDirectoryForExePathA(str)
 @ stdcall -import NeedCurrentDirectoryForExePathW(wstr)
 # @ stub NlsCheckPolicy
@@ -1601,7 +1601,7 @@
 # @ stub WerpNotifyLoadStringResourceEx
 # @ stub WerpNotifyUseStringResource
 # @ stub WerpStringLookup
-@ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr)
+@ stdcall -import WideCharToMultiByte(long long wstr long ptr long ptr ptr)
 @ stdcall WinExec(str long)
 @ stdcall Wow64EnableWow64FsRedirection(long) KERNEL32_Wow64EnableWow64FsRedirection
 @ stdcall -import Wow64DisableWow64FsRedirection(ptr)

dlls/kernel32/kernel_private.h

@@ -72,9 +72,6 @@ extern void ENV_CopyStartupInformation(void) DECLSPEC_HIDDEN;
 /* computername.c */
 extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN;
 
-/* locale.c */
-extern void LOCALE_Init(void) DECLSPEC_HIDDEN;
-
 /* time.c */
 extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN;
 

dlls/kernel32/process.c

@@ -173,8 +173,6 @@ void * CDECL __wine_kernel_init(void)
     kernel32_handle = GetModuleHandleW(kernel32W);
     RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter );
 
-    LOCALE_Init();
-
     return start_process_wrapper;
 }
 

dlls/kernelbase/locale.c

@@ -1118,7 +1118,10 @@ static inline int is_valid_dbcs_mapping( const CPTABLEINFO *info, DWORD flags,
                                          WCHAR wch, unsigned short ch )
 {
     if ((flags & WC_NO_BEST_FIT_CHARS) || ch == info->DefaultChar)
-        return info->DBCSOffsets[info->DBCSOffsets[ch >> 8] + (ch & 0xff)] == wch;
+    {
+        if (ch >> 8) return info->DBCSOffsets[info->DBCSOffsets[ch >> 8] + (ch & 0xff)] == wch;
+        return info->MultiByteTable[ch] == wch;
+    }
     return 1;
 }