ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libwine: Move collation table to libwine_port. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-03-23 13:43:17 +01:00
parent 9de388258f
commit 84cd904334
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wine/unicode.h
View File

@ -35,14 +35,6 @@
extern "C" { extern "C" {
#endif #endif
#ifndef WINE_UNICODE_API
# if defined(_MSC_VER) || defined(__MINGW32__)
# define WINE_UNICODE_API DECLSPEC_IMPORT
# else
# define WINE_UNICODE_API
# endif
#endif
#ifndef WINE_UNICODE_INLINE #ifndef WINE_UNICODE_INLINE
#define WINE_UNICODE_INLINE static inline #define WINE_UNICODE_INLINE static inline
#endif #endif

2
libs/port/Makefile.in
View File

@ -74,6 +74,7 @@ C_SRCS = \
c_949.c \ c_949.c \
c_950.c \ c_950.c \
casemap.c \ casemap.c \
collation.c \
combclass.c \ combclass.c \
compose.c \ compose.c \
cpsymbol.c \ cpsymbol.c \
@ -97,6 +98,7 @@ C_SRCS = \
pwrite.c \ pwrite.c \
readlink.c \ readlink.c \
rint.c \ rint.c \
sortkey.c \
spawn.c \ spawn.c \
statvfs.c \ statvfs.c \
strnlen.c \ strnlen.c \

4
libs/wine/collation.c → libs/port/collation.c
View File

@ -2,7 +2,9 @@
/* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
const unsigned int collation_table[12800] = #include "wine/unicode.h"
const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
{ {
/* index */ /* index */
0x00000200, 0x00000300, 0x00000400, 0x00000500, 0x00000600, 0x00000700, 0x00000800, 0x00000900, 0x00000200, 0x00000300, 0x00000400, 0x00000500, 0x00000600, 0x00000700, 0x00000800, 0x00000900,

0
libs/wine/sortkey.c → libs/port/sortkey.c
View File

3
libs/wine/Makefile.in
View File

@ -1,15 +1,12 @@
EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS)
EXTRADEFS = -DWINE_UNICODE_API=""
C_SRCS = \ C_SRCS = \
collation.c \
config.c \ config.c \
debug.c \ debug.c \
ldt.c \ ldt.c \
loader.c \ loader.c \
mmap.c \ mmap.c \
port.c \ port.c \
sortkey.c \
string.c string.c
EXTRA_OBJS = version.o EXTRA_OBJS = version.o

1
libs/wine/port.c
View File

@ -33,6 +33,7 @@
#ifndef __ANDROID__ #ifndef __ANDROID__
const void *libwine_port_functions[] = const void *libwine_port_functions[] =
{ {
wine_compare_string,
wine_cp_enum_table, wine_cp_enum_table,
wine_cp_get_table, wine_cp_get_table,
wine_cp_mbstowcs, wine_cp_mbstowcs,

7
tools/make_unicode
View File

@ -844,7 +844,7 @@ sub READ_SORTKEYS_FILE()
################################################################ ################################################################
# build the sort keys table # build the sort keys table
sub DUMP_SORTKEYS($@) sub dump_sortkeys($@)
{ {
my ($filename, @keys) = @_; my ($filename, @keys) = @_;
@ -868,8 +868,9 @@ sub DUMP_SORTKEYS($@)
printf OUTPUT "/* Unicode collation element table */\n"; printf OUTPUT "/* Unicode collation element table */\n";
printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS"; printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS";
printf OUTPUT "/* DO NOT EDIT!! */\n\n"; printf OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n";
printf OUTPUT "const unsigned int collation_table[%d] =\n{\n", $ranges*256; printf OUTPUT "const unsigned int DECLSPEC_HIDDEN collation_table[%d] =\n{\n", $ranges*256;
printf OUTPUT " /* index */\n"; printf OUTPUT " /* index */\n";
printf OUTPUT "%s,\n", DUMP_ARRAY( "0x%08x", 0, @offsets ); printf OUTPUT "%s,\n", DUMP_ARRAY( "0x%08x", 0, @offsets );
@ -2767,7 +2768,7 @@ sub REPLACE_IN_FILE($@)
chdir ".." if -f "./make_unicode"; chdir ".." if -f "./make_unicode";
READ_DEFAULTS( $DEFAULTS ); READ_DEFAULTS( $DEFAULTS );
dump_case_mappings( "libs/port/casemap.c" ); dump_case_mappings( "libs/port/casemap.c" );
DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); dump_sortkeys( "libs/port/collation.c", READ_SORTKEYS_FILE() );
dump_compose_table( "libs/port/compose.c" ); dump_compose_table( "libs/port/compose.c" );
dump_decompose_table( "libs/port/decompose.c" ); dump_decompose_table( "libs/port/decompose.c" );
dump_ctype_tables( "libs/port/wctype.c" ); dump_ctype_tables( "libs/port/wctype.c" );