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

libport: Move the digitmap table back to libwine and stop updating it. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-02-05 09:00:40 +01:00
parent 473914f6a5
commit 599166bd35
4 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/port/Makefile.in
View File

@ -79,7 +79,6 @@ C_SRCS = \
compose.c \ compose.c \
cptable.c \ cptable.c \
decompose.c \ decompose.c \
digitmap.c \
ffs.c \ ffs.c \
fstatvfs.c \ fstatvfs.c \
getopt.c \ getopt.c \

1
libs/wine/Makefile.in
View File

@ -5,6 +5,7 @@ C_SRCS = \
config.c \ config.c \
cpsymbol.c \ cpsymbol.c \
debug.c \ debug.c \
digitmap.c \
fold.c \ fold.c \
ldt.c \ ldt.c \
loader.c \ loader.c \

6
libs/port/digitmap.c → libs/wine/digitmap.c
View File

@ -2,6 +2,10 @@
/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
/* DO NOT EDIT!! */ /* DO NOT EDIT!! */
#include "wine/asm.h"
#ifdef __ASM_OBSOLETE
#include "windef.h" #include "windef.h"
const unsigned short DECLSPEC_HIDDEN wine_digitmap[619] = const unsigned short DECLSPEC_HIDDEN wine_digitmap[619] =
@ -287,3 +291,5 @@ const WCHAR DECLSPEC_HIDDEN wine_compatmap[1497] =
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
}; };
#endif /* __ASM_OBSOLETE */

24
tools/make_unicode
View File

@ -409,7 +409,6 @@ my @unicode_aliases = ();
my @tolower_table = (); my @tolower_table = ();
my @toupper_table = (); my @toupper_table = ();
my @digitmap_table = (); my @digitmap_table = ();
my @compatmap_table = ();
my @category_table = (); my @category_table = ();
my @joining_table = (); my @joining_table = ();
my @direction_table = (); my @direction_table = ();
@ -582,11 +581,6 @@ sub load_data($)
if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/)
{ {
# decomposition of the form "<foo> 1234" -> use char if type is known # decomposition of the form "<foo> 1234" -> use char if type is known
if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))
{
# Single char decomposition in the compatibility range
$compatmap_table[$src] = hex $2;
}
if ($1 eq "isolated" || $1 eq "final" || $1 eq "initial" || $1 eq "medial") if ($1 eq "isolated" || $1 eq "final" || $1 eq "initial" || $1 eq "medial")
{ {
${joining_forms{$1}}[hex $2] = $src; ${joining_forms{$1}}[hex $2] = $src;
@ -623,12 +617,6 @@ sub load_data($)
{ {
# Single char decomposition # Single char decomposition
$decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ]; $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ];
if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))
{
# Single char decomposition in the compatibility range
$compatmap_table[$src] = hex $1;
}
} }
} }
else else
@ -1816,9 +1804,9 @@ sub dump_vertical($)
################################################################ ################################################################
# dump the digit folding tables # dump the digit folding tables
sub dump_digit_folding($$) sub dump_digit_folding($)
{ {
my ($filename, $compat) = @_; my ($filename) = shift;
open OUTPUT,">$filename.new" or die "Cannot create $filename"; open OUTPUT,">$filename.new" or die "Cannot create $filename";
print "Building $filename\n"; print "Building $filename\n";
print OUTPUT "/* Unicode digit folding mappings */\n"; print OUTPUT "/* Unicode digit folding mappings */\n";
@ -1827,11 +1815,6 @@ sub dump_digit_folding($$)
print OUTPUT "#include \"windef.h\"\n\n"; print OUTPUT "#include \"windef.h\"\n\n";
dump_two_level_mapping( "wine_digitmap", 0, 16, @digitmap_table ); dump_two_level_mapping( "wine_digitmap", 0, 16, @digitmap_table );
if ($compat)
{
print OUTPUT "\n";
dump_case_table( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table );
}
close OUTPUT; close OUTPUT;
save_file($filename); save_file($filename);
} }
@ -2755,8 +2738,7 @@ dump_bidi_dir_table( "dlls/gdi32/direction.c" );
dump_bidi_dir_table( "dlls/usp10/direction.c" ); dump_bidi_dir_table( "dlls/usp10/direction.c" );
dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_bidi_dir_table( "dlls/dwrite/direction.c" );
dump_string_type_table( "dlls/kernelbase/wctype.c" ); dump_string_type_table( "dlls/kernelbase/wctype.c" );
dump_digit_folding( "libs/port/digitmap.c", 1 ); dump_digit_folding( "dlls/kernelbase/digitmap.c" );
dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 );
dump_combining_class( "dlls/ntdll/combclass.c" ); dump_combining_class( "dlls/ntdll/combclass.c" );
dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/usp10/mirror.c" );
dump_mirroring( "dlls/dwrite/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" );