wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Dmitry Timoshkov : widl: If a variable doesn't have a name provide an autogenerated one.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 2c501aa7502dbedeef9517dea408deb4a73c5811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c501aa7502dbedeef9517de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 20:56:21 2020 +0800 widl: If a variable doesn't have a name provide an autogenerated one. Otherwise widl crashes while generating a typelib for a structure with an embedded anonymous union: typedef struct _s { int type; union { int f; }; } s; Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index b70057eda1..7cfe9e146c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1630,6 +1630,9 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) unsigned char *namedata; int var_num = (typeinfo->typeinfo->cElement >> 16) & 0xffff; + if (!var->name) + var->name = gen_name(); + chat("add_var_desc(%d, %s)\n", index, var->name); id = 0x40000000 + index;

1 0

Dmitry Timoshkov : widl: Generate name for a tagless union.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 8d0f8da652c7547af1348a06b1e690c1502eec30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0f8da652c7547af1348a06… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 20:56:12 2020 +0800 widl: Generate name for a tagless union. Otherwise widl crashes while generating a typelib for typedef struct _s { int type; union { int field; } u; } s; Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3a11d2ddd7..b70057eda1 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2208,6 +2208,9 @@ static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) if (-1 < tunion->typelib_idx) return; + if (!tunion->name) + tunion->name = gen_name(); + tunion->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_UNION, tunion->name, tunion->attrs); msft_typeinfo->typeinfo->size = 0;

1 0

Alexandre Julliard : unicode: Take into account explicit composition exclusions.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 2b9d720ea018c746907b0a7f0543ec9718352109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9d720ea018c746907b0a7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 11:54:07 2020 +0100 unicode: Take into account explicit composition exclusions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/compose.c | 96 ++++++++++------------------------------------- dlls/ntdll/compose.c | 96 ++++++++++------------------------------------- tools/make_unicode | 19 ++++++++++ 3 files changed, 59 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b9d720ea018c746907b…

1 0

Alexandre Julliard : unicode: Remove non-starter and compatibility compositions from the table.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 30f298f5db7caf341c3efe770085797a9b3da7ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=30f298f5db7caf341c3efe77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 11:52:24 2020 +0100 unicode: Remove non-starter and compatibility compositions from the table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/compose.c | 81 ++++++++++++++++++++++------------------------- dlls/ntdll/compose.c | 81 ++++++++++++++++++++++------------------------- tools/make_unicode | 4 +++ 3 files changed, 80 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=30f298f5db7caf341c3e…

1 0

Alexandre Julliard : unicode: Generate compositions on the fly based on the decomposition table.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: ce41b32117ea0a94de54d745cd7cd3b301a46d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce41b32117ea0a94de54d745… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 11:48:30 2020 +0100 unicode: Generate compositions on the fly based on the decomposition table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 60 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index fa8d7a3dec..59b681e631 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -405,7 +405,6 @@ my @category_table = (); my @joining_table = (); my @direction_table = (); my @decomp_table = (); -my @compose_table = (); my @combining_class_table = (); my @decomp_compat_table = (); my $default_char; @@ -419,12 +418,22 @@ my %joining_forms = "medial" => [] ); -sub get_utf16($) +sub to_utf16(@) { - my $ch = shift; - return $ch if ($ch < 0x10000); - $ch -= 0x10000; - return ( 0xd800 | ($ch >> 10), 0xdc00 | ($ch & 0x3ff) ); + my @ret; + foreach my $ch (@_) + { + if ($ch < 0x10000) + { + push @ret, $ch; + } + else + { + my $val = $ch - 0x10000; + push @ret, 0xd800 | ($val >> 10), 0xdc00 | ($val & 0x3ff); + } + } + return @ret; } ################################################################ @@ -465,14 +474,25 @@ sub get_decomposition($$) my ($char, $table) = @_; my @ret; - return get_utf16($char) unless defined ${$table}[$char]; - foreach my $ch (@{${$table}[$char]}) + return $char unless defined $table->[$char]; + foreach my $ch (@{$table->[$char]}) { push @ret, get_decomposition( $ch, $table ); } return @ret; } +################################################################ +# get the composition that results in a given character +sub get_composition($$) +{ + my ($ch, $compat) = @_; + return () unless defined $decomp_table[$ch]; # no decomposition + my @ret = @{$decomp_table[$ch]}; + return () if @ret < 2; # singleton decomposition + return @ret; +} + ################################################################ # recursively build decompositions sub build_decompositions(@) @@ -483,7 +503,7 @@ sub build_decompositions(@) for (my $i = 0; $i < @src; $i++) { next unless defined $src[$i]; - my @decomp = get_decomposition( $i, \@src ); + my @decomp = to_utf16( get_decomposition( $i, \@src )); $dst[$i] = \@decomp; } return @dst; @@ -588,7 +608,6 @@ sub load_data() if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1, hex $2 ]; - push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^([0-9a-fA-F]+)$/) { @@ -2010,21 +2029,13 @@ sub dump_compose_table($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"windef.h\"\n\n"; - my @filled = (); - foreach my $i (@compose_table) - { - my @comp = @$i; - push @{$filled[$comp[1]]}, [ $comp[0], $comp[2] ]; - } - - # count how many different second chars we have - - my $count = 0; + my @filled; for (my $i = 0; $i <= $MAX_CHAR; $i++) { - next unless defined $filled[$i]; - $count++; + my @comp = get_composition( $i, 0 ); + push @{$filled[$comp[1]]}, [ $comp[0], $i ] if @comp; } + my $count = scalar grep defined, @filled; # build the table of second chars and offsets @@ -2047,10 +2058,9 @@ sub dump_compose_table($) { next unless defined $filled[$i]; my @table = (); - my @list = sort { $a->[0] <=> $b->[0] } @{$filled[$i]}; - for (my $j = 0; $j <= $#list; $j++) + foreach my $map (sort { $a->[0] <=> $b->[0] } @{$filled[$i]}) { - push @table, $list[$j][0], $list[$j][1]; + push @table, $map->[0], $map->[1]; } printf OUTPUT ",\n /* 0x%04x */\n%s", $i, dump_array( 20, 0, @table ); }

1 0

Alexandre Julliard : ntdll: Add support for Hangul Unicode normalization.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: fdc89e02e65adc4c0f2b28147154291fb9aa8bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc89e02e65adc4c0f2b2814… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 11:08:45 2020 +0100 ntdll: Add support for Hangul Unicode normalization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 90800c92bb..27dceaf8e7 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -269,6 +269,16 @@ static void canonical_order_string( WCHAR *str, unsigned int len ) } +#define HANGUL_SBASE 0xac00 +#define HANGUL_LBASE 0x1100 +#define HANGUL_VBASE 0x1161 +#define HANGUL_TBASE 0x11a7 +#define HANGUL_LCOUNT 19 +#define HANGUL_VCOUNT 21 +#define HANGUL_TCOUNT 28 +#define HANGUL_NCOUNT (HANGUL_VCOUNT * HANGUL_TCOUNT) +#define HANGUL_SCOUNT (HANGUL_LCOUNT * HANGUL_NCOUNT) + static NTSTATUS decompose_string( int compat, const WCHAR *src, int src_len, WCHAR *dst, int *dst_len ) { const unsigned short *table = compat ? nfkd_table : nfd_table; @@ -276,8 +286,19 @@ static NTSTATUS decompose_string( int compat, const WCHAR *src, int src_len, WCH unsigned int ch, len, decomp_len; const WCHAR *decomp; - for (src_pos = dst_pos = 0; src_pos < src_len; src_pos += len, dst_pos += decomp_len) + for (src_pos = dst_pos = 0; src_pos < src_len; src_pos += len) { + if (src[src_pos] >= HANGUL_SBASE && src[src_pos] < HANGUL_SBASE + HANGUL_SCOUNT) + { + unsigned short sindex = src[src_pos] - HANGUL_SBASE; + unsigned short tindex = sindex % HANGUL_TCOUNT; + if (dst_pos + 2 + !!tindex > *dst_len) break; + dst[dst_pos++] = HANGUL_LBASE + sindex / HANGUL_NCOUNT; + dst[dst_pos++] = HANGUL_VBASE + (sindex % HANGUL_NCOUNT) / HANGUL_TCOUNT; + if (tindex) dst[dst_pos++] = HANGUL_TBASE + tindex; + len = 1; + continue; + } if (!(len = get_utf16( src + src_pos, src_len - src_pos, &ch )) || (ch >= 0xfdd0 && ch <= 0xfdef) || ((ch & 0xffff) >= 0xfffe)) { @@ -288,6 +309,7 @@ static NTSTATUS decompose_string( int compat, const WCHAR *src, int src_len, WCH if (dst_pos + decomp_len > *dst_len) break; if (decomp) memcpy( dst + dst_pos, decomp, decomp_len * sizeof(WCHAR) ); else put_utf16( dst + dst_pos, ch ); + dst_pos += decomp_len; } if (src_pos < src_len) @@ -301,6 +323,28 @@ static NTSTATUS decompose_string( int compat, const WCHAR *src, int src_len, WCH } +static unsigned int compose_hangul( unsigned int ch1, unsigned int ch2 ) +{ + if (ch1 >= HANGUL_LBASE && ch1 < HANGUL_LBASE + HANGUL_LCOUNT) + { + int lindex = ch1 - HANGUL_LBASE; + int vindex = ch2 - HANGUL_VBASE; + if (vindex >= 0 && vindex < HANGUL_VCOUNT) + return HANGUL_SBASE + (lindex * HANGUL_VCOUNT + vindex) * HANGUL_TCOUNT; + } + if (ch1 >= HANGUL_SBASE && ch1 < HANGUL_SBASE + HANGUL_SCOUNT) + { + int sindex = ch1 - HANGUL_SBASE; + if (!(sindex % HANGUL_TCOUNT)) + { + int tindex = ch2 - HANGUL_TBASE; + if (tindex > 0 && tindex < HANGUL_TCOUNT) return ch1 + tindex; + } + } + return 0; +} + + static unsigned int compose_string( WCHAR *str, unsigned int srclen ) { unsigned int i, ch, comp, len, start_ch = 0, last_starter = srclen; @@ -311,7 +355,7 @@ static unsigned int compose_string( WCHAR *str, unsigned int srclen ) if (!(len = get_utf16( str + i, srclen - i, &ch ))) return 0; class = get_combining_class( ch ); if (last_starter == srclen || (prev_class && prev_class >= class) || - !(comp = wine_compose( start_ch, ch ))) + (!(comp = compose_hangul( start_ch, ch )) && !(comp = wine_compose( start_ch, ch )))) { if (!class) {

1 0

Alexandre Julliard : unicode: Add support for high Unicode planes in composition tables.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 64e6d72284cdcaf757b7e937828437152e137388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64e6d72284cdcaf757b7e937… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 10:45:27 2020 +0100 unicode: Add support for high Unicode planes in composition tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/compose.c | 653 ++++++++++++++++++++++++---------------------- dlls/kernelbase/locale.c | 57 ++-- dlls/ntdll/compose.c | 653 ++++++++++++++++++++++++---------------------- dlls/ntdll/locale.c | 54 ++-- tools/make_unicode | 29 +- 5 files changed, 756 insertions(+), 690 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64e6d72284cdcaf757b7…

1 0

Alexandre Julliard : unicode: Add support for high Unicode planes in decomposition tables.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: c658731975d7755d2ae0d05af43f1af6332292b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c658731975d7755d2ae0d05a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 10:44:04 2020 +0100 unicode: Add support for high Unicode planes in decomposition tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 23 +- dlls/kernelbase/decompose.c | 1588 +++++++++++---- dlls/ntdll/decompose.c | 4440 ++++++++++++++++++++++++++++++------------ dlls/ntdll/locale.c | 99 +- tools/make_unicode | 23 +- 5 files changed, 4478 insertions(+), 1695 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c658731975d7755d2ae0…

1 0

Alexandre Julliard : unicode: Add support for high Unicode planes to the combining class table.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 148f564d10ecdacd523c7f44a066502acd7dd4e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=148f564d10ecdacd523c7f44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 13:00:48 2020 +0100 unicode: Add support for high Unicode planes to the combining class table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/combclass.c | 301 ++++++++++++++++++++++++++++++++++--------------- dlls/ntdll/locale.c | 5 +- tools/make_unicode | 30 ++++- 3 files changed, 239 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=148f564d10ecdacd523c…

1 0

Alexandre Julliard : libport: Move the composition tables back to libwine and stop updating them.
by Alexandre Julliard 17 Feb '20

17 Feb '20

Module: wine Branch: master Commit: 23cee79d72bb64d824ec07350dedb7bfc23f8029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23cee79d72bb64d824ec0735… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 10:30:23 2020 +0100 libport: Move the composition tables back to libwine and stop updating them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 2 -- libs/wine/Makefile.in | 2 ++ libs/{port => wine}/compose.c | 6 ++++++ libs/{port => wine}/decompose.c | 6 ++++++ tools/make_unicode | 2 -- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 56b8371d8e..08e143d26d 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -2,8 +2,6 @@ STATICLIB = libwine_port.a C_SRCS = \ casemap.c \ - compose.c \ - decompose.c \ ffs.c \ fstatvfs.c \ getopt.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 01cfc6ba99..66ecf13c67 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -67,10 +67,12 @@ C_SRCS = \ c_949.c \ c_950.c \ collation.c \ + compose.c \ config.c \ cpsymbol.c \ cptable.c \ debug.c \ + decompose.c \ digitmap.c \ fold.c \ ldt.c \ diff --git a/libs/port/compose.c b/libs/wine/compose.c similarity index 99% rename from libs/port/compose.c rename to libs/wine/compose.c index 4a23b5a92d..12febcf6cd 100644 --- a/libs/port/compose.c +++ b/libs/wine/compose.c @@ -2,6 +2,10 @@ /* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" static const WCHAR table[0x85e] = @@ -403,3 +407,5 @@ WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str ) count = table[2 * pos + 3]; } } + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/port/decompose.c b/libs/wine/decompose.c similarity index 99% rename from libs/port/decompose.c rename to libs/wine/decompose.c index 8c09dd5526..e75a7ca3ac 100644 --- a/libs/port/decompose.c +++ b/libs/wine/decompose.c @@ -2,6 +2,10 @@ /* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const WCHAR DECLSPEC_HIDDEN nfd_table[6075] = @@ -959,3 +963,5 @@ const WCHAR DECLSPEC_HIDDEN nfd_table[6075] = 0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf }; + +#endif /* __ASM_OBSOLETE */ diff --git a/tools/make_unicode b/tools/make_unicode index 312b2a7627..445ab68a9d 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2355,10 +2355,8 @@ chdir ".." if -f "./make_unicode"; load_data(); dump_case_mappings( "libs/port/casemap.c" ); dump_sortkeys( "dlls/kernelbase/collation.c" ); -dump_compose_table( "libs/port/compose.c" ); dump_compose_table( "dlls/ntdll/compose.c" ); dump_compose_table( "dlls/kernelbase/compose.c" ); -dump_decompose_table( "libs/port/decompose.c", 0 ); dump_decompose_table( "dlls/ntdll/decompose.c", 1 ); dump_decompose_table( "dlls/kernelbase/decompose.c", 0 ); dump_ctype_tables( "libs/port/wctype.c" );

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020