kernel32: Move LCMapString functions to kernelbase.

dlls/kernel32/kernel32.spec

@@ -1027,9 +1027,9 @@
 @ stdcall -i386 -private -norelay K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog
 @ stdcall -i386 -private -norelay K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog
 @ stdcall -import LCIDToLocaleName(long ptr long long)
-@ stdcall LCMapStringA(long long str long ptr long)
-@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long)
-@ stdcall LCMapStringW(long long wstr long ptr long)
+@ stdcall -import LCMapStringA(long long str long ptr long)
+@ stdcall -import LCMapStringEx(wstr long wstr long ptr long ptr ptr long)
+@ stdcall -import LCMapStringW(long long wstr long ptr long)
 @ stdcall LZClose(long)
 # @ stub LZCloseFile
 @ stdcall LZCopy(long long)

dlls/kernelbase/Makefile.in

@@ -4,6 +4,7 @@ IMPORTS   = uuid ntdll winecrt0 kernel32
 EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin
 
 C_SRCS = \
+	collation.c \
 	compose.c \
 	console.c \
 	debug.c \

dlls/kernelbase/kernelbase.spec

@@ -914,9 +914,9 @@
 @ stdcall K32QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx
 @ stub KernelBaseGetGlobalData
 @ stdcall LCIDToLocaleName(long ptr long long)
-@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA
-@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx
-@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW
+@ stdcall LCMapStringA(long long str long ptr long)
+@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long)
+@ stdcall LCMapStringW(long long wstr long ptr long)
 # @ stub LeaveCriticalPolicySectionInternal
 @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection
 @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion

tools/make_unicode

@@ -2912,6 +2912,7 @@ chdir ".." if -f "./make_unicode";
 READ_DEFAULTS( $DEFAULTS );
 dump_case_mappings( "libs/port/casemap.c" );
 dump_sortkeys( "libs/port/collation.c", READ_SORTKEYS_FILE() );
+dump_sortkeys( "dlls/kernelbase/collation.c", READ_SORTKEYS_FILE() );
 dump_compose_table( "libs/port/compose.c" );
 dump_compose_table( "dlls/kernelbase/compose.c" );
 dump_decompose_table( "libs/port/decompose.c", 1 );