From a7f0cf9bc707e8b5dd4a06e8ed9d911073aaf629 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 22 Aug 2014 13:34:35 -0600 Subject: [PATCH] Add missing apc argument to async TransmitFile. --- ...4-ws2_32-Add-asynchronous-support-for-TransmitFile.patch | 6 +++--- ...2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch b/patches/ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch index 8ad926ab..416906ed 100644 --- a/patches/ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch +++ b/patches/ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch @@ -1,4 +1,4 @@ -From 7e7370ad1ee7cba45ad65bdf02d41ff9171c00e8 Mon Sep 17 00:00:00 2001 +From 0535832365c4fba553cfddd1546ce55d63b45510 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 18:24:53 -0700 Subject: ws2_32: Add asynchronous support for TransmitFile. @@ -9,7 +9,7 @@ Subject: ws2_32: Add asynchronous support for TransmitFile. 2 files changed, 124 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c -index 322c5ed..1c30bd1 100644 +index 322c5ed..42c7832 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -364,6 +364,18 @@ typedef struct ws2_accept_async @@ -56,7 +56,7 @@ index 322c5ed..1c30bd1 100644 + * + * Asynchronous callback for overlapped TransmitFile operations. + */ -+static NTSTATUS WS2_async_transmitfile( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ++static NTSTATUS WS2_async_transmitfile( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved, void **apc) +{ + struct ws2_transmitfile_async *wsa = arg; + BOOL ret; diff --git a/patches/ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch b/patches/ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch index 0908ef93..fc1eb5d9 100644 --- a/patches/ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch +++ b/patches/ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch @@ -1,4 +1,4 @@ -From 0e0a27b0e40f55fbca7eb4c9fefa55d2b85ba6d4 Mon Sep 17 00:00:00 2001 +From 8acfd293ecd49b7cad340dc90e6ea6b0ed07289a Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 19:08:30 -0700 Subject: ws2_32: Add support for TF_DISCONNECT and TF_REUSE_SOCKET to @@ -13,7 +13,7 @@ Subject: ws2_32: Add support for TF_DISCONNECT and TF_REUSE_SOCKET to 5 files changed, 89 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c -index 1c30bd1..b200e93 100644 +index 42c7832..ddb50a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2558,6 +2558,18 @@ static BOOL WS2_transmitfile_base( SOCKET s, HANDLE h, DWORD total_bytes, DWORD