December 2022 - Wine-commits

Paul Gofman : bcrypt: Use SecureZeroMemory() to zero magic values before free.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: a7efc770f7b1e1da959367e3186d871dce50c6e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7efc770f7b1e1da959367e3186d87… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Dec 14 21:13:12 2022 -0600 bcrypt: Use SecureZeroMemory() to zero magic values before free. The compiler may optimize out the assignment before free and then second free on the bcrypt handle finds magic values in the freed memory. --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 72501faf90e..cf05e8b4d44 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -397,7 +397,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, const WC static void destroy_object( struct object *obj ) { - obj->magic = 0; + SecureZeroMemory( &obj->magic, sizeof(obj->magic) ); free( obj ); }

1 0

Paul Gofman : bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: 6f455e10afaf95f64008f45cdb5b794308275504 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f455e10afaf95f64008f45cdb5b79… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 15 09:25:40 2022 -0600 bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing. --- dlls/bcrypt/gnutls.c | 2 ++ dlls/bcrypt/tests/bcrypt.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index bb79e885652..a67030a3ae0 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2205,6 +2205,8 @@ static NTSTATUS key_asymmetric_encrypt( void *args ) NTSTATUS status = STATUS_SUCCESS; int ret; + if (!key_data(params->key)->a.pubkey) return STATUS_INVALID_HANDLE; + d.data = params->input; d.size = params->input_len; if ((ret = pgnutls_pubkey_encrypt_data(key_data(params->key)->a.pubkey, 0, &d, &e))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 39cdd015c90..3bcdda0cf47 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2284,12 +2284,12 @@ static void test_rsa_encrypt(void) ret = BCryptGenerateKeyPair(rsa, &key, 512, 0); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); - todo_wine { /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); BCryptFinalizeKeyPair(key, 0); + todo_wine { /* No padding */ memset(input_no_padding, 0, sizeof(input_no_padding)); strcpy((char *)input_no_padding, "Hello World");

1 0

Paul Gofman : bcrypt: Set pubkey from privkey in key_asymmetric_import().
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: e1fb63168756c73ebd97a8c7f3b3aba00c52e444 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1fb63168756c73ebd97a8c7f3b3ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 20:02:28 2022 -0600 bcrypt: Set pubkey from privkey in key_asymmetric_import(). --- dlls/bcrypt/gnutls.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a67030a3ae0..89e5c91776d 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -713,8 +713,6 @@ static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_rsa_raw( key_data(key)->a.pubkey, &m, &e ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ); else return STATUS_INVALID_PARAMETER; @@ -781,8 +779,6 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_ecc_raw( key_data(key)->a.pubkey, &curve, &x, &y ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ); else return STATUS_INVALID_PARAMETER; @@ -831,8 +827,6 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_dsa_raw( key_data(key)->a.pubkey, &p, &q, &g, &y ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ); else return STATUS_INVALID_PARAMETER; @@ -1574,6 +1568,8 @@ static NTSTATUS key_asymmetric_import( void *args ) const struct key_asymmetric_import_params *params = args; struct key *key = params->key; unsigned flags = params->flags; + gnutls_pubkey_t pubkey; + NTSTATUS ret; switch (key->alg_id) { @@ -1583,13 +1579,15 @@ static NTSTATUS key_asymmetric_import( void *args ) case ALG_ID_ECDSA_P384: if (flags & KEY_IMPORT_FLAG_PUBLIC) return key_import_ecc_public( key, params->buf, params->len ); - return key_import_ecc( key, params->buf, params->len ); + ret = key_import_ecc( key, params->buf, params->len ); + break; case ALG_ID_RSA: case ALG_ID_RSA_SIGN: if (flags & KEY_IMPORT_FLAG_PUBLIC) return key_import_rsa_public( key, params->buf, params->len ); - return key_import_rsa( key, params->buf, params->len ); + ret = key_import_rsa( key, params->buf, params->len ); + break; case ALG_ID_DSA: if (flags & KEY_IMPORT_FLAG_PUBLIC) @@ -1599,7 +1597,10 @@ static NTSTATUS key_asymmetric_import( void *args ) return key_import_dsa_public( key, params->buf, params->len ); } if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) - return key_import_dsa_capi( key, params->buf, params->len ); + { + ret = key_import_dsa_capi( key, params->buf, params->len ); + break; + } FIXME( "DSA private key not supported\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1607,6 +1608,26 @@ static NTSTATUS key_asymmetric_import( void *args ) FIXME( "algorithm %u not yet supported\n", key->alg_id ); return STATUS_NOT_IMPLEMENTED; } + + if (ret) return ret; + + if ((ret = pgnutls_pubkey_init( &pubkey ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (pgnutls_pubkey_import_privkey( pubkey, key_data(params->key)->a.privkey, 0, 0 )) + { + /* Imported private key may be legitimately missing public key, so ignore the failure here. */ + pgnutls_pubkey_deinit( pubkey ); + } + else + { + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); + key_data(key)->a.pubkey = pubkey; + } + return STATUS_SUCCESS; } static NTSTATUS prepare_gnutls_signature_dsa( struct key *key, UCHAR *signature, ULONG signature_len,

1 0

Paul Gofman : bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt().
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: a88cc503653c06b612429d98e4e6174278687b94 URL: https://gitlab.winehq.org/wine/wine/-/commit/a88cc503653c06b612429d98e4e617… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 20:13:03 2022 -0600 bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt(). --- dlls/bcrypt/tests/bcrypt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3bcdda0cf47..5d1a80f330b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2262,6 +2262,14 @@ static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] = 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd }; +static const UCHAR rsa_encrypted_no_padding[] = +{ + 0x4a, 0xc1, 0xfa, 0x4f, 0xe0, 0x3f, 0x36, 0x9a, 0x64, 0xbf, 0x2e, 0x00, 0xb4, 0xb5, 0x40, 0xbe, + 0x2d, 0x9a, 0x14, 0xf6, 0x8f, 0xa5, 0xc2, 0xe2, 0x20, 0xaf, 0x21, 0x79, 0xc6, 0x32, 0x7e, 0xea, + 0x73, 0x00, 0x01, 0xbb, 0x9a, 0x19, 0x73, 0x41, 0x96, 0xae, 0x88, 0x6e, 0x36, 0x56, 0xe9, 0x9c, + 0xac, 0x04, 0x82, 0xa8, 0x00, 0xdb, 0x4e, 0x29, 0x61, 0x7e, 0xaf, 0x64, 0xdb, 0xa2, 0x70, 0x0f, +}; + static void test_rsa_encrypt(void) { static UCHAR input[] = "Hello World!"; @@ -2287,7 +2295,15 @@ static void test_rsa_encrypt(void) /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); - BCryptFinalizeKeyPair(key, 0); + BCryptDestroyKey(key); + + /* Import a different public key first to make sure a public key from private key improted next + * overrides it. */ + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); todo_wine { /* No padding */ @@ -2313,6 +2329,7 @@ static void test_rsa_encrypt(void) ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(!memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs should be the same\n"); + ok(!memcmp(encrypted_b, rsa_encrypted_no_padding, encrypted_size), "Data mismatch.\n"); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE); decrypted = malloc(decrypted_size);

1 0

Gabriel Ivăncescu : mshtml: Fix document fragment's inner window leak.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: d38c1c1076d04089eedc47fa532ed8ec0e69a5ee URL: https://gitlab.winehq.org/wine/wine/-/commit/d38c1c1076d04089eedc47fa532ed8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 mshtml: Fix document fragment's inner window leak. Document fragments own reference to the inner window, so it must be unlinked. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 49640cff9da..90c4706abee 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5846,12 +5846,6 @@ void detach_document_node(HTMLDocumentNode *doc) doc->catmgr = NULL; } - if(!doc->dom_document && doc->window) { - /* document fragments own reference to inner window */ - IHTMLWindow2_Release(&doc->window->base.IHTMLWindow2_iface); - doc->window = NULL; - } - if(doc->browser) { list_remove(&doc->browser_entry); doc->browser = NULL; @@ -5935,6 +5929,19 @@ static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode return S_OK; } +static void HTMLDocumentFragment_unlink(HTMLDOMNode *iface) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + + if(This->window) { + detach_document_node(This); + + /* document fragments own reference to inner window */ + IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); + This->window = NULL; + } +} + static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); @@ -6134,7 +6141,21 @@ static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { HTMLDocumentNode_QI, HTMLDocumentNode_destructor, HTMLDocumentNode_cpc, - HTMLDocumentFragment_clone + HTMLDocumentFragment_clone, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLDocumentFragment_unlink }; static const tid_t HTMLDocumentNode_iface_tids[] = {

1 0

Gabriel Ivăncescu : mshtml: Fix previous EventObj leak.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: 10a6b80811af5965a393cfb62bb4e057f30184dd URL: https://gitlab.winehq.org/wine/wine/-/commit/10a6b80811af5965a393cfb62bb4e0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 mshtml: Fix previous EventObj leak. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 45db4719b10..bcde9f38bba 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3683,11 +3683,14 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, *r = variant_bool(!event->prevent_default); if(target_vtbl && target_vtbl->set_current_event) { - prev_event = target_vtbl->set_current_event(&event_target->dispex, prev_event); - if(prev_event) - IHTMLEventObj_Release(prev_event); + IHTMLEventObj *prev = target_vtbl->set_current_event(&event_target->dispex, prev_event); + if(prev) + IHTMLEventObj_Release(prev); } + if(prev_event) + IHTMLEventObj_Release(prev_event); + if(event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS) { BOOL prevent_default = event->prevent_default; for(i = 0; !prevent_default && i < chain_cnt; i++) {

1 0

Gabriel Ivăncescu : jscript: Release converted args after invoking.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: 2ecf699dca93c44dd14ee93cc4d47617dd7b6479 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ecf699dca93c44dd14ee93cc4d476… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Release converted args after invoking. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 04632f4c755..06e44fcb129 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1937,6 +1937,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc else hres = jsdisp_call_value(This, passed_this ? jsval_disp(passed_this) : jsval_undefined(), wFlags, argc, argv, pvarRes ? &r : NULL); + while(argc--) + jsval_release(argv[argc]); if(argv != buf) free(argv); if(SUCCEEDED(hres) && pvarRes) {

1 0

Gabriel Ivăncescu : jscript: Fix array ref leak when setting element.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: d1f176b49749dafd42c2ff349ff228d9a2b052d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1f176b49749dafd42c2ff349ff228… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Fix array ref leak when setting element. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 28ada7e53bd..b0557065e69 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1684,7 +1684,7 @@ static HRESULT interp_carray_set(script_ctx_t *ctx) array = stack_top(ctx); assert(is_object_instance(array)); - hres = jsdisp_propput_idx(iface_to_jsdisp(get_object(array)), index, value); + hres = jsdisp_propput_idx(to_jsdisp(get_object(array)), index, value); jsval_release(value); return hres; }

1 0

Gabriel Ivăncescu : jscript: Fix refcount trace's long type format specifier.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: wine Branch: master Commit: b77255f88b1f54c4ceea5713367f2fc82030f2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/b77255f88b1f54c4ceea5713367f2f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Fix refcount trace's long type format specifier. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- 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 06e44fcb129..2c35f2ae9cc 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2247,7 +2247,7 @@ void jsdisp_free(jsdisp_t *obj) jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) { ULONG ref = ++jsdisp->ref; - TRACE("(%p) ref=%d\n", jsdisp, ref); + TRACE("(%p) ref=%ld\n", jsdisp, ref); return jsdisp; } @@ -2255,7 +2255,7 @@ void jsdisp_release(jsdisp_t *jsdisp) { ULONG ref = --jsdisp->ref; - TRACE("(%p) ref=%d\n", jsdisp, ref); + TRACE("(%p) ref=%ld\n", jsdisp, ref); if(!ref) jsdisp_free(jsdisp);

1 0

Francois Gouget : testbot/web: Show the task id in a more compact form.
by Alexandre Julliard 15 Dec '22

15 Dec '22

Module: tools Branch: master Commit: f1d196b96dcaa71f49acdb98ca80a3e1a462f3c5 URL: https://gitlab.winehq.org/winehq/tools/-/commit/f1d196b96dcaa71f49acdb98ca8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 17 17:33:06 2022 +0100 testbot/web: Show the task id in a more compact form. --- testbot/web/JobDetails.pl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a4a250fa..c2b7cf5c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures)$/ ? "" : + return $PropertyName =~ /^(?:Id|StepNo|PreviousNo|Type|VM|FileType|Missions|NewWarnings|NewTestFailures)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -65,7 +65,11 @@ sub GenerateHeaderView($$$) my ($self, $Row, $Col) = @_; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName eq "CmdLineArg") + if ($PropertyName eq "TaskNo") + { + print "<a class='title' title='Step.Task'>Task</a>"; + } + elsif ($PropertyName eq "CmdLineArg") { print "Arguments / <span class='MissionHeader'>Missions</span>"; } @@ -101,6 +105,11 @@ sub GenerateDataView($$$) my $StepTask = $Row->{Item}; my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName eq "TaskNo") + { + print $StepTask->StepNo, ".", $StepTask->TaskNo; + return; + } if ($PropertyName eq "VMName") { print "<a href='#k", $StepTask->GetKey(), "'>",

1 0