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

[PATCH 4/5] nsiproxy: Add support for parsing other icmp packets.
by Huw Davies Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/icmp_echo.c | 63 ++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index abcccdb4c73..cef5c04a6c7 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -297,6 +297,30 @@ static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, struct nsiproxy_icmp_echo_reply *reply, int ping_socket ) { + static const IP_STATUS unreach_codes[] = + { + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_NET */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST */ + IP_DEST_PROT_UNREACHABLE, /* ICMP_UNREACH_PROTOCOL */ + IP_DEST_PORT_UNREACHABLE, /* ICMP_UNREACH_PORT */ + IP_PACKET_TOO_BIG, /* ICMP_UNREACH_NEEDFRAG */ + IP_BAD_ROUTE, /* ICMP_UNREACH_SRCFAIL */ + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_NET_UNKNOWN */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST_UNKNOWN */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_ISOLATED */ + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_NET_PROHIB */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST_PROHIB */ + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_TOSNET */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_TOSHOST */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_FILTER_PROHIB */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST_PRECEDENCE */ + IP_DEST_HOST_UNREACHABLE /* ICMP_UNREACH_PRECEDENCE_CUTOFF */ + }; + const struct ip_hdr *orig_ip_hdr; + const struct icmp_hdr *orig_icmp_hdr; + int orig_ip_hdr_len; + IP_STATUS status; + switch (icmp->type) { case ICMP4_ECHO_REPLY: @@ -306,11 +330,48 @@ static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, reply->status = IP_SUCCESS; return icmp_size - sizeof(*icmp); - /* FIXME: handle other icmp messages */ + case ICMP4_DST_UNREACH: + if (icmp->code < ARRAY_SIZE(unreach_codes)) + status = unreach_codes[icmp->code]; + else + status = IP_DEST_HOST_UNREACHABLE; + break; + + case ICMP4_TIME_EXCEEDED: + if (icmp->code == 1) /* ICMP_TIMXCEED_REASS */ + status = IP_TTL_EXPIRED_REASSEM; + else + status = IP_TTL_EXPIRED_TRANSIT; + break; + + case ICMP4_PARAM_PROB: + status = IP_PARAM_PROBLEM; + break; + + case ICMP4_SOURCE_QUENCH: + status = IP_SOURCE_QUENCH; + break; default: return -1; } + + /* Check that the appended packet is really ours - + * all handled icmp replies have an 8-byte header + * followed by the original ip hdr. */ + if (icmp_size < sizeof(*icmp) + sizeof(*orig_ip_hdr)) return -1; + orig_ip_hdr = (struct ip_hdr *)(icmp + 1); + if (orig_ip_hdr->v_hl >> 4 != 4 || orig_ip_hdr->protocol != IPPROTO_ICMP) return -1; + orig_ip_hdr_len = (orig_ip_hdr->v_hl & 0xf) << 2; + if (icmp_size < sizeof(*icmp) + orig_ip_hdr_len + sizeof(*orig_icmp_hdr)) return -1; + orig_icmp_hdr = (const struct icmp_hdr *)((const BYTE *)orig_ip_hdr + orig_ip_hdr_len); + if (orig_icmp_hdr->type != ICMP4_ECHO_REQUEST || + orig_icmp_hdr->code != 0 || + (!ping_socket && orig_icmp_hdr->un.echo.id != data->id) || + orig_icmp_hdr->un.echo.sequence != data->seq) return -1; + + reply->status = status; + return 0; } static int ipv4_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, -- 2.23.0

1 0

[PATCH 3/5] nsiproxy: Parse any received ICMP_ECHO_REPLY.
by Huw Davies Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/icmp_echo.c | 205 +++++++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 2 deletions(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index afb48fc72e3..abcccdb4c73 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -233,6 +233,100 @@ static void ipv4_linux_ping_set_socket_opts( struct icmp_data *data, struct icmp } #endif +static int ipv4_reply_buffer_len( int reply_len ) +{ + return sizeof(struct ip_hdr) + sizeof(struct icmp_hdr) + reply_len - sizeof(struct nsiproxy_icmp_echo_reply); +} + +#ifdef __linux__ +static int ipv4_linux_ping_reply_buffer_len( int reply_len ) +{ + return sizeof(struct icmp_hdr) + reply_len - sizeof(struct nsiproxy_icmp_echo_reply); +} +#endif + +static BOOL ipv4_parse_ip_hdr( struct msghdr *msg, int recvd, + int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ) +{ + struct ip_hdr *ip_hdr; + + if (recvd < sizeof(*ip_hdr)) return FALSE; + ip_hdr = msg->msg_iov[0].iov_base; + if (ip_hdr->v_hl >> 4 != 4 || ip_hdr->protocol != IPPROTO_ICMP) return FALSE; + *ip_hdr_len = (ip_hdr->v_hl & 0xf) << 2; + if (*ip_hdr_len < sizeof(*ip_hdr)) return FALSE; + *opts = ip_hdr + 1; + reply->opts.ttl = ip_hdr->ttl; + reply->opts.tos = ip_hdr->tos; + reply->opts.flags = ip_hdr->frag_off >> 13; + reply->opts.options_size = *ip_hdr_len - sizeof(*ip_hdr); + + return TRUE; +} + +#ifdef __linux__ +static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, + int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ) +{ + struct cmsghdr *cmsg; + + *ip_hdr_len = 0; + *opts = NULL; + reply->opts.ttl = 0; + reply->opts.tos = 0; + reply->opts.flags = 0; + reply->opts.options_size = 0; /* FIXME from IP_OPTIONS but will require checking for space in the reply */ + + for (cmsg = CMSG_FIRSTHDR( msg ); cmsg; cmsg = CMSG_NXTHDR( msg, cmsg )) + { + if (cmsg->cmsg_level != IPPROTO_IP) continue; + switch (cmsg->cmsg_type) + { + case IP_TTL: + reply->opts.ttl = *(BYTE *)CMSG_DATA( cmsg ); + break; + case IP_TOS: + reply->opts.tos = *(BYTE *)CMSG_DATA( cmsg ); + break; + } + } + return TRUE; +} +#endif + +static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, + struct nsiproxy_icmp_echo_reply *reply, int ping_socket ) +{ + switch (icmp->type) + { + case ICMP4_ECHO_REPLY: + if ((!ping_socket && icmp->un.echo.id != data->id) || + icmp->un.echo.sequence != data->seq) return -1; + + reply->status = IP_SUCCESS; + return icmp_size - sizeof(*icmp); + + /* FIXME: handle other icmp messages */ + + default: + return -1; + } +} + +static int ipv4_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, + struct nsiproxy_icmp_echo_reply *reply ) +{ + return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, reply, 0 ); +} + +#ifdef __linux__ +static int ipv4_linux_ping_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, + struct nsiproxy_icmp_echo_reply *reply ) +{ + return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, reply, 1 ); +} +#endif + struct family_ops { int family; @@ -240,6 +334,11 @@ struct family_ops 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 ); + int (*reply_buffer_len)( int reply_len ); + BOOL (*parse_ip_hdr)( struct msghdr *msg, int recvd, + int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ); + int (*parse_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_len, + struct nsiproxy_icmp_echo_reply *reply ); }; static const struct family_ops ipv4 = @@ -249,6 +348,9 @@ static const struct family_ops ipv4 = ipv4_init_icmp_hdr, chksum, ipv4_set_socket_opts, + ipv4_reply_buffer_len, + ipv4_parse_ip_hdr, + ipv4_parse_icmp_hdr, }; #ifdef __linux__ @@ -260,6 +362,9 @@ static const struct family_ops ipv4_linux_ping = ipv4_init_icmp_hdr, null_chksum, ipv4_linux_ping_set_socket_opts, + ipv4_linux_ping_reply_buffer_len, + ipv4_linux_ping_parse_ip_hdr, + ipv4_linux_ping_parse_icmp_hdr, }; #endif @@ -302,6 +407,34 @@ static int SOCKADDR_INET_to_sockaddr( const SOCKADDR_INET *in, struct sockaddr * return 0; } +static BOOL sockaddr_to_SOCKADDR_INET( const struct sockaddr *in, SOCKADDR_INET *out ) +{ + switch (in->sa_family) + { + case AF_INET: + { + struct sockaddr_in *sa = (struct sockaddr_in *)in; + + out->Ipv4.sin_family = WS_AF_INET; + out->Ipv4.sin_port = sa->sin_port; + out->Ipv4.sin_addr.WS_s_addr = sa->sin_addr.s_addr; + return TRUE; + } + case AF_INET6: + { + struct sockaddr_in6 *sa = (struct sockaddr_in6 *)in; + + out->Ipv6.sin6_family = WS_AF_INET6; + out->Ipv6.sin6_port = sa->sin6_port; + out->Ipv6.sin6_flowinfo = sa->sin6_flowinfo; + memcpy( out->Ipv6.sin6_addr.WS_s6_addr, sa->sin6_addr.s6_addr, sizeof(sa->sin6_addr.s6_addr) ); + out->Ipv6.sin6_scope_id = sa->sin6_scope_id; + return TRUE; + } + } + return FALSE; +} + static NTSTATUS icmp_data_create( ADDRESS_FAMILY win_family, struct icmp_data **icmp_data ) { struct icmp_data *data; @@ -404,11 +537,78 @@ static int get_timeout( LARGE_INTEGER start, DWORD timeout ) return min( (end.QuadPart - now.QuadPart) / 10000, INT_MAX ); } +static ULONG get_rtt( LARGE_INTEGER start ) +{ + LARGE_INTEGER now; + + NtQueryPerformanceCounter( &now, NULL ); + return (now.QuadPart - start.QuadPart) / 10000; +} + +static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_listen_params *params ) +{ + struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)params->reply; + struct sockaddr_storage addr; + struct iovec iov[1]; + BYTE cmsg_buf[1024]; + struct msghdr msg = { .msg_name = &addr, .msg_namelen = sizeof(addr), + .msg_iov = iov, .msg_iovlen = ARRAY_SIZE(iov), + .msg_control = cmsg_buf, .msg_controllen = sizeof(cmsg_buf) }; + int ip_hdr_len, recvd, reply_buf_len, data_size; + char *reply_buf; + void *opts; + struct icmp_hdr *icmp_hdr; + + reply_buf_len = data->ops->reply_buffer_len( params->reply_len ); + reply_buf = malloc( reply_buf_len ); + if (!reply_buf) return STATUS_NO_MEMORY; + + iov[0].iov_base = reply_buf; + iov[0].iov_len = reply_buf_len; + + recvd = recvmsg( data->socket, &msg, 0 ); + TRACE( "recvmsg() rets %d errno %d addr_len %d iovlen %d msg_flags %x\n", + recvd, errno, msg.msg_namelen, (int)iov[0].iov_len, msg.msg_flags ); + + if (!data->ops->parse_ip_hdr( &msg, recvd, &ip_hdr_len, reply, &opts )) goto skip; + if (recvd < ip_hdr_len + sizeof(*icmp_hdr)) goto skip; + + icmp_hdr = (struct icmp_hdr *)(reply_buf + ip_hdr_len); + if ((data_size = data->ops->parse_icmp_hdr( data, icmp_hdr, recvd - ip_hdr_len, reply )) < 0) goto skip; + reply->data_size = data_size; + if (reply->data_size && msg.msg_flags & MSG_TRUNC) + { + free( reply_buf ); + return set_reply_ip_status( params, IP_GENERAL_FAILURE ); + } + + sockaddr_to_SOCKADDR_INET( (struct sockaddr *)&addr, &reply->addr ); + reply->round_trip_time = get_rtt( data->send_time ); + reply->num_of_pkts = 1; + reply->opts.options_offset = sizeof(*reply); + reply->data_offset = sizeof(*reply) + ((reply->opts.options_size + 3) & ~3); + if (reply->opts.options_size) + memcpy( (char *)reply + reply->opts.options_offset, opts, reply->opts.options_size ); + if (reply->opts.options_size & 3) + memset( (char *)reply + reply->opts.options_offset + reply->opts.options_size, 0, 4 - (reply->opts.options_size & 3) ); + if (reply->data_size) + memcpy( (char *)reply + reply->data_offset, icmp_hdr + 1, reply->data_size ); + + params->reply_len = reply->data_offset + reply->data_size; + free( reply_buf ); + return STATUS_SUCCESS; + +skip: + free( reply_buf ); + return STATUS_RETRY; +} + NTSTATUS icmp_listen( void *args ) { struct icmp_listen_params *params = args; struct icmp_data *data; struct pollfd fds[1]; + NTSTATUS status; int ret; data = handle_data( params->handle ); @@ -419,8 +619,9 @@ NTSTATUS icmp_listen( void *args ) while ((ret = poll( fds, ARRAY_SIZE(fds), get_timeout( data->send_time, params->timeout ) )) > 0) { - /* FIXME */ - return STATUS_NOT_SUPPORTED; + status = recv_msg( data, params ); + if (status == STATUS_RETRY) continue; + return status; } if (!ret) /* timeout */ -- 2.23.0

1 0

[PATCH 2/5] nsiproxy: Wait for an icmp reply.
by Huw Davies Oct. 5, 2021

Oct. 5, 2021

This patch doesn't yet recv() that reply. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 19 +++++++++-- dlls/nsiproxy.sys/icmp_echo.c | 50 ++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 7 ++++ dlls/nsiproxy.sys/unix_private.h | 1 + 5 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 0cd168946cb..6461071c395 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -59,6 +59,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { icmp_close, + icmp_listen, icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, @@ -306,16 +307,30 @@ static int add_device( DRIVER_OBJECT *driver ) static DWORD WINAPI listen_thread_proc( void *arg ) { IRP *irp = arg; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_icmp_echo *in = irp->AssociatedIrp.SystemBuffer; + struct icmp_listen_params params; + NTSTATUS status; TRACE( "\n" ); - /* FIXME */ + params.handle = irp_get_icmp_handle( irp ); + params.timeout = in->timeout; + params.reply = irp->AssociatedIrp.SystemBuffer; + params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + status = nsiproxy_call( icmp_listen, &params ); + TRACE( "icmp_listen rets %08x\n", status ); EnterCriticalSection( &nsiproxy_cs ); nsiproxy_call( icmp_close, irp_set_icmp_handle( irp, NULL ) ); - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + irp->IoStatus.Status = status; + if (status == STATUS_SUCCESS) + irp->IoStatus.Information = params.reply_len; + else + irp->IoStatus.Information = 0; IoCompleteRequest( irp, IO_NO_INCREMENT ); LeaveCriticalSection( &nsiproxy_cs ); diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 90a779fb67e..afb48fc72e3 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -31,6 +31,7 @@ #include <errno.h> #include <limits.h> #include <pthread.h> +#include <poll.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> @@ -382,6 +383,55 @@ NTSTATUS icmp_send_echo( void *args ) return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; } +static NTSTATUS set_reply_ip_status( struct icmp_listen_params *params, IP_STATUS ip_status ) +{ + struct nsiproxy_icmp_echo_reply *reply = params->reply; + + memset( reply, 0, sizeof(*reply) ); + reply->status = ip_status; + params->reply_len = sizeof(*reply); + return STATUS_SUCCESS; +} + +static int get_timeout( LARGE_INTEGER start, DWORD timeout ) +{ + LARGE_INTEGER now, end; + + end.QuadPart = start.QuadPart + (ULONGLONG)timeout * 10000; + NtQueryPerformanceCounter( &now, NULL ); + if (now.QuadPart >= end.QuadPart) return 0; + + return min( (end.QuadPart - now.QuadPart) / 10000, INT_MAX ); +} + +NTSTATUS icmp_listen( void *args ) +{ + struct icmp_listen_params *params = args; + struct icmp_data *data; + struct pollfd fds[1]; + int ret; + + data = handle_data( params->handle ); + if (!data) return STATUS_INVALID_PARAMETER; + + fds[0].fd = data->socket; + fds[0].events = POLLIN; + + while ((ret = poll( fds, ARRAY_SIZE(fds), get_timeout( data->send_time, params->timeout ) )) > 0) + { + /* FIXME */ + return STATUS_NOT_SUPPORTED; + } + + if (!ret) /* timeout */ + { + TRACE( "timeout\n" ); + return set_reply_ip_status( params, IP_REQ_TIMED_OUT ); + } + /* ret < 0 */ + return set_reply_ip_status( params, errno_to_ip_status( errno ) ); +} + NTSTATUS icmp_close( void *args ) { HANDLE handle = args; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index dec66ad6a33..b92de7a9a11 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -148,6 +148,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { icmp_close, + icmp_listen, 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 b40a6198c7c..91dd393e41e 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -17,6 +17,13 @@ * 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_listen_params +{ + HANDLE handle; + void *reply; + unsigned int reply_len; + int timeout; +}; struct icmp_send_echo_params { diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 7f81336e3f1..855c06011f9 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -158,4 +158,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) } NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; +NTSTATUS icmp_listen( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 1/5] nsiproxy: Pass the listen request off to a separate thread.
by Huw Davies Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index cd0bc0e4db2..0cd168946cb 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -178,6 +178,16 @@ static NTSTATUS nsiproxy_get_parameter( IRP *irp ) return status; } +static inline HANDLE irp_get_icmp_handle( IRP *irp ) +{ + return irp->Tail.Overlay.DriverContext[0]; +} + +static inline HANDLE irp_set_icmp_handle( IRP *irp, HANDLE handle ) +{ + return InterlockedExchangePointer( irp->Tail.Overlay.DriverContext, handle ); +} + static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) { TRACE( "device %p, irp %p.\n", device, irp ); @@ -293,6 +303,26 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static DWORD WINAPI listen_thread_proc( void *arg ) +{ + IRP *irp = arg; + + TRACE( "\n" ); + + /* FIXME */ + + EnterCriticalSection( &nsiproxy_cs ); + + nsiproxy_call( icmp_close, irp_set_icmp_handle( irp, NULL ) ); + + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + + LeaveCriticalSection( &nsiproxy_cs ); + + return 0; +} + static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; @@ -323,10 +353,8 @@ static void handle_queued_send_echo( IRP *irp ) } else { - /* FIXME */ - nsiproxy_call( icmp_close, params.handle ); - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + irp_set_icmp_handle( irp, params.handle ); + RtlQueueWorkItem( listen_thread_proc, irp, WT_EXECUTELONGFUNCTION ); } } -- 2.23.0

1 0

[PATCH] include: Add some more TOM interfaces.
by Nikolay Sivov Oct. 4, 2021

Oct. 4, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/tom.idl | 123 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 2 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index fda81777db0..940b1f2e52c 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -269,12 +269,131 @@ interface ITextDocument2Old : ITextDocument interface ITextDisplays; interface ITextFont2; interface ITextPara2; -interface ITextRange2; -interface ITextSelection2; interface ITextStory; interface ITextStoryRanges2; interface ITextStrings; +[ + object, + uuid(c241f5ef-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextRow : IDispatch +{ + HRESULT GetAlignment([retval, out] LONG *value); + HRESULT SetAlignment([in] LONG value); + HRESULT GetCellCount([retval, out] LONG *value); + HRESULT SetCellCount([in] LONG value); + HRESULT GetCellCountCache([retval, out] LONG *value); + HRESULT SetCellCountCache([in] LONG value); + HRESULT GetCellIndex([retval, out] LONG *value); + HRESULT SetCellIndex([in] LONG value); + HRESULT GetCellMargin([retval, out] LONG *value); + HRESULT SetCellMargin([in] LONG value); + HRESULT GetHeight([retval, out] LONG *value); + HRESULT SetHeight([in] LONG value); + HRESULT GetIndent([retval, out] LONG *value); + HRESULT SetIndent([in] LONG value); + HRESULT GetKeepTogether([retval, out] LONG *value); + HRESULT SetKeepTogether([in] LONG value); + HRESULT GetKeepWithNext([retval, out] LONG *value); + HRESULT SetKeepWithNext([in] LONG value); + HRESULT GetNestLevel([retval, out] LONG *value); + HRESULT GetRTL([retval, out] LONG *value); + HRESULT SetRTL([in] LONG value); + HRESULT GetCellAlignment([retval, out] LONG *value); + HRESULT SetCellAlignment([in] LONG value); + HRESULT GetCellColorBack([retval, out] LONG *value); + HRESULT SetCellColorBack([in] LONG value); + HRESULT GetCellColorFore([retval, out] LONG *value); + HRESULT SetCellColorFore([in] LONG value); + HRESULT GetCellMergeFlags([retval, out] LONG *value); + HRESULT SetCellMergeFlags([in] LONG value); + HRESULT GetCellShading([retval, out] LONG *value); + HRESULT SetCellShading([in] LONG value); + HRESULT GetCellVerticalText([retval, out] LONG *value); + HRESULT SetCellVerticalText([in] LONG value); + HRESULT GetCellWidth([retval, out] LONG *value); + HRESULT SetCellWidth([in] LONG value); + HRESULT GetCellBorderColors([out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom); + HRESULT GetCellBorderWidths([out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom); + HRESULT SetCellBorderColors([in] LONG left, [in] LONG top, + [in] LONG right, [in] LONG bottom); + HRESULT SetCellBorderWidths([in] LONG left, [in] LONG top, + [in] LONG right, [in] LONG bottom); + HRESULT Apply([in] LONG row, [in] LONG flags); + HRESULT CanChange([retval, out] LONG *value); + HRESULT GetProperty([in] LONG type, [out] LONG *value); + HRESULT Insert([in] LONG row); + HRESULT IsEqual([in] ITextRow *row, [retval, out] LONG *r); + HRESULT Reset([in] LONG value); + HRESULT SetProperty([in] LONG type, [in] LONG value); +} + +[ + object, + uuid(c241f5e2-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextRange2 : ITextSelection +{ + HRESULT GetCch([retval, out] LONG *count); + HRESULT GetCells([retval, out] IUnknown **cells); + HRESULT GetColumn([retval, out] IUnknown **column); + HRESULT GetCount([retval, out] LONG *count); + HRESULT GetDuplicate2([retval, out] ITextRange2 **range); + HRESULT GetFont2([retval, out] ITextFont2 **font); + HRESULT SetFont2([in] ITextFont2 *font); + HRESULT GetFormattedText2([retval, out] ITextRange2 **range); + HRESULT SetFormattedText2([in] ITextRange2 *range); + HRESULT GetGravity([retval, out] LONG *value); + HRESULT SetGravity([in] LONG value); + HRESULT GetPara2([retval, out] ITextPara2 **para); + HRESULT SetPara2([in] ITextPara2 *para); + HRESULT GetRow([retval, out] ITextRow **row); + HRESULT GetStartPara([retval, out] LONG *value); + HRESULT GetTable([retval, out] IUnknown **table); + HRESULT GetURL([retval, out] BSTR *url); + HRESULT SetURL([in] BSTR url); + HRESULT AddSubrange([in] LONG cp1, [in] LONG cp2, [in] LONG activate); + HRESULT BuildUpMath([in] LONG flags); + HRESULT DeleteSubrange([in] LONG first, [in] LONG lim); + HRESULT Find([in] ITextRange2 *range, [in] LONG count, [in] LONG flags, [out] LONG *delta); + HRESULT GetChar2([out] LONG *ch, [in] LONG offset); + HRESULT GetDropCap([out] LONG *line, [out] LONG *pos); + HRESULT GetInlineObject([out] LONG *type, [out] LONG *align, [out] LONG *ch, + [out] LONG *ch1, [out] LONG *ch2, [out] LONG *count, [out] LONG *texstyle, + [out] LONG *ccol, [out] LONG *level); + HRESULT GetProperty([in] LONG type, [out] LONG *value); + HRESULT GetRect([in] LONG type, [out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom, [out] LONG *hit); + HRESULT GetSubrange([in] LONG subrange, [out] LONG *first, [out] LONG *limit); + HRESULT GetText2([in] LONG flags, [out] BSTR *str); + HRESULT HexToUnicode(); + HRESULT InsertTable([in] LONG col, [in] LONG row, [in] LONG autofit); + HRESULT Linearize([in] LONG flags); + HRESULT SetActiveSubrange([in] LONG anchor, [in] LONG active); + HRESULT SetDropCap([in] LONG line, [in] LONG pos); + HRESULT SetProperty([in] LONG type, [in] LONG value); + HRESULT SetText2([in] LONG flags, [in] BSTR str); + HRESULT UnicodeToHex(); + HRESULT SetInlineObject([in] LONG type, [in] LONG align, [in] LONG ch, + [in] LONG ch1, [in] LONG ch2, [in] LONG count, [in] LONG texstyle, + [in] LONG ccol); + HRESULT GetMathFunctionType([in] BSTR str, [out] LONG *value); + HRESULT InsertImage([in] LONG width, [in] LONG height, [in] LONG ascent, + [in] LONG type, [in] BSTR alttext, [in] IStream *stream); +} + +[ + object, + uuid(c241f5e1-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextSelection2 : ITextRange2 +{ +} + + [ object, uuid(c241f5e0-7206-11d8-a2c7-00a0d1d6c6b3) -- 2.33.0

1 0

[PATCH] wintrust: Cache provider functions in WintrustLoadFunctionPointers().
by Paul Gofman Oct. 4, 2021

Oct. 4, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- As comment in WINTRUST_ReadProviderFromReg() says, there is no way to free a provider and module references are just leaked. This can potentially overflow module LoadCount (which is currently 16 bit in Wine) if the app calls WintrustLoadFunctionPointers() a lot. Then there is a specific issue with DeathLoop where every LoadLibrary call triggers wintrust.WintrustLoadFunctionPointers() call (the process is triggered from LDR notification callback while the actual call is from another thread). The latter either deadlocks or (with WIP relaxed loader locking patches) triggers an infinite loop and eventually crashes. Caching the providers data solves both problems. dlls/wintrust/register.c | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index effe9d18f20..b15fbe5ab35 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -34,6 +34,7 @@ #include "mssip.h" #include "wintrust_priv.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -835,6 +836,23 @@ error_close_key: return Func; } +static CRITICAL_SECTION cache_cs; +static CRITICAL_SECTION_DEBUG cache_cs_debug = +{ + 0, 0, &cache_cs, + { &cache_cs_debug.ProcessLocksList, &cache_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } +}; +static CRITICAL_SECTION cache_cs = { &cache_cs_debug, -1, 0, 0, 0, 0 }; + +static struct provider_cache_entry +{ + GUID guid; + CRYPT_PROVIDER_FUNCTIONS provider_functions; +} +*provider_cache; +static unsigned int provider_cache_size; + /*********************************************************************** * WintrustLoadFunctionPointers (WINTRUST.@) */ @@ -842,6 +860,8 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, CRYPT_PROVIDER_FUNCTIONS* pPfns ) { WCHAR GuidString[39]; + BOOL cached = FALSE; + unsigned int i; TRACE("(%s %p)\n", debugstr_guid(pgActionID), pPfns); @@ -853,6 +873,20 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, } if (pPfns->cbStruct != sizeof(CRYPT_PROVIDER_FUNCTIONS)) return FALSE; + EnterCriticalSection( &cache_cs ); + for (i = 0; i < provider_cache_size; ++i) + { + if (IsEqualGUID( &provider_cache[i].guid, pgActionID )) + { + TRACE( "Using cached data.\n" ); + *pPfns = provider_cache[i].provider_functions; + cached = TRUE; + break; + } + } + LeaveCriticalSection( &cache_cs ); + if (cached) return TRUE; + /* Create this string only once, instead of in the helper function */ WINTRUST_Guid2Wstr( pgActionID, GuidString); @@ -873,6 +907,32 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnTestFinalPolicy = (PFN_PROVIDER_TESTFINALPOLICY_CALL)WINTRUST_ReadProviderFromReg(GuidString, DiagnosticPolicy); pPfns->pfnCleanupPolicy = (PFN_PROVIDER_CLEANUP_CALL)WINTRUST_ReadProviderFromReg(GuidString, Cleanup); + EnterCriticalSection( &cache_cs ); + for (i = 0; i < provider_cache_size; ++i) + if (IsEqualGUID( &provider_cache[i].guid, pgActionID )) break; + + if (i == provider_cache_size) + { + struct provider_cache_entry *new; + + new = heap_realloc( provider_cache, (provider_cache_size + 1) * sizeof(*new) ); + if (new) + { + provider_cache = new; + ++provider_cache_size; + } + else + { + ERR( "No memory.\n" ); + } + } + if (i < provider_cache_size) + { + provider_cache[i].guid = *pgActionID; + provider_cache[i].provider_functions = *pPfns; + } + LeaveCriticalSection( &cache_cs ); + return TRUE; } -- 2.31.1

1 0

[PATCH v4] gdi32: Create the registry keys recursively, if needed.
by Gabriel Ivăncescu Oct. 4, 2021

Oct. 4, 2021

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/gdi32/font.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6..9b3d3e2 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -569,11 +571,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -583,7 +587,32 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (!root && len > 10 && !memcmp( name, registry_rootW, 10 )) i += 10; + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; } -- 2.31.1

1 0

[PATCH v3] gdi32: Create the registry keys recursively, if needed.
by Gabriel Ivăncescu Oct. 4, 2021

Oct. 4, 2021

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Most of the code is taken from kernelbase's create_key, but simplified to gdi32's cases only. v3: Minor whitespace issue... dlls/gdi32/font.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6..87d7934 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -569,11 +571,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -583,7 +587,28 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; } -- 2.31.1

4 8

[PATCH 1/7] mshtml: Adjust the IWineHTMLWindowPrivate ids.
by Gabriel Ivăncescu Oct. 4, 2021

Oct. 4, 2021

So it doesn't clash with IHTMLWindow2, which uses low ids ('console' clashes with 'history'). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a patch series pre-requisite for the proper toString() and object names implementations, which fixes a bunch of things and implements some missing bits first. It's needed for those tests to pass properly while testing almost all of the objects, and to avoid sending too many patches at once, I decided to split them up into multiple series. dlls/mshtml/mshtml_private_iface.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 491f4af..2292e2c 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -83,9 +83,9 @@ interface IWineMSHTMLConsole : IDispatch ] interface IWineHTMLWindowPrivate : IDispatch { - [id(1)] + [id(50)] HRESULT requestAnimationFrame([in] VARIANT *expr, [retval, out] VARIANT *timer_id); - [propget, id(2)] + [propget, id(51)] HRESULT console([retval, out] IDispatch **console); } -- 2.31.1

3 18

[PATCH 0/6 v3] Seventh step towards dwarf 3/4 support in wine
by Eric Pouech Oct. 4, 2021

Oct. 4, 2021

V1: - partly committed V2: - added new SymTag* values in cvconst.h V3: - amend configure.ac patch for coherency of config options for regular and cross compilation (from Jacek's suggestions) A+ --- Eric Pouech (6): dbghelp/dwarf: downgrade FIXME into WARN for empty range dbghelp/dwarf: added support for local variables with constant values dbghelp/dwarf: fix incorrect WARN dbghelp/dwarf: Bumping max supported version (by default) up to 4 configure: allow picking up dwarf version for compilation from command line include/cvconst.h: added enumeration for newest SymTag values configure.ac | 15 ++++++++---- dlls/dbghelp/dbghelp_private.h | 4 ++++ dlls/dbghelp/dwarf.c | 43 ++++++++++++++++++++-------------- dlls/dbghelp/symbol.c | 39 ++++++++++++++++++++++++++++++ dlls/dbghelp/type.c | 15 ++++++++++-- include/cvconst.h | 14 ++++++++++- 6 files changed, 104 insertions(+), 26 deletions(-)

3 11