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 76644a7c26f2c2b3a5968665c349b45bdb294387.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-01-25 22:09:05 +01:00
parent 26a06cd63b
commit e7a0f0e60e
18 changed files with 282 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/ws2_32-TransmitFile/0001-ws2_32-Add-support-for-TF_DISCONNECT-to-TransmitFile.patch
View File

@@ -1,4 +1,4 @@
From 0a7427437a87557be853c5d27e11b62436a00848 Mon Sep 17 00:00:00 2001
From a30764f2b6ae3311242b881ecfaf5a243e3ac387 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Wed, 4 Mar 2015 13:16:20 -0700
Subject: ws2_32: Add support for TF_DISCONNECT to TransmitFile.
@@ -9,10 +9,10 @@ Subject: ws2_32: Add support for TF_DISCONNECT to TransmitFile.
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index b0cbb11..7deaeda 100644
index 4977bbfa592..ecec3dc5314 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2883,7 +2883,16 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws
@@ -3032,7 +3032,16 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws
return wsaErrStatus();
}
@@ -30,7 +30,7 @@ index b0cbb11..7deaeda 100644
}
/***********************************************************************
@@ -2920,6 +2929,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
@@ -3069,6 +3078,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers,
DWORD flags )
{
@@ -38,7 +38,7 @@ index b0cbb11..7deaeda 100644
union generic_unix_sockaddr uaddr;
unsigned int uaddrlen = sizeof(uaddr);
struct ws2_transmitfile_async *wsa;
@@ -2941,8 +2951,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
@@ -3090,8 +3100,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
WSASetLastError( WSAENOTCONN );
return FALSE;
}
@@ -50,11 +50,11 @@ index b0cbb11..7deaeda 100644
if (h && GetFileType( h ) != FILE_TYPE_DISK)
{
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 29e20c3..d5c206c 100644
index 720808887cf..2084dceb987 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -7663,6 +7663,17 @@ static void test_TransmitFile(void)
ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0,
@@ -8404,6 +8404,17 @@ static void test_TransmitFile(void)
ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0,
"TransmitFile footer buffer did not match!\n");
+ /* Test TransmitFile w/ TF_DISCONNECT */
@@ -72,5 +72,5 @@ index 29e20c3..d5c206c 100644
closesocket(client);
client = socket(AF_INET, SOCK_DGRAM, 0);
--
2.6.1
2.11.0