Gabriel Ivăncescu : nsiproxy: Fill the reply when it's not pending on the unix-side.
Alexandre Julliard
julliard at winehq.org
Fri Nov 26 15:46:27 CST 2021
Module: wine
Branch: master
Commit: 5cd42975c370504e89261745f19b9839f588912e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cd42975c370504e89261745f19b9839f588912e
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Mon Nov 8 18:18:03 2021 +0200
nsiproxy: Fill the reply when it's not pending on the unix-side.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/nsiproxy.sys/device.c | 8 ++------
dlls/nsiproxy.sys/icmp_echo.c | 2 +-
dlls/nsiproxy.sys/nsiproxy_private.h | 5 ++---
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c
index 90a7a3ded7c..dd082820b78 100644
--- a/dlls/nsiproxy.sys/device.c
+++ b/dlls/nsiproxy.sys/device.c
@@ -353,13 +353,13 @@ static DWORD WINAPI listen_thread_proc( void *arg )
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.reply = irp->AssociatedIrp.SystemBuffer;
params.ttl = in->ttl;
params.tos = in->tos;
params.dst = &in->dst;
@@ -371,11 +371,7 @@ static void handle_queued_send_echo( IRP *irp )
{
irp->IoStatus.Status = status;
if (status == STATUS_SUCCESS)
- {
- memset( reply, 0, sizeof(*reply) );
- reply->status = params.ip_status;
- irp->IoStatus.Information = sizeof(*reply);
- }
+ irp->IoStatus.Information = params.reply_len;
IoCompleteRequest( irp, IO_NO_INCREMENT );
}
else
diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c
index a4ef02a4a10..a9bdb8251f5 100644
--- a/dlls/nsiproxy.sys/icmp_echo.c
+++ b/dlls/nsiproxy.sys/icmp_echo.c
@@ -586,7 +586,7 @@ NTSTATUS icmp_send_echo( void *args )
{
TRACE( "sendto() rets %d errno %d\n", ret, errno );
icmp_data_free( data );
- params->ip_status = errno_to_ip_status( errno );
+ params->reply_len = data->ops->set_reply_ip_status( errno_to_ip_status( errno ), params->reply );
return STATUS_SUCCESS;
}
diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h
index 91dd393e41e..8a9f2dd1a55 100644
--- a/dlls/nsiproxy.sys/nsiproxy_private.h
+++ b/dlls/nsiproxy.sys/nsiproxy_private.h
@@ -28,9 +28,8 @@ struct icmp_listen_params
struct icmp_send_echo_params
{
SOCKADDR_INET *dst;
- void *request;
- DWORD request_size;
+ void *request, *reply;
+ DWORD request_size, reply_len;
BYTE ttl, tos;
HANDLE handle;
- ULONG ip_status;
};
More information about the wine-cvs
mailing list