December 2022 - Wine-Commits

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

Dec. 15, 2022

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: Use SecureZeroMemory() to zero magic values before free.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

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

Zebediah Figura : win32u: Set the width and height when creating a caret from an existing bitmap.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 30398d6f3350914fc1bc127eaa43279d5e30bd0e URL: https://gitlab.winehq.org/wine/wine/-/commit/30398d6f3350914fc1bc127eaa4327… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 14 14:13:45 2022 -0600 win32u: Set the width and height when creating a caret from an existing bitmap. This was omitted in b8732c80b11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53485 --- dlls/win32u/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index eaad697a63e..fd16d03f733 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1843,6 +1843,8 @@ BOOL WINAPI NtUserCreateCaret( HWND hwnd, HBITMAP bitmap, int width, int height BITMAP bitmap_data; if (!NtGdiExtGetObjectW( bitmap, sizeof(bitmap_data), &bitmap_data )) return FALSE; + width = bitmap_data.bmWidth; + height = bitmap_data.bmHeight; caret_bitmap = NtGdiCreateBitmap( bitmap_data.bmWidth, bitmap_data.bmHeight, bitmap_data.bmPlanes, bitmap_data.bmBitsPixel, NULL ); if (caret_bitmap)

1 0

Sven Baars : win32u: Account for 16-bit instances in find_class().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d904f84ed01edc7ec56fbd736c3610057c5173b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d904f84ed01edc7ec56fbd736c3610… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Dec 14 17:17:12 2022 +0100 win32u: Account for 16-bit instances in find_class(). This mimics the condition in the server. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53384 --- dlls/win32u/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index b18fd69edfc..9f3b4251e65 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -353,8 +353,9 @@ static void release_class_ptr( CLASS *ptr ) static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) { ATOM atom = get_int_atom_value( name ); - ULONG_PTR instance = (UINT_PTR)module & ~0xffff; + ULONG_PTR instance = (UINT_PTR)module; CLASS *class; + int is_win16; user_lock(); LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry ) @@ -368,7 +369,9 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) || class->name[name->Length / sizeof(WCHAR)]) continue; } - if (!class->local || !module || (class->instance & ~0xffff) == instance) + is_win16 = !(class->instance >> 16); + if (!instance || !class->local || class->instance == instance || + (!is_win16 && ((class->instance & ~0xffff) == (instance & ~0xffff)))) { TRACE( "%s %lx -> %p\n", debugstr_us(name), instance, class ); return class;

1 0

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

Dec. 15, 2022

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 Dec. 15, 2022

Dec. 15, 2022

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

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

Dec. 15, 2022

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 : mshtml: Fix document fragment's inner window leak.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

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 Dec. 15, 2022

Dec. 15, 2022

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

Francois Gouget : winetest/build-patterns: Fix the summary pattern for the success case.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: tools Branch: master Commit: e2c6973cac94d42664f786b94387ce21a3116d3a URL: https://gitlab.winehq.org/winehq/tools/-/commit/e2c6973cac94d42664f786b9438… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Dec 11 04:07:17 2022 +0100 winetest/build-patterns: Fix the summary pattern for the success case. The data for the summary pattern is stored under the "0" pseudo-test name. But that pseudo-test was never marked as present so that if no other test failed it would be marked as 'missing in this build' instead of as 'successful run'. --- winetest/build-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index 14b1917c..d541d5a2 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -366,6 +366,7 @@ foreach my $build (@sortedbuilds) $reports{$reportdir} = $report; } $build->{hasreport}->{$reportdir} = 1; + $build->{hastest}->{0} = 1; # summary results are present in all builds } while (my $line = <$fh>)

1 0