March 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : make_unicode: Use codepage 949 to add default mappings to codepage 20949.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 6f68543692a7588daa581d00c475715395036b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f68543692a7588daa581d00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 12:46:04 2021 +0100 make_unicode: Use codepage 949 to add default mappings to codepage 20949. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 74 ++++++++++++++++++++--------------------- nls/c_20949.nls | Bin 177698 -> 177698 bytes tools/make_unicode | 28 +++++++++++++--- 3 files changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index d35eb0a71a8..0d9dbd29c43 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -10,41 +10,6 @@ HKLM { Codepage { - val '37' = s 'c_037.nls' - val '437' = s 'c_437.nls' - val '500' = s 'c_500.nls' - val '708' = s 'c_708.nls' - val '737' = s 'c_737.nls' - val '775' = s 'c_775.nls' - val '850' = s 'c_850.nls' - val '852' = s 'c_852.nls' - val '855' = s 'c_855.nls' - val '857' = s 'c_857.nls' - val '860' = s 'c_860.nls' - val '861' = s 'c_861.nls' - val '862' = s 'c_862.nls' - val '863' = s 'c_863.nls' - val '864' = s 'c_864.nls' - val '865' = s 'c_865.nls' - val '866' = s 'c_866.nls' - val '869' = s 'c_869.nls' - val '874' = s 'c_874.nls' - val '875' = s 'c_875.nls' - val '932' = s 'c_932.nls' - val '936' = s 'c_936.nls' - val '949' = s 'c_949.nls' - val '950' = s 'c_950.nls' - val '1026' = s 'c_1026.nls' - val '1250' = s 'c_1250.nls' - val '1251' = s 'c_1251.nls' - val '1252' = s 'c_1252.nls' - val '1253' = s 'c_1253.nls' - val '1254' = s 'c_1254.nls' - val '1255' = s 'c_1255.nls' - val '1256' = s 'c_1256.nls' - val '1257' = s 'c_1257.nls' - val '1258' = s 'c_1258.nls' - val '1361' = s 'c_1361.nls' val '10000' = s 'c_10000.nls' val '10001' = s 'c_10001.nls' val '10002' = s 'c_10002.nls' @@ -61,8 +26,21 @@ HKLM val '10079' = s 'c_10079.nls' val '10081' = s 'c_10081.nls' val '10082' = s 'c_10082.nls' + val '1026' = s 'c_1026.nls' + val '1250' = s 'c_1250.nls' + val '1251' = s 'c_1251.nls' + val '1252' = s 'c_1252.nls' + val '1253' = s 'c_1253.nls' + val '1254' = s 'c_1254.nls' + val '1255' = s 'c_1255.nls' + val '1256' = s 'c_1256.nls' + val '1257' = s 'c_1257.nls' + val '1258' = s 'c_1258.nls' + val '1361' = s 'c_1361.nls' val '20127' = s 'c_20127.nls' val '20866' = s 'c_20866.nls' + val '20932' = s 'c_20932.nls' + val '20949' = s 'c_20949.nls' val '21866' = s 'c_21866.nls' val '28591' = s 'c_28591.nls' val '28592' = s 'c_28592.nls' @@ -75,8 +53,30 @@ HKLM val '28599' = s 'c_28599.nls' val '28603' = s 'c_28603.nls' val '28605' = s 'c_28605.nls' - val '20932' = s 'c_20932.nls' - val '20949' = s 'c_20949.nls' + val '37' = s 'c_037.nls' + val '437' = s 'c_437.nls' + val '500' = s 'c_500.nls' + val '708' = s 'c_708.nls' + val '737' = s 'c_737.nls' + val '775' = s 'c_775.nls' + val '850' = s 'c_850.nls' + val '852' = s 'c_852.nls' + val '855' = s 'c_855.nls' + val '857' = s 'c_857.nls' + val '860' = s 'c_860.nls' + val '861' = s 'c_861.nls' + val '862' = s 'c_862.nls' + val '863' = s 'c_863.nls' + val '864' = s 'c_864.nls' + val '865' = s 'c_865.nls' + val '866' = s 'c_866.nls' + val '869' = s 'c_869.nls' + val '874' = s 'c_874.nls' + val '875' = s 'c_875.nls' + val '932' = s 'c_932.nls' + val '936' = s 'c_936.nls' + val '949' = s 'c_949.nls' + val '950' = s 'c_950.nls' } Normalization { diff --git a/nls/c_20949.nls b/nls/c_20949.nls index 1ee157af003..2ff92aec922 100644 Binary files a/nls/c_20949.nls and b/nls/c_20949.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 053adb92602..1e0dbe419e1 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -945,10 +945,9 @@ sub dump_eucjp_codepage() ################################################################ # build Korean Wansung table from the KSX1001 file -# FIXME: compare to Windows we should add extra mappings for -# characters added from Unicode 1.1 to enhance the completeness. -sub dump_krwansung_codepage() +sub dump_krwansung_codepage(@) { + my @cp949 = @_; @cp2uni = (); @glyph2uni = (); @lead_bytes = (); @@ -980,6 +979,24 @@ sub dump_krwansung_codepage() } close $INPUT; + # get some extra mappings from cp 949 + my @defined_lb; + map { $defined_lb[$_] = 1; } @lead_bytes; + foreach my $i (0x0000 .. 0xffff) + { + next if ($i >= 0x1100 && $i <= 0x11ff); # range not used in 20949 + next unless defined $cp949[$i]; + if ($cp949[$i] >= 0xff) + { + # only add chars for lead bytes that exist in 20949 + my $hi = $cp949[$i] >> 8; + my $lo = $cp949[$i] & 0xff; + next unless $defined_lb[$hi]; + next unless $lo >= 0xa1 && $lo <= 0xfe; + } + add_mapping( $cp949[$i], $i ); + } + output_codepage_file( 20949 ); } @@ -2341,6 +2358,8 @@ sub dump_msdata_codepage($) close $INPUT; output_codepage_file( $codepage ); + + if ($codepage == 949) { dump_krwansung_codepage( @uni2cp ); } } ################################################################ @@ -2758,7 +2777,7 @@ sub dump_registry_script($%) $i == $#subkeys && $def ? " = s '$def'" : "", 4 * $indent, ""; $indent++; } - foreach my $v (@vals) { printf OUTPUT "%*sval $v\n", 4 * $indent, ""; } + foreach my $v (sort @vals) { printf OUTPUT "%*sval $v\n", 4 * $indent, ""; } for (my $i = 0; $i < @subkeys; $i++) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } } while ($indent) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } @@ -2813,7 +2832,6 @@ dump_norm_table( "nls/normidna.nls" ); dump_sortkey_table( "nls/sortdefault.nls", "Windows 10 Sorting Weight Table.txt" ); foreach my $file (@allfiles) { dump_msdata_codepage( $file ); } dump_eucjp_codepage(); -dump_krwansung_codepage(); dump_registry_script( "dlls/kernelbase/kernelbase.rgs", %registry_keys ); exit 0;

1 0

Sanghoon Park : make_unicode: Add support for codepage 20949 (Korean Wansung).
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: fd3a6402065a057e189d44905f62774bb6a381c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3a6402065a057e189d4490… Author: Sanghoon Park <esifea1908(a)gmail.com> Date: Thu Mar 11 14:02:09 2021 +0900 make_unicode: Add support for codepage 20949 (Korean Wansung). Signed-off-by: Sanghoon Park <esifea1908(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 1 + dlls/kernelbase/locale.c | 1 + loader/wine.inf.in | 1 + nls/Makefile.in | 1 + nls/c_20949.nls | Bin 0 -> 177698 bytes tools/make_unicode | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 629f98ebafa..d35eb0a71a8 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -76,6 +76,7 @@ HKLM val '28603' = s 'c_28603.nls' val '28605' = s 'c_28605.nls' val '20932' = s 'c_20932.nls' + val '20949' = s 'c_20949.nls' } Normalization { diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 951a8a54a86..9e77ca8dd37 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -159,6 +159,7 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 20127, L"US-ASCII (7bit)" }, { 20866, L"Russian KOI8" }, { 20932, L"EUC-JP" }, + { 20949, L"Korean Wansung" }, { 21866, L"Ukrainian KOI8" }, { 28591, L"ISO 8859-1 Latin 1" }, { 28592, L"ISO 8859-2 Latin 2 (East European)" }, diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 627d98a9e66..4cef944fb88 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4101,6 +4101,7 @@ c_1361.nls c_20127.nls c_20866.nls c_20932.nls +c_20949.nls c_21866.nls c_28591.nls c_28592.nls diff --git a/nls/Makefile.in b/nls/Makefile.in index a3c3b69b029..4352becac5f 100644 --- a/nls/Makefile.in +++ b/nls/Makefile.in @@ -30,6 +30,7 @@ SOURCES = \ c_20127.nls \ c_20866.nls \ c_20932.nls \ + c_20949.nls \ c_21866.nls \ c_28591.nls \ c_28592.nls \ diff --git a/nls/c_20949.nls b/nls/c_20949.nls new file mode 100644 index 00000000000..1ee157af003 Binary files /dev/null and b/nls/c_20949.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 93d6a9346c2..053adb92602 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,6 +26,7 @@ my $UNIVERSION = "13.0.0"; my $UNIDATA = "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip"; my $IDNADATA = "https://www.unicode.org/Public/idna/$UNIVERSION"; my $JISDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS"; +my $KSCDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC"; my $REPORTS = "http://www.unicode.org/reports"; my $MSDATA = "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6…"; my $MSCODEPAGES = "$MSDATA/Windows Supported Code Page Data Files.zip"; @@ -942,6 +943,45 @@ sub dump_eucjp_codepage() output_codepage_file( 20932 ); } +################################################################ +# build Korean Wansung table from the KSX1001 file +# FIXME: compare to Windows we should add extra mappings for +# characters added from Unicode 1.1 to enhance the completeness. +sub dump_krwansung_codepage() +{ + @cp2uni = (); + @glyph2uni = (); + @lead_bytes = (); + @uni2cp = (); + $default_char = 0x3f; + $default_wchar = 0x003f; + + # ASCII and undefined chars + foreach my $i (0x00 .. 0x9f) { add_mapping( $i, $i ); } + add_mapping( 0xa0, 0xf8e6 ); + add_mapping( 0xad, 0xf8e7 ); + add_mapping( 0xae, 0xf8e8 ); + add_mapping( 0xaf, 0xf8e9 ); + add_mapping( 0xfe, 0xf8ea ); + add_mapping( 0xff, 0xf8eb ); + + my $INPUT = open_data_file( $KSCDATA, "KSX1001.TXT" ); + while (<$INPUT>) + { + next if /^\#/; # skip comments + next if /^$/; # skip empty lines + next if /\x1a/; # skip ^Z + if (/^0x([0-9a-fA-F]+)\s+0x([0-9a-fA-F]+)\s+(\#.*)?/) + { + add_mapping( 0x8080 + hex $1, hex $2 ); + next; + } + die "Unrecognized line $_\n"; + } + close $INPUT; + + output_codepage_file( 20949 ); +} ################################################################ # build the sort keys table @@ -2773,6 +2813,7 @@ dump_norm_table( "nls/normidna.nls" ); dump_sortkey_table( "nls/sortdefault.nls", "Windows 10 Sorting Weight Table.txt" ); foreach my $file (@allfiles) { dump_msdata_codepage( $file ); } dump_eucjp_codepage(); +dump_krwansung_codepage(); dump_registry_script( "dlls/kernelbase/kernelbase.rgs", %registry_keys ); exit 0;

1 0

Hans Leidekker : secur32: Add support for setting DTLS MTU.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: a114ce67db2357740eb58fbda0102e582e79c11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a114ce67db2357740eb58fbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:27 2021 +0100 secur32: Add support for setting DTLS MTU. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 7 +++++++ dlls/secur32/schannel_gnutls.c | 20 ++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 6 ++++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 34 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a1dfd42152..e7673a7f814 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -879,6 +879,13 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( schan_imp_set_application_protocols(ctx->session, buffer->pvBuffer, buffer->cbBuffer); } + if (pInput && (idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_DTLS_MTU)) != -1) + { + buffer = &pInput->pBuffers[idx]; + if (buffer->cbBuffer >= sizeof(WORD)) schan_imp_set_dtls_mtu(ctx->session, *(WORD *)buffer->pvBuffer); + else WARN("invalid buffer size %u\n", buffer->cbBuffer); + } + phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index fbf9277a39c..785430ddf58 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -53,6 +53,7 @@ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); /* Not present in gnutls version < 3.0. */ static void (*pgnutls_transport_set_pull_timeout_function)(gnutls_session_t, int (*)(gnutls_transport_ptr_t, unsigned int)); +static void (*pgnutls_dtls_set_mtu)(gnutls_session_t, unsigned int); /* Not present in gnutls version < 3.2.0. */ static int (*pgnutls_alpn_get_selected_protocol)(gnutls_session_t, gnutls_datum_t *); @@ -186,6 +187,11 @@ static int compat_gnutls_alpn_set_protocols(gnutls_session_t session, const gnut return GNUTLS_E_INVALID_REQUEST; } +static void compat_gnutls_dtls_set_mtu(gnutls_session_t session, unsigned int mtu) +{ + FIXME("\n"); +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -767,6 +773,15 @@ SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, return SEC_E_OK; } +SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session session, unsigned int mtu) +{ + gnutls_session_t s = (gnutls_session_t)session; + + pgnutls_dtls_set_mtu(s, mtu); + TRACE("MTU set to %u\n", mtu); + return SEC_E_OK; +} + static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) { static const WCHAR rsabaseW[] = @@ -1130,6 +1145,11 @@ BOOL schan_imp_init(void) WARN("gnutls_alpn_get_selected_protocol not found\n"); pgnutls_alpn_get_selected_protocol = compat_gnutls_alpn_get_selected_protocol; } + if (!(pgnutls_dtls_set_mtu = dlsym(libgnutls_handle, "gnutls_dtls_set_mtu"))) + { + WARN("gnutls_dtls_set_mtu not found\n"); + pgnutls_dtls_set_mtu = compat_gnutls_dtls_set_mtu; + } if (!(pgnutls_privkey_export_x509 = dlsym(libgnutls_handle, "gnutls_privkey_export_x509"))) { WARN("gnutls_privkey_export_x509 not found\n"); diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 6e6296722cc..ab97615014d 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1213,6 +1213,12 @@ SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, return SEC_E_UNSUPPORTED_FUNCTION; } +SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session session, unsigned int mtu) +{ + FIXME("no support for setting dtls mtu on this platform\n"); + return SEC_E_UNSUPPORTED_FUNCTION; +} + BOOL schan_imp_init(void) { TRACE("()\n"); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index ce8d55d1eb6..ca0062056d6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -253,5 +253,6 @@ extern void schan_imp_deinit(void) DECLSPEC_HIDDEN; extern void schan_imp_set_application_protocols(schan_imp_session, unsigned char *, unsigned int) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session, SecPkgContext_ApplicationProtocol *) DECLSPEC_HIDDEN; +extern SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session, unsigned int) DECLSPEC_HIDDEN; #endif /* ndef __SECUR32_PRIV_H__ */

1 0

Hugh McMaster : reg/tests: Try importing registry files with escaped null characters.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 1c2b96699973e198e72a01a969af0876387f08e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2b96699973e198e72a01a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:21 2021 +1100 reg/tests: Try importing registry files with escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/import.c | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 9b7a90ac99c..f8e7e4b7acb 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -1574,22 +1574,22 @@ static void test_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); - /* Test with embedded null characters */ + /* Test with escaped null characters */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"Wine69f\"=\"\\\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "Wine69a"); - verify_reg_nonexist(hkey, "Wine69b"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3126,19 +3126,19 @@ static void test_unicode_import(void) /* Test with embedded null characters */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"Wine69f\"=\"\\\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "Wine69a"); - verify_reg_nonexist(hkey, "Wine69b"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Arkadiusz Hiler : dinput8/tests: Make input helper function more versatile.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: d3e7e0426cf5544b0fcec210304cfa6898c06cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e7e0426cf5544b0fcec210… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:08 2021 +0200 dinput8/tests: Make input helper function more versatile. test_device_input() now takes properly sized appdata expected value and can be used to send any keyboard event. It also drains device's queue so it can be called multiple times on a single device instance. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2fc04358cc1..02574961ec1 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -80,7 +80,7 @@ static void flush_events(void) } } -static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, DWORD expected) +static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, UINT_PTR expected) { HRESULT hr; DIDEVICEOBJECTDATA obj_data; @@ -91,7 +91,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event( event, DIK_SPACE, 0, 0); + keybd_event(event, MapVirtualKeyA(event, MAPVK_VK_TO_VSC), 0, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -107,7 +107,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO return; } - ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); + ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%lu\n", obj_data.uAppData, expected); /* Check for buffer overflow */ for (i = 0; i < 17; i++) @@ -132,6 +132,14 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + /* drain device's queue */ + while (data_size == 1) + { + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + if (hr != DI_OK) break; + } + IDirectInputDevice_Unacquire(lpdid); }

1 0

Arkadiusz Hiler : dinput: Clear action mapping with SetDataFormat().
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 542f6134563b491030737831f8c6da2aa530c9bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=542f6134563b491030737831… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:09 2021 +0200 dinput: Clear action mapping with SetDataFormat(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 18 ++++++++++++------ dlls/dinput8/tests/device.c | 12 ++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 198e903fc2e..14c47dd3c7d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -833,6 +833,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; unsigned int offset = 0; + ActionMap *action_map; if (This->acquired) return DIERR_ACQUIRED; @@ -848,15 +849,12 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L if (num_actions == 0) return DI_NOEFFECT; - This->num_actions = num_actions; - /* Construct the dataformat and actionmap */ obj_df = HeapAlloc(GetProcessHeap(), 0, sizeof(DIOBJECTDATAFORMAT)*num_actions); data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; - HeapFree(GetProcessHeap(), 0, This->action_map); - This->action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); for (i = 0; i < lpdiaf->dwNumActions; i++) { @@ -873,8 +871,8 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L memcpy(&obj_df[action], obj, df->dwObjSize); - This->action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; - This->action_map[action].offset = offset; + action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + action_map[action].offset = offset; obj_df[action].dwOfs = offset; offset += (type & DIDFT_BUTTON) ? 1 : 4; @@ -884,6 +882,9 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L IDirectInputDevice8_SetDataFormat(iface, &data_format); + This->action_map = action_map; + This->num_actions = num_actions; + HeapFree(GetProcessHeap(), 0, obj_df); /* Set the device properties according to the action format */ @@ -962,6 +963,7 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim This->data_queue[This->queue_head].dwData = data; This->data_queue[This->queue_head].dwTimeStamp = time; This->data_queue[This->queue_head].dwSequence = seq; + This->data_queue[This->queue_head].uAppData = -1; /* Set uAppData by means of action mapping */ if (This->num_actions > 0) @@ -1063,6 +1065,10 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac EnterCriticalSection(&This->crit); + HeapFree(GetProcessHeap(), 0, This->action_map); + This->action_map = NULL; + This->num_actions = 0; + release_DataFormat(&This->data_format); res = create_DataFormat(df, &This->data_format); diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 02574961ec1..4a766280982 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -362,6 +362,18 @@ static void test_action_mapping(void) /* Test keyboard input */ test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + /* setting format should reset action map */ + hr = IDirectInputDevice8_SetDataFormat(data.keyboard, &c_dfDIKeyboard); + ok (SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + + test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + + /* back to action map */ + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); + ok (SUCCEEDED(hr), "SetActionMap should succeed hr=%08x\n", hr); + + test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + /* Test BuildActionMap with no suitable actions for a device */ IDirectInputDevice_Unacquire(data.keyboard); af.dwDataSize = 4 * DITEST_KEYBOARDSPACE;

1 0

Hugh McMaster : reg/tests: Try exporting registry values with escaped null characters.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 53fd4df85f004597161a26d86333755e7cbff0ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fd4df85f004597161a26d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:22 2021 +1100 reg/tests: Try exporting registry values with escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 32c99e36376..2c7ba88fb59 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -168,6 +168,16 @@ static void test_export(void) "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + const char *escaped_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine5a\"=\"\\\\0\"\r\n" + "\"Wine5b\"=\"\\\\0\\\\0\"\r\n" + "\"Wine5c\"=\"Value1\\\\0\"\r\n" + "\"Wine5d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\r\n" + "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" + "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -402,6 +412,21 @@ static void test_export(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_tree(HKEY_CURRENT_USER, KEY_BASE); + + /* Test escaped null characters */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine5a", REG_SZ, "\\0", 3); + add_value(hkey, "Wine5b", REG_SZ, "\\0\\0", 5); + add_value(hkey, "Wine5c", REG_SZ, "Value1\\0", 9); + add_value(hkey, "Wine5d", REG_SZ, "Value2\\0\\0\\0\\0", 15); + add_value(hkey, "Wine5e", REG_SZ, "Value3\\0Value4", 15); + add_value(hkey, "Wine5f", REG_SZ, "\\0Value5", 9); + close_key(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(export)

1 0

Hugh McMaster : reg/tests: Try deleting strings containing escaped null characters.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: aa98e3f6da78135ecffaa50bb78ad906dfd4570d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa98e3f6da78135ecffaa50b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 10 23:25:20 2021 +1100 reg/tests: Try deleting strings containing escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/delete.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index fff3c5348b8..ee2257d42c5 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -100,6 +100,22 @@ static void test_delete(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "\\foo\\bar"); + add_value(hkey, "string\\01", REG_SZ, "Value", 6); + add_value(hkey, "string2", REG_SZ, "foo\\0bar", 9); + add_value(hkey, "\\0", REG_SZ, "Value", 6); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v string\\01 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "string\\01"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v string2 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "string2"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\0 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\0"); + close_key(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r);

1 0

Hans Leidekker : secur32: Return more attributes from schan_InitializeSecurityContextW.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: ed06d64bf41cc3eb6258a3576e845a544855b0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed06d64bf41cc3eb6258a357… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:28 2021 +0100 secur32: Return more attributes from schan_InitializeSecurityContextW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index e7673a7f814..1dd3a029401 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -958,10 +958,11 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } *pfContextAttr = ISC_RET_REPLAY_DETECT | ISC_RET_SEQUENCE_DETECT | ISC_RET_CONFIDENTIALITY | ISC_RET_STREAM; - if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) - *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; - if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) - *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; + if (ctx->req_ctx_attr & ISC_REQ_EXTENDED_ERROR) *pfContextAttr |= ISC_RET_EXTENDED_ERROR; + if (ctx->req_ctx_attr & ISC_REQ_DATAGRAM) *pfContextAttr |= ISC_RET_DATAGRAM; + if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; + if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; + if (ctx->req_ctx_attr & ISC_REQ_MANUAL_CRED_VALIDATION) *pfContextAttr |= ISC_RET_MANUAL_CRED_VALIDATION; return ret; }

1 0

Arkadiusz Hiler : include: Add DIPROPPOINTER definition.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: fb56afae15c99fdb6735021aca3a8bd706e88612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb56afae15c99fdb6735021a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:10 2021 +0200 include: Add DIPROPPOINTER definition. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index 92c6255cf37..2d183bbc944 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -876,6 +876,12 @@ typedef struct DIPROPSTRING { } DIPROPSTRING, *LPDIPROPSTRING; typedef const DIPROPSTRING *LPCDIPROPSTRING; +typedef struct DIPROPPOINTER { + DIPROPHEADER diph; + UINT_PTR uData; +} DIPROPPOINTER, *LPDIPROPPOINTER; +typedef const DIPROPPOINTER *LPCDIPROPPOINTER; + /* special property GUIDs */ #ifdef __cplusplus #define MAKEDIPROP(prop) (*(const GUID *)(prop))

1 0