February 2023 - Wine-commits

Hans Leidekker : wpcap: Implement pcap_init().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: a410984aee5da668dcbab51eefb7e8f4a2fdb621 URL: https://gitlab.winehq.org/wine/wine/-/commit/a410984aee5da668dcbab51eefb7e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:55:36 2023 +0100 wpcap: Implement pcap_init(). --- dlls/wpcap/unixlib.c | 7 +++++++ dlls/wpcap/unixlib.h | 7 +++++++ dlls/wpcap/wpcap.c | 14 ++++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 49232c4c444..4ef301c8bbe 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -230,6 +230,12 @@ static NTSTATUS wrap_getnonblock( void *args ) return pcap_getnonblock( (pcap_t *)(ULONG_PTR)params->handle, params->errbuf ); } +static NTSTATUS wrap_init( void *args ) +{ + const struct init_params *params = args; + return pcap_init( params->opt, params->errbuf ); +} + static NTSTATUS wrap_lib_version( void *args ) { const struct lib_version_params *params = args; @@ -465,6 +471,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = wrap_get_tstamp_precision, wrap_geterr, wrap_getnonblock, + wrap_init, wrap_lib_version, wrap_list_datalinks, wrap_list_tstamp_types, diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 3adb8f1f61d..668658089f3 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -174,6 +174,12 @@ struct get_tstamp_precision_params UINT64 handle; }; +struct init_params +{ + int opt; + char *errbuf; +}; + struct lib_version_params { char *version; @@ -348,6 +354,7 @@ enum pcap_funcs unix_get_tstamp_precision, unix_geterr, unix_getnonblock, + unix_init, unix_lib_version, unix_list_datalinks, unix_list_tstamp_types, diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index afb47a58a90..d1c05ed0c01 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1399,6 +1399,20 @@ int CDECL pcap_wsockinit( void ) return 0; } +#define PCAP_CHAR_ENC_LOCAL 0 + +int CDECL pcap_init( unsigned int opt, char *errbuf ) +{ + struct init_params params; + + TRACE( "%u, %p\n", opt, errbuf ); + if (opt == PCAP_CHAR_ENC_LOCAL) FIXME( "need to convert to/from local encoding\n" ); + + params.opt = opt; + params.errbuf = errbuf; + return PCAP_CALL( init, &params ); +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { switch (reason) diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index b3685d098fe..ec2e17dc16e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -45,7 +45,7 @@ @ cdecl pcap_getnonblock(ptr ptr) @ stub pcap_hopen_offline @ stub pcap_hopen_offline_with_tstamp_precision -@ stub pcap_init +@ cdecl pcap_init(long ptr) @ stub pcap_inject @ stub pcap_is_swapped @ cdecl pcap_lib_version()

1 0

Hans Leidekker : wpcap: Reimplement pcap_loop() on top of pcap_next_ex().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: aa748140c10234223c66418d01b7efa2385fa23f URL: https://gitlab.winehq.org/wine/wine/-/commit/aa748140c10234223c66418d01b7ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 17:00:14 2023 +0100 wpcap: Reimplement pcap_loop() on top of pcap_next_ex(). --- dlls/wpcap/wpcap.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index d1c05ed0c01..2a3be168fdf 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -909,15 +909,6 @@ int CDECL pcap_lookupnet( const char *device, unsigned int *net, unsigned int *m return ret; } -int CDECL pcap_loop( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), - unsigned char *user) -{ - /* FIXME: reimplement on top of pcap_next_ex */ - FIXME( "%p, %d, %p, %p: not implemented\n", pcap, count, callback, user ); - return -1; -} - int CDECL pcap_major_version( struct pcap *pcap ) { struct major_version_params params; @@ -1001,6 +992,39 @@ int CDECL pcap_dispatch( struct pcap *pcap, int count, return processed; } +int CDECL pcap_loop( struct pcap *pcap, int count, + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), + unsigned char *user) +{ + int processed = 0; + + TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); + + while (processed < count) + { + struct pcap_pkthdr_win32 *hdr = NULL; + const unsigned char *data = NULL; + + int ret = pcap_next_ex( pcap, &hdr, &data ); + + if (ret == 1) + processed++; + else if (ret == 0) + continue; + else if (ret == PCAP_ERROR_BREAK) + { + if (processed == 0) return PCAP_ERROR_BREAK; + break; + } + else + return ret; + + callback( user, hdr, data ); + } + + return processed; +} + struct pcap * CDECL pcap_create( const char *source, char *errbuf ) { struct pcap *ret;

1 0

Hans Leidekker : wpcap: Enable UTF-8 encoding in libpcap.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: fdbbee506226239631937c4d60c2efbc81274c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/fdbbee506226239631937c4d60c2ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 17:08:11 2023 +0100 wpcap: Enable UTF-8 encoding in libpcap. --- dlls/wpcap/wpcap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 2a3be168fdf..39a65885723 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1424,6 +1424,7 @@ int CDECL pcap_wsockinit( void ) } #define PCAP_CHAR_ENC_LOCAL 0 +#define PCAP_CHAR_ENC_UTF_8 1 int CDECL pcap_init( unsigned int opt, char *errbuf ) { @@ -1442,10 +1443,19 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) switch (reason) { case DLL_PROCESS_ATTACH: + { DisableThreadLibraryCalls( hinst ); - if (__wine_init_unix_call()) - ERR( "No pcap support, expect problems\n" ); + if (__wine_init_unix_call()) ERR( "No pcap support, expect problems\n" ); + else + { + char errbuf[PCAP_ERRBUF_SIZE]; + struct init_params params = { PCAP_CHAR_ENC_UTF_8, errbuf }; + + if (PCAP_CALL( init, &params ) == PCAP_ERROR) + WARN( "failed to enable UTF-8 encoding %s\n", debugstr_a(errbuf) ); + } break; + } case DLL_PROCESS_DETACH: if (reserved) break; free_datalinks();

1 0

Hans Leidekker : wpcap: Add wow64 thunks.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 2432c123e9f46f794aa55fa3fed196ab3ce4f532 URL: https://gitlab.winehq.org/wine/wine/-/commit/2432c123e9f46f794aa55fa3fed196… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 21:47:33 2023 +0100 wpcap: Add wow64 thunks. --- dlls/wpcap/unixlib.c | 465 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 465 insertions(+)

1 0

Hans Leidekker : wpcap: Try to enable 32-bit mmap() support in libpcap.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: b97c9be3b822512b83cad6fd5a80c9574a6b1113 URL: https://gitlab.winehq.org/wine/wine/-/commit/b97c9be3b822512b83cad6fd5a80c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 22:00:48 2023 +0100 wpcap: Try to enable 32-bit mmap() support in libpcap. This feature will be available in version 1.11. --- dlls/wpcap/wpcap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 39a65885723..8c304ce66a4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1425,6 +1425,7 @@ int CDECL pcap_wsockinit( void ) #define PCAP_CHAR_ENC_LOCAL 0 #define PCAP_CHAR_ENC_UTF_8 1 +#define PCAP_MMAP_32BIT 2 int CDECL pcap_init( unsigned int opt, char *errbuf ) { @@ -1450,9 +1451,16 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { char errbuf[PCAP_ERRBUF_SIZE]; struct init_params params = { PCAP_CHAR_ENC_UTF_8, errbuf }; + BOOL is_wow64; if (PCAP_CALL( init, &params ) == PCAP_ERROR) WARN( "failed to enable UTF-8 encoding %s\n", debugstr_a(errbuf) ); + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + params.opt = PCAP_MMAP_32BIT; + if (PCAP_CALL( init, &params ) == PCAP_ERROR) + WARN( "failed to enable 32-bit mmap() %s\n", debugstr_a(errbuf) ); + } } break; }

1 0

Zebediah Figura : user32/tests: Remove BroadcastSystemMessage() test for WM_DEVICECHANGE.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 9b9692466db9f2969af050c7947069edf5636448 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b9692466db9f2969af050c7947069… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 12 19:48:43 2023 -0600 user32/tests: Remove BroadcastSystemMessage() test for WM_DEVICECHANGE. These are not uninteresting, but not consistent either, and it is not at the moment behaviour that needs to be implemented. This partially reverts 8675cad31c66b6620150a897545f705c1d17a59f. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54477 --- dlls/user32/tests/msg.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cca211cc22a..6faaa2c2f40 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11040,12 +11040,10 @@ static const WCHAR wszUnicode[] = {'U','n','i','c','o','d','e',0}; static const WCHAR wszAnsi[] = {'U',0}; static const GUID iface_guid = {0x66666666}; -static bool got_device_broadcast; static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { const DEV_BROADCAST_DEVICEINTERFACE_A *ifaceA = (const void *)lParam; - const DEV_BROADCAST_DEVICEINTERFACE_W *ifaceW = (const void *)lParam; switch (uMsg) { @@ -11068,17 +11066,6 @@ static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, ok(!strcmp(ifaceA->dbcc_name, "test name"), "Got name %s.\n", debugstr_a(ifaceA->dbcc_name)); return 2; } - else if (wParam == DBT_CUSTOMEVENT && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) - { - DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen(ifaceW->dbcc_name) + 1]); - - ok(ifaceW->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceW->dbcc_size); - ok(ifaceW->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, - "Got notification type %#lx.\n", ifaceW->dbcc_devicetype); - ok(!ifaceW->dbcc_reserved, "Got reserved %#lx.\n", ifaceW->dbcc_reserved); - ok(!wcscmp(ifaceW->dbcc_name, L"test name"), "Got name %s.\n", debugstr_w(ifaceW->dbcc_name)); - got_device_broadcast = true; - } } return DefWindowProcW(hwnd, uMsg, wParam, lParam); } @@ -11204,9 +11191,6 @@ static void test_message_conversion(void) dbcc_name[strlen(dev_interface->dbcc_name)]); lRes = SendMessageA(hwnd, WM_DEVICECHANGE, DBT_DEVICEARRIVAL, (LPARAM)dev_interface); ok(lRes == 2, "Got %Id, error %lu.\n", lRes, GetLastError()); - lRes = BroadcastSystemMessageA(0, NULL, WM_DEVICECHANGE, DBT_CUSTOMEVENT, (LPARAM)dev_interface); - todo_wine ok(!lRes, "Got %Id, error %lu.\n", lRes, GetLastError()); - todo_wine ok(got_device_broadcast, "Device broadcast was not received.\n"); DestroyWindow(hwnd);

1 0

Paul Gofman : bcrypt/tests: Add more tests for AES initialization vectors.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 8e305d811a753d1de5a5a4c2c481e3f31c312e1c URL: https://gitlab.winehq.org/wine/wine/-/commit/8e305d811a753d1de5a5a4c2c481e3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 10 19:14:02 2023 -0600 bcrypt/tests: Add more tests for AES initialization vectors. --- dlls/bcrypt/tests/bcrypt.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)

1 0

Paul Gofman : bcrypt: Update init vector after encrypt or decrypt.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 7d31f39487e701d3378b51a6e32d3bc2b9094ce7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d31f39487e701d3378b51a6e32d3b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 10 19:18:04 2023 -0600 bcrypt: Update init vector after encrypt or decrypt. --- dlls/bcrypt/bcrypt_main.c | 20 ++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 22 deletions(-)

1 0

Paul Gofman : bcrypt: Only reset init vector if the new vector is non-NULL.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 39dc9d09f3af3c08fda2070e4bf0c862c232ca17 URL: https://gitlab.winehq.org/wine/wine/-/commit/39dc9d09f3af3c08fda2070e4bf0c8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 10 19:19:15 2023 -0600 bcrypt: Only reset init vector if the new vector is non-NULL. --- dlls/bcrypt/bcrypt_main.c | 8 ++++---- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c5fc6391f38..ca5b934a8d5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1149,12 +1149,12 @@ static BOOL is_equal_vector( const UCHAR *vector, ULONG len, const UCHAR *vector static NTSTATUS key_symmetric_set_vector( struct key *key, UCHAR *vector, ULONG vector_len, BOOL force_reset ) { BOOL needs_reset = force_reset || !is_equal_vector( key->u.s.vector, key->u.s.vector_len, vector, vector_len ); - - free( key->u.s.vector ); - key->u.s.vector = NULL; - key->u.s.vector_len = 0; if (vector) { + free( key->u.s.vector ); + key->u.s.vector = NULL; + key->u.s.vector_len = 0; + if (!(key->u.s.vector = malloc( vector_len ))) return STATUS_NO_MEMORY; memcpy( key->u.s.vector, vector, vector_len ); key->u.s.vector_len = vector_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9f8d0145735..19518480ee0 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -843,7 +843,7 @@ static void test_BCryptGenerateSymmetricKey(void) ret = BCryptEncrypt(key, data, 16, NULL, NULL, 0, ciphertext, 16, &size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size == 16, "got %lu\n", size); - todo_wine ok(!memcmp(ciphertext, expected2, sizeof(expected2)), "wrong data\n"); + ok(!memcmp(ciphertext, expected2, sizeof(expected2)), "wrong data\n"); size = 0; memcpy(ivbuf, iv, sizeof(iv)); @@ -1129,7 +1129,7 @@ static void test_BCryptEncrypt(void) ret = BCryptEncrypt(key, data, 16, NULL, NULL, 0, ciphertext, 16, &size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size == 16, "got %lu\n", size); - todo_wine ok(!memcmp(ciphertext, expected8, sizeof(expected8)), "wrong data\n"); + ok(!memcmp(ciphertext, expected8, sizeof(expected8)), "wrong data\n"); /* all zero initialization vector */ size = 0; @@ -1556,7 +1556,7 @@ static void test_BCryptEncrypt(void) ret = BCryptEncrypt(key, data, 16, NULL, NULL, 0, ciphertext, 16, &size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size == 16, "got %lu\n", size); - todo_wine ok(!memcmp(ciphertext, expected12, sizeof(expected12)), "wrong data\n"); + ok(!memcmp(ciphertext, expected12, sizeof(expected12)), "wrong data\n"); /* all zero initialization vector */ size = 0; @@ -1784,7 +1784,7 @@ static void test_BCryptDecrypt(void) ret = BCryptDecrypt(key, ciphertext, 32, NULL, NULL, 0, plaintext, 32, &size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ok(size == 32, "got %lu\n", size); - todo_wine ok(!memcmp(plaintext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(plaintext, expected4, sizeof(expected4)), "wrong data\n"); /* test with padding smaller than block size */ size = 0;

1 0

Rémi Bernon : joy.cpl: Process messages while waiting for the input threads.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 37025bdabd4ed771d0e9a5092c421e067b3b623e URL: https://gitlab.winehq.org/wine/wine/-/commit/37025bdabd4ed771d0e9a5092c421e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 11 16:26:57 2023 +0100 joy.cpl: Process messages while waiting for the input threads. Instead of interrupting the wait on any message. --- dlls/joy.cpl/dinput.c | 11 ++++++++++- dlls/joy.cpl/xinput.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/dinput.c b/dlls/joy.cpl/dinput.c index 521634ff7da..9a6359834ea 100644 --- a/dlls/joy.cpl/dinput.c +++ b/dlls/joy.cpl/dinput.c @@ -792,7 +792,16 @@ INT_PTR CALLBACK test_di_dialog_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM case PSN_RESET: case PSN_KILLACTIVE: SetEvent( thread_stop ); - MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, 0 ); + /* wait for the input thread to stop, processing any WM_USER message from it */ + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_ALLINPUT ) == 1) + { + MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + } CloseHandle( state_event ); CloseHandle( thread_stop ); CloseHandle( thread ); diff --git a/dlls/joy.cpl/xinput.c b/dlls/joy.cpl/xinput.c index 757b99fa333..f652c9ad171 100644 --- a/dlls/joy.cpl/xinput.c +++ b/dlls/joy.cpl/xinput.c @@ -428,7 +428,16 @@ extern INT_PTR CALLBACK test_xi_dialog_proc( HWND hwnd, UINT msg, WPARAM wparam, case PSN_RESET: case PSN_KILLACTIVE: SetEvent( thread_stop ); - MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, 0 ); + /* wait for the input thread to stop, processing any WM_USER message from it */ + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_ALLINPUT ) == 1) + { + MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + } CloseHandle( thread_stop ); CloseHandle( thread ); dialog_hwnd = 0;

1 0