wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Zebediah Figura : ws2_32: Explicitly return WSAENOPROTOOPT for IP membership options in getsockopt().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 51c19a9d978b3d0e985d00b728a3cc87057da66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c19a9d978b3d0e985d00b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:38 2021 -0500 ws2_32: Explicitly return WSAENOPROTOOPT for IP membership options in getsockopt(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 84f7f06036f..650885a101e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2433,8 +2433,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPPROTO_IP: switch(optname) { - case WS_IP_ADD_MEMBERSHIP: - case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL case WS_IP_HDRINCL: #endif @@ -2462,19 +2460,20 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; case WS_IP_DONTFRAGMENT: return get_dont_fragment(s, IPPROTO_IP, (BOOL *)optval) ? 0 : SOCKET_ERROR; + + default: + FIXME( "unrecognized IP option %u\n", optname ); + /* fall through */ + + case WS_IP_ADD_MEMBERSHIP: + case WS_IP_DROP_MEMBERSHIP: + SetLastError( WSAENOPROTOOPT ); + return -1; } - FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); - return SOCKET_ERROR; case WS_IPPROTO_IPV6: switch(optname) { -#ifdef IPV6_ADD_MEMBERSHIP - case WS_IPV6_ADD_MEMBERSHIP: -#endif -#ifdef IPV6_DROP_MEMBERSHIP - case WS_IPV6_DROP_MEMBERSHIP: -#endif case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: @@ -2495,9 +2494,16 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; case WS_IPV6_DONTFRAG: return get_dont_fragment(s, IPPROTO_IPV6, (BOOL *)optval) ? 0 : SOCKET_ERROR; + + default: + FIXME( "unrecognized IPv6 option %u\n", optname ); + /* fall through */ + + case WS_IPV6_ADD_MEMBERSHIP: + case WS_IPV6_DROP_MEMBERSHIP: + SetLastError( WSAENOPROTOOPT ); + return -1; } - FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); - return SOCKET_ERROR; default: WARN("Unknown level: 0x%08x\n", level);

1 0

Zebediah Figura : ws2_32/tests: Add tests for options which can only be set.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: b9bf00605d4af7d0927a63695b97eb3d8db8bd4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9bf00605d4af7d0927a6369… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:37 2021 -0500 ws2_32/tests: Add tests for options which can only be set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e579b72ecb5..8617a6fb7e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11011,6 +11011,47 @@ static void test_so_debug(void) closesocket(s); } +static void test_set_only_options(void) +{ + unsigned int i; + int ret, len; + int value; + SOCKET s; + + static const struct + { + int level; + int option; + } + tests[] = + { + {IPPROTO_IP, IP_ADD_MEMBERSHIP}, + {IPPROTO_IP, IP_DROP_MEMBERSHIP}, + {IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP}, + {IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (tests[i].level == IPPROTO_IPV6) + { + s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (s == INVALID_SOCKET) continue; + } + else + { + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + } + + len = sizeof(value); + ret = getsockopt(s, tests[i].level, tests[i].option, (char *)&value, &len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + + closesocket(s); + } +} + START_TEST( sock ) { int i; @@ -11027,6 +11068,7 @@ START_TEST( sock ) test_ip_pktinfo(); test_extendedSocketOptions(); test_so_debug(); + test_set_only_options(); for (i = 0; i < ARRAY_SIZE(tests); i++) do_test(&tests[i]);

1 0

Zebediah Figura : ws2_32: Use ws_protocol_info() in getsockopt(SO_LINGER).
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 1ccab719ee6e87b7399876d4d5b30eb889c49e32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccab719ee6e87b7399876d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:36 2021 -0500 ws2_32: Use ws_protocol_info() in getsockopt(SO_LINGER). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9f32e7eaf96..84f7f06036f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -694,14 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static int _get_fd_type(int fd) -{ - int sock_type = -1; - socklen_t optlen = sizeof(sock_type); - getsockopt(fd, SOL_SOCKET, SO_TYPE, (char*) &sock_type, &optlen); - return sock_type; -} - static BOOL set_dont_fragment(SOCKET s, int level, BOOL value) { int fd, optname; @@ -2176,22 +2168,24 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { + WSAPROTOCOL_INFOW info; + int size; + /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (_get_fd_type(fd) == SOCK_DGRAM) + if (!ws_protocol_info( s, TRUE, &info, &size )) + return -1; + + if (info.iSocketType == SOCK_DGRAM) { - release_sock_fd( s, fd ); SetLastError( WSAENOPROTOOPT ); return -1; } - release_sock_fd( s, fd ); return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_LINGER, optval, optlen ); }

1 0

Zebediah Figura : ws2_32: Reimplement getsockopt(SO_TYPE) on top of ws_protocol_info().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: b58ca92fa53088a87c4c33a1e31c0d4ec1a43a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b58ca92fa53088a87c4c33a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:35 2021 -0500 ws2_32: Reimplement getsockopt(SO_TYPE) on top of ws_protocol_info(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ce71e25d63d..9f32e7eaf96 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2259,27 +2259,22 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_TYPE: { - int sock_type; + WSAPROTOCOL_INFOW info; + int size; + if (!optlen || *optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - sock_type = _get_fd_type(fd); - if (sock_type == -1) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - (*(int *)optval) = convert_socktype_u2w(sock_type); + if (!ws_protocol_info( s, TRUE, &info, &size )) + return -1; - release_sock_fd( s, fd ); - return ret; + *(int *)optval = info.iSocketType; + return 0; } + default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT);

1 0

Francois Gouget : winetest: Remove the unused td.arrow CSS style.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: tools Branch: master Commit: a58e6db33be949a740baba49d7e232eb8b136435 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a58e6db33be949a740baba4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:50:30 2021 +0200 winetest: Remove the unused td.arrow CSS style. The up/down arrows are now positioned using the ralign class rather than a table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/report.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index 80be53d..b558c6f 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -65,10 +65,6 @@ table.output td { text-align: left; } -td.arrow :link { color: #ffffff; text-decoration: none; } -td.arrow :visited { color: #ffffff; text-decoration: none; } -td.arrow :hover { color: #ffffff; text-decoration: underline; } - .ralign { display: inline-block; float: right;

1 0

Francois Gouget : winetest/gather: Truncated files are rejected.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: tools Branch: master Commit: 4fde1079b1e417291e067331542673ae7d922f00 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4fde1079b1e417291e06733… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:26:33 2021 +0200 winetest/gather: Truncated files are rejected. When a report size exceeds the size limit it is dropped so the corresponding summary.txt file will never contain "failed filelimit". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/winetest/gather b/winetest/gather index 1e9b2da..abb3395 100755 --- a/winetest/gather +++ b/winetest/gather @@ -108,8 +108,6 @@ sub short_date($) # group A reference to the group the report belongs to. # missing A hash of the reason why some test results are missing, # indexed by the test unit name. -# filelimit The name of the last test that was run before the report file -# size limit was reached. # <testname> Maps the test names to a structure containing the individual # unit test's results. Note that there's no name collision # with the other fields because the test names contain a ':'. @@ -349,9 +347,6 @@ foreach my $file (glob "$builddir/*/summary.txt") { if ($count eq "failed") { if ($todos eq "crash") { $report->{$testname} = { status => "crash" }; - } elsif ($todos eq "filelimit") { - $report->{$testname} = { status => "file limit" }; - $report->{filelimit} = $testname; } else { $report->{$testname} = { status => $todos }; } @@ -437,16 +432,12 @@ foreach my $group (@groups) { foreach my $report (@{$group->{reports}}) { if (!exists $report->{$testname}) { my ($dll, $unit) = split(/:/, $testname); - my $filelimit = $report->{filelimit}; if (exists $report->{missing}->{$dll}) { # Record the reason why this test is missing $report->{$testname} = { status => $report->{missing}->{$dll}, count => [ 1, 1 ], skips => [ 1, 1 ] }; - } elsif (defined $filelimit && $testname gt $filelimit) { - # Mark this test as missing because of a partial report file - $report->{$testname}->{status} = "truncated"; } else { # Mark this test as missing for an unknown reason (typically # the start & done lines where unrecognizable) @@ -650,7 +641,6 @@ sub get_result_title($$) if ($result->{status} eq "crash") { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } if ($result->{status} eq "skipped") { return "Skipped by user request"; } - if ($result->{status} eq "truncated") { return "The report was truncated"; } my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\....?$/); @@ -737,7 +727,6 @@ sub singletest($$$) { crash => "crashed", 258 => "timeout", mixed => "mixed", - truncated => "truncated", ); $msg = $status2label{$status} || "unknown"; }

1 0

Francois Gouget : winetest/gather: Link 'test list' failures to the test's version page.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: tools Branch: master Commit: 79b8c4e42f40f7d9983779bff372b7056122ccf7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=79b8c4e42f40f7d9983779b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:26:08 2021 +0200 winetest/gather: Link 'test list' failures to the test's version page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/gather b/winetest/gather index e000777..1e9b2da 100755 --- a/winetest/gather +++ b/winetest/gather @@ -693,6 +693,12 @@ sub singletest($$$) { { $href = "$report->{dir}/$testname.html"; } + elsif (-r "$builddir/$report->{dir}/version.html") + { + my $dll = $testname; + $dll =~ s/:.*//; + $href = "$report->{dir}/version.html#$dll"; + } else { $href="";

1 0

Francois Gouget : winetest/build-patterns: Show the list a test pattern is in.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: tools Branch: master Commit: b180989b797979d2874ffa02b6c7a496a745fa42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b180989b797979d2874ffa0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 1 19:25:41 2021 +0200 winetest/build-patterns: Show the list a test pattern is in. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index e3174b2..da7272e 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -382,7 +382,6 @@ foreach my $build (@sortedbuilds) $tests{$testname} = $test = { id => $testname, name => $testname, - title => "<a href='tests/$testname.html'>$testname</a>", source => $source, }; $testsources{$source} = 1; @@ -1236,7 +1235,13 @@ sub write_patterns_list($$$$) my $test = $tests{$testname}; print $html "<div class='testfile' id='$test->{id}'>\n"; - print $html "<div class='updownbar'>$test->{title}"; + my $title = $test->{title}; + if (!$test->{title}) + { + my $tooltip = $list->{title} ? " title='$list->{title}'" : ""; + $title = "<a href='tests/$testname.html'$tooltip>$testname</a>"; + } + print $html "<div class='updownbar'>$title"; print $html "<div class='ralign'>"; if ($mainpage) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021