- Wine-Devel - list.winehq.org

[PATCH 2/7] nsiproxy: Implement TCP connections enumerate_all.
by Huw Davies Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 101 ++++++++++++++ dlls/nsiproxy.sys/tcp.c | 302 ++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 25 ++++ 3 files changed, 428 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 33b4e9e6d97..8e19df83684 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -848,6 +848,101 @@ static void test_tcp_stats( int family ) winetest_pop_context(); } +static void test_tcp_tables( int family, int table_type ) +{ + DWORD dyn_sizes[] = { FIELD_OFFSET(struct nsi_tcp_conn_dynamic, unk[2]), sizeof(struct nsi_tcp_conn_dynamic) }; + DWORD i, err, count, table_num, dyn_size, size; + struct nsi_tcp_conn_key *keys; + struct nsi_tcp_conn_dynamic *dyn_tbl, *dyn; + struct nsi_tcp_conn_static *stat; + MIB_TCPTABLE_OWNER_MODULE *table; + MIB_TCP6TABLE_OWNER_MODULE *table6; + MIB_TCPROW_OWNER_MODULE *row; + MIB_TCP6ROW_OWNER_MODULE *row6; + + winetest_push_context( "%s: %d", family == AF_INET ? "AF_INET" : "AF_INET6", table_type ); + + switch (table_type) + { + case TCP_TABLE_OWNER_MODULE_ALL: table_num = 3; break; + case TCP_TABLE_OWNER_MODULE_CONNECTIONS: table_num = 4; break; + case TCP_TABLE_OWNER_MODULE_LISTENER: table_num = 5; break; + default: return; + } + + for (i = 0; i < ARRAY_SIZE(dyn_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, table_num, (void **)&keys, sizeof(*keys), NULL, 0, + (void **)&dyn_tbl, dyn_sizes[i], (void **)&stat, sizeof(*stat), &count, 0 ); + if (!err) break; + } + ok( !err, "got %d\n", err ); + dyn_size = dyn_sizes[i]; + + size = 0; + err = GetExtendedTcpTable( NULL, &size, 0, family, table_type, 0 ); + size *= 2; + table = malloc( size ); + table6 = (MIB_TCP6TABLE_OWNER_MODULE *)table; + err = GetExtendedTcpTable( table, &size, 0, family, table_type, 0 ); + ok( !err, "got %d\n", err ); + + row = table->table; + row6 = table6->table; + + for (i = 0; i < count; i++) + { + dyn = (struct nsi_tcp_conn_dynamic *)((BYTE *)dyn_tbl + i * dyn_size); + if (keys[i].local.si_family != family) continue; + + if (family == AF_INET) + { + ok( unstable( row->dwLocalAddr == keys[i].local.Ipv4.sin_addr.s_addr ), "%08x vs %08x\n", + row->dwLocalAddr, keys[i].local.Ipv4.sin_addr.s_addr ); + ok( unstable( row->dwLocalPort == keys[i].local.Ipv4.sin_port ), "%d vs %d\n", + row->dwLocalPort, keys[i].local.Ipv4.sin_port ); + ok( unstable( row->dwRemoteAddr == keys[i].remote.Ipv4.sin_addr.s_addr ), "%08x vs %08x\n", + row->dwRemoteAddr, keys[i].remote.Ipv4.sin_addr.s_addr ); + ok( unstable( row->dwRemotePort == keys[i].remote.Ipv4.sin_port ), "%d vs %d\n", + row->dwRemotePort, keys[i].remote.Ipv4.sin_port ); + ok( unstable( row->dwState == dyn->state ), "%x vs %x\n", row->dwState, dyn->state ); +todo_wine_if( !unstable(0) && row->dwOwningPid ) + ok( unstable( row->dwOwningPid == stat[i].pid ), "%x vs %x\n", row->dwOwningPid, stat[i].pid ); + ok( unstable( row->liCreateTimestamp.QuadPart == stat[i].create_time ), "mismatch\n" ); + ok( unstable( row->OwningModuleInfo[0] == stat[i].mod_info ), "mismatch\n"); + row++; + } + else if (family == AF_INET6) + { + ok( unstable( !memcmp( row6->ucLocalAddr, keys[i].local.Ipv6.sin6_addr.s6_addr, sizeof(IN6_ADDR) ) ), + "mismatch\n" ); +todo_wine_if( !unstable(0) && row6->dwLocalScopeId ) + ok( unstable( row6->dwLocalScopeId == keys[i].local.Ipv6.sin6_scope_id ), "%x vs %x\n", + row6->dwLocalScopeId, keys[i].local.Ipv6.sin6_scope_id ); + ok( unstable( row6->dwLocalPort == keys[i].local.Ipv6.sin6_port ), "%d vs %d\n", + row6->dwLocalPort, keys[i].local.Ipv6.sin6_port ); + ok( unstable( !memcmp( row6->ucRemoteAddr, keys[i].remote.Ipv6.sin6_addr.s6_addr, sizeof(IN6_ADDR) ) ), + "mismatch\n" ); +todo_wine_if( !unstable(0) && row6->dwRemoteScopeId ) + ok( unstable( row6->dwRemoteScopeId == keys[i].remote.Ipv6.sin6_scope_id ), "%x vs %x\n", + row6->dwRemoteScopeId, keys[i].remote.Ipv6.sin6_scope_id ); + ok( unstable( row6->dwRemotePort == keys[i].remote.Ipv6.sin6_port ), "%d vs %d\n", + row6->dwRemotePort, keys[i].remote.Ipv6.sin6_port ); + ok( unstable( row6->dwState == dyn->state ), "%x vs %x\n", row6->dwState, dyn->state ); +todo_wine_if( !unstable(0) && row6->dwOwningPid ) + ok( unstable( row6->dwOwningPid == stat[i].pid ), "%x vs %x\n", row6->dwOwningPid, stat[i].pid ); + ok( unstable( row6->liCreateTimestamp.QuadPart == stat[i].create_time ), "mismatch\n" ); + ok( unstable( row6->OwningModuleInfo[0] == stat[i].mod_info ), "mismatch\n"); + row6++; + } + + } + free( table ); + NsiFreeTable( keys, NULL, dyn_tbl, stat ); + winetest_pop_context(); +} + + START_TEST( nsi ) { test_nsi_api(); @@ -870,4 +965,10 @@ START_TEST( nsi ) test_tcp_stats( AF_INET ); test_tcp_stats( AF_INET6 ); + test_tcp_tables( AF_INET, TCP_TABLE_OWNER_MODULE_ALL ); + test_tcp_tables( AF_INET, TCP_TABLE_OWNER_MODULE_CONNECTIONS ); + test_tcp_tables( AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER ); + test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_ALL ); + test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_CONNECTIONS ); + test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_LISTENER ); } diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 5fe7fcbd72e..710aed5d6c3 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -46,6 +46,10 @@ #include <netinet/tcp_var.h> #endif +#ifdef HAVE_NETINET_TCP_FSM_H +#include <netinet/tcp_fsm.h> +#endif + #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif @@ -61,11 +65,26 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "tcpmib.h" +#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "nsiproxy_private.h" +#ifndef HAVE_NETINET_TCP_FSM_H +#define TCPS_ESTABLISHED 1 +#define TCPS_SYN_SENT 2 +#define TCPS_SYN_RECEIVED 3 +#define TCPS_FIN_WAIT_1 4 +#define TCPS_FIN_WAIT_2 5 +#define TCPS_TIME_WAIT 6 +#define TCPS_CLOSED 7 +#define TCPS_CLOSE_WAIT 8 +#define TCPS_LAST_ACK 9 +#define TCPS_LISTEN 10 +#define TCPS_CLOSING 11 +#endif + WINE_DEFAULT_DEBUG_CHANNEL(nsi); static NTSTATUS tcp_stats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, @@ -171,6 +190,265 @@ static NTSTATUS tcp_stats_get_all_parameters( const void *key, DWORD key_size, v #endif } +static inline MIB_TCP_STATE tcp_state_to_mib_state( int state ) +{ + switch (state) + { + case TCPS_ESTABLISHED: return MIB_TCP_STATE_ESTAB; + case TCPS_SYN_SENT: return MIB_TCP_STATE_SYN_SENT; + case TCPS_SYN_RECEIVED: return MIB_TCP_STATE_SYN_RCVD; + case TCPS_FIN_WAIT_1: return MIB_TCP_STATE_FIN_WAIT1; + case TCPS_FIN_WAIT_2: return MIB_TCP_STATE_FIN_WAIT2; + case TCPS_TIME_WAIT: return MIB_TCP_STATE_TIME_WAIT; + case TCPS_CLOSE_WAIT: return MIB_TCP_STATE_CLOSE_WAIT; + case TCPS_LAST_ACK: return MIB_TCP_STATE_LAST_ACK; + case TCPS_LISTEN: return MIB_TCP_STATE_LISTEN; + case TCPS_CLOSING: return MIB_TCP_STATE_CLOSING; + default: + case TCPS_CLOSED: return MIB_TCP_STATE_CLOSED; + } +} + +static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key *key_data, DWORD key_size, + void *rw, DWORD rw_size, + struct nsi_tcp_conn_dynamic *dynamic_data, DWORD dynamic_size, + struct nsi_tcp_conn_static *static_data, DWORD static_size, DWORD_PTR *count ) +{ + DWORD num = 0; + NTSTATUS status = STATUS_SUCCESS; + BOOL want_data = key_size || rw_size || dynamic_size || static_size; + struct nsi_tcp_conn_key key; + struct nsi_tcp_conn_dynamic dyn; + struct nsi_tcp_conn_static stat; + +#ifdef __linux__ + { + FILE *fp; + char buf[512], *ptr; + int inode; + + if (!(fp = fopen( "/proc/net/tcp", "r" ))) return ERROR_NOT_SUPPORTED; + + memset( &key, 0, sizeof(key) ); + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (sscanf( ptr, "%*x: %x:%hx %x:%hx %x %*s %*s %*s %*s %*s %d", + &key.local.Ipv4.sin_addr.WS_s_addr, &key.local.Ipv4.sin_port, + &key.remote.Ipv4.sin_addr.WS_s_addr, &key.remote.Ipv4.sin_port, + &dyn.state, &inode ) != 6) + continue; + dyn.state = tcp_state_to_mib_state( dyn.state ); + if (filter && filter != dyn.state ) continue; + + key.local.Ipv4.sin_family = key.remote.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); + key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); + + stat.pid = 0; /* FIXME */ + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + + if (num < *count) + { + if (key_data) *key_data++ = key; + if (dynamic_data) *dynamic_data++ = dyn; + if (static_data) *static_data++ = stat; + } + num++; + } + fclose( fp ); + + if ((fp = fopen( "/proc/net/tcp6", "r" ))) + { + memset( &key, 0, sizeof(key) ); + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD *local_addr = (DWORD *)&key.local.Ipv6.sin6_addr; + DWORD *remote_addr = (DWORD *)&key.remote.Ipv6.sin6_addr; + + if (sscanf( ptr, "%*u: %8x%8x%8x%8x:%hx %8x%8x%8x%8x:%hx %x %*s %*s %*s %*s %*s %*s %*s %d", + local_addr, local_addr + 1, local_addr + 2, local_addr + 3, &key.local.Ipv6.sin6_port, + remote_addr, remote_addr + 1, remote_addr + 2, remote_addr + 3, &key.remote.Ipv6.sin6_port, + &dyn.state, &inode ) != 12) + continue; + dyn.state = tcp_state_to_mib_state( dyn.state ); + if (filter && filter != dyn.state ) continue; + key.local.Ipv6.sin6_family = key.remote.Ipv6.sin6_family = WS_AF_INET6; + key.local.Ipv6.sin6_port = htons( key.local.Ipv6.sin6_port ); + key.remote.Ipv6.sin6_port = htons( key.remote.Ipv6.sin6_port ); + key.local.Ipv6.sin6_scope_id = 0; /* FIXME */ + key.remote.Ipv6.sin6_scope_id = 0; /* FIXME */ + + stat.pid = 0; /* FIXME */ + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + + if (num < *count) + { + if (key_data) *key_data++ = key; + if (dynamic_data) *dynamic_data++ = dyn; + if (static_data) *static_data++ = stat; + } + num++; + } + fclose( fp ); + } + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_PCBLIST) && defined(HAVE_STRUCT_XINPGEN) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_PCBLIST }; + size_t len = 0; + char *buf = NULL; + struct xinpgen *xig, *orig_xig; + + if (sysctl( mib, ARRAY_SIZE(mib), NULL, &len, NULL, 0 ) < 0) + { + ERR( "Failure to read net.inet.tcp.pcblist via sysctl\n" ); + status = STATUS_NOT_SUPPORTED; + goto err; + } + + buf = heap_alloc( len ); + if (!buf) + { + status = STATUS_NO_MEMORY; + goto err; + } + + if (sysctl( mib, ARRAY_SIZE(mib), buf, &len, NULL, 0 ) < 0) + { + ERR( "Failure to read net.inet.tcp.pcblist via sysctl\n" ); + status = STATUS_NOT_SUPPORTED; + goto err; + } + + /* Might be nothing here; first entry is just a header it seems */ + if (len <= sizeof(struct xinpgen)) goto err; + + orig_xig = (struct xinpgen *)buf; + xig = orig_xig; + + for (xig = (struct xinpgen *)((char *)xig + xig->xig_len); + xig->xig_len > sizeof(struct xinpgen); + xig = (struct xinpgen *)((char *)xig + xig->xig_len)) + { +#if __FreeBSD_version >= 1200026 + struct xtcpcb *tcp = (struct xtcpcb *)xig; + struct xinpcb *in = &tcp->xt_inp; + struct xsocket *sock = &in->xi_socket; +#else + struct tcpcb *tcp = &((struct xtcpcb *)xig)->xt_tp; + struct inpcb *in = &((struct xtcpcb *)xig)->xt_inp; + struct xsocket *sock = &((struct xtcpcb *)xig)->xt_socket; +#endif + static const struct in6_addr zero; + + /* Ignore sockets for other protocols */ + if (sock->xso_protocol != IPPROTO_TCP) continue; + + /* Ignore PCBs that were freed while generating the data */ + if (in->inp_gencnt > orig_xig->xig_gen) continue; + + /* we're only interested in IPv4 and IPV6 addresses */ + if (!(in->inp_vflag & (INP_IPV4 | INP_IPV6))) continue; + + /* If all 0's, skip it */ + if (in->inp_vflag & INP_IPV4 && !in->inp_laddr.s_addr && !in->inp_lport && + !in->inp_faddr.s_addr && !in->inp_fport) continue; + if (in->inp_vflag & INP_IPV6 && !memcmp( &in->in6p_laddr, &zero, sizeof(zero) ) && !in->inp_lport && + !memcmp( &in->in6p_faddr, &zero, sizeof(zero) ) && !in->inp_fport) continue; + + dyn.state = tcp_state_to_mib_state( tcp->t_state ); + if (filter && filter != dyn.state ) continue; + + if (in->inp_vflag & INP_IPV4) + { + key.local.Ipv4.sin_family = key.remote.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_addr.WS_s_addr = in->inp_laddr.s_addr; + key.local.Ipv4.sin_port = in->inp_lport; + key.remote.Ipv4.sin_addr.WS_s_addr = in->inp_faddr.s_addr; + key.remote.Ipv4.sin_port = in->inp_fport; + } + else + { + key.local.Ipv6.sin6_family = key.remote.Ipv6.sin6_family = WS_AF_INET6; + memcpy( &key.local.Ipv6.sin6_addr, &in->in6p_laddr, sizeof(in->in6p_laddr) ); + key.local.Ipv6.sin6_port = in->inp_lport; + memcpy( &key.remote.Ipv6.sin6_addr, &in->in6p_faddr, sizeof(in->in6p_faddr) ); + key.remote.Ipv6.sin6_port = in->inp_fport; + key.local.Ipv6.sin6_scope_id = 0; /* FIXME */ + key.remote.Ipv6.sin6_scope_id = 0; /* FIXME */ + } + + stat.pid = 0; /* FIXME */ + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + + if (num < *count) + { + if (key_data) *key_data++ = key; + if (dynamic_data) *dynamic_data++ = dyn; + if (static_data) *static_data++ = stat; + } + num++; + } + err: + heap_free( buf ); + } +#else + FIXME( "not implemented\n" ); + status = STATUS_NOT_IMPLEMENTED; +#endif + + if (!want_data || num <= *count) *count = num; + else status = STATUS_MORE_ENTRIES; + + return status; +} + +static NTSTATUS tcp_all_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); + + return tcp_conns_enumerate_all( 0, key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); +} + +static NTSTATUS tcp_estab_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); + + return tcp_conns_enumerate_all( MIB_TCP_STATE_ESTAB, key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); +} + +static NTSTATUS tcp_listen_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); + + return tcp_conns_enumerate_all( MIB_TCP_STATE_LISTEN, key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); +} + static struct module_table tcp_tables[] = { { @@ -182,6 +460,30 @@ static struct module_table tcp_tables[] = NULL, tcp_stats_get_all_parameters, }, + { + NSI_TCP_ALL_TABLE, + { + sizeof(struct nsi_tcp_conn_key), 0, + sizeof(struct nsi_tcp_conn_dynamic), sizeof(struct nsi_tcp_conn_static) + }, + tcp_all_enumerate_all, + }, + { + NSI_TCP_ESTAB_TABLE, + { + sizeof(struct nsi_tcp_conn_key), 0, + sizeof(struct nsi_tcp_conn_dynamic), sizeof(struct nsi_tcp_conn_static) + }, + tcp_estab_enumerate_all, + }, + { + NSI_TCP_LISTEN_TABLE, + { + sizeof(struct nsi_tcp_conn_key), 0, + sizeof(struct nsi_tcp_conn_dynamic), sizeof(struct nsi_tcp_conn_static) + }, + tcp_listen_enumerate_all, + }, { ~0u } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 3c92fb81aae..39a1ecebda1 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -21,6 +21,8 @@ #include "inaddr.h" #include "in6addr.h" +#include "ws2def.h" +#include "ws2ipdef.h" #include "winioctl.h" /* Undocumented NSI NDIS tables */ @@ -294,6 +296,9 @@ struct nsi_ip_forward_static /* Undocumented NSI TCP tables */ #define NSI_TCP_STATS_TABLE 0 +#define NSI_TCP_ALL_TABLE 3 +#define NSI_TCP_ESTAB_TABLE 4 +#define NSI_TCP_LISTEN_TABLE 5 struct nsi_tcp_stats_dynamic { @@ -321,6 +326,26 @@ struct nsi_tcp_stats_static DWORD unk; }; +struct nsi_tcp_conn_key +{ + SOCKADDR_INET local; + SOCKADDR_INET remote; +}; + +struct nsi_tcp_conn_dynamic +{ + DWORD state; + DWORD unk[3]; +}; + +struct nsi_tcp_conn_static +{ + DWORD unk[3]; + DWORD pid; + ULONGLONG create_time; + ULONGLONG mod_info; +}; + /* Wine specific ioctl interface */ #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) -- 2.23.0

1 0

[PATCH 1/7] iphlpapi: Use the correct size to allocate the process map.
by Huw Davies Aug. 17, 2021

Aug. 17, 2021

The size is known at the start, so there's no need to grow it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index ececfcdcecd..af14cddb0ca 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -546,7 +546,7 @@ struct pid_map static struct pid_map *get_pid_map( unsigned int *num_entries ) { struct pid_map *map; - unsigned int i = 0, map_count = 16, buffer_len = 4096, process_count, pos = 0; + unsigned int i = 0, buffer_len = 4096, process_count, pos = 0; NTSTATUS ret; char *buffer = NULL, *new_buffer; @@ -573,7 +573,7 @@ static struct pid_map *get_pid_map( unsigned int *num_entries ) buffer = new_buffer; } - if (!(map = HeapAlloc( GetProcessHeap(), 0, map_count * sizeof(*map) ))) + if (!(map = HeapAlloc( GetProcessHeap(), 0, process_count * sizeof(*map) ))) { HeapFree( GetProcessHeap(), 0, buffer ); return NULL; @@ -586,19 +586,6 @@ static struct pid_map *get_pid_map( unsigned int *num_entries ) pos = (pos + 7) & ~7; process = (const struct process_info *)(buffer + pos); - if (i >= map_count) - { - struct pid_map *new_map; - map_count *= 2; - if (!(new_map = HeapReAlloc( GetProcessHeap(), 0, map, map_count * sizeof(*map)))) - { - HeapFree( GetProcessHeap(), 0, map ); - HeapFree( GetProcessHeap(), 0, buffer ); - return NULL; - } - map = new_map; - } - map[i].pid = process->pid; map[i].unix_pid = process->unix_pid; -- 2.23.0

1 0

[PATCH v4 4/4] ws2_32/tests: Add tabular socket option validity tests
by Alex Henrie Aug. 17, 2021

Aug. 17, 2021

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 Aug. 17, 2021

Aug. 17, 2021

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 Aug. 16, 2021

Aug. 16, 2021

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 Aug. 16, 2021

Aug. 16, 2021

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 Aug. 16, 2021

Aug. 16, 2021

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 Aug. 16, 2021

Aug. 16, 2021

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 Aug. 16, 2021

Aug. 16, 2021

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 Aug. 16, 2021

Aug. 16, 2021

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