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

Rémi Bernon : tools: Relax the dot in module names rules.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: a6f214d75a124e7d84c23f05f353e8ebd2bf0740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f214d75a124e7d84c23f05… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 5 19:16:45 2021 +0100 tools: Relax the dot in module names rules. This should allow modules with dot in their names, while still making the .dll extension optional. The MODULE variable still determines the actual output file extension. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2d3c14cb2ec..3abba2da840 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -446,18 +446,17 @@ sub update_makefiles(@) if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; - die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name; if ($file =~ /^programs\//) { die "EXTRADLLFLAGS should be defined in $file" unless $dllflags; die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.exe"; } else { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; } if (defined $make{"IMPORTLIB"}) {

1 0

Bernhard Kölbl : netprofm: Set correct GUIDs for network connections.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 4393438ab31e8825edf4111524ef5a0be0a90d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4393438ab31e8825edf41115… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Mar 5 16:22:07 2021 +0100 netprofm: Set correct GUIDs for network connections. Retrieve the network connection's GUID from the interface index. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index fa94916dd9b..40d2fd9763c 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1738,8 +1738,10 @@ static void init_networks( struct list_manager *mgr ) { struct network *network; struct connection *connection; + NET_LUID luid; - id.Data1 = aa->u.s.IfIndex; + ConvertInterfaceIndexToLuid(aa->u.s.IfIndex, &luid); + ConvertInterfaceLuidToGuid(&luid, &id); /* assume a one-to-one mapping between networks and connections */ if (!(network = create_network( &id ))) goto done;

1 0

Jacek Caban : jscript: Improve prop_get and prop_put debug traces.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 492b65df1f764219790c83ffb3f1dbebfaace5e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=492b65df1f764219790c83ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 15:00:04 2021 +0100 jscript: Improve prop_get and prop_put debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5829cebe55b..efe8741f3c1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -502,7 +502,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) return hres; } - TRACE("%s ret %s\n", debugstr_w(prop->name), debugstr_jsval(*r)); + TRACE("%p.%s ret %s\n", This, debugstr_w(prop->name), debugstr_jsval(*r)); return hres; } @@ -559,7 +559,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return E_FAIL; } - TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_jsval(val)); + TRACE("%p.%s = %s\n", This, debugstr_w(prop->name), debugstr_jsval(val)); hres = jsval_copy(val, &prop->u.val); if(FAILED(hres))

1 0

Hans Leidekker : include: Add missing SECBUFFER defines.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 4be05213943d8b522d47e3706614175f531197d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be05213943d8b522d47e370… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:24 2021 +0100 include: Add missing SECBUFFER defines. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sspi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sspi.h b/include/sspi.h index e7371f129de..1cd1e6e0035 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -201,7 +201,9 @@ typedef struct _SecBuffer #define SECBUFFER_MECHLIST_SIGNATURE 12 #define SECBUFFER_TARGET 13 #define SECBUFFER_CHANNEL_BINDINGS 14 +#define SECBUFFER_ALERT 17 #define SECBUFFER_APPLICATION_PROTOCOLS 18 +#define SECBUFFER_DTLS_MTU 24 #define SECBUFFER_ATTRMASK 0xf0000000 #define SECBUFFER_READONLY 0x80000000

1 0

Hans Leidekker : secur32: Add a helper to read TLS record size.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: 37b29862b36364c6fee143de5eb816bcae514279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b29862b36364c6fee143de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:25 2021 +0100 secur32: Add a helper to read TLS record size. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d47c4d79258..3a34007a8cb 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -772,6 +772,13 @@ static void dump_buffer_desc(SecBufferDesc *desc) } } +#define HEADER_SIZE_TLS 5 + +static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) +{ + return (buf[header_size - 2] << 8) | buf[header_size - 1]; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -870,9 +877,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ptr = buffer->pvBuffer; expected_size = 0; - while (buffer->cbBuffer > expected_size + 5) + while (buffer->cbBuffer > expected_size + HEADER_SIZE_TLS) { - record_size = 5 + ((ptr[3] << 8) | ptr[4]); + record_size = HEADER_SIZE_TLS + read_record_size(ptr, HEADER_SIZE_TLS); if (buffer->cbBuffer < expected_size + record_size) break; @@ -1035,7 +1042,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( mac_size, message_size, block_size); /* These are defined by the TLS RFC */ - stream_sizes->cbHeader = 5; + stream_sizes->cbHeader = HEADER_SIZE_TLS; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ stream_sizes->cbMaximumMessage = message_size; stream_sizes->cbBuffers = 4; @@ -1360,7 +1367,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle buffer = &message->pBuffers[idx]; buf_ptr = buffer->pvBuffer; - expected_size = 5 + ((buf_ptr[3] << 8) | buf_ptr[4]); + expected_size = HEADER_SIZE_TLS + read_record_size(buf_ptr, HEADER_SIZE_TLS); if(buffer->cbBuffer < expected_size) { TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); @@ -1377,7 +1384,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return SEC_E_INCOMPLETE_MESSAGE; } - data_size = expected_size - 5; + data_size = expected_size - HEADER_SIZE_TLS; data = heap_alloc(data_size); init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); @@ -1412,21 +1419,21 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %ld bytes\n", received); - memcpy(buf_ptr + 5, data, received); + memcpy(buf_ptr + HEADER_SIZE_TLS, data, received); heap_free(data); schan_decrypt_fill_buffer(message, SECBUFFER_DATA, - buf_ptr + 5, received); + buf_ptr + HEADER_SIZE_TLS, received); schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, - buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + buf_ptr + HEADER_SIZE_TLS + received, buffer->cbBuffer - HEADER_SIZE_TLS - received); if(buffer->cbBuffer > expected_size) schan_decrypt_fill_buffer(message, SECBUFFER_EXTRA, buf_ptr + expected_size, buffer->cbBuffer - expected_size); buffer->BufferType = SECBUFFER_STREAM_HEADER; - buffer->cbBuffer = 5; + buffer->cbBuffer = HEADER_SIZE_TLS; return status; }

1 0

Hans Leidekker : secur32: Add DTLS support.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: f93284dfa44b060436c6a0617b51280abb3f24fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f93284dfa44b060436c6a061… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:26 2021 +0100 secur32: Add DTLS support. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 89 ++++++++++++++++++++++++++---------------- dlls/secur32/schannel_gnutls.c | 39 +++++++++++++++++- 2 files changed, 92 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f93284dfa44b060436c6…

1 0

Hans Leidekker : secur32: Add support for setting DTLS MTU.
by Alexandre Julliard 10 Mar '21

10 Mar '21

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

Hans Leidekker : secur32: Return more attributes from schan_InitializeSecurityContextW.
by Alexandre Julliard 10 Mar '21

10 Mar '21

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

Francois Gouget : winetest: Avoid duplicating the extract_test_proc() cleanup code.
by Alexandre Julliard 10 Mar '21

10 Mar '21

Module: wine Branch: master Commit: e9a0eeff41675597e8ccd7daa7d62681c5a32d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a0eeff41675597e8ccd7da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 10 18:15:58 2021 +0100 winetest: Avoid duplicating the extract_test_proc() cleanup code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 54 ++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1731850bfdb..408e1b3c706 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -890,6 +890,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP DWORD err; HANDLE actctx; ULONG_PTR cookie; + BOOL run; if (aborting) return TRUE; @@ -941,50 +942,39 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP else dll = 0; } + run = TRUE; if (!dll) { xprintf (" %s=dll is missing\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) - { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); - } - return TRUE; + run = FALSE; } - if(is_stub_dll(dllname)) + else { - FreeLibrary(dll); - xprintf (" %s=dll is a stub\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) + if (is_stub_dll(dllname)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=dll is a stub\n", dllname); + run = FALSE; } - return TRUE; - } - if (is_native_dll(dll)) - { - FreeLibrary(dll); - xprintf (" %s=load error Configured as native\n", dllname); - nr_native_dlls++; - if (actctx != INVALID_HANDLE_VALUE) + else if (is_native_dll(dll)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=load error Configured as native\n", dllname); + nr_native_dlls++; + run = FALSE; } - return TRUE; + FreeLibrary(dll); } - FreeLibrary(dll); - if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ))) + if (run) { - xprintf (" %s=%s\n", dllname, get_file_version(filename)); - nr_of_tests += wine_tests[nr_of_files].subtest_count; - nr_of_files++; - } - else - { - xprintf (" %s=load error %u\n", dllname, err); + err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); + if (!err) + { + xprintf (" %s=%s\n", dllname, get_file_version(filename)); + nr_of_tests += wine_tests[nr_of_files].subtest_count; + nr_of_files++; + } + else + xprintf (" %s=load error %u\n", dllname, err); } if (actctx != INVALID_HANDLE_VALUE)

1 0

Hugh McMaster : reg/tests: Try deleting strings containing escaped null characters.
by Alexandre Julliard 10 Mar '21

10 Mar '21

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