January 2024 - Wine-commits

Hans Leidekker : bcrypt: Add support for generating DH keys from known parameters.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 7f41d5059ed4dc6ff3ac14e7d845edb828b21ead URL: https://gitlab.winehq.org/wine/wine/-/commit/7f41d5059ed4dc6ff3ac14e7d845ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 8 11:26:19 2023 +0100 bcrypt: Add support for generating DH keys from known parameters. --- dlls/bcrypt/gnutls.c | 70 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index dbcfd723687..3592c685c56 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -79,6 +79,10 @@ typedef enum typedef struct gnutls_x509_spki_st *gnutls_x509_spki_t; #endif +#if GUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 8) +#define GNUTLS_KEYGEN_DH 4 +#endif + union key_data { gnutls_cipher_hd_t cipher; @@ -132,11 +136,14 @@ static int (*pgnutls_privkey_export_rsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_export_dsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); -static int (*pgnutls_privkey_generate)(gnutls_privkey_t, gnutls_pk_algorithm_t, unsigned int, unsigned int); static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); +/* Not present in gnutls version < 3.5.0 */ +static int (*pgnutls_privkey_generate2)(gnutls_privkey_t, gnutls_pk_algorithm_t, unsigned int, unsigned int, + const gnutls_keygen_data_st *, unsigned); + /* Not present in gnutls version < 3.6.0 */ static int (*pgnutls_decode_rs_value)(const gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_x509_spki_init)(gnutls_x509_spki_t *); @@ -263,12 +270,6 @@ static int compat_gnutls_pubkey_import_dsa_raw(gnutls_pubkey_t key, const gnutls return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } -static int compat_gnutls_privkey_generate(gnutls_privkey_t key, gnutls_pk_algorithm_t algo, unsigned int bits, - unsigned int flags) -{ - return GNUTLS_E_UNKNOWN_PK_ALGORITHM; -} - static int compat_gnutls_decode_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t * r, gnutls_datum_t * s) { return GNUTLS_E_INTERNAL_ERROR; @@ -347,6 +348,12 @@ static int compat_gnutls_pubkey_import_dh_raw(gnutls_pubkey_t pubkey, const gnut return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_privkey_generate2(gnutls_privkey_t privkey, gnutls_pk_algorithm_t alg, unsigned int bits, + unsigned int flags, const gnutls_keygen_data_st *data, unsigned data_size) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -419,7 +426,7 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR_OPT(gnutls_privkey_export_dsa_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) - LOAD_FUNCPTR_OPT(gnutls_privkey_generate) + LOAD_FUNCPTR_OPT(gnutls_privkey_generate2) LOAD_FUNCPTR_OPT(gnutls_privkey_import_dh_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_import_rsa_raw) @@ -1005,7 +1012,8 @@ done: return status; } -static gnutls_privkey_t create_privkey( gnutls_pk_algorithm_t pk_alg, unsigned int bitlen ) +static gnutls_privkey_t create_privkey( gnutls_pk_algorithm_t pk_alg, unsigned int bitlen, + const gnutls_keygen_data_st *data, unsigned int data_size ) { gnutls_privkey_t privkey; int ret; @@ -1016,7 +1024,7 @@ static gnutls_privkey_t create_privkey( gnutls_pk_algorithm_t pk_alg, unsigned i return NULL; } - if ((ret = pgnutls_privkey_generate( privkey, pk_alg, bitlen, 0 ))) + if ((ret = pgnutls_privkey_generate2( privkey, pk_alg, bitlen, 0, data, data_size ))) { pgnutls_perror( ret ); pgnutls_privkey_deinit( privkey ); @@ -1047,6 +1055,29 @@ static gnutls_pubkey_t create_pubkey_from_privkey( gnutls_privkey_t privkey ) return pubkey; } +static gnutls_dh_params_t get_dh_params( gnutls_privkey_t privkey ) +{ + gnutls_dh_params_t params; + gnutls_datum_t x; + int ret; + + if ((ret = pgnutls_dh_params_init( &params ))) + { + pgnutls_perror( ret ); + return NULL; + } + + if ((ret = pgnutls_privkey_export_dh_raw( privkey, params, NULL, &x, 0 ))) + { + pgnutls_perror( ret ); + pgnutls_dh_params_deinit( params ); + return NULL; + } + + free( x.data ); + return params; +} + static NTSTATUS key_asymmetric_generate( void *args ) { struct key *key = args; @@ -1093,7 +1124,24 @@ static NTSTATUS key_asymmetric_generate( void *args ) return STATUS_NOT_SUPPORTED; } - if (!(privkey = create_privkey( pk_alg, bitlen ))) return STATUS_INTERNAL_ERROR; + if (key->alg_id == ALG_ID_DH && key_data(key)->a.dh_params) + { + gnutls_keygen_data_st data; + + data.type = GNUTLS_KEYGEN_DH; + data.data = (unsigned char *)key_data(key)->a.dh_params; + data.size = 0; + if (!(privkey = create_privkey( pk_alg, bitlen, &data, 1 ))) return STATUS_INTERNAL_ERROR; + } + else if (!(privkey = create_privkey( pk_alg, bitlen, NULL, 0 ))) return STATUS_INTERNAL_ERROR; + + if (key->alg_id == ALG_ID_DH && !key_data(key)->a.dh_params && + !(key_data(key)->a.dh_params = get_dh_params( privkey ))) + { + pgnutls_privkey_deinit( privkey ); + return STATUS_INTERNAL_ERROR; + } + if (!(pubkey = create_pubkey_from_privkey( privkey ))) { pgnutls_privkey_deinit( privkey );

1 0

Hans Leidekker : bcrypt: Make sure key_asymmetric_derive_key() returns correct size.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: dfbbfd6f240992de21bec13200cca54ccb815f67 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfbbfd6f240992de21bec13200cca5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 8 12:13:12 2023 +0100 bcrypt: Make sure key_asymmetric_derive_key() returns correct size. --- dlls/bcrypt/gnutls.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 3592c685c56..1e5a81d9366 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2671,6 +2671,7 @@ static NTSTATUS key_asymmetric_derive_key( void *args ) { const struct key_asymmetric_derive_key_params *params = args; gnutls_datum_t s; + NTSTATUS status = STATUS_SUCCESS; int ret; if ((ret = pgnutls_privkey_derive_secret( key_data(params->privkey)->a.privkey, @@ -2680,15 +2681,15 @@ static NTSTATUS key_asymmetric_derive_key( void *args ) return STATUS_INTERNAL_ERROR; } - if (!params->output) *params->ret_len = s.size; - else + *params->ret_len = EXPORT_SIZE( s, params->privkey->u.a.bitlen / 8, 1 ); + if (params->output) { - *params->ret_len = min( params->output_len, s.size ); - memcpy( params->output, s.data, *params->ret_len ); + if (params->output_len < *params->ret_len) status = STATUS_BUFFER_TOO_SMALL; + else export_gnutls_datum( params->output, *params->ret_len, &s, 1 ); } free( s.data ); - return STATUS_SUCCESS; + return status; } const unixlib_entry_t __wine_unix_call_funcs[] =

1 0

Hans Leidekker : bcrypt: Assume we have a public key in key_export_dh_public().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: f067283f9b41b3e71c870de5c2fff7b9857dc98c URL: https://gitlab.winehq.org/wine/wine/-/commit/f067283f9b41b3e71c870de5c2fff7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 11 09:41:57 2023 +0100 bcrypt: Assume we have a public key in key_export_dh_public(). --- dlls/bcrypt/gnutls.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 1e5a81d9366..f7df47674c6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1657,7 +1657,7 @@ static NTSTATUS key_export_dh_public( struct key *key, UCHAR *buf, ULONG len, UL BCRYPT_DH_KEY_BLOB *dh_blob = (BCRYPT_DH_KEY_BLOB *)buf; ULONG size = key->u.a.bitlen / 8; gnutls_dh_params_t params; - gnutls_datum_t p, g, y, x = {0}; + gnutls_datum_t p, g, y; UCHAR *dst; int ret = GNUTLS_E_INVALID_REQUEST; @@ -1667,12 +1667,7 @@ static NTSTATUS key_export_dh_public( struct key *key, UCHAR *buf, ULONG len, UL return STATUS_INTERNAL_ERROR; } - if (key_data(key)->a.pubkey) - ret = pgnutls_pubkey_export_dh_raw( key_data(key)->a.pubkey, params, &y, 0 ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_dh_raw( key_data(key)->a.privkey, params, &y, &x, 0 ); - - if (ret) + if ((ret = pgnutls_pubkey_export_dh_raw( key_data(key)->a.pubkey, params, &y, 0 ))) { pgnutls_perror( ret ); pgnutls_dh_params_deinit( params ); @@ -1682,7 +1677,7 @@ static NTSTATUS key_export_dh_public( struct key *key, UCHAR *buf, ULONG len, UL if ((ret = pgnutls_dh_params_export_raw( params, &p, &g, NULL )) < 0) { pgnutls_perror( ret ); - free( y.data ); free( x.data ); + free( y.data ); pgnutls_dh_params_deinit( params ); return STATUS_INTERNAL_ERROR; } @@ -1699,7 +1694,7 @@ static NTSTATUS key_export_dh_public( struct key *key, UCHAR *buf, ULONG len, UL dh_blob->cbKey = size; } - free( p.data ); free( g.data ); free( y.data ); free( x.data ); + free( p.data ); free( g.data ); free( y.data ); return STATUS_SUCCESS; }

1 0

Hans Leidekker : bcrypt: Set dh_params in key_import_dh/_public().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: c6974c6b4685aea126763e416e688a2ba834d832 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6974c6b4685aea126763e416e688a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 11 10:10:47 2023 +0100 bcrypt: Set dh_params in key_import_dh/_public(). --- dlls/bcrypt/gnutls.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index f7df47674c6..512731dfcd3 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1868,17 +1868,19 @@ static NTSTATUS key_import_dh_public( struct key *key, UCHAR *buf, ULONG len ) return STATUS_INTERNAL_ERROR; } - ret = pgnutls_pubkey_import_dh_raw( handle, params, &y ); - pgnutls_dh_params_deinit( params ); - if (ret < 0) + if ((ret = pgnutls_pubkey_import_dh_raw( handle, params, &y ))) { pgnutls_perror( ret ); + pgnutls_dh_params_deinit( params ); pgnutls_pubkey_deinit( handle ); return STATUS_INTERNAL_ERROR; } if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); key_data(key)->a.pubkey = handle; + + if (key_data(key)->a.dh_params) pgnutls_dh_params_deinit( key_data(key)->a.dh_params ); + key_data(key)->a.dh_params = params; return STATUS_SUCCESS; } @@ -1921,17 +1923,19 @@ static NTSTATUS key_import_dh( struct key *key, UCHAR *buf, ULONG len ) return STATUS_INTERNAL_ERROR; } - ret = pgnutls_privkey_import_dh_raw( handle, params, &y, &x ); - pgnutls_dh_params_deinit( params ); - if (ret < 0) + if ((ret = pgnutls_privkey_import_dh_raw( handle, params, &y, &x ))) { pgnutls_perror( ret ); + pgnutls_dh_params_deinit( params ); pgnutls_privkey_deinit( handle ); return STATUS_INTERNAL_ERROR; } if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey ); key_data(key)->a.privkey = handle; + + if (key_data(key)->a.dh_params) pgnutls_dh_params_deinit( key_data(key)->a.dh_params ); + key_data(key)->a.dh_params = params; return STATUS_SUCCESS; }

1 0

Hans Leidekker : bcrypt/tests: Add DH tests.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 47349f34225623e52fa944be1c140f8d6a084f07 URL: https://gitlab.winehq.org/wine/wine/-/commit/47349f34225623e52fa944be1c140f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 6 22:06:45 2023 +0100 bcrypt/tests: Add DH tests. Mostly written by Paul Gofman. --- dlls/bcrypt/tests/bcrypt.c | 326 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 323 insertions(+), 3 deletions(-)

1 0

Hans Leidekker : crypt32: Pad R/S values with zeroes if smaller than their counterpart.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 0ceb41a5fdaf2426df60bc5b441772e7a94608a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ceb41a5fdaf2426df60bc5b441772… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 8 15:24:11 2024 +0100 crypt32: Pad R/S values with zeroes if smaller than their counterpart. Fixes certificate verification in Brawlhalla. --- dlls/crypt32/cert.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f640234d89b..373805e858f 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2778,32 +2778,37 @@ BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) static BOOL CNG_PrepareSignatureECC(BYTE *encoded_sig, DWORD encoded_size, BYTE **sig_value, DWORD *sig_len) { CERT_ECC_SIGNATURE *ecc_sig; - DWORD size; + DWORD size, r_size, s_size, r_offset, s_offset; int i; if (!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ECC_SIGNATURE, encoded_sig, encoded_size, CRYPT_DECODE_ALLOC_FLAG, NULL, &ecc_sig, &size)) return FALSE; - if (!ecc_sig->r.cbData || !ecc_sig->s.cbData) + if (!(r_size = ecc_sig->r.cbData) || !(s_size = ecc_sig->s.cbData)) { LocalFree(ecc_sig); SetLastError(ERROR_INVALID_DATA); return FALSE; } + r_size = s_size = max( r_size, s_size ); - *sig_len = ecc_sig->r.cbData + ecc_sig->s.cbData; + *sig_len = r_size + s_size; if (!(*sig_value = CryptMemAlloc(*sig_len))) { LocalFree(ecc_sig); SetLastError(ERROR_OUTOFMEMORY); return FALSE; } + memset( *sig_value, 0, *sig_len ); + + r_offset = r_size - ecc_sig->r.cbData; + s_offset = s_size - ecc_sig->s.cbData; for (i = 0; i < ecc_sig->r.cbData; i++) - (*sig_value)[i] = ecc_sig->r.pbData[ecc_sig->r.cbData - i - 1]; + (*sig_value)[i + r_offset] = ecc_sig->r.pbData[ecc_sig->r.cbData - i - 1]; for (i = 0; i < ecc_sig->s.cbData; i++) - (*sig_value)[ecc_sig->r.cbData + i] = ecc_sig->s.pbData[ecc_sig->s.cbData - i - 1]; + (*sig_value)[r_size + i + s_offset] = ecc_sig->s.pbData[ecc_sig->s.cbData - i - 1]; LocalFree(ecc_sig); return TRUE;

1 0

Alex Henrie : advapi32: Add TreeSetNamedSecurityInfoW stub.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 2b323dbad7cd52a7d0c3537d8b5fbe7319d2c7fa URL: https://gitlab.winehq.org/wine/wine/-/commit/2b323dbad7cd52a7d0c3537d8b5fbe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 20 23:13:08 2023 -0700 advapi32: Add TreeSetNamedSecurityInfoW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56055 --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index b69186d07a7..dde83cc7045 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -824,7 +824,7 @@ # @ stub TreeResetNamedSecurityInfoA @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) # @ stub TreeSetNamedSecurityInfoA -# @ stub TreeSetNamedSecurityInfoW +@ stdcall TreeSetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) # @ stub TrusteeAccessToObjectA # @ stub TrusteeAccessToObjectW # @ stub UninstallApplication diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8d0c6977d72..0f36cc4d536 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3101,6 +3101,19 @@ BOOL WINAPI SaferCloseLevel(SAFER_LEVEL_HANDLE handle) return TRUE; } +/****************************************************************************** + * TreeSetNamedSecurityInfoW [ADVAPI32.@] + */ +DWORD WINAPI TreeSetNamedSecurityInfoW(WCHAR *name, SE_OBJECT_TYPE type, SECURITY_INFORMATION info, + SID *owner, SID *group, ACL *dacl, ACL *sacl, DWORD action, + FN_PROGRESS progress, PROG_INVOKE_SETTING pis, void *args) +{ + FIXME("(%s, %d, %lu, %p, %p, %p, %p, %lu, %p, %d, %p) stub\n", + debugstr_w(name), type, info, owner, group, dacl, sacl, action, progress, pis, args); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + /****************************************************************************** * TreeResetNamedSecurityInfoW [ADVAPI32.@] */

1 0

Zhiyi Zhang : compstui: Fix a possible out-of-bounds write (Coverity).
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 6164432aa7ec7a575a8753d93b62684c93dbe5a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6164432aa7ec7a575a8753d93b6268… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 12:09:03 2023 +0800 compstui: Fix a possible out-of-bounds write (Coverity). When len is 256, (ARRAY_SIZE(title) - len) is 0. When LoadStringW() is called with the last parameter being zero, a WCHAR string pointer is stored at 'title + 256', writing title out of bounds. --- dlls/compstui/compstui_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index 60d5f9891b0..108ef64bd78 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -478,18 +478,22 @@ static LONG create_property_sheetW(struct propsheet *ps, PROPSHEETUI_INFO_HEADER (!header->titleW || !(header->flags & PSUIHDRF_EXACT_PTITLE))) { len = wcslen(title); - if (len < ARRAY_SIZE(title)) + if (len < ARRAY_SIZE(title) - 1) + { title[len++] = ' '; - LoadStringW(compstui_hmod, IDS_CPSUI_DEFAULT, title + len, ARRAY_SIZE(title) - len); + LoadStringW(compstui_hmod, IDS_CPSUI_DEFAULT, title + len, ARRAY_SIZE(title) - len); + } } if ((header->flags & PSUIHDRF_PROPTITLE) && (!header->titleW || !(header->flags & PSUIHDRF_EXACT_PTITLE))) { len = wcslen(title); - if (len < ARRAY_SIZE(title)) + if (len < ARRAY_SIZE(title) - 1) + { title[len++] = ' '; - LoadStringW(compstui_hmod, IDS_CPSUI_PROPERTIES, title + len, ARRAY_SIZE(title) - len); + LoadStringW(compstui_hmod, IDS_CPSUI_PROPERTIES, title + len, ARRAY_SIZE(title) - len); + } } psh.nPages = ps->pages_cnt;

1 0

Bernhard Übelacker : server: Allow VirtualQueryEx on "limited" handle.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 702aeb3acb7324783593d368d96dc8de39095ec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/702aeb3acb7324783593d368d96dc8… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Jan 2 15:34:36 2024 +0100 server: Allow VirtualQueryEx on "limited" handle. A handle created with just PROCESS_QUERY_LIMITED_INFORMATION should allow VirtualQueryEx / APC_VIRTUAL_QUERY. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56093 --- dlls/kernel32/tests/process.c | 2 +- server/thread.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e0f1d210e58..0e5bf82530b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1852,7 +1852,7 @@ static void test_OpenProcess(void) ok(info.Type == MEM_PRIVATE, "%lx != MEM_PRIVATE\n", info.Type); } else /* before win8 */ - ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %ld\n", GetLastError()); + ok(broken(GetLastError() == ERROR_ACCESS_DENIED), "wrong error %ld\n", GetLastError()); SetLastError(0xdeadbeef); ok(!VirtualFreeEx(hproc, addr1, 0, MEM_RELEASE), diff --git a/server/thread.c b/server/thread.c index 50eddabe8eb..56f57cefd8f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1734,7 +1734,7 @@ DECL_HANDLER(queue_apc) process = get_process_from_handle( req->handle, PROCESS_VM_OPERATION ); break; case APC_VIRTUAL_QUERY: - process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ); + process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ); break; case APC_MAP_VIEW: case APC_MAP_VIEW_EX:

1 0

Jinoh Kang : ntdll/tests: Avoid misaligned load in exception handler code in run_exception_test_flags().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: b07ce09982acaefaafedb435b542088c7000cc3f URL: https://gitlab.winehq.org/wine/wine/-/commit/b07ce09982acaefaafedb435b54208… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jan 6 22:36:09 2024 +0900 ntdll/tests: Avoid misaligned load in exception handler code in run_exception_test_flags(). This is required for testing EH behavior on alignment check (#AC) exceptions. --- dlls/ntdll/tests/exception.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0153843da19..e49fbb5bce1 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3200,7 +3200,7 @@ static void run_exception_test_flags(void *handler, const void* context, const void *code, unsigned int code_size, DWORD access, DWORD handler_flags) { - unsigned char buf[8 + 6 + 8 + 8]; + unsigned char buf[2 + 8 + 2 + 8 + 8]; RUNTIME_FUNCTION runtime_func; UNWIND_INFO *unwind = (UNWIND_INFO *)buf; void (*func)(void) = code_mem; @@ -3219,11 +3219,13 @@ static void run_exception_test_flags(void *handler, const void* context, *(ULONG *)&buf[4] = 0x1010; *(const void **)&buf[8] = context; - /* jmp near */ - buf[16] = 0xff; - buf[17] = 0x25; - *(ULONG *)&buf[18] = 0; - *(void **)&buf[22] = handler; + /* movabs $<handler>, %rax */ + buf[16] = 0x48; + buf[17] = 0xb8; + *(void **)&buf[18] = handler; + /* jmp *%rax */ + buf[26] = 0xff; + buf[27] = 0xe0; memcpy((unsigned char *)code_mem + 0x1000, buf, sizeof(buf)); memcpy(code_mem, code, code_size);

1 0