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

[PATCH 3/8] gdi32: Use pthread mutex in font.c.
by Jacek Caban 04 Oct '21

04 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 95 ++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 50 deletions(-)

1 0

[PATCH 2/8] gdi32: Use pthread mutex instead of gdi_section.
by Jacek Caban 04 Oct '21

04 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- GDI_CheckNotLock can't be implemented directly on top of pthread, we would need to keep track of owning thread ourselves. Since it's used only for an assert, I replaced it with comments instead. dlls/gdi32/dc.c | 10 ++--- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 83 ++++++++++++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - 4 files changed, 40 insertions(+), 56 deletions(-)

1 0

[PATCH 1/8] gdi32: Use pthread mutex in driver.c.
by Jacek Caban 04 Oct '21

04 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-)

1 0

[PATCH 5/5] nsiproxy: Introduce a unix-side handle returned by icmp_send_echo().
by Huw Davies 04 Oct '21

04 Oct '21

This represents the state of the icmp request for use on the PE-side. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 10 +++- dlls/nsiproxy.sys/icmp_echo.c | 77 +++++++++++++++++++++++++++- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 1 + dlls/nsiproxy.sys/unix_private.h | 1 + 5 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 5ae243a4111..cd0bc0e4db2 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -58,6 +58,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { + icmp_close, icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, @@ -309,7 +310,7 @@ static void handle_queued_send_echo( IRP *irp ) status = nsiproxy_call( icmp_send_echo, &params ); TRACE( "icmp_send_echo rets %08x\n", status ); - if (1) + if (status != STATUS_PENDING) { irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) @@ -320,6 +321,13 @@ static void handle_queued_send_echo( IRP *irp ) } IoCompleteRequest( irp, IO_NO_INCREMENT ); } + else + { + /* FIXME */ + nsiproxy_call( icmp_close, params.handle ); + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } } static DWORD WINAPI request_thread_proc( void *arg ) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 8ec506f823c..90a779fb67e 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -104,6 +104,68 @@ struct icmp_data const struct family_ops *ops; }; +#define MAX_HANDLES 256 /* Max number of simultaneous pings - could become dynamic if need be */ +static struct icmp_data *handle_table[MAX_HANDLES]; +static pthread_mutex_t handle_lock = PTHREAD_MUTEX_INITIALIZER; +static struct icmp_data **next_free, **next_unused = handle_table; + +static HANDLE handle_alloc( struct icmp_data *data ) +{ + struct icmp_data **entry; + HANDLE h; + + pthread_mutex_lock( &handle_lock ); + entry = next_free; + if (entry) next_free = *(struct icmp_data ***)entry; + else if (next_unused < handle_table + MAX_HANDLES) entry = next_unused++; + else + { + pthread_mutex_unlock( &handle_lock ); + FIXME( "Exhausted icmp handle count\n" ); + return 0; + } + *entry = data; + h = LongToHandle( entry - handle_table + 1 ); + pthread_mutex_unlock( &handle_lock ); + TRACE( "returning handle %p\n", h ); + return h; +} + +static struct icmp_data **handle_entry( HANDLE h ) +{ + unsigned int idx = HandleToLong( h ); + + if (!idx || idx > MAX_HANDLES) + { + ERR( "Invalid icmp handle\n" ); + return NULL; + } + return handle_table + idx - 1; +} + +static struct icmp_data *handle_data( HANDLE h ) +{ + struct icmp_data **entry = handle_entry( h ); + + if (!entry) return NULL; + return *entry; +} + +static void handle_free( HANDLE h ) +{ + struct icmp_data **entry; + + TRACE( "%p\n", h ); + pthread_mutex_lock( &handle_lock ); + entry = handle_entry( h ); + if (entry) + { + *(struct icmp_data ***)entry = next_free; + next_free = entry; + } + pthread_mutex_unlock( &handle_lock ); +} + static void ipv4_init_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp_hdr ) { icmp_hdr->type = ICMP4_ECHO_REQUEST; @@ -315,7 +377,18 @@ NTSTATUS icmp_send_echo( void *args ) return STATUS_SUCCESS; } - /* FIXME */ + params->handle = handle_alloc( data ); + if (!params->handle) icmp_data_free( data ); + return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; +} + +NTSTATUS icmp_close( void *args ) +{ + HANDLE handle = args; + struct icmp_data *data = handle_data( handle ); + + if (!data) return STATUS_INVALID_PARAMETER; icmp_data_free( data ); - return STATUS_NOT_SUPPORTED; + handle_free( handle ); + return STATUS_SUCCESS; } diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 25219a1c3fe..dec66ad6a33 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -147,6 +147,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { + icmp_close, icmp_send_echo, unix_nsi_enumerate_all_ex, unix_nsi_get_all_parameters_ex, diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 9831998793d..b40a6198c7c 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -24,5 +24,6 @@ struct icmp_send_echo_params void *request; DWORD request_size; BYTE ttl, tos; + HANDLE handle; ULONG ip_status; }; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 0dfe9e69dbc..7f81336e3f1 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -157,4 +157,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) return ascii_strncasecmp( s1, s2, -1 ); } +NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 4/5] nsiproxy: Actually send the ICMP ECHO request.
by Huw Davies 04 Oct '21

04 Oct '21

However, don't yet wait for the reply. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 1 + dlls/nsiproxy.sys/device.c | 37 ++- dlls/nsiproxy.sys/icmp_echo.c | 321 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 28 +++ dlls/nsiproxy.sys/unix_private.h | 2 + 6 files changed, 387 insertions(+), 3 deletions(-) create mode 100644 dlls/nsiproxy.sys/icmp_echo.c create mode 100644 dlls/nsiproxy.sys/nsiproxy_private.h diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index 95f2a205816..87f7e165ef4 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ + icmp_echo.c \ ip.c \ ndis.c \ nsi.c \ diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index f4cefd4b794..5ae243a4111 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -33,6 +33,8 @@ #include "wine/debug.h" #include "wine/unixlib.h" +#include "nsiproxy_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(nsi); static unixlib_handle_t nsiproxy_handle; @@ -56,6 +58,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { + icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, nsi_get_parameter_ex, @@ -289,6 +292,36 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static void handle_queued_send_echo( IRP *irp ) +{ + struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; + struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)irp->AssociatedIrp.SystemBuffer; + struct icmp_send_echo_params params; + NTSTATUS status; + + TRACE( "\n" ); + params.request = in->data + ((in->opt_size + 3) & ~3); + params.request_size = in->req_size; + params.ttl = in->ttl; + params.tos = in->tos; + params.dst = &in->dst; + + status = nsiproxy_call( icmp_send_echo, &params ); + TRACE( "icmp_send_echo rets %08x\n", status ); + + if (1) + { + irp->IoStatus.Status = status; + if (status == STATUS_SUCCESS) + { + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } +} + static DWORD WINAPI request_thread_proc( void *arg ) { LIST_ENTRY *entry; @@ -309,9 +342,7 @@ static DWORD WINAPI request_thread_proc( void *arg ) continue; } - /* FIXME */ - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + handle_queued_send_echo( irp ); } LeaveCriticalSection( &nsiproxy_cs ); } diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c new file mode 100644 index 00000000000..8ec506f823c --- /dev/null +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -0,0 +1,321 @@ +/* + * nsiproxy.sys icmp_echo implementation + * + * 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 + */ +#if 0 +#pragma makedep unix +#endif + +#define _NTSYSTEM_ + +#include "config.h" +#include <stdarg.h> + +#include <stdlib.h> +#include <unistd.h> +#include <errno.h> +#include <limits.h> +#include <pthread.h> + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#define USE_WS_PREFIX +#include "ddk/wdm.h" +#include "ifdef.h" +#include "netiodef.h" +#include "ipexport.h" +#include "ipmib.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +#include "nsiproxy_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static LONG icmp_sequence; + +struct ip_hdr +{ + uint8_t v_hl; /* version << 4 | hdr_len */ + uint8_t tos; + uint16_t tot_len; + uint16_t id; + uint16_t frag_off; + uint8_t ttl; + uint8_t protocol; + uint16_t checksum; + uint32_t saddr; + uint32_t daddr; +}; + +struct icmp_hdr +{ + uint8_t type; + uint8_t code; + uint16_t checksum; + union + { + struct + { + uint16_t id; + uint16_t sequence; + } echo; + } un; +}; + +struct family_ops; +struct icmp_data +{ + LARGE_INTEGER send_time; + int socket; + unsigned short id; + unsigned short seq; + const struct family_ops *ops; +}; + +static void ipv4_init_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp_hdr ) +{ + icmp_hdr->type = ICMP4_ECHO_REQUEST; + icmp_hdr->code = 0; + icmp_hdr->checksum = 0; + icmp_hdr->un.echo.id = data->id = getpid() & 0xffff; /* will be overwritten for linux ping socks */ + icmp_hdr->un.echo.sequence = data->seq = InterlockedIncrement( &icmp_sequence ) & 0xffff; +} + +/* rfc 1071 checksum */ +static unsigned short chksum( BYTE *data, unsigned int count ) +{ + unsigned int sum = 0, carry = 0; + unsigned short check, s; + + while (count > 1) + { + s = *(unsigned short *)data; + data += 2; + sum += carry; + sum += s; + carry = s > sum; + count -= 2; + } + sum += carry; /* This won't produce another carry */ + sum = (sum & 0xffff) + (sum >> 16); + + if (count) sum += *data; /* LE-only */ + + sum = (sum & 0xffff) + (sum >> 16); + /* fold in any carry */ + sum = (sum & 0xffff) + (sum >> 16); + + check = ~sum; + return check; +} + +#ifdef __linux__ +static unsigned short null_chksum( BYTE *data, unsigned int count ) +{ + return 0; +} +#endif + +static void ipv4_set_socket_opts( struct icmp_data *data, struct icmp_send_echo_params *params ) +{ + int val; + + val = params->ttl; + if (val) setsockopt( data->socket, IPPROTO_IP, IP_TTL, &val, sizeof(val) ); + val = params->tos; + if (val) setsockopt( data->socket, IPPROTO_IP, IP_TOS, &val, sizeof(val) ); +} + +#ifdef __linux__ +static void ipv4_linux_ping_set_socket_opts( struct icmp_data *data, struct icmp_send_echo_params *params ) +{ + static const int val = 1; + + ipv4_set_socket_opts( data, params ); + + setsockopt( data->socket, IPPROTO_IP, IP_RECVTTL, &val, sizeof(val) ); + setsockopt( data->socket, IPPROTO_IP, IP_RECVTOS, &val, sizeof(val) ); +} +#endif + +struct family_ops +{ + int family; + int icmp_protocol; + void (*init_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp_hdr ); + unsigned short (*chksum)( BYTE *data, unsigned int count ); + void (*set_socket_opts)( struct icmp_data *data, struct icmp_send_echo_params *params ); +}; + +static const struct family_ops ipv4 = +{ + AF_INET, + IPPROTO_ICMP, + ipv4_init_icmp_hdr, + chksum, + ipv4_set_socket_opts, +}; + +#ifdef __linux__ +/* linux ipv4 ping sockets behave more like ipv6 raw sockets */ +static const struct family_ops ipv4_linux_ping = +{ + AF_INET, + IPPROTO_ICMP, + ipv4_init_icmp_hdr, + null_chksum, + ipv4_linux_ping_set_socket_opts, +}; +#endif + +static IP_STATUS errno_to_ip_status( int err ) +{ + switch( err ) + { + case EHOSTUNREACH: return IP_DEST_HOST_UNREACHABLE; + default: return IP_GENERAL_FAILURE; + } +} + +static int SOCKADDR_INET_to_sockaddr( const SOCKADDR_INET *in, struct sockaddr *out, int len ) +{ + switch (in->si_family) + { + case WS_AF_INET: + { + struct sockaddr_in *sa = (struct sockaddr_in *)out; + + if (len < sizeof(*sa)) return 0; + sa->sin_family = AF_INET; + sa->sin_port = in->Ipv4.sin_port; + sa->sin_addr.s_addr = in->Ipv4.sin_addr.WS_s_addr; + return sizeof(*sa); + } + case WS_AF_INET6: + { + struct sockaddr_in6 *sa = (struct sockaddr_in6 *)out; + + if (len < sizeof(*sa)) return 0; + sa->sin6_family = AF_INET6; + sa->sin6_port = in->Ipv6.sin6_port; + sa->sin6_flowinfo = in->Ipv6.sin6_flowinfo; + memcpy( sa->sin6_addr.s6_addr, in->Ipv6.sin6_addr.WS_s6_addr, sizeof(sa->sin6_addr.s6_addr) ); + sa->sin6_scope_id = in->Ipv6.sin6_scope_id; + return sizeof(*sa); + } + } + return 0; +} + +static NTSTATUS icmp_data_create( ADDRESS_FAMILY win_family, struct icmp_data **icmp_data ) +{ + struct icmp_data *data; + const struct family_ops *ops; + + if (win_family == WS_AF_INET) ops = &ipv4; + else return STATUS_INVALID_PARAMETER; + + data = malloc( sizeof(*data) ); + if (!data) return STATUS_NO_MEMORY; + + data->socket = socket( ops->family, SOCK_RAW, ops->icmp_protocol ); + if (data->socket < 0) /* Try a ping-socket */ + { + TRACE( "failed to open raw sock, trying a dgram sock\n" ); + data->socket = socket( ops->family, SOCK_DGRAM, ops->icmp_protocol ); + if (data->socket < 0) + { + WARN( "Unable to create socket\n" ); + free( data ); + return STATUS_ACCESS_DENIED; + } +#ifdef __linux__ + if (ops->family == AF_INET) ops = &ipv4_linux_ping; +#endif + } + data->ops = ops; + + *icmp_data = data; + return STATUS_SUCCESS; +} + +static void icmp_data_free( struct icmp_data *data ) +{ + close( data->socket ); + free( data ); +} + +NTSTATUS icmp_send_echo( void *args ) +{ + struct icmp_send_echo_params *params = args; + struct icmp_hdr *icmp_hdr; /* this is the same for both ipv4 and ipv6 */ + struct sockaddr_storage dst_storage; + struct sockaddr *dst = (struct sockaddr *)&dst_storage; + struct icmp_data *data; + int dst_len, ret; + NTSTATUS status; + + status = icmp_data_create( params->dst->si_family, &data ); + if (status) return status; + data->ops->set_socket_opts( data, params ); + + icmp_hdr = malloc( sizeof(*icmp_hdr) + params->request_size ); + if (!icmp_hdr) + { + icmp_data_free( data ); + return STATUS_NO_MEMORY; + } + data->ops->init_icmp_hdr( data, icmp_hdr ); + memcpy( icmp_hdr + 1, params->request, params->request_size ); + icmp_hdr->checksum = data->ops->chksum( (BYTE *)icmp_hdr, sizeof(*icmp_hdr) + params->request_size ); + + dst_len = SOCKADDR_INET_to_sockaddr( params->dst, dst, sizeof(dst_storage) ); + + NtQueryPerformanceCounter( &data->send_time, NULL ); + ret = sendto( data->socket, icmp_hdr, sizeof(*icmp_hdr) + params->request_size, 0, dst, dst_len ); + free( icmp_hdr ); + + if (ret < 0) + { + TRACE( "sendto() rets %d errno %d\n", ret, errno ); + icmp_data_free( data ); + params->ip_status = errno_to_ip_status( errno ); + return STATUS_SUCCESS; + } + + /* FIXME */ + icmp_data_free( data ); + return STATUS_NOT_SUPPORTED; +} diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 565ae2d11dd..25219a1c3fe 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -147,6 +147,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { + icmp_send_echo, unix_nsi_enumerate_all_ex, unix_nsi_get_all_parameters_ex, unix_nsi_get_parameter_ex diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h new file mode 100644 index 00000000000..9831998793d --- /dev/null +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -0,0 +1,28 @@ +/* + * nsiproxy.sys + * + * 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 + */ + +struct icmp_send_echo_params +{ + SOCKADDR_INET *dst; + void *request; + DWORD request_size; + BYTE ttl, tos; + ULONG ip_status; +}; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 97e264e9b1a..0dfe9e69dbc 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -156,3 +156,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) { return ascii_strncasecmp( s1, s2, -1 ); } + +NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 3/5] nsiproxy: Introduce IOCTL_NSIPROXY_WINE_ICMP_ECHO.
by Huw Davies 04 Oct '21

04 Oct '21

With this patch the irp is simply marked as pending and transferred to the request thread which completes the irp with STATUS_NOT_SUPPORTED. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 103 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 34 ++++++++++++ 2 files changed, 137 insertions(+) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index fb330ddfc93..f4cefd4b794 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -36,6 +36,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); static unixlib_handle_t nsiproxy_handle; +static HANDLE request_event; + +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION( nsiproxy_cs ); + +#define LIST_ENTRY_INIT( list ) { .Flink = &(list), .Blink = &(list) } +static LIST_ENTRY request_queue = LIST_ENTRY_INIT( request_queue ); static NTSTATUS nsiproxy_call( unsigned int code, void *args ) { @@ -162,6 +174,59 @@ static NTSTATUS nsiproxy_get_parameter( IRP *irp ) return status; } +static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) +{ + TRACE( "device %p, irp %p.\n", device, irp ); + + IoReleaseCancelSpinLock( irp->CancelIrql ); + + /* FIXME: at the moment just let the request thread bail */ + return; +} + +static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + TRACE( "\n" ); + + if (in_len < offsetof(struct nsiproxy_icmp_echo, data[0]) || + in_len < offsetof(struct nsiproxy_icmp_echo, data[((in->opt_size + 3) & ~3) + in->req_size]) || + out_len < sizeof(struct nsiproxy_icmp_echo_reply)) + return STATUS_INVALID_PARAMETER; + + switch (in->dst.si_family) + { + case AF_INET: + if (in->dst.Ipv4.sin_addr.s_addr == INADDR_ANY) return STATUS_INVALID_ADDRESS_WILDCARD; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + EnterCriticalSection( &nsiproxy_cs ); + + IoSetCancelRoutine( irp, icmp_echo_cancel ); + if (irp->Cancel && !IoSetCancelRoutine( irp, NULL )) + { + /* IRP was canceled before we set cancel routine */ + InitializeListHead( &irp->Tail.Overlay.ListEntry ); + LeaveCriticalSection( &nsiproxy_cs ); + return STATUS_CANCELLED; + } + + InsertTailList( &request_queue, &irp->Tail.Overlay.ListEntry ); + IoMarkIrpPending( irp ); + + LeaveCriticalSection( &nsiproxy_cs ); + SetEvent( request_event ); + + return STATUS_PENDING; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -186,6 +251,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = nsiproxy_get_parameter( irp ); break; + case IOCTL_NSIPROXY_WINE_ICMP_ECHO: + status = nsiproxy_icmp_echo( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; @@ -220,10 +289,40 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static DWORD WINAPI request_thread_proc( void *arg ) +{ + LIST_ENTRY *entry; + + while (WaitForSingleObject( request_event, INFINITE ) == WAIT_OBJECT_0) + { + TRACE( "request_event triggered\n" ); + EnterCriticalSection( &nsiproxy_cs ); + while ((entry = RemoveHeadList( &request_queue )) != &request_queue ) + { + IRP *irp = CONTAINING_RECORD( entry, IRP, Tail.Overlay.ListEntry ); + + if (irp->Cancel) + { + irp->IoStatus.Status = STATUS_CANCELLED; + TRACE( "already cancelled\n" ); + IoCompleteRequest( irp, IO_NO_INCREMENT ); + continue; + } + + /* FIXME */ + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } + LeaveCriticalSection( &nsiproxy_cs ); + } + return 0; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { HMODULE instance; NTSTATUS status; + HANDLE thread; TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); @@ -236,5 +335,9 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) add_device( driver ); + request_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + thread = CreateThread( NULL, 0, request_thread_proc, NULL, 0, NULL ); + CloseHandle( thread ); + return STATUS_SUCCESS; } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 7b8cb29e9d5..9664b534b09 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -380,6 +380,7 @@ struct nsi_udp_endpoint_static #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS CTL_CODE(FILE_DEVICE_NETWORK, 0x401, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_PARAMETER CTL_CODE(FILE_DEVICE_NETWORK, 0x402, METHOD_BUFFERED, 0) +#define IOCTL_NSIPROXY_WINE_ICMP_ECHO CTL_CODE(FILE_DEVICE_NETWORK, 0x403, METHOD_BUFFERED, 0) /* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ struct nsiproxy_enumerate_all @@ -420,6 +421,39 @@ struct nsiproxy_get_parameter BYTE key[1]; /* key_size */ }; +/* input for IOCTL_NSIPROXY_WINE_ICMP_ECHO */ +struct nsiproxy_icmp_echo +{ + SOCKADDR_INET src; + SOCKADDR_INET dst; + BYTE ttl; + BYTE tos; + BYTE flags; + DWORD opt_size; + DWORD req_size; + DWORD timeout; + BYTE data[1]; /* ((opt_size + 3) & ~3) + req_size */ +}; + +/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ +struct nsiproxy_icmp_echo_reply +{ + SOCKADDR_INET addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + DWORD data_offset; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + DWORD options_offset; + } opts; +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.23.0

1 0

[PATCH 2/5] nsiproxy: Let the general dispatch function update the irp's status.
by Huw Davies 04 Oct '21

04 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 77 ++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 3afd76487ff..fb330ddfc93 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -50,7 +49,7 @@ enum unix_calls nsi_get_parameter_ex, }; -static void nsiproxy_enumerate_all( IRP *irp ) +static NTSTATUS nsiproxy_enumerate_all( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_enumerate_all *in = (struct nsiproxy_enumerate_all *)irp->AssociatedIrp.SystemBuffer; @@ -58,18 +57,12 @@ static void nsiproxy_enumerate_all( IRP *irp ) void *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_enumerate_all_ex enum_all; + NTSTATUS status; - if (in_len != sizeof(*in)) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len != sizeof(*in)) return STATUS_INVALID_PARAMETER; if (out_len < sizeof(DWORD) + (in->key_size + in->rw_size + in->dynamic_size + in->static_size) * in->count) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + return STATUS_INVALID_PARAMETER; enum_all.unknown[0] = 0; enum_all.unknown[1] = 0; @@ -87,16 +80,18 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.static_size = in->static_size; enum_all.count = in->count; - irp->IoStatus.u.Status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); - if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) + status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); + if (status == STATUS_SUCCESS || status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; *(DWORD *)out = enum_all.count; } else irp->IoStatus.Information = 0; + + return status; } -static void nsiproxy_get_all_parameters( IRP *irp ) +static NTSTATUS nsiproxy_get_all_parameters( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_get_all_parameters *in = (struct nsiproxy_get_all_parameters *)irp->AssociatedIrp.SystemBuffer; @@ -104,19 +99,14 @@ static void nsiproxy_get_all_parameters( IRP *irp ) BYTE *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_get_all_parameters_ex get_all; + NTSTATUS status; - if (in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[0]) || - in_len < FIELD_OFFSET(struct nsiproxy_get_all_parameters, key[in->key_size])) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len < offsetof(struct nsiproxy_get_all_parameters, key[0]) || + in_len < offsetof(struct nsiproxy_get_all_parameters, key[in->key_size])) + return STATUS_INVALID_PARAMETER; if (out_len < in->rw_size + in->dynamic_size + in->static_size) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + return STATUS_INVALID_PARAMETER; get_all.unknown[0] = 0; get_all.unknown[1] = 0; @@ -133,11 +123,13 @@ static void nsiproxy_get_all_parameters( IRP *irp ) get_all.static_data = out + in->rw_size + in->dynamic_size; get_all.static_size = in->static_size; - irp->IoStatus.u.Status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); - irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; + status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); + irp->IoStatus.Information = (status == STATUS_SUCCESS) ? out_len : 0; + + return status; } -static void nsiproxy_get_parameter( IRP *irp ) +static NTSTATUS nsiproxy_get_parameter( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_get_parameter *in = (struct nsiproxy_get_parameter *)irp->AssociatedIrp.SystemBuffer; @@ -145,13 +137,11 @@ static void nsiproxy_get_parameter( IRP *irp ) void *out = irp->AssociatedIrp.SystemBuffer; DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsi_get_parameter_ex get_param; + NTSTATUS status; - if (in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[0]) || - in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[in->key_size])) - { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; - } + if (in_len < offsetof(struct nsiproxy_get_parameter, key[0]) || + in_len < offsetof(struct nsiproxy_get_parameter, key[in->key_size])) + return STATUS_INVALID_PARAMETER; get_param.unknown[0] = 0; get_param.unknown[1] = 0; @@ -166,8 +156,10 @@ static void nsiproxy_get_parameter( IRP *irp ) get_param.data_size = out_len; get_param.data_offset = in->data_offset; - irp->IoStatus.u.Status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); - irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; + status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); + irp->IoStatus.Information = (status == STATUS_SUCCESS) ? out_len : 0; + + return status; } static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) @@ -183,25 +175,28 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_NSIPROXY_WINE_ENUMERATE_ALL: - nsiproxy_enumerate_all( irp ); + status = nsiproxy_enumerate_all( irp ); break; case IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS: - nsiproxy_get_all_parameters( irp ); + status = nsiproxy_get_all_parameters( irp ); break; case IOCTL_NSIPROXY_WINE_GET_PARAMETER: - nsiproxy_get_parameter( irp ); + status = nsiproxy_get_parameter( irp ); break; default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } - status = irp->IoStatus.u.Status; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } return status; } -- 2.23.0

1 0

[PATCH 1/5] nsiproxy: Rename private unixlib header to unix_private.h
by Huw Davies 04 Oct '21

04 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 2 +- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/nsi.c | 2 +- dlls/nsiproxy.sys/tcp.c | 2 +- dlls/nsiproxy.sys/udp.c | 2 +- dlls/nsiproxy.sys/{nsiproxy_private.h => unix_private.h} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename dlls/nsiproxy.sys/{nsiproxy_private.h => unix_private.h} (99%) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 2e69c289c16..c7ec2e89b16 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -103,7 +103,7 @@ #include "wine/nsi.h" #include "wine/debug.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 8971b69c2db..3e37bcecc78 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -91,7 +91,7 @@ #include "wine/debug.h" #include "wine/unixlib.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index ccfc325a085..565ae2d11dd 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -36,7 +36,7 @@ #include "wine/nsi.h" #include "wine/debug.h" #include "wine/unixlib.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 55311a4affc..1ed80afbe4b 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -105,7 +105,7 @@ #include "wine/debug.h" #include "wine/server.h" -#include "nsiproxy_private.h" +#include "unix_private.h" #ifndef HAVE_NETINET_TCP_FSM_H #define TCPS_ESTABLISHED 1 diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 0cc2cadbc98..403431acbef 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -85,7 +85,7 @@ #include "wine/debug.h" #include "wine/server.h" -#include "nsiproxy_private.h" +#include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/unix_private.h similarity index 99% rename from dlls/nsiproxy.sys/nsiproxy_private.h rename to dlls/nsiproxy.sys/unix_private.h index acc60ce4806..97e264e9b1a 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -1,5 +1,5 @@ /* - * nsiproxy.sys + * nsiproxy.sys unixlib private header * * Copyright 2021 Huw Davies * -- 2.23.0

1 0

[PATCH 1/2] widl: Allow modules without attributes.
by Nikolay Sivov 04 Oct '21

04 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4c361e81dd1..51050a24fa3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1082,7 +1082,7 @@ dispinterfaceref: module: tMODULE typename { $$ = type_module_declare($2); } ; -moduledef: attributes module '{' int_statements '}' semicolon_opt +moduledef: m_attributes module '{' int_statements '}' semicolon_opt { $$ = type_module_define($2, $1, $4); } ; -- 2.33.0

1 1

[PATCH 1/4] oledb32/tests: modify size of buffers in order to handle GCC 11.2 warning (GCC11)
by Eric Pouech 04 Oct '21

04 Oct '21

in oledb32/tests/convert.c, gcc 11.2 complains (-Warray-bounds) about accessing fields from a pointer to VARIANT, while underlying storage buffer is strictly smaller than a VARIANT gcc doesn't check that accessed field is inside or not the underlying storage size of 20 used in most of the tests is not necessarly wrong wrt the fields adressed, even if I don't fully grasp the logic of a 20 byte buffer: - VARIANT is 16 bytes on 32bit systems, and 24 bytes on 64 bit systems - and all the other structures are 16 bytes at most anyway, make it always of the sizeof of a VARIANT, in order to keep gcc happy Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oledb32/tests/convert.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 8ec64d40ae5..1f22851a2b3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -327,7 +327,7 @@ static void test_converttoi1(void) { HRESULT hr; signed char dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -638,7 +638,7 @@ static void test_converttoi2(void) { HRESULT hr; signed short dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -950,7 +950,7 @@ static void test_converttoi4(void) { HRESULT hr; INT i4; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -1224,7 +1224,7 @@ static void test_converttoi8(void) { HRESULT hr; LARGE_INTEGER dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; /* assuming that VARIANT is larger than all the types used in src */ DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; @@ -2774,7 +2774,7 @@ static void test_converttoui4(void) { HRESULT hr; DWORD dst; - BYTE src[20]; + BYTE src[sizeof(VARIANT)]; DBSTATUS dst_status; DBLENGTH dst_len;

5 7