Paul Gofman : netio.sys: Implement wsk_close_socket() function.

Alexandre Julliard julliard at winehq.org
Mon Jun 15 15:03:05 CDT 2020


Module: wine
Branch: master
Commit: 136d4603816e98edb9d8772f26e048ad8cee7a04
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=136d4603816e98edb9d8772f26e048ad8cee7a04

Author: Paul Gofman <pgofman at codeweavers.com>
Date:   Sun Jun 14 21:58:54 2020 +0300

netio.sys: Implement wsk_close_socket() function.

Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/netio.sys/netio.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c
index 3ac2008c7e..2b8848a275 100644
--- a/dlls/netio.sys/netio.c
+++ b/dlls/netio.sys/netio.c
@@ -52,6 +52,11 @@ struct wsk_socket_internal
     void *client_context;
 };
 
+static inline struct wsk_socket_internal *wsk_socket_internal_from_wsk_socket(WSK_SOCKET *wsk_socket)
+{
+    return CONTAINING_RECORD(wsk_socket, struct wsk_socket_internal, wsk_socket);
+}
+
 static NTSTATUS sock_error_to_ntstatus(DWORD err)
 {
     switch (err)
@@ -114,9 +119,18 @@ static NTSTATUS WINAPI wsk_control_socket(WSK_SOCKET *socket, WSK_CONTROL_SOCKET
 
 static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp)
 {
-    FIXME("socket %p, irp %p stub.\n", socket, irp);
+    struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket);
+    NTSTATUS status;
 
-    return STATUS_NOT_IMPLEMENTED;
+    TRACE("socket %p, irp %p.\n", socket, irp);
+
+    status = closesocket(s->s) ? sock_error_to_ntstatus(WSAGetLastError()) : STATUS_SUCCESS;
+    heap_free(socket);
+
+    irp->IoStatus.Information = 0;
+    dispatch_irp(irp, status);
+
+    return status ? status : STATUS_PENDING;
 }
 
 static NTSTATUS WINAPI wsk_bind(WSK_SOCKET *socket, SOCKADDR *local_address, ULONG flags, IRP *irp)




More information about the wine-cvs mailing list