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

[PATCH 3/4] nsiproxy: Implement IP compartment get_all_paramters.
by Huw Davies 11 Aug '21

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 42 ++++++++++ dlls/nsiproxy.sys/ip.c | 121 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 29 +++++++ include/wine/nsi.h | 17 ++++ 4 files changed, 209 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index feed72a1626..598e7124afd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -411,6 +411,46 @@ static void test_ndis_index_luid( void ) ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); } +static void test_ip_cmpt( int family ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_cmpt_rw, unk2), sizeof(struct nsi_ip_cmpt_rw) }; + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_cmpt_dynamic dyn; + struct nsi_ip_cmpt_rw rw; + MIB_IPSTATS table; + DWORD err, key, i; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + /* key = 0 also seems to work, but NsiAllocateAndGetTable returns + a single table with key == 1. Presumably this is the compartment id */ + key = 1; + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiGetAllParameters( 1, mod, 2, &key, sizeof(key), &rw, rw_sizes[i], &dyn, sizeof(dyn), NULL, 0 ); + if (!err) break; + } + ok( !err, "got %x\n", err ); + + err = GetIpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + if (err) goto err; + +todo_wine_if(family == AF_INET6 && table.dwForwarding - 1 != rw.not_forwarding) + ok( table.dwForwarding - 1 == rw.not_forwarding, "%x vs %x\n", table.dwForwarding, rw.not_forwarding ); +todo_wine_if(family == AF_INET6 && table.dwDefaultTTL != rw.default_ttl) + ok( table.dwDefaultTTL == rw.default_ttl, "%x vs %x\n", table.dwDefaultTTL, rw.default_ttl ); + ok( table.dwNumIf == dyn.num_ifs, "%x vs %x\n", table.dwNumIf, dyn.num_ifs ); +todo_wine_if(table.dwNumAddr != dyn.num_addrs) + ok( table.dwNumAddr == dyn.num_addrs, "%x vs %x\n", table.dwNumAddr, dyn.num_addrs ); +todo_wine_if(family == AF_INET6 && table.dwNumRoutes != dyn.num_routes) + ok( table.dwNumRoutes == dyn.num_routes, "%x vs %x\n", table.dwNumRoutes, dyn.num_routes ); + +err: + winetest_pop_context(); +} + + static void test_ip_ipstats( int family ) { const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; @@ -725,6 +765,8 @@ START_TEST( nsi ) test_ndis_ifinfo(); test_ndis_index_luid(); + test_ip_cmpt( AF_INET ); + test_ip_cmpt( AF_INET6 ); test_ip_ipstats( AF_INET ); test_ip_ipstats( AF_INET6 ); test_ip_unicast( AF_INET ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 7d9af08c711..64a223ab3fb 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -120,6 +120,109 @@ static ULONG64 get_boot_time( void ) return ti.BootTime.QuadPart; } +#if __linux__ +static NTSTATUS read_sysctl_int( const char *file, int *val ) +{ + FILE *fp; + char buf[128], *endptr = buf; + + fp = fopen( file, "r" ); + if (!fp) return STATUS_NOT_SUPPORTED; + + if (fgets( buf, sizeof(buf), fp )) + *val = strtol( buf, &endptr, 10 ); + + fclose( fp ); + return (endptr == buf) ? STATUS_NOT_SUPPORTED : STATUS_SUCCESS; +} +#endif + +static NTSTATUS ip_cmpt_get_all_parameters( DWORD fam, const DWORD *key, DWORD key_size, + struct nsi_ip_cmpt_rw *rw_data, DWORD rw_size, + struct nsi_ip_cmpt_dynamic *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + const NPI_MODULEID *ip_mod = (fam == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_cmpt_rw rw; + struct nsi_ip_cmpt_dynamic dyn; + DWORD count; + + memset( &rw, 0, sizeof(rw) ); + memset( &dyn, 0, sizeof(dyn) ); + + if (*key != 1) return STATUS_NOT_SUPPORTED; + +#if __linux__ + { + const char *fwd = (fam == AF_INET) ? "/proc/sys/net/ipv4/conf/default/forwarding" : + "/proc/sys/net/ipv6/conf/default/forwarding"; + const char *ttl = (fam == AF_INET) ? "/proc/sys/net/ipv4/ip_default_ttl" : + "/proc/sys/net/ipv6/conf/default/hop_limit"; + int value; + + if (!read_sysctl_int( fwd, &value )) rw.not_forwarding = !value; + if (!read_sysctl_int( ttl, &value )) rw.default_ttl = value; + } +#elif defined(HAVE_SYS_SYSCTL_H) + { + int fwd_4[] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_FORWARDING }; + int fwd_6[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_FORWARDING }; + int ttl_4[] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_DEFTTL }; + int ttl_6[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_DEFHLIM }; + int value; + size_t needed; + + needed = sizeof(value); + if (!sysctl( (fam == AF_INET) ? fwd_4 : fwd_6, ARRAY_SIZE(fwd_4), &value, &needed, NULL, 0 )) + rw.not_forwarding = value; + + needed = sizeof(value); + if (!sysctl( (fam == AF_INET) ? ttl_4 : ttl_6, ARRAY_SIZE(ttl_4), &value, &needed, NULL, 0 )) + rw.default_ttl = value; + } +#else + FIXME( "forwarding and default ttl not implemented\n" ); +#endif + + count = 0; + if (!nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &count )) + dyn.num_ifs = count; + + count = 0; + if (!nsi_enumerate_all( 1, 0, ip_mod, NSI_IP_FORWARD_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &count )) + dyn.num_routes = count; + + count = 0; + if (!nsi_enumerate_all( 1, 0, ip_mod, NSI_IP_UNICAST_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &count )) + dyn.num_addrs = count; + + if (rw_data) *rw_data = rw; + if (dynamic_data) *dynamic_data = dyn; + + return STATUS_SUCCESS; +} + +static NTSTATUS ipv4_cmpt_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + return ip_cmpt_get_all_parameters( AF_INET, key, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size ); +} + +static NTSTATUS ipv6_cmpt_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + return ip_cmpt_get_all_parameters( AF_INET6, key, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size ); +} + static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { @@ -869,6 +972,15 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, DWORD key_size, void static struct module_table ipv4_tables[] = { + { + NSI_IP_COMPARTMENT_TABLE, + { + sizeof(DWORD), sizeof(struct nsi_ip_cmpt_rw), + sizeof(struct nsi_ip_cmpt_dynamic), 0 + }, + NULL, + ipv4_cmpt_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { @@ -916,6 +1028,15 @@ const struct module ipv4_module = static struct module_table ipv6_tables[] = { + { + NSI_IP_COMPARTMENT_TABLE, + { + sizeof(DWORD), sizeof(struct nsi_ip_cmpt_rw), + sizeof(struct nsi_ip_cmpt_dynamic), 0 + }, + NULL, + ipv6_cmpt_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 44409ae159e..24f40e184a4 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -22,6 +22,35 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HI NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; +static inline NTSTATUS nsi_enumerate_all( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + 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 *count ) +{ + struct nsi_enumerate_all_ex params; + NTSTATUS status; + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.second_arg = unk2; + params.key_data = key_data; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + params.count = *count; + + status = nsi_enumerate_all_ex( &params ); + *count = params.count; + return status; +} + BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) DECLSPEC_HIDDEN; BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index f3edef9f3fd..6a90f5f1203 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,11 +97,28 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented NSI IP tables */ +#define NSI_IP_COMPARTMENT_TABLE 2 #define NSI_IP_IPSTATS_TABLE 6 #define NSI_IP_UNICAST_TABLE 10 #define NSI_IP_NEIGHBOUR_TABLE 11 #define NSI_IP_FORWARD_TABLE 16 +struct nsi_ip_cmpt_rw +{ + DWORD not_forwarding; + DWORD unk; + DWORD default_ttl; + DWORD unk2; +}; + +struct nsi_ip_cmpt_dynamic +{ + DWORD num_ifs; + DWORD num_routes; + DWORD unk; + DWORD num_addrs; +}; + struct nsi_ip_ipstats_dynamic { DWORD unk[4]; -- 2.23.0

1 0

[PATCH 2/4] nsiproxy: Implement IPv6 ipstats get_all_parameters on linux.
by Huw Davies 11 Aug '21

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 1 - dlls/nsiproxy.sys/ip.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index dd1a552cce6..feed72a1626 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -424,7 +424,6 @@ static void test_ip_ipstats( int family ) /* The table appears to consist of a single object without a key. The rw data does exist but isn't part of GetIpStatisticsEx() and isn't yet tested */ err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, &dyn, sizeof(dyn), &stat, sizeof(stat) ); -todo_wine_if( family == AF_INET6 ) ok( !err, "got %x\n", err ); if (err) goto err; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 438ae219174..7d9af08c711 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -226,6 +226,82 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size #endif } +static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_ipstats_dynamic dyn; + struct nsi_ip_ipstats_static stat; + + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + +#ifdef __linux__ + { + struct + { + const char *name; + void *elem; + int size; + } ipstatlist[] = + { +#define X(x) &x, sizeof(x) + { "Ip6InReceives", X( dyn.in_recv ) }, + { "Ip6InHdrErrors", X( dyn.in_hdr_errs ) }, + { "Ip6InAddrErrors", X( dyn.in_addr_errs ) }, + { "Ip6OutForwDatagrams", X( dyn.fwd_dgrams ) }, + { "Ip6InUnknownProtos", X( dyn.in_unk_protos ) }, + { "Ip6InDiscards", X( dyn.in_discards ) }, + { "Ip6InDelivers", X( dyn.in_delivers ) }, + { "Ip6OutRequests", X( dyn.out_reqs ) }, + { "Ip6OutDiscards", X( dyn.out_discards ) }, + { "Ip6OutNoRoutes", X( dyn.out_no_routes ) }, + { "Ip6ReasmTimeout", X( stat.reasm_timeout ) }, + { "Ip6ReasmReqds", X( dyn.reasm_reqds ) }, + { "Ip6ReasmOKs", X( dyn.reasm_oks ) }, + { "Ip6ReasmFails", X( dyn.reasm_fails ) }, + { "Ip6FragOKs", X( dyn.frag_oks ) }, + { "Ip6FragFails", X( dyn.frag_fails ) }, + { "Ip6FragCreates", X( dyn.frag_creates ) }, + /* no routingDiscards */ +#undef X + }; + NTSTATUS status = STATUS_NOT_SUPPORTED; + char buf[512], *ptr, *value; + DWORD i; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp6", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (!(value = strchr( buf, ' ' ))) continue; + /* terminate the valuename */ + *value++ = '\0'; + /* and strip leading spaces from value */ + while (*value == ' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; + + for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) + if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + { + if (ipstatlist[i].size == sizeof(long)) + *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); + else + *(long long *)ipstatlist[i].elem = strtoull( value, NULL, 10 ); + status = STATUS_SUCCESS; + } + } + fclose( fp ); + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + return status;; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_unicast_rw *rw, struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) { @@ -840,6 +916,15 @@ const struct module ipv4_module = static struct module_table ipv6_tables[] = { + { + NSI_IP_IPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_ipstats_dynamic), sizeof(struct nsi_ip_ipstats_static) + }, + NULL, + ipv6_ipstats_get_all_parameters, + }, { NSI_IP_UNICAST_TABLE, { -- 2.23.0

1 0

[PATCH 1/4] nsiproxy: Implement IPv4 ipstats get_all_parameters.
by Huw Davies 11 Aug '21

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 50 ++++++++++++++++++ dlls/nsiproxy.sys/ip.c | 115 +++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 35 +++++++++++++ 3 files changed, 200 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index f2a247d3333..dd1a552cce6 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -411,6 +411,54 @@ static void test_ndis_index_luid( void ) ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); } +static void test_ip_ipstats( int family ) +{ + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_ipstats_dynamic dyn, dyn2; + struct nsi_ip_ipstats_static stat; + MIB_IPSTATS table; + DWORD err; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + /* The table appears to consist of a single object without a key. The rw data does exist but + isn't part of GetIpStatisticsEx() and isn't yet tested */ + err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, &dyn, sizeof(dyn), &stat, sizeof(stat) ); +todo_wine_if( family == AF_INET6 ) + ok( !err, "got %x\n", err ); + if (err) goto err; + + err = GetIpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, &dyn2, sizeof(dyn2), NULL, 0 ); + ok( !err, "got %x\n", err ); + + /* dwForwarding and dwDefaultTTL come from the compartment table */ + ok( bounded( table.dwInReceives, dyn.in_recv, dyn2.in_recv ), "mismatch\n" ); + ok( bounded( table.dwInHdrErrors, dyn.in_hdr_errs, dyn2.in_hdr_errs ), "mismatch\n" ); + ok( bounded( table.dwInAddrErrors, dyn.in_addr_errs, dyn2.in_addr_errs ), "mismatch\n" ); + ok( bounded( table.dwForwDatagrams, dyn.fwd_dgrams, dyn2.fwd_dgrams ), "mismatch\n" ); + ok( bounded( table.dwInUnknownProtos, dyn.in_unk_protos, dyn2.in_unk_protos ), "mismatch\n" ); + ok( bounded( table.dwInDiscards, dyn.in_discards, dyn2.in_discards ), "mismatch\n" ); + ok( bounded( table.dwInDelivers, dyn.in_delivers, dyn2.in_delivers ), "mismatch\n" ); + ok( bounded( table.dwOutRequests, dyn.out_reqs, dyn2.out_reqs ), "mismatch\n" ); + ok( bounded( table.dwRoutingDiscards, dyn.routing_discards, dyn2.routing_discards ), "mismatch\n" ); + ok( bounded( table.dwOutDiscards, dyn.out_discards, dyn2.out_discards ), "mismatch\n" ); + ok( bounded( table.dwOutNoRoutes, dyn.out_no_routes, dyn2.out_no_routes ), "mismatch\n" ); + ok( table.dwReasmTimeout == stat.reasm_timeout, "mismatch\n" ); + ok( bounded( table.dwReasmReqds, dyn.reasm_reqds, dyn2.reasm_reqds ), "mismatch\n" ); + ok( bounded( table.dwReasmOks, dyn.reasm_oks, dyn2.reasm_oks ), "mismatch\n" ); + ok( bounded( table.dwReasmFails, dyn.reasm_fails, dyn2.reasm_fails ), "mismatch\n" ); + ok( bounded( table.dwFragOks, dyn.frag_oks, dyn2.frag_oks ), "mismatch\n" ); + ok( bounded( table.dwFragFails, dyn.frag_fails, dyn2.frag_fails ), "mismatch\n" ); + ok( bounded( table.dwFragCreates, dyn.frag_creates, dyn2.frag_creates ), "mismatch\n" ); + /* dwNumIf, dwNumAddr and dwNumRoutes come from the compartment table */ + +err: + winetest_pop_context(); +} + static void test_ip_unicast( int family ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[0]), FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[1]), @@ -678,6 +726,8 @@ START_TEST( nsi ) test_ndis_ifinfo(); test_ndis_index_luid(); + test_ip_ipstats( AF_INET ); + test_ip_ipstats( AF_INET6 ); test_ip_unicast( AF_INET ); test_ip_unicast( AF_INET6 ); test_ip_neighbour( AF_INET ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 2e727e5f369..438ae219174 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -120,6 +120,112 @@ static ULONG64 get_boot_time( void ) return ti.BootTime.QuadPart; } +static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_ipstats_dynamic dyn; + struct nsi_ip_ipstats_static stat; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + +#ifdef __linux__ + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Ip:"; + char buf[512], *ptr; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + /* last line was a header, get another */ + if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; + if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + { + DWORD in_recv, in_hdr_errs, fwd_dgrams, in_delivers, out_reqs; + ptr += sizeof(hdr); + sscanf( ptr, "%*u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", + &in_recv, + &in_hdr_errs, + &dyn.in_addr_errs, + &fwd_dgrams, + &dyn.in_unk_protos, + &dyn.in_discards, + &in_delivers, + &out_reqs, + &dyn.out_discards, + &dyn.out_no_routes, + &stat.reasm_timeout, + &dyn.reasm_reqds, + &dyn.reasm_oks, + &dyn.reasm_fails, + &dyn.frag_oks, + &dyn.frag_fails, + &dyn.frag_creates ); + /* no routingDiscards */ + dyn.in_recv = in_recv; + dyn.in_hdr_errs = in_hdr_errs; + dyn.fwd_dgrams = fwd_dgrams; + dyn.in_delivers = in_delivers; + dyn.out_reqs = out_reqs; + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + status = STATUS_SUCCESS; + break; + } + } + fclose( fp ); + return status; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS }; +#if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) + struct ipstat ip_stat; +#elif defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL) + struct ip_stats ip_stat; +#endif + size_t needed; + + needed = sizeof(ip_stat); + if (sysctl( mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_recv = ip_stat.ips_total; + dyn.in_hdr_errs = ip_stat.ips_badhlen + ip_stat.ips_badsum + ip_stat.ips_tooshort + ip_stat.ips_badlen + + ip_stat.ips_badvers + ip_stat.ips_badoptions; + /* ips_badaddr also includes outgoing packets with a bad address, but we can't account for that right now */ + dyn.in_addr_errs = ip_stat.ips_cantforward + ip_stat.ips_badaddr + ip_stat.ips_notmember; + dyn.fwd_dgrams = ip_stat.ips_forward; + dyn.in_unk_protos = ip_stat.ips_noproto; + dyn.in_discards = ip_stat.ips_fragdropped; + dyn.in_delivers = ip_stat.ips_delivered; + dyn.out_reqs = ip_stat.ips_localout; + dyn.out_discards = ip_stat.ips_odropped; + dyn.out_no_routes = ip_stat.ips_noroute; + stat.reasm_timeout = ip_stat.ips_fragtimeout; + dyn.reasm_reqds = ip_stat.ips_fragments; + dyn.reasm_oks = ip_stat.ips_reassembled; + dyn.reasm_fails = ip_stat.ips_fragments - ip_stat.ips_reassembled; + dyn.frag_oks = ip_stat.ips_fragmented; + dyn.frag_fails = ip_stat.ips_cantfrag; + dyn.frag_creates = ip_stat.ips_ofragments; + + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_unicast_rw *rw, struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) { @@ -687,6 +793,15 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, DWORD key_size, void static struct module_table ipv4_tables[] = { + { + NSI_IP_IPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_ipstats_dynamic), sizeof(struct nsi_ip_ipstats_static) + }, + NULL, + ipv4_ipstats_get_all_parameters, + }, { NSI_IP_UNICAST_TABLE, { diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 437582ad692..f3edef9f3fd 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,10 +97,45 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented NSI IP tables */ +#define NSI_IP_IPSTATS_TABLE 6 #define NSI_IP_UNICAST_TABLE 10 #define NSI_IP_NEIGHBOUR_TABLE 11 #define NSI_IP_FORWARD_TABLE 16 +struct nsi_ip_ipstats_dynamic +{ + DWORD unk[4]; + ULONGLONG in_recv; + ULONGLONG in_octets; + ULONGLONG fwd_dgrams; + ULONGLONG in_delivers; + ULONGLONG out_reqs; + ULONGLONG unk2; + ULONGLONG unk3; + ULONGLONG out_octets; + ULONGLONG unk4[6]; + ULONGLONG in_hdr_errs; + DWORD in_addr_errs; + DWORD in_unk_protos; + DWORD unk5; + DWORD reasm_reqds; + DWORD reasm_oks; + DWORD reasm_fails; + DWORD in_discards; + DWORD out_no_routes; + DWORD out_discards; + DWORD routing_discards; + DWORD frag_oks; + DWORD frag_fails; + DWORD frag_creates; + DWORD unk6[7]; +}; + +struct nsi_ip_ipstats_static +{ + DWORD reasm_timeout; +}; + struct nsi_ipv4_unicast_key { NET_LUID luid; -- 2.23.0

1 0

[PATCH 7/7] gdi32/tests: Add more metafile blitting tests.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 299 ++++++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+)

1 0

[PATCH 6/7] gdi32: Use NtGdiAlphaBlend for GdiAlphaBlend.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 13 ++++++++++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 39 insertions(+), 7 deletions(-)

1 0

[PATCH 5/7] gdi32: Use NtGdiBitBlt for BitBlt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 12 +++++++---- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 42 +++++++++++++++++++++++------------- include/ntgdi.h | 2 ++ 6 files changed, 63 insertions(+), 24 deletions(-)

1 0

[PATCH 4/7] gdi32: Use NtGdiStretchBlt for StretchBlt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 +++++---- dlls/gdi32/enhmfdrv/bitblt.c | 25 ++++++++++++++++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 6 ++++++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 12 ++++++------ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 -- include/ntgdi.h | 3 +++ 10 files changed, 60 insertions(+), 25 deletions(-)

1 0

[PATCH 3/7] gdi32: Use GetDIBits instead of GetObject in MFDRV_StretchBlt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/bitblt.c | 136 +++++++++++++++----------------------- 1 file changed, 54 insertions(+), 82 deletions(-)

1 0

[PATCH 2/7] gdi32: Don't use bitblt_coords in emfdrv_stretchblt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 46 ++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 20 deletions(-)

1 0

[PATCH vkd3d 1/7] tests: Add a test for the shader DTOF instruction.
by Conor McCarthy 11 Aug '21

11 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ae1394b0..2b1830bd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9365,6 +9365,31 @@ static void test_shader_instructions(void) 0x00000021, 0x00000000, }; static const struct named_shader ps_dtoi = {"dtoi", ps_dtoi_code, sizeof(ps_dtoi_code)}; + static const DWORD ps_dtof_code[] = + { +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + float2 f = float2(src0, -src0); + dst.x = asuint(f.x); + dst.y = asuint(f.y); + dst.zw = 0; + } +#endif + 0x43425844, 0xa920927f, 0xac06725f, 0x310edf68, 0xec6ab7cd, 0x00000001, 0x00000128, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000118, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050, + 0x00000027, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000c9, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x070000c9, 0x00100022, 0x00000000, 0x80208446, 0x00000041, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, + 0x00000001, 0x00000000, + }; + static const struct named_shader ps_dtof = {"dtof", ps_dtof_code, sizeof(ps_dtof_code)}; static const DWORD ps_utod_code[] = { #if 0 @@ -10004,6 +10029,7 @@ static void test_shader_instructions(void) {&ps_dtou, {.d = {{ -1.0}}}, {{ 0, 1 }}, true, true}, {&ps_dtou, {.d = {{ 1.0}}}, {{ 1, 0 }}, true, true}, {&ps_dtoi, {.d = {{ 1.0}}}, {.i = {1, -1}}, true, true}, + {&ps_dtof, {.d = {{ 1.5}}}, {.f = {1.5f, -1.5f}}, true, true}, {&ps_utod, {.u = {{3, 0xffffffff}}}, {.d = {3.0, 4294967295.0}}, true, true}, {&ps_itod, {.u = {{3, INT_MIN}}}, {.d = {3.0, -2147483648.0}}, true, true}, {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true, true}, -- 2.32.0

3 8