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

Jacek Caban : user32: Store current spy indent in user_thread_info struct.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 65fe0f6521954e5b44798a994ada31b555d10278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65fe0f6521954e5b44798a99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:14:39 2022 +0100 user32: Store current spy indent in user_thread_info struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 13 ++----------- dlls/win32u/ntuser_private.h | 1 + 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 4d22acb43c2..141843e15bb 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2028,14 +2028,12 @@ typedef struct WCHAR wnd_name[16]; /* window name for message */ } SPY_INSTANCE; -static LONG indent_tls_index = TLS_OUT_OF_INDEXES; - /*********************************************************************** * get_indent_level */ static inline INT_PTR get_indent_level(void) { - return (INT_PTR)TlsGetValue( indent_tls_index ); + return get_user_thread_info()->spy_indent; } @@ -2044,7 +2042,7 @@ static inline INT_PTR get_indent_level(void) */ static inline void set_indent_level( INT_PTR level ) { - TlsSetValue( indent_tls_index, (void *)level ); + get_user_thread_info()->spy_indent = level; } @@ -2539,13 +2537,6 @@ static BOOL spy_init(void) if (!TRACE_ON(message)) return FALSE; - if (indent_tls_index == TLS_OUT_OF_INDEXES) - { - DWORD index = TlsAlloc(); - if (InterlockedCompareExchange( &indent_tls_index, index, TLS_OUT_OF_INDEXES ) != TLS_OUT_OF_INDEXES) - TlsFree( index ); - } - if (spy_exclude) return TRUE; exclude = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, SPY_MAX_MSGNUM + 2 ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 03017af9882..4710c45ebc0 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -159,6 +159,7 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */ + UINT spy_indent; /* Current spy indent */ }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) );

1 0

Jacek Caban : win32u: Move message spy implementation from user32.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 6b3da8a4d8fe4d9cdb82e8c52c1548166c00bf5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3da8a4d8fe4d9cdb82e8c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 16:42:08 2022 +0100 win32u: Move message spy implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 - dlls/user32/user_main.c | 21 ++++++++ dlls/user32/user_private.h | 7 --- dlls/win32u/Makefile.in | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 6 +++ dlls/win32u/ntuser_private.h | 15 ++++++ dlls/{user32 => win32u}/spy.c | 109 +++++++++++++++++++++++------------------- dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/window.c | 4 +- dlls/win32u/wrappers.c | 7 +++ include/ntuser.h | 5 ++ 14 files changed, 124 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b3da8a4d8fe4d9cdb82…

1 0

Alexandre Julliard : wow64win: Add missing syscall for NtUserGetAtomName().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 90139001d401ca98abf9699ee51daf649e9c52a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90139001d401ca98abf9699e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 16:13:30 2022 +0100 wow64win: Add missing syscall for NtUserGetAtomName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 7b6bbb5eda6..007459457b2 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -100,6 +100,7 @@ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserGetAncestor ) \ + SYSCALL_ENTRY( NtUserGetAtomName ) \ SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \ SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1a43b4793fb..fb237bfff47 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -189,6 +189,16 @@ NTSTATUS WINAPI wow64_NtUserRemoveProp( UINT *args ) return HandleToUlong( NtUserRemoveProp( hwnd, str )); } +NTSTATUS WINAPI wow64_NtUserGetAtomName( UINT *args ) +{ + ATOM atom = get_ulong( &args ); + UNICODE_STRING32 *str32 = get_ptr( &args ); + + UNICODE_STRING str; + + return NtUserGetAtomName( atom, unicode_str_32to64( &str, str32 )); +} + NTSTATUS WINAPI wow64_NtUserGetAncestor( UINT *args ) { HWND hwnd = get_handle( &args );

1 0

Alexandre Julliard : wow64win: Add missing syscall for NtUserGetClassName().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 65d0c15014d45552e9f069c6d8c38162c71c1be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65d0c15014d45552e9f069c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 16:13:56 2022 +0100 wow64win: Add missing syscall for NtUserGetClassName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 007459457b2..a90c4c20d40 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserGetAncestor ) \ SYSCALL_ENTRY( NtUserGetAtomName ) \ + SYSCALL_ENTRY( NtUserGetClassName ) \ SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \ SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index fb237bfff47..9d957673ceb 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -199,6 +199,17 @@ NTSTATUS WINAPI wow64_NtUserGetAtomName( UINT *args ) return NtUserGetAtomName( atom, unicode_str_32to64( &str, str32 )); } +NTSTATUS WINAPI wow64_NtUserGetClassName( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + BOOL real = get_ulong( &args ); + UNICODE_STRING32 *str32 = get_ptr( &args ); + + UNICODE_STRING str; + + return NtUserGetClassName( hwnd, real, unicode_str_32to64( &str, str32 )); +} + NTSTATUS WINAPI wow64_NtUserGetAncestor( UINT *args ) { HWND hwnd = get_handle( &args );

1 0

Alexandre Julliard : mlang: Skip locales that can't be converted to rfc1766 format.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: f324021e6854ef7d228fd20a9c8fa32d6695efdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f324021e6854ef7d228fd20a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 17:31:30 2022 +0100 mlang: Skip locales that can't be converted to rfc1766 format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 5d89a051e09..8a062971dc4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2403,7 +2403,7 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale, DWORD flags, LPARAM lparam if (info->lcid == LOCALE_CUSTOM_UNSPECIFIED) return TRUE; info->wszRfc1766[0] = 0; - lcid_to_rfc1766W( info->lcid, info->wszRfc1766, MAX_RFC1766_NAME ); + if (FAILED( lcid_to_rfc1766W( info->lcid, info->wszRfc1766, MAX_RFC1766_NAME ))) return TRUE; info->wszLocaleName[0] = 0; GetLocaleInfoW(info->lcid, LOCALE_SLANGUAGE, info->wszLocaleName, MAX_LOCALE_NAME);

1 0

Gabriel Ivăncescu : jscript: Return JS_E_INVALID_PROPERTY in jsdisp_call_name if property is not found.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 324b82d9ec428e26929709ca321d04f6769b0f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=324b82d9ec428e26929709ca… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 21 17:58:28 2022 +0200 jscript: Return JS_E_INVALID_PROPERTY in jsdisp_call_name if property is not found. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 +++ dlls/jscript/tests/run.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e14001074ff..1cacd49a1fa 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2007,6 +2007,9 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, unsigned if(FAILED(hres)) return hres; + if(!prop || prop->type == PROP_DELETED) + return JS_E_INVALID_PROPERTY; + return invoke_prop_func(disp, to_disp(disp), prop, flags, argc, argv, r, NULL); } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 63d81150e0e..86d6fa46212 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2946,6 +2946,28 @@ static void test_script_exprs(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + hres = parse_script_expr(L"var o=new Object(); Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"[object Object]"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = parse_script_expr(L"var o=new Object(); Object.prototype.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + todo_wine + ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = parse_script_expr(L"var o=new Object(); delete Object.prototype.toString; Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == 0x800a01b6, "parse_script_expr failed: %08lx\n", hres); + + hres = parse_script_expr(L"var o=new Object(); o.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + test_default_value(); test_retval();

1 0

Gabriel Ivăncescu : jscript: Allow overriding builtin methods by setting the prop.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 94349fdd9abae527f6b71d9776663380d9ac81f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94349fdd9abae527f6b71d97… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 21 17:58:29 2022 +0200 jscript: Allow overriding builtin methods by setting the prop. Methods can be overriden by simple assignment, not just via defineProperty, unlike accessors. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 6 ++++++ dlls/jscript/tests/run.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1cacd49a1fa..03062eebb63 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -495,6 +495,12 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) switch(prop->type) { case PROP_BUILTIN: + if(prop->u.p->invoke) { + prop->type = PROP_JSVAL; + prop->flags = PROPF_CONFIGURABLE | PROPF_WRITABLE; + prop->u.val = jsval_undefined(); + break; + } if(!prop->u.p->setter) { TRACE("getter with no setter\n"); return S_OK; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 86d6fa46212..5e797a19cb9 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2955,7 +2955,6 @@ static void test_script_exprs(void) hres = parse_script_expr(L"var o=new Object(); Object.prototype.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); - todo_wine ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Hans Leidekker : bcrypt: Pass the algorithm ID to key_asymmetric_create().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: f3d4df60ff4afbf1983387a098ae96830384f53a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3d4df60ff4afbf1983387a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:06 2022 +0100 bcrypt: Pass the algorithm ID to key_asymmetric_create(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5df4da009a4..fe16f9269c9 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -968,7 +968,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return status; } -static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *alg, ULONG bitlen, +static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id, ULONG bitlen, const UCHAR *pubkey, ULONG pubkey_len ) { struct key *key; @@ -981,7 +981,7 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a if (!(key = calloc( 1, sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - key->alg_id = alg->id; + key->alg_id = alg_id; key->u.a.bitlen = bitlen; key->u.a.pubkey_len = pubkey_len; @@ -1366,7 +1366,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ); } else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) { @@ -1396,7 +1396,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*ecc_blob) + key_size * 2; - if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status; params.key = key; params.buf = input; @@ -1420,7 +1420,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; if (size != input_len) return NTE_BAD_DATA; - return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); } else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) { @@ -1431,7 +1431,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) + if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status; params.key = key; params.buf = input; @@ -1454,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); + return key_asymmetric_create( (struct key **)ret_key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); } else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB )) { @@ -1482,7 +1482,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_INVALID_PARAMETER; size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status; params.key = key; params.buf = input; @@ -1517,7 +1517,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); if (input_len < size) return STATUS_INVALID_PARAMETER; - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status; key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; *ret_key = key; @@ -1629,7 +1629,7 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H return STATUS_NOT_SUPPORTED; } - if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, size ))) *handle = key; + if (!(status = key_asymmetric_create( &key, alg->id, key_len, NULL, size ))) *handle = key; return status; }

1 0

Hans Leidekker : bcrypt: Call key_destroy() instead of BCryptDestroyKey().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 9176251af425ba494c0334c5659aa47941ee7c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9176251af425ba494c0334c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:07 2022 +0100 bcrypt: Call key_destroy() instead of BCryptDestroyKey(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fe16f9269c9..ab9cf67923d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1324,6 +1324,22 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } +static void key_destroy( struct key *key ) +{ + if (key_is_symmetric( key )) + { + UNIX_CALL( key_symmetric_destroy, key ); + free( key->u.s.vector ); + free( key->u.s.secret ); + DeleteCriticalSection( &key->u.s.cs ); + } + else + UNIX_CALL( key_asymmetric_destroy, key ); + + key->hdr.magic = 0; + free( key ); +} + static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { @@ -1403,7 +1419,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_ecc, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1438,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_rsa, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1489,7 +1505,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP params.len = input_len; if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) { - BCryptDestroyKey( key ); + key_destroy( key ); return status; } @@ -1724,24 +1740,6 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) return STATUS_SUCCESS; } -static void key_destroy( struct key *key ) -{ - if (key_is_symmetric( key )) - { - UNIX_CALL( key_symmetric_destroy, key ); - free( key->u.s.vector ); - free( key->u.s.secret ); - DeleteCriticalSection( &key->u.s.cs ); - } - else - { - UNIX_CALL( key_asymmetric_destroy, key ); - free( key->u.a.pubkey ); - } - key->hdr.magic = 0; - free( key ); -} - NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy, UCHAR *object, ULONG object_len, ULONG flags ) {

1 0

Hans Leidekker : bcrypt: Merge the various key export Unix calls into one.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: c1ed9ca9b18267b2139fcf7fd68f24d2c6d7a2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1ed9ca9b18267b2139fcf7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:08 2022 +0100 bcrypt: Merge the various key export Unix calls into one. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 10 +- dlls/bcrypt/bcrypt_main.c | 46 +++--- dlls/bcrypt/gnutls.c | 336 +++++++++++++++++++++++++++++++----------- 3 files changed, 277 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1ed9ca9b18267b2139f…

1 0