libwine: Move the wide char to multi-byte conversion functions to libwine_port.

libs/port/Makefile.in

@@ -73,6 +73,7 @@ C_SRCS = \
 	c_936.c \
 	c_949.c \
 	c_950.c \
+	compose.c \
 	cpsymbol.c \
 	cptable.c \
 	decompose.c \
@@ -101,4 +102,6 @@ C_SRCS = \
 	strerror.c \
 	strncasecmp.c \
 	symlink.c \
-	usleep.c
+	usleep.c \
+	utf8.c \
+	wctomb.c

libs/wine/Makefile.in

@@ -5,7 +5,6 @@ STATICLIB = libwine_static.a
 C_SRCS = \
 	casemap.c \
 	collation.c \
-	compose.c \
 	config.c \
 	debug.c \
 	ldt.c \
@@ -14,8 +13,6 @@ C_SRCS = \
 	port.c \
 	sortkey.c \
 	string.c \
-	utf8.c \
-	wctomb.c \
 	wctype.c
 
 EXTRA_OBJS = version.o

libs/wine/port.c

@@ -34,9 +34,12 @@ const void *libwine_port_functions[] =
     wine_cp_enum_table,
     wine_cp_get_table,
     wine_cp_mbstowcs,
+    wine_cp_wcstombs,
     wine_cpsymbol_mbstowcs,
     wine_cpsymbol_wcstombs,
-    wine_fold_string
+    wine_fold_string,
+    wine_utf8_mbstowcs,
+    wine_utf8_wcstombs
 };
 
 /* no longer used, for backwards compatibility only */

tools/make_unicode

@@ -2465,7 +2465,7 @@ chdir ".." if -f "./make_unicode";
 READ_DEFAULTS( $DEFAULTS );
 DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" );
 DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() );
-dump_compose_table( "libs/wine/compose.c" );
+dump_compose_table( "libs/port/compose.c" );
 dump_decompose_table( "libs/port/decompose.c" );
 DUMP_CTYPE_TABLES( "libs/wine/wctype.c" );
 dump_digit_folding( "libs/port/digitmap.c" );