Rebase against 20ff3352eb19292d47eaa8f3aecc61523ac1f1d9.

patches/ws2_32-TransmitFile/0001-ws2_32-Add-stub-for-TransmitFile.patch

@@ -1,46 +0,0 @@
-From 73dbe41e80fa7ed3aeb3c3f0ee91fe2023b2a356 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Thu, 16 Jan 2014 17:52:50 -0700
-Subject: ws2_32: Add stub for TransmitFile.
-
----
- dlls/ws2_32/socket.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
-index 760e184..86efbe6 100644
---- a/dlls/ws2_32/socket.c
-+++ b/dlls/ws2_32/socket.c
-@@ -2538,6 +2538,19 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW
- }
- 
- /***********************************************************************
-+ *     TransmitFile
-+ */
-+static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD bytes_per_send,
-+                                     LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers,
-+                                     DWORD flags )
-+{
-+    FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped,
-+          buffers, flags );
-+    WSASetLastError( WSAEOPNOTSUPP );
-+    return FALSE;
-+}
-+
-+/***********************************************************************
-  *     GetAcceptExSockaddrs
-  */
- static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size,
-@@ -4177,7 +4190,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
-         }
-         else if ( IsEqualGUID(&transmitfile_guid, in_buff) )
-         {
--            FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitFile\n");
-+            *(LPFN_TRANSMITFILE *)out_buff = WS2_TransmitFile;
-+            break;
-         }
-         else if ( IsEqualGUID(&transmitpackets_guid, in_buff) )
-         {
--- 
-2.3.0
-

patches/ws2_32-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch

@@ -1,168 +0,0 @@
-From 9e8e6d6b4c14478ac28da693de9bd1a51f60d3eb Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Fri, 17 Jan 2014 12:35:57 -0700
-Subject: ws2_32: Check for invalid parameters in TransmitFile.
-
----
- dlls/ws2_32/socket.c     |  21 ++++++++++
- dlls/ws2_32/tests/sock.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 124 insertions(+)
-
-diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
-index 86efbe6..96335cd 100644
---- a/dlls/ws2_32/socket.c
-+++ b/dlls/ws2_32/socket.c
-@@ -2544,8 +2544,29 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
-                                      LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers,
-                                      DWORD flags )
- {
-+    union generic_unix_sockaddr uaddr;
-+    unsigned int uaddrlen = sizeof(uaddr);
-+    int fd;
-+
-     FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped,
-           buffers, flags );
-+
-+    fd = get_sock_fd( s, 0, NULL );
-+    if (fd == -1)
-+    {
-+        WSASetLastError( WSAENOTSOCK );
-+        return FALSE;
-+    }
-+    if (getpeername( fd, &uaddr.addr, &uaddrlen ) != 0)
-+    {
-+        release_sock_fd( s, fd );
-+        WSASetLastError( WSAENOTCONN );
-+        return FALSE;
-+    }
-+    release_sock_fd( s, fd );
-+    if (flags)
-+        FIXME("Flags are not currently supported (0x%x).\n", flags);
-+
-     WSASetLastError( WSAEOPNOTSUPP );
-     return FALSE;
- }
-diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index 7155a09..0991e54 100644
---- a/dlls/ws2_32/tests/sock.c
-+++ b/dlls/ws2_32/tests/sock.c
-@@ -6906,6 +6906,108 @@ end:
-         closesocket(connector2);
- }
- 
-+static void test_TransmitFile(void)
-+{
-+    GUID transmitFileGuid = WSAID_TRANSMITFILE;
-+    LPFN_TRANSMITFILE pTransmitFile = NULL;
-+    HANDLE file = INVALID_HANDLE_VALUE;
-+    char system_ini_path[MAX_PATH];
-+    struct sockaddr_in bindAddress;
-+    SOCKET client, server, dest;
-+    DWORD num_bytes, err;
-+    int iret, len;
-+    BOOL bret;
-+
-+    /* Setup sockets for testing TransmitFile */
-+    client = socket(AF_INET, SOCK_STREAM, 0);
-+    server = socket(AF_INET, SOCK_STREAM, 0);
-+    if (client == INVALID_SOCKET || server == INVALID_SOCKET)
-+    {
-+        skip("could not create acceptor socket, error %d\n", WSAGetLastError());
-+        goto cleanup;
-+    }
-+    iret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &transmitFileGuid, sizeof(transmitFileGuid),
-+                    &pTransmitFile, sizeof(pTransmitFile), &num_bytes, NULL, NULL);
-+    if (iret)
-+    {
-+        skip("WSAIoctl failed to get TransmitFile with ret %d + errno %d\n", iret, WSAGetLastError());
-+        goto cleanup;
-+    }
-+    GetSystemWindowsDirectoryA(system_ini_path, MAX_PATH );
-+    strcat(system_ini_path, "\\system.ini");
-+    file = CreateFileA(system_ini_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL);
-+    if (file == INVALID_HANDLE_VALUE)
-+    {
-+        skip("Unable to open a file to transmit.\n");
-+        goto cleanup;
-+    }
-+
-+    /* Test TransmitFile with an invalid socket */
-+    bret = pTransmitFile(INVALID_SOCKET, file, 0, 0, NULL, NULL, 0);
-+    err = WSAGetLastError();
-+    ok(!bret, "TransmitFile succeeded unexpectedly.\n");
-+    ok(err == WSAENOTSOCK, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTSOCK);
-+
-+    /* Test a bogus TransmitFile without a connected socket */
-+    bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, TF_REUSE_SOCKET);
-+    err = WSAGetLastError();
-+    ok(!bret, "TransmitFile succeeded unexpectedly.\n");
-+    ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN);
-+
-+    /* Setup a properly connected socket for transfers */
-+    memset(&bindAddress, 0, sizeof(bindAddress));
-+    bindAddress.sin_family = AF_INET;
-+    bindAddress.sin_port = htons(9375);
-+    bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1");
-+    iret = bind(server, (struct sockaddr*)&bindAddress, sizeof(bindAddress));
-+    if (iret != 0)
-+    {
-+        skip("failed to bind(), error %d\n", WSAGetLastError());
-+        goto cleanup;
-+    }
-+    iret = listen(server, 1);
-+    if (iret != 0)
-+    {
-+        skip("failed to listen(), error %d\n", WSAGetLastError());
-+        goto cleanup;
-+    }
-+    iret = connect(client, (struct sockaddr*)&bindAddress, sizeof(bindAddress));
-+    if (iret != 0)
-+    {
-+        skip("failed to connect(), error %d\n", WSAGetLastError());
-+        goto cleanup;
-+    }
-+    len = sizeof(bindAddress);
-+    dest = accept(server, (struct sockaddr*)&bindAddress, &len);
-+    if (dest == INVALID_SOCKET)
-+    {
-+        skip("failed to accept(), error %d\n", WSAGetLastError());
-+        goto cleanup;
-+    }
-+    if (set_blocking(dest, FALSE))
-+    {
-+        skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError());
-+        goto cleanup;
-+    }
-+
-+    /* Test TransmitFile with no possible buffer */
-+    bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0);
-+    todo_wine ok(bret, "TransmitFile failed unexpectedly.\n");
-+
-+    /* Test TransmitFile with a UDP datagram socket */
-+    closesocket(client);
-+    client = socket(AF_INET, SOCK_DGRAM, 0);
-+    bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0);
-+    err = WSAGetLastError();
-+    ok(!bret, "TransmitFile succeeded unexpectedly.\n");
-+    ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN);
-+
-+cleanup:
-+    CloseHandle(file);
-+    closesocket(client);
-+    closesocket(server);
-+}
-+
- static void test_getpeername(void)
- {
-     SOCKET sock;
-@@ -8266,6 +8368,7 @@ START_TEST( sock )
-     test_events(1);
- 
-     test_ipv6only();
-+    test_TransmitFile();
-     test_GetAddrInfoW();
-     test_getaddrinfo();
-     test_AcceptEx();
--- 
-2.3.0
-