wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 829170f3d6b875f7a6f065072cc3334a20ff805e

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-03-27 11:07:38 +11:00
parent 0d4d90ee80
commit a02caca06d
17 changed files with 89 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/ws2_32-TransmitFile/0002-ws2_32-Add-support-for-TF_REUSE_SOCKET-to-TransmitFi.patch
View File

@@ -1,4 +1,4 @@
From 3c9640222b7b6e5bfbb067911171761b4062143e Mon Sep 17 00:00:00 2001
From 4b387117f10718d3796709bb6851fd8c46898f25 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 16 Jan 2014 19:08:30 -0700
Subject: [PATCH] ws2_32: Add support for TF_REUSE_SOCKET to TransmitFile.
@@ -12,10 +12,10 @@ Subject: [PATCH] ws2_32: Add support for TF_REUSE_SOCKET to TransmitFile.
5 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 07f812b2391..c1cc4c6e209 100644
index 9a720458a22..00c47151e16 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3084,6 +3084,17 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws
@@ -3092,6 +3092,17 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws
if (status != STATUS_SUCCESS)
return status;
@@ -33,7 +33,7 @@ index 07f812b2391..c1cc4c6e209 100644
if (wsa->flags & TF_DISCONNECT)
{
/* we can't use WS_closesocket because it modifies the last error */
@@ -3126,7 +3137,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
@@ -3134,7 +3145,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers,
DWORD flags )
{
@@ -43,10 +43,10 @@ index 07f812b2391..c1cc4c6e209 100644
socklen_t uaddrlen = sizeof(uaddr);
struct ws2_transmitfile_async *wsa;
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 134bb9625a6..c40e277687e 100644
index bcbc56bcb1e..ad80f1614e5 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -9069,7 +9069,6 @@ static void test_TransmitFile(void)
@@ -9099,7 +9099,6 @@ static void test_TransmitFile(void)
err, WSAENOTSOCK);
/* Test TransmitFile with a UDP datagram socket */
@@ -67,10 +67,10 @@ index 789e1da8172..86ce4ffcf05 100644
#define FD_WINE_NONBLOCKING 0x20000000
#define FD_WINE_CONNECTED 0x40000000
diff --git a/server/protocol.def b/server/protocol.def
index 8afe8e11435..614ab91ae7d 100644
index a001556ca10..89487916d0b 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1369,6 +1369,12 @@ enum server_fd_type
@@ -1378,6 +1378,12 @@ enum server_fd_type
@END
@@ -84,7 +84,7 @@ index 8afe8e11435..614ab91ae7d 100644
@REQ(set_socket_event)
obj_handle_t handle; /* handle to the socket */
diff --git a/server/sock.c b/server/sock.c
index 48ef19b4fbd..d95e847fd6b 100644
index 44874fa55c4..fea7bd1f275 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -86,6 +86,7 @@
@@ -106,7 +106,7 @@ index 48ef19b4fbd..d95e847fd6b 100644
@@ -155,7 +157,7 @@ static const struct object_ops sock_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
no_alloc_handle, /* alloc_handle */
no_kernel_obj_list, /* get_kernel_obj_list */
- fd_close_handle, /* close_handle */
+ sock_close_handle, /* close_handle */
sock_destroy /* destroy */
@@ -194,5 +194,5 @@ index 48ef19b4fbd..d95e847fd6b 100644
DECL_HANDLER(set_socket_event)
{
--
2.19.1
2.20.1

2
patches/ws2_32-TransmitFile/definition
View File

@@ -1,2 +1,2 @@
# Fixes: [5048] Support for TransmitFile
Depends: server-Desktop_Refcount
#Depends: server-Desktop_Refcount