February 2023 - Wine-Commits

Brendan Shanks : ntdll: Respect zero_bits/limit when mapping a PE file.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: c4fba638942f975194704855f2bdf3d80714f020 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4fba638942f975194704855f2bdf3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 19 14:01:49 2022 -0700 ntdll: Respect zero_bits/limit when mapping a PE file. --- dlls/ntdll/unix/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f6e8793396c..d4afb8cc2ad 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1923,6 +1923,8 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if (is_beyond_limit( base, size, address_space_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (limit && is_beyond_limit( base, size, (void *)limit )) + return STATUS_CONFLICTING_ADDRESSES; status = map_fixed_area( base, size, vprot ); if (status != STATUS_SUCCESS) return status; ptr = base;

1 0

Brendan Shanks : ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 82c96f94840ae279fdcfe8e08c243dde89b72bbe URL: https://gitlab.winehq.org/wine/wine/-/commit/82c96f94840ae279fdcfe8e08c243d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 25 16:32:33 2022 -0700 ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31. --- dlls/ntdll/tests/virtual.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 6831fe3c522..a239a75ad47 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -1265,6 +1265,32 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL file image mapping */ + if (is_win64) + { + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + NtClose(mapping); + CloseHandle(file); + } + TerminateProcess(process, 0); CloseHandle(process); }

1 0

Hans Leidekker : wpcap/tests: Initial tests.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 8104688879e4cdc1110fd302a282dbdf4295fe05 URL: https://gitlab.winehq.org/wine/wine/-/commit/8104688879e4cdc1110fd302a282db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 7 09:40:54 2023 +0100 wpcap/tests: Initial tests. --- configure | 1 + configure.ac | 1 + dlls/wpcap/tests/Makefile.in | 4 + dlls/wpcap/tests/wpcap.c | 374 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 380 insertions(+)

1 0

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

Feb. 13, 2023

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

Hans Leidekker : wpcap: Add wow64 thunks.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

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: Enable UTF-8 encoding in libpcap.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

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: Implement pcap_init().
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

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 Feb. 13, 2023

Feb. 13, 2023

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: Sync spec file with latest version of libpcap.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: adf7336b53042f4875a62e28d51931c836af2889 URL: https://gitlab.winehq.org/wine/wine/-/commit/adf7336b53042f4875a62e28d51931… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 12:39:19 2023 +0100 wpcap: Sync spec file with latest version of libpcap. --- dlls/wpcap/wpcap.c | 2 +- dlls/wpcap/wpcap.spec | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 4d8a115b0ea..0964715f92c 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -865,7 +865,7 @@ const char * CDECL pcap_tstamp_type_val_to_name( int val ) return ret; } -int CDECL wsockinit( void ) +int CDECL pcap_wsockinit( void ) { WSADATA wsadata; TRACE( "\n" ); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 8cbb44148e8..5c26ad0c24e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -2,11 +2,9 @@ @ stub bpf_filter @ stub bpf_image @ stub bpf_validate -@ stub endservent @ stub eproto_db -@ stub getservent -@ stub install_bpf_program @ cdecl pcap_activate(ptr) +@ stub pcap_bufsize @ cdecl pcap_breakloop(ptr) @ cdecl pcap_can_set_rfmon(ptr) @ cdecl pcap_close(ptr) @@ -14,9 +12,11 @@ @ stub pcap_compile_nopcap @ cdecl pcap_create(str ptr) @ stub pcap_createsrcstr +@ stub pcap_datalink_ext @ cdecl pcap_datalink(ptr) @ cdecl pcap_datalink_name_to_val(str) @ cdecl pcap_datalink_val_to_description(long) +@ stub pcap_datalink_val_to_description_or_dlt @ cdecl pcap_datalink_val_to_name(long) @ cdecl pcap_dispatch(ptr long ptr ptr) @ cdecl pcap_dump(ptr ptr str) @@ -24,7 +24,12 @@ @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell +@ stub pcap_dump_ftell64 +@ stub pcap_dump_hopen @ cdecl pcap_dump_open(ptr str) +@ stub pcap_dump_open_append +@ stub pcap_ether_aton +@ stub pcap_ether_hostton @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) @@ -38,6 +43,10 @@ @ cdecl pcap_geterr(ptr) @ stub pcap_getevent @ cdecl pcap_getnonblock(ptr ptr) +@ stub pcap_hopen_offline +@ stub pcap_hopen_offline_with_tstamp_precision +@ stub pcap_init +@ stub pcap_inject @ stub pcap_is_swapped @ cdecl pcap_lib_version() @ cdecl pcap_list_datalinks(ptr ptr) @@ -53,15 +62,18 @@ @ stub pcap_next_etherent @ cdecl pcap_next_ex(ptr ptr ptr) @ stub pcap_offline_filter -@ stub pcap_offline_read +@ stub pcap_oid_get_request +@ stub pcap_oid_set_request @ cdecl pcap_open(str long long long ptr ptr) @ stub pcap_open_dead +@ stub pcap_open_dead_with_tstamp_precision @ cdecl pcap_open_live(str long long long ptr) @ stub pcap_open_offline +@ stub pcap_open_offline_with_tstamp_precision @ cdecl pcap_parsesrcstr(str ptr ptr ptr ptr ptr) @ stub pcap_perror -@ stub pcap_read @ stub pcap_remoteact_accept +@ stub pcap_remoteact_accept_ex @ stub pcap_remoteact_cleanup @ stub pcap_remoteact_close @ stub pcap_remoteact_list @@ -72,6 +84,7 @@ @ stub pcap_sendqueue_transmit @ cdecl pcap_set_buffer_size(ptr long) @ cdecl pcap_set_datalink(ptr long) +@ stub pcap_set_immediate_mode @ cdecl pcap_set_promisc(ptr long) @ cdecl pcap_set_rfmon(ptr long) @ cdecl pcap_set_snaplen(ptr long) @@ -79,6 +92,7 @@ @ cdecl pcap_set_tstamp_precision(ptr long) @ cdecl pcap_set_tstamp_type(ptr long) @ cdecl pcap_setbuff(ptr long) +@ stub pcap_setdirection @ cdecl pcap_setfilter(ptr ptr) @ stub pcap_setmintocopy @ stub pcap_setmode @@ -93,4 +107,5 @@ @ cdecl pcap_tstamp_type_name_to_val(str) @ cdecl pcap_tstamp_type_val_to_description(long) @ cdecl pcap_tstamp_type_val_to_name(long) -@ cdecl wsockinit() +@ stub pcap_version +@ cdecl pcap_wsockinit()

1 0

Hans Leidekker : wpcap: Fix an off-by-one error in convert_length_to_ipv6_mask().
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 90f53d681a2fbd0c9fcb9db33b50183688b61031 URL: https://gitlab.winehq.org/wine/wine/-/commit/90f53d681a2fbd0c9fcb9db33b5018… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:33:40 2023 +0100 wpcap: Fix an off-by-one error in convert_length_to_ipv6_mask(). --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 5494ed292e1..5c25e4a2708 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -444,7 +444,7 @@ static struct sockaddr *get_address( const IP_ADAPTER_UNICAST_ADDRESS *addr ) static void convert_length_to_ipv6_mask( ULONG length, IN6_ADDR *mask ) { unsigned int i; - for (i = 0; i < length / 8; i++) mask->u.Byte[i] = 0xff; + for (i = 0; i < length / 8 - 1; i++) mask->u.Byte[i] = 0xff; mask->u.Byte[i] = 0xff << (8 - length % 8); }

1 0