July 2022 - Wine-Commits - list.winehq.org

Paul Gofman : ntdll: Support SOCK_RAW / IPPROTO_ICMP fallback over SOCK_DGRAM.
by Alexandre Julliard July 18, 2022

July 18, 2022

Module: wine Branch: master Commit: 1e35966eb57db7060d0c459bc7aaac2f6cad7442 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e35966eb57db7060d0c459bc7aaac… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 4 21:15:38 2022 -0500 ntdll: Support SOCK_RAW / IPPROTO_ICMP fallback over SOCK_DGRAM. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++- server/sock.c | 17 ++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ef3c8494c3d..53b4ac9dc48 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -115,6 +115,7 @@ struct async_recv_ioctl DWORD *ret_flags; int unix_flags; unsigned int count; + BOOL icmp_over_dgram; struct iovec iov[1]; }; @@ -566,6 +567,89 @@ static int wow64_translate_control( const WSABUF *control64, struct afd_wsabuf_3 return 1; } +struct ip_hdr +{ + BYTE v_hl; /* version << 4 | hdr_len */ + BYTE tos; + UINT16 tot_len; + UINT16 id; + UINT16 frag_off; + BYTE ttl; + BYTE protocol; + UINT16 checksum; + ULONG saddr; + ULONG daddr; +}; + +static ssize_t fixup_icmp_over_dgram( struct msghdr *hdr, union unix_sockaddr *unix_addr, + ssize_t recv_len, NTSTATUS *status ) +{ + unsigned int tot_len = sizeof(struct ip_hdr) + recv_len; + struct cmsghdr *cmsg; + struct ip_hdr ip_h; + size_t buf_len; + char *buf; + + if (hdr->msg_iovlen != 1) + { + FIXME( "Buffer count %zu is not supported for ICMP fixup.\n", (size_t)hdr->msg_iovlen ); + return recv_len; + } + + buf = hdr->msg_iov[0].iov_base; + buf_len = hdr->msg_iov[0].iov_len; + + if (recv_len + sizeof(ip_h) > buf_len) + *status = STATUS_BUFFER_OVERFLOW; + + if (buf_len < sizeof(ip_h)) + { + recv_len = buf_len; + } + else + { + recv_len = min( recv_len, buf_len - sizeof(ip_h) ); + memmove( buf + sizeof(ip_h), buf, recv_len ); + recv_len += sizeof(ip_h); + } + memset( &ip_h, 0, sizeof(ip_h) ); + ip_h.v_hl = (4 << 4) | (sizeof(ip_h) >> 2); + ip_h.tot_len = htons( tot_len ); + ip_h.protocol = 1; + ip_h.saddr = unix_addr->in.sin_addr.s_addr; + + for (cmsg = CMSG_FIRSTHDR( hdr ); cmsg; cmsg = CMSG_NXTHDR( hdr, cmsg )) + { + if (cmsg->cmsg_level != IPPROTO_IP) continue; + switch (cmsg->cmsg_type) + { +#if defined(IP_TTL) + case IP_TTL: + ip_h.ttl = *(BYTE *)CMSG_DATA( cmsg ); + break; +#endif +#if defined(IP_TOS) + case IP_TOS: + ip_h.tos = *(BYTE *)CMSG_DATA( cmsg ); + break; +#endif +#if defined(IP_PKTINFO) + case IP_PKTINFO: + { + struct in_pktinfo *info; + + info = (struct in_pktinfo *)CMSG_DATA( cmsg ); + ip_h.daddr = info->ipi_addr.s_addr; + break; + } +#endif + } + } + memcpy( buf, &ip_h, min( sizeof(ip_h), buf_len )); + + return recv_len; +} + static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *size ) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -577,7 +661,7 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz ssize_t ret; memset( &hdr, 0, sizeof(hdr) ); - if (async->addr) + if (async->addr || async->icmp_over_dgram) { hdr.msg_name = &unix_addr.addr; hdr.msg_namelen = sizeof(unix_addr); @@ -602,9 +686,14 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz } status = (hdr.msg_flags & MSG_TRUNC) ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; + if (async->icmp_over_dgram) + ret = fixup_icmp_over_dgram( &hdr, &unix_addr, ret, &status ); if (async->control) { + if (async->icmp_over_dgram) + FIXME( "May return extra control headers.\n" ); + if (in_wow64_call()) { char control_buffer64[512]; @@ -675,6 +764,23 @@ static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) return TRUE; } +static BOOL is_icmp_over_dgram( int fd ) +{ +#ifdef linux + socklen_t len; + int val; + + len = sizeof(val); + if (getsockopt( fd, SOL_SOCKET, SO_PROTOCOL, (char *)&val, &len ) || val != IPPROTO_ICMP) + return FALSE; + + len = sizeof(val); + return !getsockopt( fd, SOL_SOCKET, SO_TYPE, (char *)&val, &len ) && val == SOCK_DGRAM; +#else + return FALSE; +#endif +} + static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, struct async_recv_ioctl *async, int force_async ) { @@ -777,6 +883,7 @@ static NTSTATUS sock_ioctl_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap async->addr = addr; async->addr_len = addr_len; async->ret_flags = ret_flags; + async->icmp_over_dgram = is_icmp_over_dgram( fd ); return sock_recv( handle, event, apc, apc_user, io, fd, async, force_async ); } diff --git a/server/sock.c b/server/sock.c index fed8e3b3093..dbb6d231a46 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1618,6 +1618,23 @@ static int init_socket( struct sock *sock, int family, int type, int protocol ) } sockfd = socket( unix_family, unix_type, unix_protocol ); + +#ifdef linux + if (sockfd == -1 && errno == EPERM && unix_family == AF_INET + && unix_type == SOCK_RAW && unix_protocol == IPPROTO_ICMP) + { + sockfd = socket( unix_family, SOCK_DGRAM, unix_protocol ); + if (sockfd != -1) + { + const int val = 1; + + setsockopt( sockfd, IPPROTO_IP, IP_RECVTTL, (const char *)&val, sizeof(val) ); + setsockopt( sockfd, IPPROTO_IP, IP_RECVTOS, (const char *)&val, sizeof(val) ); + setsockopt( sockfd, IPPROTO_IP, IP_PKTINFO, (const char *)&val, sizeof(val) ); + } + } +#endif + if (sockfd == -1) { if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT );

1 0

Paul Gofman : ws2_32/tests: Test ICMP.
by Alexandre Julliard July 18, 2022

July 18, 2022

Module: wine Branch: master Commit: 86f084931bc90a86c6f514e1d64b71a33b9bdfa8 URL: https://gitlab.winehq.org/wine/wine/-/commit/86f084931bc90a86c6f514e1d64b71… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 5 14:13:55 2022 -0500 ws2_32/tests: Test ICMP. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f611fe6ed9d..d24556ccdd2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12816,6 +12816,155 @@ static void test_tcp_reset(void) CloseHandle(overlapped.hEvent); } +struct icmp_hdr +{ + BYTE type; + BYTE code; + UINT16 checksum; + union + { + struct + { + UINT16 id; + UINT16 sequence; + } echo; + } un; +}; + +struct ip_hdr +{ + BYTE v_hl; /* version << 4 | hdr_len */ + BYTE tos; + UINT16 tot_len; + UINT16 id; + UINT16 frag_off; + BYTE ttl; + BYTE protocol; + UINT16 checksum; + ULONG saddr; + ULONG daddr; +}; + +/* rfc 1071 checksum */ +static unsigned short chksum(BYTE *data, unsigned int count) +{ + unsigned int sum = 0, carry = 0; + unsigned short check, s; + + while (count > 1) + { + s = *(unsigned short *)data; + data += 2; + sum += carry; + sum += s; + carry = s > sum; + count -= 2; + } + sum += carry; /* This won't produce another carry */ + sum = (sum & 0xffff) + (sum >> 16); + + if (count) sum += *data; /* LE-only */ + + sum = (sum & 0xffff) + (sum >> 16); + /* fold in any carry */ + sum = (sum & 0xffff) + (sum >> 16); + + check = ~sum; + return check; +} + +static void test_icmp(void) +{ + static const unsigned int ping_data = 0xdeadbeef; + struct icmp_hdr *icmp_h; + BYTE send_buf[sizeof(struct icmp_hdr) + sizeof(ping_data)]; + UINT16 recv_checksum, checksum; + unsigned int reply_data; + struct sockaddr_in sa; + struct ip_hdr *ip_h; + struct in_addr addr; + BYTE recv_buf[256]; + SOCKET s; + int ret; + + s = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_ICMP, NULL, 0, 0); + if (s == INVALID_SOCKET) + { + ret = WSAGetLastError(); + ok(ret == WSAEACCES, "Expected 10013, received %d\n", ret); + skip("SOCK_RAW is not supported\n"); + return; + } + + icmp_h = (struct icmp_hdr *)send_buf; + icmp_h->type = ICMP4_ECHO_REQUEST; + icmp_h->code = 0; + icmp_h->checksum = 0; + icmp_h->un.echo.id = 0xbeaf; /* will be overwritten for linux ping socks */ + icmp_h->un.echo.sequence = 1; + *(unsigned int *)(icmp_h + 1) = ping_data; + icmp_h->checksum = chksum(send_buf, sizeof(send_buf)); + + memset(&sa, 0, sizeof(sa)); + sa.sin_family = AF_INET; + sa.sin_port = 0; + sa.sin_addr.s_addr = inet_addr("127.0.0.1"); + + ret = sendto(s, (char *)send_buf, sizeof(send_buf), 0, (struct sockaddr*)&sa, sizeof(sa)); + ok(ret == sizeof(send_buf), "got %d, error %d.\n", ret, WSAGetLastError()); + + ret = recv(s, (char *)recv_buf, sizeof(struct ip_hdr) + sizeof(send_buf) - 1, 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEMSGSIZE, "got %d\n", WSAGetLastError()); + + icmp_h->un.echo.sequence = 2; + icmp_h->checksum = 0; + icmp_h->checksum = chksum(send_buf, sizeof(send_buf)); + + ret = sendto(s, (char *)send_buf, sizeof(send_buf), 0, (struct sockaddr*)&sa, sizeof(sa)); + ok(ret != SOCKET_ERROR, "got error %d.\n", WSAGetLastError()); + + memset(recv_buf, 0xcc, sizeof(recv_buf)); + ret = recv(s, (char *)recv_buf, sizeof(recv_buf), 0); + ok(ret == sizeof(struct ip_hdr) + sizeof(send_buf), "got %d\n", ret); + + ip_h = (struct ip_hdr *)recv_buf; + icmp_h = (struct icmp_hdr *)(ip_h + 1); + reply_data = *(unsigned int *)(icmp_h + 1); + + ok(ip_h->v_hl == ((4 << 4) | (sizeof(*ip_h) >> 2)), "got v_hl %#x.\n", ip_h->v_hl); + ok(ntohs(ip_h->tot_len) == sizeof(struct ip_hdr) + sizeof(send_buf), + "got tot_len %#x.\n", ntohs(ip_h->tot_len)); + + recv_checksum = ip_h->checksum; + ip_h->checksum = 0; + checksum = chksum((BYTE *)ip_h, sizeof(*ip_h)); + /* Checksum is 0 for localhost ping on Windows but not for remote host ping. */ + ok(recv_checksum == checksum || !recv_checksum, "got checksum %#x, expected %#x.\n", recv_checksum, checksum); + + ok(!ip_h->frag_off, "got id %#x.\n", ip_h->frag_off); + addr.s_addr = ip_h->saddr; + ok(ip_h->saddr == sa.sin_addr.s_addr, "got saddr %s.\n", inet_ntoa(addr)); + addr.s_addr = ip_h->daddr; + ok(!!ip_h->daddr, "got daddr %s.\n", inet_ntoa(addr)); + + ok(ip_h->protocol == 1, "got protocol %#x.\n", ip_h->protocol); + + ok(icmp_h->type == ICMP4_ECHO_REPLY, "got type %#x.\n", icmp_h->type); + ok(!icmp_h->code, "got code %#x.\n", icmp_h->code); + todo_wine ok(icmp_h->un.echo.id == 0xbeaf, "got echo id %#x.\n", icmp_h->un.echo.id); + ok(icmp_h->un.echo.sequence == 2, "got echo sequence %#x.\n", icmp_h->un.echo.sequence); + + recv_checksum = icmp_h->checksum; + icmp_h->checksum = 0; + checksum = chksum((BYTE *)icmp_h, sizeof(send_buf)); + ok(recv_checksum == checksum, "got checksum %#x, expected %#x.\n", recv_checksum, checksum); + + ok(reply_data == ping_data, "got reply_data %#x.\n", reply_data); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -12892,6 +13041,7 @@ START_TEST( sock ) test_empty_recv(); test_timeout(); test_tcp_reset(); + test_icmp(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Paul Gofman : ws2_32: Add ipv4 raw socket protocol info.
by Alexandre Julliard July 18, 2022

July 18, 2022

Module: wine Branch: master Commit: 4c67e0fb7917025646725d2b6133e0778802afe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c67e0fb7917025646725d2b6133e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 5 11:33:51 2022 -0500 ws2_32: Add ipv4 raw socket protocol info. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++++++++------ dlls/ws2_32/tests/protocol.c | 2 ++ dlls/ws2_32/tests/sock.c | 23 +++++++++++++++++++++-- 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9cc75aacf20..d3c93e15a47 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -70,6 +70,23 @@ static const WSAPROTOCOL_INFOW supported_protocols[] = .dwMessageSize = 0xffbb, .szProtocol = L"UDP/IP", }, + { + .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST + | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS, + .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO | PFL_HIDDEN, + .ProviderId = {0xe70f1aa0, 0xab8b, 0x11cf, {0x8c, 0xa3, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}, + .dwCatalogEntryId = 1003, + .ProtocolChain.ChainLen = 1, + .iVersion = 2, + .iAddressFamily = AF_INET, + .iMaxSockAddr = sizeof(struct sockaddr_in), + .iMinSockAddr = sizeof(struct sockaddr_in), + .iSocketType = SOCK_RAW, + .iProtocol = 0, + .iProtocolMaxOffset = 255, + .dwMessageSize = 0x8000, + .szProtocol = L"MSAFD Tcpip [RAW/IP]", + }, { .dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY, @@ -4097,12 +4114,13 @@ int WINAPI WSARecvDisconnect( SOCKET s, WSABUF *data ) } -static BOOL protocol_matches_filter( const int *filter, int protocol ) +static BOOL protocol_matches_filter( const int *filter, unsigned int index ) { + if (supported_protocols[index].dwProviderFlags & PFL_HIDDEN) return FALSE; if (!filter) return TRUE; while (*filter) { - if (protocol == *filter++) return TRUE; + if (supported_protocols[index].iProtocol == *filter++) return TRUE; } return FALSE; } @@ -4120,7 +4138,7 @@ int WINAPI WSAEnumProtocolsA( int *filter, WSAPROTOCOL_INFOA *protocols, DWORD * for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) { - if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + if (protocol_matches_filter( filter, i )) ++count; } @@ -4134,7 +4152,7 @@ int WINAPI WSAEnumProtocolsA( int *filter, WSAPROTOCOL_INFOA *protocols, DWORD * count = 0; for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) { - if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + if (protocol_matches_filter( filter, i )) { memcpy( &protocols[count], &supported_protocols[i], offsetof( WSAPROTOCOL_INFOW, szProtocol ) ); WideCharToMultiByte( CP_ACP, 0, supported_protocols[i].szProtocol, -1, @@ -4190,7 +4208,7 @@ int WINAPI WSAEnumProtocolsW( int *filter, WSAPROTOCOL_INFOW *protocols, DWORD * for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) { - if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + if (protocol_matches_filter( filter, i )) ++count; } @@ -4204,7 +4222,7 @@ int WINAPI WSAEnumProtocolsW( int *filter, WSAPROTOCOL_INFOW *protocols, DWORD * count = 0; for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) { - if (protocol_matches_filter( filter, supported_protocols[i].iProtocol )) + if (protocol_matches_filter( filter, i )) protocols[count++] = supported_protocols[i]; } return count; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 9a6c8610718..0b14543606a 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -107,6 +107,7 @@ static void test_WSAEnumProtocolsA(void) for (i = 0; i < ret; i++) { ok( strlen( buffer[i].szProtocol ), "No protocol name found\n" ); + ok( !(buffer[i].dwProviderFlags & PFL_HIDDEN), "Found a protocol with PFL_HIDDEN.\n" ); test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, buffer[i].iSocketType, buffer[i].iProtocol, buffer[i].dwServiceFlags1); @@ -174,6 +175,7 @@ static void test_WSAEnumProtocolsW(void) for (i = 0; i < ret; i++) { ok( lstrlenW( buffer[i].szProtocol ), "No protocol name found\n" ); + ok( !(buffer[i].dwProviderFlags & PFL_HIDDEN), "Found a protocol with PFL_HIDDEN.\n" ); test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, buffer[i].iSocketType, buffer[i].iProtocol, buffer[i].dwServiceFlags1); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3ec0ab67040..f611fe6ed9d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2937,18 +2937,38 @@ static void test_WSASocket(void) } else { + WSAPROTOCOL_INFOW info; + size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", SOCK_RAW, socktype); + + size = sizeof(info); + err = getsockopt(sock, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &info, &size); + ok(!err,"got error %d\n", WSAGetLastError()); + ok(!wcscmp(info.szProtocol, L"MSAFD Tcpip [RAW/IP]") + || broken(!wcscmp(info.szProtocol, L"MSAFD-Tcpip [RAW/IP]")) /* Some Win7 machines. */, + "got szProtocol %s.\n", debugstr_w(info.szProtocol)); + ok(info.iAddressFamily == AF_INET, "got iAddressFamily %d.\n", info.iAddressFamily); + ok(info.iSocketType == SOCK_RAW, "got iSocketType %d.\n", info.iSocketType); + ok(info.iMaxSockAddr == 0x10, "got iMaxSockAddr %d.\n", info.iMaxSockAddr); + ok(info.iMinSockAddr == 0x10, "got iMinSockAddr %d.\n", info.iMinSockAddr); + todo_wine ok(!info.iProtocol, "got iProtocol %d.\n", info.iProtocol); + ok(info.iProtocolMaxOffset == 255, "got iProtocol %d.\n", info.iProtocolMaxOffset); + ok(info.dwProviderFlags == (PFL_MATCHES_PROTOCOL_ZERO | PFL_HIDDEN), "got dwProviderFlags %#lx.\n", + info.dwProviderFlags); + ok(info.dwServiceFlags1 == (XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT + | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS), "got dwServiceFlags1 %#lx.\n", + info.dwServiceFlags1); + closesocket(sock); sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); if (sock != INVALID_SOCKET) { - todo_wine { size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); @@ -2956,7 +2976,6 @@ static void test_WSASocket(void) ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", SOCK_RAW, socktype); closesocket(sock); - } sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n",

1 0

Francisco Casas : vkd3d-shader/hlsl: Introduce function to clean up hlsl_derefs.
by Alexandre Julliard July 18, 2022

July 18, 2022

Module: vkd3d Branch: master Commit: a7a4eb95e55514444d179cdb681dd862456b208d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a7a4eb95e55514444d179cd… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jul 14 21:23:46 2022 -0400 vkd3d-shader/hlsl: Introduce function to clean up hlsl_derefs. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index eac58c69..2925b4e5 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -621,6 +621,11 @@ static bool type_is_single_reg(const struct hlsl_type *type) return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; } +static void cleanup_deref(struct hlsl_deref *deref) +{ + hlsl_src_remove(&deref->offset); +} + struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc) { @@ -1579,7 +1584,7 @@ static void free_ir_jump(struct hlsl_ir_jump *jump) static void free_ir_load(struct hlsl_ir_load *load) { - hlsl_src_remove(&load->src.offset); + cleanup_deref(&load->src); vkd3d_free(load); } @@ -1592,8 +1597,8 @@ static void free_ir_loop(struct hlsl_ir_loop *loop) static void free_ir_resource_load(struct hlsl_ir_resource_load *load) { hlsl_src_remove(&load->coords); - hlsl_src_remove(&load->sampler.offset); - hlsl_src_remove(&load->resource.offset); + cleanup_deref(&load->sampler); + cleanup_deref(&load->resource); hlsl_src_remove(&load->texel_offset); vkd3d_free(load); } @@ -1601,7 +1606,7 @@ static void free_ir_resource_load(struct hlsl_ir_resource_load *load) static void free_ir_store(struct hlsl_ir_store *store) { hlsl_src_remove(&store->rhs); - hlsl_src_remove(&store->lhs.offset); + cleanup_deref(&store->lhs); vkd3d_free(store); }

1 0

Francisco Casas : vkd3d-shader/hlsl: Pass field to add_record_load() via index.
by Alexandre Julliard July 18, 2022

July 18, 2022

Module: vkd3d Branch: master Commit: b9435fb1ff0fcff6695f186312085323b612a3cb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b9435fb1ff0fcff6695f186… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jul 14 21:23:45 2022 -0400 vkd3d-shader/hlsl: Pass field to add_record_load() via index. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f293b82e..bfafd981 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -669,10 +669,14 @@ static struct hlsl_ir_load *add_load(struct hlsl_ctx *ctx, struct list *instrs, } static bool add_record_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record, - const struct hlsl_struct_field *field, const struct vkd3d_shader_location loc) + unsigned int idx, const struct vkd3d_shader_location loc) { + const struct hlsl_struct_field *field; struct hlsl_ir_constant *c; + assert(idx < record->data_type->e.record.field_count); + field = &record->data_type->e.record.fields[idx]; + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &loc))) return false; list_add_tail(instrs, &c->node.entry); @@ -3948,6 +3952,7 @@ postfix_expr: { struct hlsl_type *type = node->data_type; const struct hlsl_struct_field *field; + unsigned int field_idx = 0; if (!(field = get_struct_field(type->e.record.fields, type->e.record.field_count, $3))) { @@ -3955,7 +3960,8 @@ postfix_expr: YYABORT; } - if (!add_record_load(ctx, $1, node, field, @2)) + field_idx = field - type->e.record.fields; + if (!add_record_load(ctx, $1, node, field_idx, @2)) YYABORT; $$ = $1; }

1 0

Francisco Casas : vkd3d-shader/hlsl: Handle errors in recursive calls in hlsl_type_clone().
by Alexandre Julliard July 18, 2022

July 18, 2022

Module: vkd3d Branch: master Commit: 300a6c8fc3d905b951abc75de2946905f2571483 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=300a6c8fc3d905b951abc75… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jul 14 21:23:44 2022 -0400 vkd3d-shader/hlsl: Handle errors in recursive calls in hlsl_type_clone(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b349eb15..eac58c69 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -505,7 +505,12 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, switch (old->type) { case HLSL_CLASS_ARRAY: - type->e.array.type = hlsl_type_clone(ctx, old->e.array.type, default_majority, modifiers); + if (!(type->e.array.type = hlsl_type_clone(ctx, old->e.array.type, default_majority, modifiers))) + { + vkd3d_free((void *)type->name); + vkd3d_free(type); + return NULL; + } type->e.array.elements_count = old->e.array.elements_count; break; @@ -528,7 +533,13 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, struct hlsl_struct_field *dst_field = &type->e.record.fields[i]; dst_field->loc = src_field->loc; - dst_field->type = hlsl_type_clone(ctx, src_field->type, default_majority, modifiers); + if (!(dst_field->type = hlsl_type_clone(ctx, src_field->type, default_majority, modifiers))) + { + vkd3d_free(type->e.record.fields); + vkd3d_free((void *)type->name); + vkd3d_free(type); + return NULL; + } dst_field->name = hlsl_strdup(ctx, src_field->name); if (src_field->semantic.name) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store the struct fields as an array.
by Alexandre Julliard July 18, 2022

July 18, 2022

Module: vkd3d Branch: master Commit: e5905bbf0fffc2d25c5deff149beb27f20b1381c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e5905bbf0fffc2d25c5deff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 14 21:23:43 2022 -0400 vkd3d-shader/hlsl: Store the struct fields as an array. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 123 ++++++++++++++++++--------------------- libs/vkd3d-shader/hlsl.h | 10 +++- libs/vkd3d-shader/hlsl.y | 99 +++++++++++++++++-------------- libs/vkd3d-shader/hlsl_codegen.c | 18 ++++-- libs/vkd3d-shader/hlsl_sm1.c | 13 +++-- libs/vkd3d-shader/hlsl_sm4.c | 13 +++-- 6 files changed, 150 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e5905bbf0fffc2d25c5…

1 0

Alexandre Julliard : Wine release 7.13
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: website Branch: master Commit: 71dc62fe5abbd2a9d2df8b47e0952640021bc8bc URL: https://gitlab.winehq.org/winehq/winehq/-/commit/71dc62fe5abbd2a9d2df8b47e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 21:48:45 2022 +0200 Wine release 7.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022071501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022071501.xml b/news/en/2022071501.xml new file mode 100644 index 00000000..d2c639c0 --- /dev/null +++ b/news/en/2022071501.xml @@ -0,0 +1,16 @@ +<news> +<date>July 15, 2022</date> +<title>Wine 7.13 Released</title> +<body> + The Wine development release 7.13 is now available. + <a href="{$root}/announce/7.13">What's new</a> in this release: +<ul> + <li>Gecko engine updated to version 2.47.3.</li> + <li>USB driver converted to PE.</li> + <li>Some theming improvements.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 7.13.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: dfff9217746e5076aba35513c6d4bc3d271d109c URL: https://gitlab.winehq.org/wine/wine/-/commit/dfff9217746e5076aba35513c6d4bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 21:45:58 2022 +0200 Release 7.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 726 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 386 insertions(+), 363 deletions(-)

1 0

Tag wine-7.13 : Alexandre Julliard : Release 7.13
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: refs/tags/wine-7.13 Tag: 04f4c75beab8207bdecb66eab704d0eebf2d3814 URL: https://gitlab.winehq.org/wine/wine/-/tags/04f4c75beab8207bdecb66eab704d0ee… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 21:45:58 2022 +0200 Release 7.13

1 0