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

[PATCH 3/8] gdi32: Use NtGdiModifyWorldTransform for SetWorldTransform implementation.
by Jacek Caban Aug. 13, 2021

Aug. 13, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 3 +-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 +++++++++++ dlls/gdi32/mapping.c | 30 ---------------------------- 6 files changed, 16 insertions(+), 44 deletions(-)

2 1

[PATCH 2/8] gdi32: Support MWT_SET in NtGdiModifyWorldTransform.
by Jacek Caban Aug. 13, 2021

Aug. 13, 2021

It's not defined in public headers, but it's documented in EMF spec. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mapping.c | 5 +++++ dlls/gdi32/tests/mapping.c | 22 ++++++++++++++++++++++ include/ntgdi.h | 2 ++ 3 files changed, 29 insertions(+)

2 1

[PATCH 1/8] gdi32: Use NtGdiModifyWorldTransform for ModifyWorldTransform.
by Jacek Caban Aug. 13, 2021

Aug. 13, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 12 +++++++ dlls/gdi32/mapping.c | 48 ++++++++++++---------------- include/ntgdi.h | 1 + 7 files changed, 39 insertions(+), 39 deletions(-)

2 1

[PATCH 1/7] winebus.sys: Read irp->IoStatus.Status before leaving the CS.
by Rémi Bernon Aug. 13, 2021

Aug. 13, 2021

Or we may have a race condition where a pending IRP may be completed after we left the CS but before we read its status. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 001f775e230..b7230cf2e33 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -982,9 +982,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) break; } + status = irp->IoStatus.Status; LeaveCriticalSection(&ext->cs); - status = irp->IoStatus.Status; if (status != STATUS_PENDING) IoCompleteRequest(irp, IO_NO_INCREMENT); return status; } -- 2.32.0

1 6

[PATCH 3/3] iphlpapi: Implement GetTcpStatisticsEx() on top of nsi.
by Huw Davies Aug. 13, 2021

Aug. 13, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 62 +++++++++++++ dlls/iphlpapi/ipstats.c | 161 --------------------------------- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/nsi/tests/nsi.c | 3 - 4 files changed, 64 insertions(+), 166 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 14a2c719b95..b45bcc41724 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2807,6 +2807,68 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo return FALSE; } +/****************************************************************** + * GetTcpStatistics (IPHLPAPI.@) + * + * Get the TCP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for TCP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetTcpStatistics( MIB_TCPSTATS *stats ) +{ + return GetTcpStatisticsEx( stats, WS_AF_INET ); +} + +/****************************************************************** + * GetTcpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 TCP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for TCP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetTcpStatisticsEx( MIB_TCPSTATS *stats, DWORD family ) +{ + struct nsi_tcp_stats_dynamic dyn; + struct nsi_tcp_stats_static stat; + USHORT key = (USHORT)family; + DWORD err; + + if (!stats || !ip_module_id( family )) return ERROR_INVALID_PARAMETER; + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (err) return err; + + stats->u.RtoAlgorithm = stat.rto_algo; + stats->dwRtoMin = stat.rto_min; + stats->dwRtoMax = stat.rto_max; + stats->dwMaxConn = stat.max_conns; + stats->dwActiveOpens = dyn.active_opens; + stats->dwPassiveOpens = dyn.passive_opens; + stats->dwAttemptFails = dyn.attempt_fails; + stats->dwEstabResets = dyn.est_rsts; + stats->dwCurrEstab = dyn.cur_est; + stats->dwInSegs = (DWORD)dyn.in_segs; + stats->dwOutSegs = (DWORD)dyn.out_segs; + stats->dwRetransSegs = dyn.retrans_segs; + stats->dwInErrs = dyn.in_errs; + stats->dwOutRsts = dyn.out_rsts; + stats->dwNumConns = dyn.num_conns; + + return err; +} /****************************************************************** * GetTcpTable (IPHLPAPI.@) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index c5621b52dd7..ececfcdcecd 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -276,167 +276,6 @@ static void *read_mib_entry( int fd, int level, int name, int *len ) } #endif /* HAVE_SYS_TIHDR_H && T_OPTMGMT_ACK */ -/****************************************************************** - * GetTcpStatisticsEx (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 TCP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for TCP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(*stats) ); - - if (family == WS_AF_INET6) - { - FIXME( "unimplemented for IPv6\n" ); - return ret; - } - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Tcp:"; - MIB_TCPTABLE *tcp_table; - char buf[512], *ptr; - - 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)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u", - &stats->u.dwRtoAlgorithm, - &stats->dwRtoMin, - &stats->dwRtoMax, - &stats->dwMaxConn, - &stats->dwActiveOpens, - &stats->dwPassiveOpens, - &stats->dwAttemptFails, - &stats->dwEstabResets, - &stats->dwCurrEstab, - &stats->dwInSegs, - &stats->dwOutSegs, - &stats->dwRetransSegs, - &stats->dwInErrs, - &stats->dwOutRsts ); - break; - } - } - if (!AllocateAndGetTcpTableFromStack( &tcp_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumConns = tcp_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, tcp_table ); - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char tcp[] = "tcp"; - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, tcp, 0, tcp )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->u.dwRtoAlgorithm = kstat_get_ui32( ksp, "rtoAlgorithm" ); - stats->dwRtoMin = kstat_get_ui32( ksp, "rtoMin" ); - stats->dwRtoMax = kstat_get_ui32( ksp, "rtoMax" ); - stats->dwMaxConn = kstat_get_ui32( ksp, "maxConn" ); - stats->dwActiveOpens = kstat_get_ui32( ksp, "activeOpens" ); - stats->dwPassiveOpens = kstat_get_ui32( ksp, "passiveOpens" ); - stats->dwAttemptFails = kstat_get_ui32( ksp, "attemptFails" ); - stats->dwEstabResets = kstat_get_ui32( ksp, "estabResets" ); - stats->dwCurrEstab = kstat_get_ui32( ksp, "currEstab" ); - stats->dwInSegs = kstat_get_ui32( ksp, "inSegs" ); - stats->dwOutSegs = kstat_get_ui32( ksp, "outSegs" ); - stats->dwRetransSegs = kstat_get_ui32( ksp, "retransSegs" ); - stats->dwInErrs = kstat_get_ui32( ksp, "inErrs" ); - stats->dwOutRsts = kstat_get_ui32( ksp, "outRsts" ); - stats->dwNumConns = kstat_get_ui32( ksp, "connTableSize" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) || defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT)) - { -#ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ -#define TCPTV_MIN 2 -#define TCPTV_REXMTMAX 128 -#endif - int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; -#define hz 1000 -#if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) - struct tcpstat tcp_stat; -#elif defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) - struct tcp_stats tcp_stat; -#endif - size_t needed = sizeof(tcp_stat); - - if(sysctl(mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0) != -1) - { - stats->u.RtoAlgorithm = MIB_TCP_RTO_VANJ; - stats->dwRtoMin = TCPTV_MIN; - stats->dwRtoMax = TCPTV_REXMTMAX; - stats->dwMaxConn = -1; - stats->dwActiveOpens = tcp_stat.tcps_connattempt; - stats->dwPassiveOpens = tcp_stat.tcps_accepts; - stats->dwAttemptFails = tcp_stat.tcps_conndrops; - stats->dwEstabResets = tcp_stat.tcps_drops; - stats->dwCurrEstab = 0; - stats->dwInSegs = tcp_stat.tcps_rcvtotal; - stats->dwOutSegs = tcp_stat.tcps_sndtotal - tcp_stat.tcps_sndrexmitpack; - stats->dwRetransSegs = tcp_stat.tcps_sndrexmitpack; - stats->dwInErrs = tcp_stat.tcps_rcvbadsum + tcp_stat.tcps_rcvbadoff + tcp_stat.tcps_rcvmemdrop + tcp_stat.tcps_rcvshort; - stats->dwOutRsts = tcp_stat.tcps_sndctrl - tcp_stat.tcps_closed; - stats->dwNumConns = tcp_stat.tcps_connects; - ret = NO_ERROR; - } - else ERR ("failed to get tcpstat\n"); - } -#else - FIXME( "unimplemented\n" ); -#endif - return ret; -} - -/****************************************************************** - * GetTcpStatistics (IPHLPAPI.@) - * - * Get the TCP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for TCP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) -{ - return GetTcpStatisticsEx(stats, WS_AF_INET); -} - /****************************************************************** * GetUdpStatistics (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d439f71069b..5ec2f2eaba2 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -715,8 +715,8 @@ static void testGetTcpStatisticsEx(void) } apiReturn = GetTcpStatisticsEx(&stats, AF_INET6); - todo_wine ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "TCP IPv6 Ex stats:\n" ); diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index fb95ab67d3b..33b4e9e6d97 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -815,9 +815,7 @@ static void test_tcp_stats( int family ) ok( !err, "got %x\n", err ); err = GetTcpStatisticsEx( &table, family ); -todo_wine_if(family == AF_INET6) ok( !err, "got %d\n", err ); - if (err) goto err; err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, &dyn2, sizeof(dyn), NULL, 0 ); @@ -847,7 +845,6 @@ todo_wine_if(family == AF_INET6) table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); ok( unstable( table.dwNumConns == dyn.num_conns ), "%d vs %d\n", table.dwNumConns, dyn.num_conns ); -err: winetest_pop_context(); } -- 2.23.0

1 0

[PATCH 2/3] nsiproxy: Implement TCP stats get_all_parameters.
by Huw Davies Aug. 13, 2021

Aug. 13, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 59 +++++++++ dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 1 + dlls/nsiproxy.sys/tcp.c | 190 +++++++++++++++++++++++++++ include/wine/nsi.h | 29 ++++ 6 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 dlls/nsiproxy.sys/tcp.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index a21ac897e2c..fb95ab67d3b 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -33,6 +33,11 @@ static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) return lo <= val && val <= hi; } +static int unstable( int val ) +{ + return !winetest_interactive || val; +} + static void test_nsi_api( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), @@ -795,6 +800,57 @@ static void test_ip_forward( int family ) winetest_pop_context(); } +static void test_tcp_stats( int family ) +{ + DWORD err; + USHORT key = family; + struct nsi_tcp_stats_dynamic dyn, dyn2; + struct nsi_tcp_stats_static stat; + MIB_TCPSTATS table; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + ok( !err, "got %x\n", err ); + + err = GetTcpStatisticsEx( &table, family ); +todo_wine_if(family == AF_INET6) + ok( !err, "got %d\n", err ); + if (err) goto err; + + err = NsiGetAllParameters( 1, &NPI_MS_TCP_MODULEID, NSI_TCP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn2, sizeof(dyn), NULL, 0 ); + ok( !err, "got %x\n", err ); + + ok( table.dwRtoAlgorithm == stat.rto_algo, "%d vs %d\n", table.dwRtoAlgorithm, stat.rto_algo ); + ok( table.dwRtoMin == stat.rto_min, "%d vs %d\n", table.dwRtoMin, stat.rto_min ); + ok( table.dwRtoMax == stat.rto_max, "%d vs %d\n", table.dwRtoMax, stat.rto_max ); + ok( table.dwMaxConn == stat.max_conns, "%d vs %d\n", table.dwMaxConn, stat.max_conns ); + + ok( unstable( table.dwActiveOpens == dyn.active_opens ), "%d vs %d\n", table.dwActiveOpens, dyn.active_opens ); + ok( unstable( table.dwPassiveOpens == dyn.passive_opens ), "%d vs %d\n", table.dwPassiveOpens, dyn.passive_opens ); + ok( bounded( table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ), "%d vs [%d %d]\n", + table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ); + ok( bounded( table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ), "%d vs [%d %d]\n", + table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ); + ok( unstable( table.dwCurrEstab == dyn.cur_est ), "%d vs %d\n", table.dwCurrEstab, dyn.cur_est ); + ok( bounded( table.dwInSegs, dyn.in_segs, dyn2.in_segs ), "%d vs [%I64d %I64d]\n", + table.dwInSegs, dyn.in_segs, dyn2.in_segs ); + ok( bounded( table.dwOutSegs, dyn.out_segs, dyn2.out_segs ), "%d vs [%I64d %I64d]\n", + table.dwOutSegs, dyn.out_segs, dyn2.out_segs ); + ok( bounded( table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ), "%d vs [%d %d]\n", + table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ); + ok( bounded( table.dwInErrs, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", + table.dwInErrs, dyn.in_errs, dyn2.in_errs ); + ok( bounded( table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ), "%d vs [%d %d]\n", + table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); + ok( unstable( table.dwNumConns == dyn.num_conns ), "%d vs %d\n", table.dwNumConns, dyn.num_conns ); + +err: + winetest_pop_context(); +} + START_TEST( nsi ) { test_nsi_api(); @@ -814,4 +870,7 @@ START_TEST( nsi ) test_ip_neighbour( AF_INET6 ); test_ip_forward( AF_INET ); test_ip_forward( AF_INET6 ); + + test_tcp_stats( AF_INET ); + test_tcp_stats( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index 07c2738e55b..3f8965236ba 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -6,4 +6,5 @@ C_SRCS = \ device.c \ ip.c \ ndis.c \ - nsi.c + nsi.c \ + tcp.c diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 8e084a076fd..ef57c65ce4d 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -40,6 +40,7 @@ static const struct module *modules[] = &ndis_module, &ipv4_module, &ipv6_module, + &tcp_module, }; static const struct module_table *get_module_table( const NPI_MODULEID *id, DWORD table ) diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 24f40e184a4..17e0189b378 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -115,3 +115,4 @@ struct module extern const struct module ndis_module DECLSPEC_HIDDEN; extern const struct module ipv4_module DECLSPEC_HIDDEN; extern const struct module ipv6_module DECLSPEC_HIDDEN; +extern const struct module tcp_module DECLSPEC_HIDDEN; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c new file mode 100644 index 00000000000..ffac9971316 --- /dev/null +++ b/dlls/nsiproxy.sys/tcp.c @@ -0,0 +1,190 @@ +/* + * nsiproxy.sys tcp module + * + * Copyright 2003, 2006, 2011 Juan Lang + * Copyright 2007 TransGaming Technologies Inc. + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" +#include <stdarg.h> + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif + +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + +#ifdef HAVE_NETINET_TCP_VAR_H +#include <netinet/tcp_var.h> +#endif + +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ifdef.h" +#include "netiodef.h" +#include "ws2ipdef.h" +#include "tcpmib.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +#include "nsiproxy_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static NTSTATUS tcp_stats_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_tcp_stats_dynamic dyn; + struct nsi_tcp_stats_static stat; + const USHORT *family = key; + + 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 ); + + if (*family != WS_AF_INET && *family != WS_AF_INET6) return STATUS_NOT_SUPPORTED; + + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + +#ifdef __linux__ + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Tcp:"; + char buf[512], *ptr; + FILE *fp; + + /* linux merges tcp4 and tcp6 stats, so simply supply that for either family */ + 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_segs, out_segs; + ptr += sizeof(hdr); + sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u", + &stat.rto_algo, + &stat.rto_min, + &stat.rto_max, + &stat.max_conns, + &dyn.active_opens, + &dyn.passive_opens, + &dyn.attempt_fails, + &dyn.est_rsts, + &dyn.cur_est, + &in_segs, + &out_segs, + &dyn.retrans_segs, + &dyn.in_errs, + &dyn.out_rsts ); + dyn.in_segs = in_segs; + dyn.out_segs = out_segs; + if (dynamic_data) *(struct nsi_tcp_stats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_tcp_stats_static *)static_data = stat; + status = STATUS_SUCCESS; + break; + } + } + fclose( fp ); + return status; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) || defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT)) + { +#ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ +#define TCPTV_MIN 2 +#define TCPTV_REXMTMAX 128 +#endif + int mib[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS }; +#define hz 1000 +#if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) + struct tcpstat tcp_stat; +#elif defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) + struct tcp_stats tcp_stat; +#endif + size_t needed = sizeof(tcp_stat); + + if (sysctl( mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + stat.rto_algo = MIB_TCP_RTO_VANJ; + stat.rto_min = TCPTV_MIN; + stat.rto_max = TCPTV_REXMTMAX; + stat.max_conns = -1; + dyn.active_opens = tcp_stat.tcps_connattempt; + dyn.passive_opens = tcp_stat.tcps_accepts; + dyn.attempt_fails = tcp_stat.tcps_conndrops; + dyn.est_rsts = tcp_stat.tcps_drops; + dyn.cur_est = 0; + dyn.pad = 0; + dyn.in_segs = tcp_stat.tcps_rcvtotal; + dyn.out_segs = tcp_stat.tcps_sndtotal - tcp_stat.tcps_sndrexmitpack; + dyn.retrans_segs = tcp_stat.tcps_sndrexmitpack; + dyn.out_rsts = tcp_stat.tcps_sndctrl - tcp_stat.tcps_closed; + dyn.in_errs = tcp_stat.tcps_rcvbadsum + tcp_stat.tcps_rcvbadoff + tcp_stat.tcps_rcvmemdrop + tcp_stat.tcps_rcvshort; + dyn.num_conns = tcp_stat.tcps_connects; + if (dynamic_data) *(struct nsi_tcp_stats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_tcp_stats_static *)static_data = stat; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + +static struct module_table tcp_tables[] = +{ + { + NSI_TCP_STATS_TABLE, + { + sizeof(USHORT), 0, + sizeof(struct nsi_tcp_stats_dynamic), sizeof(struct nsi_tcp_stats_static) + }, + NULL, + tcp_stats_get_all_parameters, + }, + { + ~0u + } +}; + +const struct module tcp_module = +{ + &NPI_MS_TCP_MODULEID, + tcp_tables +}; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 2c72c16aedc..3c92fb81aae 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -292,6 +292,35 @@ struct nsi_ip_forward_static DWORD if_index; }; +/* Undocumented NSI TCP tables */ +#define NSI_TCP_STATS_TABLE 0 + +struct nsi_tcp_stats_dynamic +{ + DWORD active_opens; + DWORD passive_opens; + DWORD attempt_fails; + DWORD est_rsts; + DWORD cur_est; + DWORD pad; /* ? */ + ULONGLONG in_segs; + ULONGLONG out_segs; + DWORD retrans_segs; + DWORD out_rsts; + DWORD in_errs; + DWORD num_conns; + DWORD unk[12]; +}; + +struct nsi_tcp_stats_static +{ + DWORD rto_algo; + DWORD rto_min; + DWORD rto_max; + DWORD max_conns; + DWORD unk; +}; + /* 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/3] nsiproxy: Add an #ifdef guard for SIN_ROUTER.
by Huw Davies Aug. 13, 2021

Aug. 13, 2021

It's not defined in FreeBSD. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Supersedes 211408 dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c5d98fa93f2..e2e292f4b59 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -962,7 +962,11 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo memcpy( entry.phys_addr, &sdl->sdl_data[sdl->sdl_nlen], entry.phys_addr_len ); if (rtm->rtm_rmx.rmx_expire == 0) entry.state = NlnsPermanent; else entry.state = NlnsReachable; +#ifdef SIN_ROUTER entry.is_router = sinarp->sin_other & SIN_ROUTER; +#else + entry.is_router = 0; +#endif entry.is_unreachable = 0; /* FIXME */ if (num < *count) -- 2.23.0

1 0

[PATCH 1/4] include: Add remaining IPv4 socket options
by Alex Henrie Aug. 13, 2021

Aug. 13, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The same option apparently causes both the hop limit and the time-to-live to be received. --- include/ws2ipdef.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index d5a4dab6ce0..3025a9c6fe9 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -83,6 +83,7 @@ typedef struct _INTERFACE_INFO #define IP_UNBLOCK_SOURCE 18 #define IP_PKTINFO 19 #define IP_HOPLIMIT 21 +#define IP_RECVTTL 21 #define IP_RECEIVE_BROADCAST 22 #define IP_RECVIF 24 #define IP_RECVDSTADDR 25 @@ -91,7 +92,21 @@ typedef struct _INTERFACE_INFO #define IP_DEL_IFLIST 30 #define IP_UNICAST_IF 31 #define IP_RTHDR 32 +#define IP_GET_IFLIST 33 #define IP_RECVRTHDR 38 +#define IP_TCLASS 39 +#define IP_RECVTCLASS 40 +#define IP_RECVTOS 40 +#define IP_ORIGINAL_ARRIVAL_IF 47 +#define IP_ECN 50 +#define IP_PKTINFO_EX 51 +#define IP_WFP_REDIRECT_RECORDS 60 +#define IP_WFP_REDIRECT_CONTEXT 70 +#define IP_MTU_DISCOVER 71 +#define IP_MTU 73 +#define IP_NRT_INTERFACE 74 +#define IP_RECVERR 75 +#define IP_USER_MTU 76 #else #define WS_IP_OPTIONS 1 #define WS_IP_HDRINCL 2 @@ -109,6 +124,7 @@ typedef struct _INTERFACE_INFO #define WS_IP_UNBLOCK_SOURCE 18 #define WS_IP_PKTINFO 19 #define WS_IP_HOPLIMIT 21 +#define WS_IP_RECVTTL 21 #define WS_IP_RECEIVE_BROADCAST 22 #define WS_IP_RECVIF 24 #define WS_IP_RECVDSTADDR 25 @@ -117,7 +133,21 @@ typedef struct _INTERFACE_INFO #define WS_IP_DEL_IFLIST 30 #define WS_IP_UNICAST_IF 31 #define WS_IP_RTHDR 32 +#define WS_IP_GET_IFLIST 33 #define WS_IP_RECVRTHDR 38 +#define WS_IP_TCLASS 39 +#define WS_IP_RECVTCLASS 40 +#define WS_IP_RECVTOS 40 +#define WS_IP_ORIGINAL_ARRIVAL_IF 47 +#define WS_IP_ECN 50 +#define WS_IP_PKTINFO_EX 51 +#define WS_IP_WFP_REDIRECT_RECORDS 60 +#define WS_IP_WFP_REDIRECT_CONTEXT 70 +#define WS_IP_MTU_DISCOVER 71 +#define WS_IP_MTU 73 +#define WS_IP_NRT_INTERFACE 74 +#define WS_IP_RECVERR 75 +#define WS_IP_USER_MTU 76 #endif /* USE_WS_PREFIX */ typedef struct WS(sockaddr_in6) -- 2.32.0

3 8

[PATCH 1/2] ntdll: Make alloc_fs_sel() a hidden symbol.
by Zebediah Figura Aug. 13, 2021

Aug. 13, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d02a7946945..390121726ad 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -92,7 +92,7 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } -extern int CDECL alloc_fs_sel( int sel, void *base ); +extern int CDECL alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( alloc_fs_sel, /* switch to 32-bit stack */ "pushq %rbx\n\t" -- 2.32.0

1 1

[PATCH 1/5] winebus.sys: Return STATUS_SUCCESS from IRP_MN_SURPRISE_REMOVAL.
by Rémi Bernon Aug. 12, 2021

Aug. 12, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 23195dfa75a..713db9c7f27 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -704,6 +704,7 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) remove_pending_irps(device); ext->removed = TRUE; LeaveCriticalSection(&ext->cs); + status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: -- 2.32.0

2 11