August 2021 - Wine-devel - list.winehq.org

[PATCH v4 4/4] ws2_32/tests: Add tabular socket option validity tests
by Alex Henrie 17 Aug '21

17 Aug '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v4: - Remove an undocumented option I missed - Remove todo flag from IP_HDRINCL --- dlls/ws2_32/tests/sock.c | 234 +++++++++++++++++++++++++++++++++------ 1 file changed, 203 insertions(+), 31 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 51aa0e61282..7b4eae6668f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11429,45 +11429,217 @@ static void test_so_debug(void) closesocket(s); } -static void test_set_only_options(void) +struct sockopt_validity_test { - unsigned int i; - int ret, len; - int value; - SOCKET s; + int opt; + int get_error; + BOOL get_todo; + int set_error; + BOOL set_todo; +}; - static const struct +static void do_sockopt_validity_tests(const char *type, SOCKET sock, int level, + const struct sockopt_validity_test *tests) +{ + char value[256]; + int count, rc, expected_rc, i; + + for (i = 0; tests[i].opt; i++) { - int level; - int option; + memset(value, 0, sizeof(value)); + count = sizeof(value); + + WSASetLastError(0); + rc = getsockopt(sock, level, tests[i].opt, value, &count); + expected_rc = tests[i].get_error ? SOCKET_ERROR : 0; +todo_wine_if(!tests[i].get_error && tests[i].get_todo) + ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), + "expected getting %s option %i to return %i, got %i\n", + type, tests[i].opt, expected_rc, rc); +todo_wine_if(tests[i].get_todo) + ok(WSAGetLastError() == tests[i].get_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), + "expected getting %s option %i to cause error %i, got %i\n", + type, tests[i].opt, tests[i].get_error, WSAGetLastError()); + + if (tests[i].get_error) + continue; + + WSASetLastError(0); + rc = setsockopt(sock, level, tests[i].opt, value, count); + expected_rc = tests[i].set_error ? SOCKET_ERROR : 0; +todo_wine_if(!tests[i].set_error && tests[i].set_todo) + ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), + "expected setting %s option %i to return %i, got %i\n", + type, tests[i].opt, expected_rc, rc); +todo_wine_if(tests[i].set_todo) + ok(WSAGetLastError() == tests[i].set_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), + "expected setting %s option %i to cause error %i, got %i\n", + type, tests[i].opt, tests[i].set_error, WSAGetLastError()); } - tests[] = +} + +static void test_sockopt_validity(void) +{ + static const struct sockopt_validity_test ipv4_tcp_tests[] = { - {IPPROTO_IP, IP_ADD_MEMBERSHIP}, - {IPPROTO_IP, IP_DROP_MEMBERSHIP}, - {IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP}, - {IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP}, + { -1, WSAENOPROTOOPT }, + { IP_OPTIONS }, + { IP_HDRINCL, WSAEINVAL, }, + { IP_TOS }, + { IP_TTL }, + { IP_MULTICAST_IF, WSAEINVAL }, + { IP_MULTICAST_TTL, WSAEINVAL }, + { IP_MULTICAST_LOOP, WSAEINVAL }, + { IP_ADD_MEMBERSHIP, WSAENOPROTOOPT }, + { IP_DROP_MEMBERSHIP, WSAENOPROTOOPT }, + { IP_DONTFRAGMENT }, + { IP_PKTINFO, WSAEINVAL }, + { IP_RECVTTL, WSAEINVAL, TRUE }, + { IP_RECEIVE_BROADCAST, WSAEINVAL, TRUE }, + { IP_RECVIF, WSAEINVAL, TRUE }, + { IP_RECVDSTADDR, WSAEINVAL, TRUE }, + { IP_IFLIST, 0, TRUE, 0, TRUE }, + { IP_UNICAST_IF }, + { IP_RTHDR, 0, TRUE, 0, TRUE }, + { IP_GET_IFLIST, WSAEINVAL, TRUE }, + { IP_RECVRTHDR, WSAEINVAL, TRUE }, + { IP_RECVTCLASS, WSAEINVAL, TRUE }, + { IP_ORIGINAL_ARRIVAL_IF, WSAEINVAL, TRUE }, + { IP_ECN, WSAEINVAL, TRUE }, + { IP_PKTINFO_EX, WSAEINVAL, TRUE }, + { IP_WFP_REDIRECT_RECORDS, WSAEINVAL, TRUE }, + { IP_WFP_REDIRECT_CONTEXT, WSAEINVAL, TRUE }, + { IP_MTU_DISCOVER, 0, TRUE, WSAEINVAL, TRUE }, + { IP_MTU, WSAENOTCONN, TRUE }, + { IP_RECVERR, WSAEINVAL, TRUE }, + { IP_USER_MTU, 0, TRUE, 0, TRUE }, + {} }; - - for (i = 0; i < ARRAY_SIZE(tests); ++i) + static const struct sockopt_validity_test ipv4_udp_tests[] = { - 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); - } + { -1, WSAENOPROTOOPT }, + { IP_OPTIONS }, + { IP_HDRINCL, WSAEINVAL, }, + { IP_TOS }, + { IP_TTL }, + { IP_MULTICAST_IF }, + { IP_MULTICAST_TTL }, + { IP_MULTICAST_LOOP }, + { IP_ADD_MEMBERSHIP, WSAENOPROTOOPT }, + { IP_DROP_MEMBERSHIP, WSAENOPROTOOPT }, + { IP_DONTFRAGMENT }, + { IP_PKTINFO }, + { IP_RECVTTL, 0, TRUE, 0, TRUE }, + { IP_RECEIVE_BROADCAST, 0, TRUE, 0, TRUE }, + { IP_RECVIF, 0, TRUE, 0, TRUE }, + { IP_RECVDSTADDR, 0, TRUE, 0, TRUE }, + { IP_IFLIST, 0, TRUE, 0, TRUE }, + { IP_UNICAST_IF }, + { IP_RTHDR, 0, TRUE, 0, TRUE }, + { IP_GET_IFLIST, WSAEINVAL, TRUE }, + { IP_RECVRTHDR, 0, TRUE, 0, TRUE }, + { IP_RECVTCLASS, 0, TRUE, 0, TRUE }, + { IP_ORIGINAL_ARRIVAL_IF, 0, TRUE, 0, TRUE }, + { IP_ECN, 0, TRUE, 0, TRUE }, + { IP_PKTINFO_EX, 0, TRUE, 0, TRUE }, + { IP_WFP_REDIRECT_RECORDS, 0, TRUE, 0, TRUE }, + { IP_WFP_REDIRECT_CONTEXT, 0, TRUE, 0, TRUE }, + { IP_MTU_DISCOVER, 0, TRUE, WSAEINVAL, TRUE }, + { IP_MTU, WSAENOTCONN, TRUE }, + { IP_RECVERR, 0, TRUE, 0, TRUE }, + { IP_USER_MTU, 0, TRUE, 0, TRUE }, + {} + }; + static const struct sockopt_validity_test ipv6_tcp_tests[] = + { + { -1, WSAENOPROTOOPT }, + { IPV6_HOPOPTS, 0, TRUE, 0, TRUE }, + { IPV6_HDRINCL, WSAEINVAL, TRUE }, + { IPV6_UNICAST_HOPS }, + { IPV6_MULTICAST_IF, WSAEINVAL }, + { IPV6_MULTICAST_HOPS, WSAEINVAL }, + { IPV6_MULTICAST_LOOP, WSAEINVAL }, + { IPV6_ADD_MEMBERSHIP, WSAENOPROTOOPT }, + { IPV6_DROP_MEMBERSHIP, WSAENOPROTOOPT }, + { IPV6_DONTFRAG }, + { IPV6_PKTINFO, WSAEINVAL }, + { IPV6_HOPLIMIT, WSAEINVAL }, + { IPV6_PROTECTION_LEVEL, 0, TRUE }, + { IPV6_RECVIF, WSAEINVAL, TRUE }, + { IPV6_RECVDSTADDR, WSAEINVAL, TRUE }, + { IPV6_V6ONLY }, + { IPV6_IFLIST, 0, TRUE, 0, TRUE }, + { IPV6_UNICAST_IF }, + { IPV6_RTHDR, 0, TRUE, 0, TRUE }, + { IPV6_GET_IFLIST, WSAEINVAL, TRUE }, + { IPV6_RECVRTHDR, WSAEINVAL, TRUE }, + { IPV6_RECVTCLASS, WSAEINVAL }, + { IP_ORIGINAL_ARRIVAL_IF, WSAEINVAL, TRUE }, + { IPV6_ECN, WSAEINVAL, TRUE }, + { IPV6_PKTINFO_EX, WSAEINVAL, TRUE }, + { IPV6_WFP_REDIRECT_RECORDS, WSAEINVAL, TRUE }, + { IPV6_WFP_REDIRECT_CONTEXT, WSAEINVAL, TRUE }, + { IPV6_MTU_DISCOVER, 0, TRUE, WSAEINVAL, TRUE }, + { IPV6_MTU, WSAENOTCONN, TRUE }, + { IPV6_RECVERR, WSAEINVAL, TRUE }, + { IPV6_USER_MTU, 0, TRUE, 0, TRUE }, + {} + }; + static const struct sockopt_validity_test ipv6_udp_tests[] = + { + { -1, WSAENOPROTOOPT }, + { IPV6_HOPOPTS, 0, TRUE, 0, TRUE }, + { IPV6_HDRINCL, WSAEINVAL, TRUE }, + { IPV6_UNICAST_HOPS }, + { IPV6_MULTICAST_IF }, + { IPV6_MULTICAST_HOPS }, + { IPV6_MULTICAST_LOOP }, + { IPV6_ADD_MEMBERSHIP, WSAENOPROTOOPT }, + { IPV6_DROP_MEMBERSHIP, WSAENOPROTOOPT }, + { IPV6_DONTFRAG }, + { IPV6_PKTINFO }, + { IPV6_HOPLIMIT }, + { IPV6_PROTECTION_LEVEL, 0, TRUE }, + { IPV6_RECVIF, 0, TRUE, 0, TRUE }, + { IPV6_RECVDSTADDR, 0, TRUE, 0, TRUE }, + { IPV6_V6ONLY }, + { IPV6_IFLIST, 0, TRUE, 0, TRUE }, + { IPV6_UNICAST_IF }, + { IPV6_RTHDR, 0, TRUE, 0, TRUE }, + { IPV6_GET_IFLIST, WSAEINVAL, TRUE }, + { IPV6_RECVRTHDR, 0, TRUE, 0, TRUE }, + { IPV6_RECVTCLASS }, + { IPV6_ECN, 0, TRUE, 0, TRUE }, + { IPV6_PKTINFO_EX, 0, TRUE, 0, TRUE }, + { IPV6_WFP_REDIRECT_RECORDS, 0, TRUE, 0, TRUE }, + { IPV6_WFP_REDIRECT_CONTEXT, 0, TRUE, 0, TRUE }, + { IPV6_MTU_DISCOVER, 0, TRUE, WSAEINVAL, TRUE }, + { IPV6_MTU, WSAENOTCONN, TRUE }, + { IPV6_RECVERR, 0, TRUE, 0, TRUE }, + { IPV6_USER_MTU, 0, TRUE, 0, TRUE }, + {} + }; + SOCKET sock; - 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()); + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + do_sockopt_validity_tests("IPv4 TCP", sock, IPPROTO_IP, ipv4_tcp_tests); + closesocket(sock); - closesocket(s); - } + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + do_sockopt_validity_tests("IPv4 UDP", sock, IPPROTO_IP, ipv4_udp_tests); + closesocket(sock); + + sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + do_sockopt_validity_tests("IPv6 TCP", sock, IPPROTO_IPV6, ipv6_tcp_tests); + closesocket(sock); + + sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + do_sockopt_validity_tests("IPv6 UDP", sock, IPPROTO_IPV6, ipv6_udp_tests); + closesocket(sock); } START_TEST( sock ) @@ -11487,7 +11659,7 @@ START_TEST( sock ) test_ipv6_cmsg(); test_extendedSocketOptions(); test_so_debug(); - test_set_only_options(); + test_sockopt_validity(); for (i = 0; i < ARRAY_SIZE(tests); i++) do_test(&tests[i]); -- 2.32.0

1 0

[PATCH 1/5] ws2_32: Hook up IPV6_RECVTCLASS
by Alex Henrie 17 Aug '21

17 Aug '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/socket.c | 18 ++++++++++++++++++ dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++-- include/wine/afd.h | 2 ++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 35c846eb7ae..4f0c83597df 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -462,6 +462,16 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } #endif /* IPV6_PKTINFO */ +#if defined(IPV6_TCLASS) + case IPV6_TCLASS: + { + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_TCLASS, ptr, &ctlsize, + CMSG_DATA(cmsg_unix), sizeof(INT) ); + if (!ptr) goto error; + break; + } +#endif /* IPV6_TCLASS */ + default: FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); break; @@ -1916,6 +1926,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, in_buffer, in_size ); #endif +#ifdef IPV6_RECVTCLASS + case IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, in_buffer, in_size ); +#endif + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8f0ab12303a..3d88e45c66e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -311,6 +311,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(IPV6_MULTICAST_LOOP); DEBUG_SOCKOPT(IPV6_PKTINFO); + DEBUG_SOCKOPT(IPV6_RECVTCLASS); DEBUG_SOCKOPT(IPV6_UNICAST_HOPS); DEBUG_SOCKOPT(IPV6_V6ONLY); DEBUG_SOCKOPT(IPV6_UNICAST_IF); @@ -1734,6 +1735,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl case IPV6_PKTINFO: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); + case IPV6_RECVTCLASS: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS, optval, optlen ); + case IPV6_UNICAST_HOPS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); @@ -2942,6 +2946,9 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; + case IPV6_RECVTCLASS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS, optval, optlen ); + case IPV6_UNICAST_HOPS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dd8c83374d0..6693c469dce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2002,7 +2002,7 @@ static void test_ipv6_cmsg(void) WSAMSG msg = {NULL, 0, &payload_buf, 1, {sizeof(control), control}, 0}; WSACMSGHDR *header = (WSACMSGHDR *)control; LPFN_WSARECVMSG pWSARecvMsg; - INT *hop_limit = (INT *)WSA_CMSG_DATA(header); + INT *int_data = (INT *)WSA_CMSG_DATA(header); IN6_PKTINFO *pkt_info = (IN6_PKTINFO *)WSA_CMSG_DATA(header); DWORD count, state; int rc; @@ -2043,7 +2043,7 @@ static void test_ipv6_cmsg(void) ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); - ok(*hop_limit >= 32, "expected at least 32, got %i\n", *hop_limit); + ok(*int_data >= 32, "expected at least 32, got %i\n", *int_data); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); @@ -2069,6 +2069,28 @@ static void test_ipv6_cmsg(void) rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&on, sizeof(on)); + ok(!rc, "failed to set IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (char *)&state, (INT *)&count); + ok(!rc, "failed to get IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); + ok(header->cmsg_type == IPV6_TCLASS, "expected IPV6_TCLASS, got %i\n", header->cmsg_type); + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + ok(*int_data == 0, "expected 0, got %i\n", *int_data); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); + closesocket(server); closesocket(client); } diff --git a/include/wine/afd.h b/include/wine/afd.h index 3936dbd87b1..49bbcccd3af 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -231,6 +231,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(287) #define IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO WINE_AFD_IOC(288) #define IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO WINE_AFD_IOC(289) +#define IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS WINE_AFD_IOC(290) +#define IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS WINE_AFD_IOC(291) struct afd_create_params { -- 2.32.0

3 16

[PATCH] advapi32/tests: Fix an uninitialized variable check in test_performance_keys().
by Francois Gouget 16 Aug '21

16 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the failures on cw-gtx560-wow64, cw-rx460-wow64 and fg-deb64-wow64: https://test.winehq.org/data/patterns.html#advapi32:registry --- dlls/advapi32/tests/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5fac9aa429f..a6e48d7840f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3867,6 +3867,7 @@ static void test_performance_keys(void) ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5); ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + key_count = 0x900ddeed; ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL, NULL, &value_count, NULL, NULL, NULL, NULL); todo_wine ok(!ret, "got %u\n", ret); -- 2.20.1

2 2

[PATCH vkd3d 1/3] vkd3d-shader: Don't resize the buffer when there is enough free space.
by Matteo Bruni 16 Aug '21

16 Aug '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 78312a14..9a4560a3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,10 +41,12 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = buffer->buffer_size * 2; + unsigned int new_buffer_size = max(buffer->buffer_size * 2, 32); char *new_buffer; - new_buffer_size = max(new_buffer_size, 32); + if (rc < buffer->buffer_size - buffer->content_size) + return true; + while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) new_buffer_size *= 2; if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) -- 2.26.3

3 10

[PATCH] ws2_32/tests: Fix a test failure in test_GetAddrInfoExW().
by Zebediah Figura 16 Aug '21

16 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 1f039e509da..bb09dc98f1c 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1910,7 +1910,9 @@ static void test_GetAddrInfoExW(void) ResetEvent(event); ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); - ok(!result, "result != NULL\n"); + /* result pointer is cleared by GetAddrInfoExW(), but may be set to the + * actual addrinfo before we can verify that */ + ok(result != (void *)0xdeadbeef, "result was not changed\n"); ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); ret = pGetAddrInfoExOverlappedResult(&overlapped); ok(!ret, "overlapped result is %d\n", ret); -- 2.32.0

2 1

[PATCH] advapi32/tests: Fix some Perflib subkey tests.
by Francois Gouget 16 Aug '21

16 Aug '21

Some languages don't have a subkey (e.g. German), and for others the subkey is the full language id rather than the primary language id (e.g. Portuguese). Furthermore there should be a CurrentLanguage key with localized values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the failures on w7u-pt-PT. https://test.winehq.org/data/patterns.html#advapi32:registry --- dlls/advapi32/tests/registry.c | 56 +++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index bccc5706131..85be22bd74e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3928,10 +3928,11 @@ static void test_perflib_key(void) HKEY perflib_key, key, key2; OBJECT_ATTRIBUTES attr; UNICODE_STRING string; - char lang_name[4]; + char lang_name[5]; + const char *knames[2] = {"009", "CurrentLanguage"}; char *buffer; DWORD size; - LONG ret; + LONG ret, l; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); @@ -4026,21 +4027,62 @@ static void test_perflib_key(void) else ok(!ret, "got %#x\n", ret); - /* multilingual support was not really completely thought through */ + for (l = 0; l < ARRAY_SIZE(knames); l++) + { + winetest_push_context("%d", l); + todo_wine_if(l == 1) { + ret = RegOpenKeyExA(perflib_key, knames[l], 0, KEY_READ, &key); + ok(!ret, "got %u\n", ret); + ok(is_special_key(key), "expected a special handle, got %p\n", key); - sprintf(lang_name, "%03x", primary_lang); - if (primary_lang != LANG_ENGLISH) + size = buffer_size; + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + ok(!ret, "got %u\n", ret); + if (!ret) + { + char *str; + int c = 0; + for (str = buffer; *str; str += strlen(str) + 1) + c++; + /* Note that the two keys may not have the same number of entries + * if they are in different languages. + */ + ok(c >= 2 && (c % 2) == 0, "%d is not a valid number of entries in %s\n", c, knames[l]); + trace("%s has %d entries\n", knames[l], c); + } + + ret = RegCloseKey(key); + ok(!ret, "got %u\n", ret); + } + winetest_pop_context(); + } + + /* multilingual support was not really completely thought through */ + switch (primary_lang) + { + case LANG_PORTUGUESE: + case LANG_CHINESE: + sprintf(lang_name, "%04x", GetUserDefaultLangID()); + break; + default: + sprintf(lang_name, "%03x", primary_lang); + break; + } + if (primary_lang != LANG_ENGLISH && + !RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key)) { - ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); - todo_wine ok(!ret, "got %u\n", ret); ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + size = buffer_size; ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); ret = RegCloseKey(key); todo_wine ok(!ret, "got %u\n", ret); } + /* else some languages don't have their own key. The keys are not really + * usable anyway so assume it does not really matter. + */ ret = RegCloseKey(perflib_key); ok(!ret, "got %u\n", ret); -- 2.20.1

2 2

[PATCH vkd3d] tests: Remove mesa bug_if from if_return instruction tests.
by Conor McCarthy 16 Aug '21

16 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6bc03b0b..073c590c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9539,7 +9539,6 @@ static void test_shader_instructions(void) struct ivec4 i; } output; bool skip_on_warp; - bool is_mesa_bug; } tests[] = { @@ -9581,24 +9580,24 @@ static void test_shader_instructions(void) /* FIXME: Ordered/unordered comparisons are broken on Mesa. */ {&ps_if_return, {{0.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}, false, true}, + {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{3.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, NAN, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true}, + {&ps_if_return, {{4.0f, NAN, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 3.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, 4.0f, NAN, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true}, + {&ps_if_return, {{4.0f, 4.0f, NAN, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 3.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 4.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 5.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, 4.0f, 0.0f, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true}, + {&ps_if_return, {{4.0f, 4.0f, 0.0f, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 1.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 2.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 3.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 4.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, {&ps_if_return, {{5.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, - {&ps_if_return, {{ NAN, NAN, NAN, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true}, + {&ps_if_return, {{ NAN, NAN, NAN, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, {&ps_nested_if, {{0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 1.0f}}}, {&ps_nested_if, {{0.0f, 0.0f, 1.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, @@ -10375,7 +10374,6 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - bug_if(tests[i].is_mesa_bug && is_mesa_device(context.device)) check_sub_resource_vec4(context.render_target, 0, queue, command_list, &tests[i].output.f, 2); reset_command_list(command_list, context.allocator); -- 2.32.0

2 1

[PATCH vkd3d] tests: Parse max ulps in the "probe rect rgba" case. (Clang)
by Chip Davis 16 Aug '21

16 Aug '21

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tests/shader_runner_d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 4221804..353e42c 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -178,7 +178,8 @@ static void parse_test_directive(struct shader_context *context, const char *lin RECT rect; int ret; - ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f )", &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w); + ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f ) %u", + &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 8) goto err; if (ret < 9) -- 2.31.1

2 1

[PATCH vkd3d] vkd3d: Do not append a newline to messages passed to d3d12_device_mark_as_removed().
by Zebediah Figura 16 Aug '21

16 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f9ae3d44..bbb832ec 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5865,7 +5865,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm if (cmd_list->is_recording) { d3d12_device_mark_as_removed(command_queue->device, DXGI_ERROR_INVALID_CALL, - "Command list %p is in recording state.\n", command_lists[i]); + "Command list %p is in recording state.", command_lists[i]); vkd3d_free(buffers); return; } -- 2.32.0

2 1

[PATCH vkd3d v3 1/5] vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op().
by Zebediah Figura 16 Aug '21

16 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 103 +++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e4070572..9f50d2fc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1033,64 +1033,53 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char * const op_names[] = + static const char *const op_names[] = { - "~", - "!", - "-", - "abs", - "sign", - "rcp", - "rsq", - "sqrt", - "nrm", - "exp2", - "log2", - - "cast", - - "fract", - - "sin", - "cos", - "sin_reduced", - "cos_reduced", - - "dsx", - "dsy", - - "sat", - - "+", - "*", - "/", - - "%", - - "<", - ">", - "<=", - ">=", - "==", - "!=", - - "&&", - "||", - - "<<", - ">>", - "&", - "|", - "^", - - "dot", - "crs", - "min", - "max", - - "pow", - - "lerp", + [HLSL_IR_UNOP_ABS] = "abs", + [HLSL_IR_UNOP_BIT_NOT] = "~", + [HLSL_IR_UNOP_CAST] = "cast", + [HLSL_IR_UNOP_COS] = "cos", + [HLSL_IR_UNOP_COS_REDUCED] = "cos_reduced", + [HLSL_IR_UNOP_DSX] = "dsx", + [HLSL_IR_UNOP_DSY] = "dsy", + [HLSL_IR_UNOP_EXP2] = "exp2", + [HLSL_IR_UNOP_FRACT] = "fract", + [HLSL_IR_UNOP_LOG2] = "log2", + [HLSL_IR_UNOP_LOGIC_NOT] = "!", + [HLSL_IR_UNOP_NEG] = "-", + [HLSL_IR_UNOP_NRM] = "nrm", + [HLSL_IR_UNOP_RCP] = "rcp", + [HLSL_IR_UNOP_RSQ] = "rsq", + [HLSL_IR_UNOP_SAT] = "sat", + [HLSL_IR_UNOP_SIGN] = "sign", + [HLSL_IR_UNOP_SIN] = "sin", + [HLSL_IR_UNOP_SIN_REDUCED] = "sin_reduced", + [HLSL_IR_UNOP_SQRT] = "sqrt", + + [HLSL_IR_BINOP_ADD] = "+", + [HLSL_IR_BINOP_BIT_AND] = "&", + [HLSL_IR_BINOP_BIT_OR] = "|", + [HLSL_IR_BINOP_BIT_XOR] = "^", + [HLSL_IR_BINOP_CRS] = "crs", + [HLSL_IR_BINOP_DIV] = "/", + [HLSL_IR_BINOP_DOT] = "dot", + [HLSL_IR_BINOP_EQUAL] = "==", + [HLSL_IR_BINOP_GEQUAL] = ">=", + [HLSL_IR_BINOP_GREATER] = ">", + [HLSL_IR_BINOP_LEQUAL] = "<=", + [HLSL_IR_BINOP_LESS] = "<", + [HLSL_IR_BINOP_LOGIC_AND] = "&&", + [HLSL_IR_BINOP_LOGIC_OR] = "||", + [HLSL_IR_BINOP_LSHIFT] = "<<", + [HLSL_IR_BINOP_MAX] = "max", + [HLSL_IR_BINOP_MIN] = "min", + [HLSL_IR_BINOP_MOD] = "%", + [HLSL_IR_BINOP_MUL] = "*", + [HLSL_IR_BINOP_NEQUAL] = "!=", + [HLSL_IR_BINOP_POW] = "pow", + [HLSL_IR_BINOP_RSHIFT] = ">>", + + [HLSL_IR_TEROP_LERP] = "lerp", }; return op_names[expr->op]; -- 2.32.0

5 16