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

[PATCH 7/8] user32: Merge WINPROC_call_window into call_window_proc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 62 ++++++++++++++++++++++++++++++++------ dlls/user32/user_private.h | 3 +- dlls/user32/winproc.c | 55 ++++----------------------------- 3 files changed, 59 insertions(+), 61 deletions(-)

3 2

[PATCH 6/8] user32: Use User32CallWinEventHook in peek_message.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 6 +++--- dlls/user32/message.c | 43 ++++++++++++++++--------------------------- dlls/win32u/hook.c | 2 ++ include/ntuser.h | 2 ++ 4 files changed, 23 insertions(+), 30 deletions(-)

3 2

[PATCH 5/8] win32u: Implement NtUserDispatchMessage.
by Jacek Caban 23 Mar '22

23 Mar '22

3 2

[PATCH 4/8] win32u: Move init_win_proc_params implementation from user32.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 46 +++++++----------------------------- dlls/win32u/class.c | 21 +++++++++++++++- dlls/win32u/message.c | 22 +++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + include/ntuser.h | 1 + 5 files changed, 52 insertions(+), 39 deletions(-)

3 2

[PATCH 3/8] user32: Move more code out of call_window_proc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 20 ++++++++++++-------- include/ntuser.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-)

3 2

[PATCH 2/8] win32u: Use dispatch_win_proc_params in CallWindowProc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 70 ++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 30 deletions(-)

3 2

[PATCH 1/8] user32: Factor out dispatch_win_proc_params.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_private.h | 13 --- dlls/user32/winproc.c | 174 +++++++++++++++++++++++-------------- include/ntuser.h | 30 +++++++ 3 files changed, 140 insertions(+), 77 deletions(-)

3 2

[PATCH v2 1/2] dinput/tests: Wait for spurious Win7 polled HID device events.
by Rémi Bernon 23 Mar '22

23 Mar '22

Win7 has spurious device arrival / removal messages for the first polled HID device created, probably when installing the driver the first time, and it causes a timeout if we open it before it completed its sequence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/hid.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index de77c02540f..8f984a006ac 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -74,7 +74,7 @@ const GUID expect_guid_product = {EXPECT_VIDPID, 0x0000, 0x0000, {0x00, 0x00, 'P const WCHAR expect_path[] = L"\\\\?\\hid#vid_1209&pid_0001#2&"; const WCHAR expect_path_end[] = L"&0000#{4d1e55b2-f16f-11cf-88cb-001111000030}"; HANDLE device_added, device_removed; -static BOOL hid_device_created; +static LONG device_added_count; static struct winetest_shared_data *test_data; static HANDLE monitor_thread, monitor_stop; @@ -734,7 +734,6 @@ BOOL hid_device_start( struct hid_device_desc *desc ) CloseHandle( control ); WaitForSingleObject( device_added, INFINITE ); - hid_device_created = TRUE; return TRUE; } @@ -2471,6 +2470,11 @@ static void test_hid_device( DWORD report_id, DWORD polled, const HIDP_CAPS *exp winetest_push_context( "id %ld%s", report_id, polled ? " poll" : "" ); + /* Win7 has a spurious device removal event with polled HID devices */ + if (!polled || !strcmp(winetest_platform, "wine")) ret = WAIT_TIMEOUT; + else ret = WaitForSingleObject( device_removed, 2000 ); + if (!ret && InterlockedOr( &device_added_count, 0 ) == 1) WaitForSingleObject( device_added, INFINITE ); + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", vid, pid ); ret = find_hid_device_path( device_path ); ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); @@ -3339,7 +3343,10 @@ static LRESULT CALLBACK monitor_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPA if (wparam == DBT_DEVICEREMOVECOMPLETE && IsEqualGUID( &iface->dbcc_classguid, &control_class )) SetEvent( device_removed ); if (wparam == DBT_DEVICEARRIVAL && IsEqualGUID( &iface->dbcc_classguid, &GUID_DEVINTERFACE_HID )) + { + InterlockedIncrement( &device_added_count ); SetEvent( device_added ); + } } return DefWindowProcW( hwnd, msg, wparam, lparam ); @@ -3648,7 +3655,6 @@ static void test_bus_driver(void) ok( ret, "IOCTL_WINETEST_CREATE_DEVICE failed, last error %lu\n", GetLastError() ); WaitForSingleObject( device_added, INFINITE ); - hid_device_created = TRUE; swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", LOWORD(EXPECT_VIDPID), HIWORD(EXPECT_VIDPID) ); ret = find_hid_device_path( device_path ); -- 2.35.1

2 2

[PATCH] bcrypt: Fix ECC public key export.
by Paul Gofman 23 Mar '22

23 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 20 +++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 884f4b1d37e..9de126c2bfe 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -91,6 +91,8 @@ static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t, const void *, size_t); static gnutls_sign_algorithm_t (*pgnutls_pk_to_sign)(gnutls_pk_algorithm_t, gnutls_digest_algorithm_t); static int (*pgnutls_pubkey_import_ecc_raw)(gnutls_pubkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *); +static int (*pgnutls_pubkey_export_ecc_raw)(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y); static int (*pgnutls_privkey_import_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t, gnutls_sign_algorithm_t, unsigned int, @@ -158,6 +160,12 @@ static int compat_gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_c return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_pubkey_export_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static int compat_gnutls_privkey_export_rsa_raw(gnutls_privkey_t key, gnutls_datum_t *m, gnutls_datum_t *e, gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t *q, gnutls_datum_t *u, gnutls_datum_t *e1, gnutls_datum_t *e2) @@ -292,6 +300,7 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR_OPT(gnutls_cipher_tag) LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) @@ -673,7 +682,14 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ))) + 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; + + if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -910,6 +926,8 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r return STATUS_NOT_IMPLEMENTED; } + if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER; + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index efb5843fa4e..5d8e81cc522 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1860,6 +1860,16 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset(buffer, 0xcc, sizeof(buffer)); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "Got unexpected magic %#lx.\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPubkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, sizeof(buffer), &size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx\n", status); + status = BCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %#lx\n", status); @@ -1885,6 +1895,14 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset( buffer, 0xcc, sizeof(buffer) ); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "got %#lx\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPrivkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); memset( buffer, 0, sizeof(buffer) ); status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); -- 2.35.1

2 1

[tools] testbot/cgi: Rename FormPage::SaveProperties() to Save().
by Francois Gouget 23 Mar '22

23 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index e432fcbbd..bc8ce478c 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -361,7 +361,7 @@ sub SaveProperty($$$) die "Pure virtual function FormPage::SaveProperty called"; } -sub SaveProperties($) +sub Save($) { my ($self) = @_; @@ -394,13 +394,6 @@ sub SaveProperties($) return 1; } -sub Save($) -{ - my ($self) = @_; - - return $self->SaveProperties(); -} - sub OnAction($$) { my ($self, $Action) = @_; -- 2.30.2

1 0