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

[PATCH] configure: Fix the check for CAPI support.
by Zebediah Figura 05 Mar '22

05 Mar '22

AC_CHECK_LIB sets the variable to "no", not an empty string. Hence compilation would fail if headers were present but libraries were missing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c668127187b..29e8058a24c 100644 --- a/configure.ac +++ b/configure.ac @@ -1646,7 +1646,7 @@ then AC_CHECK_LIB(capi20,capi20_register,[:],[CAPI20_LIBS=""],[$CAPI20_LIBS]) fi]) fi -WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" = "x"], +WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" != xyes], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.], [enable_capi2032]) -- 2.35.1

1 0

[PATCH v2] ws2_32: Base inet_addr() implementation on musl.
by Paul Gofman 04 Mar '22

04 Mar '22

The imported algorithm is modified to match the tests. Fixes a regression introduced by commit 671cf16f773e5dafc7edbf7766aed9e52e4e7b56. Windows inet_addr() behaves basically the same as Unix inet_addr() which is different from inet_pton(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - allow any space as terminator and add tests for that; - remove now duplicate inet_addr() tests from test_inet_pton (the main part of those didn't work due to missing brackets for '?' operator). dlls/ws2_32/protocol.c | 52 ++++++++++++++++-- dlls/ws2_32/tests/protocol.c | 103 +++++++++++++++++++++++++++++++---- 2 files changed, 141 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 0f56b1604d8..6e7e8eee18a 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1834,17 +1834,61 @@ int WINAPI WSAAddressToStringW( struct sockaddr *addr, DWORD addr_len, return 0; } - /*********************************************************************** * inet_addr (ws2_32.11) */ u_long WINAPI inet_addr( const char *str ) { + unsigned long a[4] = { 0 }; + const char *s = str; + unsigned char *d; + unsigned int i; u_long addr; + char *z; + + TRACE( "str %s.\n", debugstr_a(str) ); + + if (!s) + { + SetLastError( WSAEFAULT ); + return INADDR_NONE; + } + + d = (unsigned char *)&addr; + + if (s[0] == ' ' && !s[1]) return 0; - if (inet_pton( AF_INET, str, &addr ) == 1) - return addr; - return INADDR_NONE; + for (i = 0; i < 4; ++i) + { + a[i] = strtoul( s, &z, 0 ); + if (z == s || !isdigit( *s )) return INADDR_NONE; + if (!*z || isspace(*z)) break; + if (*z != '.') return INADDR_NONE; + s = z + 1; + } + + if (i == 4) return INADDR_NONE; + + switch (i) + { + case 0: + a[1] = a[0] & 0xffffff; + a[0] >>= 24; + /* fallthrough */ + case 1: + a[2] = a[1] & 0xffff; + a[1] >>= 16; + /* fallthrough */ + case 2: + a[3] = a[2] & 0xff; + a[2] >>= 8; + } + for (i = 0; i < 4; ++i) + { + if (a[i] > 255) return INADDR_NONE; + d[i] = a[i]; + } + return addr; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..9b3dec39dad 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -674,6 +674,98 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_inet_addr(void) +{ + static const struct + { + const char *input; + u_long addr; + } + tests[] = + { + {"1.2.3.4", 0x04030201}, + {"1 2 3 4", 0x01000000}, + {"1.2.3. 4", 0xffffffff}, + {"1.2.3 .4", 0x03000201}, + {"1.2.3 \xfe\xff", 0x03000201}, + {"3.4.5.6.7", 0xffffffff}, + {"3.4.5.6. 7", 0xffffffff}, + {"3.4.5.6 7", 0x06050403}, + {" 3.4.5.6", 0xffffffff}, + {"\t3.4.5.6", 0xffffffff}, + {"3.4.5.6 ", 0x06050403}, + {"3.4.5.6 ", 0x06050403}, + {"3. 4.5.6", 0xffffffff}, + {"3 .4.5.6", 0x03000000}, + {"1.2.3", 0x03000201}, + {".1.2.3", 0xffffffff}, + {"0.0.0.0", 0x00000000}, + {"", 0xffffffff}, + {" 0", 0xffffffff}, + {"0xa1a2b3b4 ", 0xb4b3a2a1}, + {".", 0xffffffff}, + {" ", 0x00000000}, + {"\t", 0xffffffff}, + {" ", 0xffffffff}, + {"127.127.127.255", 0xff7f7f7f}, + {"127.127.127.255:123", 0xffffffff}, + {"127.127.127.256", 0xffffffff}, + {"a", 0xffffffff}, + {"1.2.3.0xaA", 0xaa030201}, + {"1.1.1.0x", 0xffffffff}, + {"1.2.3.010", 0x08030201}, + {"1.2.3.00", 0x00030201}, + {"1.2.3.0a", 0xffffffff}, + {"1.1.1.0o10", 0xffffffff}, + {"1.1.1.0b10", 0xffffffff}, + {"1.1.1.-2", 0xffffffff}, + {"1", 0x01000000}, + {"1.2", 0x02000001}, + {"1.2.3", 0x03000201}, + {"203569230", 0x4e38220c}, + {"[0.1.2.3]", 0xffffffff}, + {"0x00010203", 0x03020100}, + {"0x2134", 0x34210000}, + {"1234BEEF", 0xffffffff}, + {"017700000001", 0x0100007f}, + {"0777", 0xff010000}, + {"2607:f0d0:1002:51::4", 0xffffffff}, + {"::177.32.45.20", 0xffffffff}, + {"::1/128", 0xffffffff}, + {"::1", 0xffffffff}, + {":1", 0xffffffff}, + }; + u_long addr, expected; + unsigned int i; + char str[32]; + + WSASetLastError(0xdeadbeef); + addr = inet_addr(NULL); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(addr == 0xffffffff, "got addr %#08x\n", addr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context( "Address %s, i %u", debugstr_a(tests[i].input), i ); + WSASetLastError(0xdeadbeef); + addr = inet_addr(tests[i].input); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == tests[i].addr, "got addr %#08x\n", addr); + winetest_pop_context(); + } + + strcpy(str, "1.2.3"); + str[6] = 0; + for (i = 1; i < 256; ++i) + { + if (isdigit(i)) + continue; + str[5] = i; + expected = isspace(i) ? 0x03000201 : 0xffffffff; + addr = inet_addr(str); + ok(addr == expected, "got addr %#08x, expected %#08x, i %u\n", addr, expected, i); + } +} + static void test_inet_pton(void) { static const struct @@ -942,11 +1034,6 @@ static void test_inet_pton(void) ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); - WSASetLastError(0xdeadbeef); - ret = inet_addr(NULL); - ok(ret == INADDR_NONE, "got %#x\n", ret); - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { WCHAR inputW[32]; @@ -969,11 +1056,6 @@ static void test_inet_pton(void) ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); ok(addr == ipv4_tests[i].addr, "got addr %#08x\n", addr); - WSASetLastError(0xdeadbeef); - addr = inet_addr(ipv4_tests[i].input); - ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, "got addr %#08x\n", addr); - ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); - winetest_pop_context(); } @@ -2871,6 +2953,7 @@ START_TEST( protocol ) test_WSALookupService(); test_inet_ntoa(); + test_inet_addr(); test_inet_pton(); test_addr_to_print(); test_WSAAddressToString(); -- 2.35.1

3 5

[tools] testbot: Fix the indentation of FormPage::SaveProperties().
by Francois Gouget 04 Mar '22

04 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 03ddea64f2..43b9b59ce5 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -361,8 +361,7 @@ sub SaveProperties($) my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ParameterName); if (defined($PropertyDescriptor)) { - if (! $self->SaveProperty($PropertyDescriptor, - $self->GetParam($ParameterName))) + if (! $self->SaveProperty($PropertyDescriptor, $self->GetParam($ParameterName))) { return !1; } -- 2.30.2

1 0

[PATCH v2 1/6] ws2_32/tests: Add tests for setting and getting socket options with shorter length.
by Paul Gofman 04 Mar '22

04 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - also check for nonzero optval where appropriate throughout the patchset. The aim of the patchset is to fix setting and getting 32bit sized socket options when the beaviour is different between Windows and Linux setsockopt() and getsockopt(). That behaviour partially regressed on the move from ws2_32 to ntdll: setsockopt() had the code which would adjust the size for option with the provided length less than 4 bytes (which helped, e. g., SO_REUSEADDR and SO_KEEPALIVE and Killing Floor 2 depended on that). ALthough, as my tests show, that was not universally correct across all the options and the details of getsockopt() were also different. I have another 16 patches on top of this series addressing the other options. There are also a few options (e. g., SO_KEEPALIVE) which should use the first byte only (like that is currently done for TCP_NODELAY minus accessing optval before NULL check). Also a few options behave like boolean values (return value of 1 after setting 0x100. But since fixing up those are orthogonal to what these patches are doing (i. e., the present patches do not change the behaviour for currently supported 4 byte optlen) I am fixing up those in the yet further patches. dlls/ws2_32/tests/sock.c | 86 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6b6267dc153..0eece82bfb1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1155,8 +1155,27 @@ static const LINGER linger_testvals[] = { static void test_set_getsockopt(void) { + static struct + { + int af; + int type; + int level; + int optname; + BOOL accepts_short_len; + unsigned int sizes[3]; + DWORD values[3]; + } + test_optsize[] = + { + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}}, + }; SOCKET s, s2; - int i, err, lasterr; + int i, j, err, lasterr; int timeout; LINGER lingval; int size; @@ -1375,6 +1394,71 @@ static void test_set_getsockopt(void) err, WSAGetLastError()); closesocket(s); + + /* Test option short length. */ + for (i = 0; i < ARRAY_SIZE(test_optsize); ++i) + { + s2 = socket( test_optsize[i].af, test_optsize[i].type, 0 ); + ok(s2 != INVALID_SOCKET, "socket() failed error %d\n", WSAGetLastError()); + for (j = 0; j < 3; ++j) + { + DWORD expected_last_error, expected_value, expected_size, save_value; + int expected_err; + + winetest_push_context("i %u, level %d, optname %d, len %u", + i, test_optsize[i].level, test_optsize[i].optname, 1 << j); + + size = sizeof(save_value); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + if (test_optsize[i].accepts_short_len || j == 2) + { + expected_err = 0; + expected_last_error = ERROR_SUCCESS; + expected_size = test_optsize[i].sizes[j] ? test_optsize[i].sizes[j] : 4; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else if (expected_size == 4) + expected_value = 1; + else + expected_value = (0xdeadbeef & ~((1 << expected_size * 8) - 1)) | 1; + } + else + { + expected_err = -1; + expected_last_error = WSAEFAULT; + expected_size = test_optsize[i].sizes[j]; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else + expected_value = 0xdeadbeef; + } + + value = 1; + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, 1 << j); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + value = 0xdeadbeef; + SetLastError(0xdeadbeef); + size = 1 << j; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == expected_err, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + ok(value == expected_value, "Got unexpected value %#x, expected %#x.\n", value, expected_value); + ok(size == expected_size, "Got unexpected size %u, expected %u.\n", size, expected_size); + + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, + (char*)&save_value, sizeof(save_value)); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + winetest_pop_context(); + } + closesocket(s2); + } + /* Test with the closed socket */ SetLastError(0xdeadbeef); size = sizeof(i); -- 2.35.1

3 9

[tools] testbot: Simplify the basic property validation.
by Francois Gouget 04 Mar '22

04 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 766a342309..b283859b9e 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -92,7 +92,7 @@ sub ValidateValue($$$) return $self->GetDisplayName() . ": Too long"; } - if ($self->GetType() eq "N" && ! ($Value =~ /^\s*\d+\s*$/)) + if ($self->GetType() eq "N" && $Value !~ /^\s*\d+\s*$/) { return $self->GetDisplayName() . ": Invalid number"; } -- 2.30.2

1 0

[tools] testbot/web: Simplify the stats page initialization.
by Francois Gouget 04 Mar '22

04 Mar '22

Pass the property descriptors directly to FormPage::_initialize(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index ab086976f7..c96e6fdafb 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -41,7 +41,10 @@ sub _initialize($$$) $self->Validate(); $self->{start} = Time(); - $self->SUPER::_initialize($Request, $RequiredRole); + my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, 1, "N", 2), + ); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub Validate($) @@ -374,17 +377,6 @@ sub GenerateBody($) print "</tbody></table></div>\n"; } -sub GetPropertyDescriptors($) -{ - my ($self) = @_; - - $self->{PropertyDescriptors} ||= [ - CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, !1, "N", 2), - ]; - - return $self->SUPER::GetPropertyDescriptors(); -} - sub GetDisplayValue($$) { my ($self, $PropertyDescriptor) = @_; -- 2.30.2

1 0

Re: [PATCH v2 1/3] vcomp: Implement _vcomp_for_dynamic_init_i8()
by David Koller 04 Mar '22

04 Mar '22

Thanks a lot, Zebediah, for your comments on my vcomp patches; I really appreciate you taking time to review them! > Does it even make sense to make these unions? Can we just make the > relevant members 64-bit? > > Alternatively, should these be stored separately from the 32-bit > versions? Tests showing what happens if you mix and match 32-bit and > 64-bit calls might be helpful. Right, I considered three alternatives: 1. Create new separate vcomp_thread and vcomp_task structures for the 64-bit data, 2. Increase the 32-bit data members to 64-bit, or 3. Use unions Creating new separate 64-bit data structures for the 64-bit calls would necessitate adding a bunch of new and redundant code (to initialize the new structs, etc.), but would be the most performant. Increasing the 32-bit members to 64-bit would waste the most memory and be the least performant for 32-bit calls, but would eliminate redundant code. My choice of unions is a compromise; new data structures are unnecessary and the separate 32-bit and 64-bit calls each access their native data types, which is good for performance. Using unions in this way is a traditional approach in OpenMP runtime implementations. For example, if you look at the code for libgomp, the most widely used OpenMP implementation, you will see that it uses unions to handle 32/64-bit variants in a similar manner: https://github.com/gcc-mirror/gcc/blob/1931cbad498e625b1e24452dcfffe02539b1… > > Could we share any (or all) of this code with the 32-bit version? > Yes, if the top priority was to minimize redundant code, then refactoring these functions to handle both the 32-bit and 64-bit cases is possible. However, performance would suffer. If you look at the other previously-implemented vcomp functions, you'll see that earlier Wine contributors implemented separate 32-bit and 64-bit versions of functions for other scheduling modes: _vcomp_for_static_init() and _vcomp_for_static_init_i8(), _vcomp_for_static_simple_init() and _vcomp_for_static_simple_init_i8(), etc. My patches follow this same pre-established pattern. I believe that my patches strike a good balance between performance, memory usage, and code concision. clarity, and consistency. If you insist on me changing something, I'm happy to do so. Otherwise, I hope we can get these patches committed swiftly, so that I can move my attention to making further improvements to Wine's vcomp/OpenMP support.

3 3

[PATCH] ntdll: Zero-initialize the syscall_frame used for starting threads on ARM/ARM64
by Martin Storsjö 04 Mar '22

04 Mar '22

This fixes an inconsistency since fed7e7a78b4bea183d0cbb107953e275f17baa4f (ntdll: Simulate a syscall return when starting a thread); in that commit, on i386 and x86_64, the syscall_frame used for starting the thread was zeroed with a memset, while it wasn't on arm and arm64. This had a noticable effect on float maths, where the uninitialized frame->restore_flags field could have the CONTEXT_FLOATING_POINT bit set. (call_init_thunk only ORs in CONTEXT_INTEGER into the restore_flags field, on all architectures). If that bit was set, it would restore uninitialized data into the fpscr register, possibly setting the FPU in a nondefault rounding mode. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_arm64.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..1fea76f6563 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1105,6 +1105,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (DWORD)ctx; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 94f280e218a..1df97f16f13 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1202,6 +1202,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (ULONG64)ctx; -- 2.25.1

1 0

[PATCH 6/6] user32: Ignore low instance word in find_class.
by Jacek Caban 04 Mar '22

04 Mar '22

Like we do in wineserver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 4 ++-- dlls/user32/tests/class.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)

2 1

[PATCH 5/6] user32: Store class instance as UINT_PTR.
by Jacek Caban 04 Mar '22

04 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 15 ++++++++------- dlls/win32u/ntuser_private.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-)

2 1