February 2020 - Wine-Commits

Dirk Niggemann : toolhelp: Return correct handle, address, flag and lock values in LocalNext() for moveable blocks.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 22173f708e2a6b8be851cc69e4aabbadd387732b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22173f708e2a6b8be851cc69… Author: Dirk Niggemann <dirk.niggemann(a)gmail.com> Date: Thu Feb 13 19:32:14 2020 +0000 toolhelp: Return correct handle, address, flag and lock values in LocalNext() for moveable blocks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48523 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/toolhelp.dll16/toolhelp.c | 44 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index f2b520b6a1..578d1ae7fa 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -90,6 +90,22 @@ typedef struct #define LOCAL_ARENA_HEADER( handle) ((handle) - LOCAL_ARENA_HEADER_SIZE) #define LOCAL_ARENA_PTR(ptr,arena) ((LOCALARENA *)((char *)(ptr)+(arena))) +#define MOVEABLE_PREFIX sizeof(HLOCAL16) + +/* Layout of a handle entry table + * + * WORD count of entries + * LOCALHANDLEENTRY[count] entries + * WORD near ptr to next table + */ +typedef struct +{ + WORD addr; /* Address of the MOVEABLE block */ + BYTE flags; /* Flags for this block */ + BYTE lock; /* Lock count */ +} LOCALHANDLEENTRY; + + typedef struct { WORD null; /* Always 0 */ @@ -349,15 +365,35 @@ BOOL16 WINAPI LocalNext16( LOCALENTRY *pLocalEntry ) WORD ds = GlobalHandleToSel16( pLocalEntry->hHeap ); char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); LOCALARENA *pArena; + WORD table, lhandle; + LOCALHEAPINFO *pInfo = get_local_heap( ds ); - if (!get_local_heap( ds )) return FALSE; + if (!pInfo) return FALSE; if (!pLocalEntry->wNext) return FALSE; + table = pInfo->htable; pArena = LOCAL_ARENA_PTR( ptr, pLocalEntry->wNext ); - - pLocalEntry->hHandle = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; - pLocalEntry->wAddress = pLocalEntry->hHandle; + pLocalEntry->wAddress = pLocalEntry->wNext + LOCAL_ARENA_HEADER_SIZE; pLocalEntry->wFlags = (pArena->prev & 3) + 1; pLocalEntry->wcLock = 0; + /* Find the address in the entry tables */ + lhandle = pLocalEntry->wAddress; + while (table) + { + WORD count = *(WORD *)(ptr + table); + LOCALHANDLEENTRY *pEntry = (LOCALHANDLEENTRY*)(ptr+table+sizeof(WORD)); + for (; count > 0; count--, pEntry++) + if (pEntry->addr == lhandle + MOVEABLE_PREFIX) + { + lhandle = (HLOCAL16)((char *)pEntry - ptr); + table = 0; + pLocalEntry->wAddress = pEntry->addr; + pLocalEntry->wFlags = pEntry->flags; + pLocalEntry->wcLock = pEntry->lock; + break; + } + if (table) table = *(WORD *)pEntry; + } + pLocalEntry->hHandle = lhandle; pLocalEntry->wType = LT_NORMAL; if (pArena->next != pLocalEntry->wNext) /* last one? */ pLocalEntry->wNext = pArena->next;

1 0

Stefan Dösinger : ddraw/tests: Clear the DXT3 destination surface manually.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 36012feb6d60ae787e103fd0b45bce75150b4706 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36012feb6d60ae787e103fd0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 15 17:24:34 2020 +0300 ddraw/tests: Clear the DXT3 destination surface manually. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 51223e62ac..8ccfbd4cd8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17141,6 +17141,23 @@ static void test_compressed_surface_stretch(void) hr = IDirectDraw7_CreateSurface(ddraw, &dst_surface_desc, &dst_surf, NULL); ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + + /* r200 does not init vidmem DXT3 surfaces to 0 correctly. Do it manually. + * We can't use DDBLT_COLORFILL on compressed surfaces, so we need memset. + * + * Locking alone is not enough, so this isn't an accidental workaround that + * forces a different codepath because the destination is currently in sysmem. */ + if (test_formats[l].fmt.dwFourCC == MAKEFOURCC('D', 'X', 'T', '3')) + { + hr = IDirectDrawSurface7_Lock(dst_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memset(lock.lpSurface, 0, U1(lock).dwLinearSize); + hr = IDirectDrawSurface7_Unlock(dst_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirectDrawSurface7_Blt(dst_surf, &dst_rect, src_surf, &src_rect, DDBLT_WAIT, NULL); todo_wine_if(test_formats[l].fmt.dwFlags == DDPF_FOURCC && test_sizes[j].todo_dst) ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr);

1 0

Zebediah Figura : d3d9: Make shader validator traces less verbose.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 23187cbda3ef2393e69fcd1b0b2b3a2898d12f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23187cbda3ef2393e69fcd1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 18:51:00 2020 -0600 d3d9: Make shader validator traces less verbose. Suggested by Paul Gofman. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 75e627dd76..137da370e0 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -151,7 +151,7 @@ static ULONG WINAPI shader_validator_Release(IDirect3DShaderValidator9 *iface) static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, shader_validator_cb callback, void *context, DWORD_PTR arg3) { - FIXME("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); + WARN("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); return S_OK; } @@ -163,7 +163,7 @@ static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *iface, const char *file, int line, const DWORD *tokens, DWORD token_count) { - FIXME("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", + WARN("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", iface, debugstr_a(file), line, tokens, token_count); return S_OK; @@ -171,7 +171,7 @@ static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *if static HRESULT WINAPI shader_validator_End(IDirect3DShaderValidator9 *iface) { - FIXME("iface %p, stub!\n", iface); + WARN("iface %p, stub!\n", iface); return S_OK; } @@ -190,7 +190,7 @@ static IDirect3DShaderValidator9 shader_validator = {&shader_validator_vtbl}; IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void) { - TRACE("Returning validator %p.\n", &shader_validator); + FIXME("Returning stub validator %p.\n", &shader_validator); return &shader_validator; }

1 0

Hans Leidekker : bcrypt: Support retrieving the PaddingSchemes property for RSA.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 2bd5a8d57278c31fa35a9ebbe2eaacf9b542aedd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd5a8d57278c31fa35a9ebb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 17 13:35:42 2020 +0100 bcrypt: Support retrieving the PaddingSchemes property for RSA. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 17 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 8 +++++++- include/bcrypt.h | 6 ++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 298bfb4007..c2939ea815 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -528,6 +528,20 @@ static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *b return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_rsa_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_PADDING_SCHEMES )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BCRYPT_SUPPORTED_PAD_PKCS1_SIG; + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -541,6 +555,9 @@ NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR case ALG_ID_AES: return get_aes_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RSA: + return get_rsa_property( alg->mode, prop, buf, size, ret_size ); + default: break; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 0dc2085111..f7404057fa 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1786,7 +1786,7 @@ static void test_RSA(void) BCRYPT_KEY_HANDLE key; BCRYPT_RSAKEY_BLOB *rsablob; UCHAR sig[64]; - ULONG len, size; + ULONG len, size, schemes; NTSTATUS ret; BYTE *buf; @@ -1797,6 +1797,12 @@ static void test_RSA(void) return; } + schemes = size = 0; + ret = pBCryptGetProperty(alg, L"PaddingSchemes", (UCHAR *)&schemes, sizeof(schemes), &size, 0); + ok(!ret, "got %08x\n", ret); + ok(schemes, "schemes not set\n"); + ok(size == sizeof(schemes), "got %u\n", size); + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); diff --git a/include/bcrypt.h b/include/bcrypt.h index 0bc4dea910..3dcab5f75a 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -189,6 +189,12 @@ static const WCHAR BCRYPT_KDF_RAW_SECRET[] = {'T','R','U','N','C','A','T','E',0} #define BCRYPT_RNG_INTERFACE 0x00000006 #define BCRYPT_KEY_DERIVATION_INTERFACE 0x00000007 +#define BCRYPT_SUPPORTED_PAD_ROUTER 0x00000001 +#define BCRYPT_SUPPORTED_PAD_PKCS1_ENC 0x00000002 +#define BCRYPT_SUPPORTED_PAD_PKCS1_SIG 0x00000004 +#define BCRYPT_SUPPORTED_PAD_OAEP 0x00000008 +#define BCRYPT_SUPPORTED_PAD_PSS 0x00000010 + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName;

1 0

Zebediah Figura : d3d9: Retrieve transform states from the primary stateblock.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 85b6cfb8260fec4e75a7168559177e93615de73e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b6cfb8260fec4e75a71685… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 13 18:51:01 2020 -0600 d3d9: Retrieve transform states from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5bf0d6484c..fafdec10d8 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2123,7 +2123,7 @@ static HRESULT WINAPI d3d9_device_GetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix); + memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Alexandre Julliard : ntdll: Add support for Hangul Unicode normalization.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

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: Generate compositions on the fly based on the decomposition table.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

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 : unicode: Remove non-starter and compatibility compositions from the table.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

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

Dmitry Timoshkov : activeds.tlb: Add typelib.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 5385937a9038831d316cb51c55ba45575a921fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5385937a9038831d316cb51c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 20:56:30 2020 +0800 activeds.tlb: Add typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/activeds.tlb/Makefile.in | 3 +++ dlls/activeds.tlb/activeds.tlb.spec | 1 + dlls/activeds.tlb/activeds_tlb.idl | 21 +++++++++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/configure b/configure index e2e5d2d816..ad49cd2550 100755 --- a/configure +++ b/configure @@ -905,6 +905,7 @@ enable_largefile with_x enable_acledit enable_aclui +enable_activeds_tlb enable_activeds enable_actxprxy enable_adsiid @@ -20040,6 +20041,7 @@ fi wine_fn_config_makefile dlls/acledit enable_acledit wine_fn_config_makefile dlls/aclui enable_aclui +wine_fn_config_makefile dlls/activeds.tlb enable_activeds_tlb wine_fn_config_makefile dlls/activeds enable_activeds wine_fn_config_makefile dlls/actxprxy enable_actxprxy wine_fn_config_makefile dlls/adsiid enable_adsiid diff --git a/configure.ac b/configure.ac index 2e102990b5..ca932ebaad 100644 --- a/configure.ac +++ b/configure.ac @@ -2785,6 +2785,7 @@ WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$wi WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) +WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) WINE_CONFIG_MAKEFILE(dlls/activeds) WINE_CONFIG_MAKEFILE(dlls/actxprxy) WINE_CONFIG_MAKEFILE(dlls/adsiid) diff --git a/dlls/activeds.tlb/Makefile.in b/dlls/activeds.tlb/Makefile.in new file mode 100644 index 0000000000..60739d2d4a --- /dev/null +++ b/dlls/activeds.tlb/Makefile.in @@ -0,0 +1,3 @@ +MODULE = activeds.tlb + +IDL_SRCS = activeds_tlb.idl diff --git a/dlls/activeds.tlb/activeds.tlb.spec b/dlls/activeds.tlb/activeds.tlb.spec new file mode 100644 index 0000000000..b427b2913c --- /dev/null +++ b/dlls/activeds.tlb/activeds.tlb.spec @@ -0,0 +1 @@ +# no exported entry points diff --git a/dlls/activeds.tlb/activeds_tlb.idl b/dlls/activeds.tlb/activeds_tlb.idl new file mode 100644 index 0000000000..f8c09a1d97 --- /dev/null +++ b/dlls/activeds.tlb/activeds_tlb.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "iads.idl"

1 0

Alex Henrie : iphlpapi/tests: Add tests for GetTcp6Table.
by Alexandre Julliard Feb. 17, 2020

Feb. 17, 2020

Module: wine Branch: master Commit: 748bed3d10737ad9b7c63df546f4d59608352318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=748bed3d10737ad9b7c63df5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 13 23:51:50 2020 -0700 iphlpapi/tests: Add tests for GetTcp6Table. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 7a4821aae7..8ccbf5f9b6 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -56,6 +56,7 @@ static DWORD (WINAPI *pAllocateAndGetTcpExTableFromStack)(void**,BOOL,HANDLE,DWO static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetIfTable2Ex)(MIB_IF_TABLE_LEVEL,PMIB_IF_TABLE2*); +static DWORD (WINAPI *pGetTcp6Table)(PMIB_TCP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); static DWORD (WINAPI *pGetUnicastIpAddressTable)(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); @@ -86,6 +87,7 @@ static void loadIPHlpApi(void) pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); pGetIfTable2Ex = (void *)GetProcAddress(hLibrary, "GetIfTable2Ex"); + pGetTcp6Table = (void *)GetProcAddress(hLibrary, "GetTcp6Table"); pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); pGetUnicastIpAddressTable = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressTable"); @@ -2095,6 +2097,51 @@ static void test_ConvertLengthToIpv4Mask(void) ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); } +static void test_GetTcp6Table(void) +{ + DWORD ret; + ULONG size = 0; + PMIB_TCP6TABLE buf; + + if (!pGetTcp6Table) + { + win_skip("GetTcp6Table not available\n"); + return; + } + + ret = pGetTcp6Table(NULL, &size, FALSE); + if (ret == ERROR_NOT_SUPPORTED) + { + skip("GetTcp6Table is not supported\n"); + return; + } + ok(ret == ERROR_INSUFFICIENT_BUFFER, + "GetTcp6Table(NULL, &size, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", ret); + if (ret != ERROR_INSUFFICIENT_BUFFER) return; + + buf = HeapAlloc(GetProcessHeap(), 0, size); + + ret = pGetTcp6Table(buf, &size, FALSE); + ok(ret == NO_ERROR, + "GetTcp6Table(buf, &size, FALSE) returned %d, expected NO_ERROR\n", ret); + + if (ret == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace("TCP6 table: %u entries\n", buf->dwNumEntries); + for (i = 0; i < buf->dwNumEntries; i++) + { + trace("%u: local %s%%%u:%u remote %s%%%u:%u state %u\n", i, + ntoa6(&buf->table[i].LocalAddr), ntohs(buf->table[i].dwLocalScopeId), + ntohs(buf->table[i].dwLocalPort), ntoa6(&buf->table[i].RemoteAddr), + ntohs(buf->table[i].dwRemoteScopeId), ntohs(buf->table[i].dwRemotePort), + buf->table[i].State); + } + } + + HeapFree(GetProcessHeap(), 0, buf); +} + static void test_GetUdp6Table(void) { DWORD apiReturn; @@ -2268,6 +2315,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); + test_GetTcp6Table(); test_GetUdp6Table(); test_ParseNetworkString(); freeIPHlpApi();

1 0