Rebase against 35939bbe0c04534da07ece7f6a47a560d356f7a1.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "561a5b8f84db68e608df022a8dbd71803f506946"
+	echo "35939bbe0c04534da07ece7f6a47a560d356f7a1"
 }
 
 # Show version information

patches/ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY/0001-ws2_32-Return-a-valid-value-for-WSAIoctl-SIO_IDEAL_S.patch

@@ -1,4 +1,4 @@
-From 3026d7b28f8c3647593895e605c2beecbd1aad6e Mon Sep 17 00:00:00 2001
+From c04e4fbc278d2e434f7adcd782af094a844ff46a Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 15 Sep 2020 19:44:38 +1000
 Subject: [PATCH] ws2_32: Return a valid value for WSAIoctl
@@ -13,10 +13,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  4 files changed, 49 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
-index 71dfcdd1114..2111e9e12ff 100644
+index 351028d4983..3aef6d27eb4 100644
 --- a/dlls/ntdll/unix/socket.c
 +++ b/dlls/ntdll/unix/socket.c
-@@ -1422,6 +1422,25 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
+@@ -1461,6 +1461,25 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
              return STATUS_SUCCESS;
          }
  
@@ -43,10 +43,10 @@ index 71dfcdd1114..2111e9e12ff 100644
          {
              int value, ret;
 diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
-index fe7e4fb3464..9c133e94e60 100644
+index 9cc75aacf20..156039b30b9 100644
 --- a/dlls/ws2_32/socket.c
 +++ b/dlls/ws2_32/socket.c
-@@ -2007,6 +2007,23 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
+@@ -2310,6 +2310,23 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
          return ret ? -1 : 0;
      }
  
@@ -71,10 +71,10 @@ index fe7e4fb3464..9c133e94e60 100644
      {
          DWORD ret;
 diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index b38357954b7..89a86cc3aa4 100644
+index af4226e6258..0179feba37f 100644
 --- a/dlls/ws2_32/tests/sock.c
 +++ b/dlls/ws2_32/tests/sock.c
-@@ -6065,8 +6065,9 @@ static void test_WSASendTo(void)
+@@ -6708,8 +6708,9 @@ static void test_WSASendTo(void)
      struct sockaddr_in addr, ret_addr;
      char buf[12] = "hello world";
      WSABUF data_buf;
@@ -85,7 +85,7 @@ index b38357954b7..89a86cc3aa4 100644
  
      addr.sin_family = AF_INET;
      addr.sin_port = htons(139);
-@@ -6102,6 +6103,11 @@ static void test_WSASendTo(void)
+@@ -6745,6 +6746,11 @@ static void test_WSASendTo(void)
      ok(!ret, "got error %u\n", WSAGetLastError());
      ok(ret_addr.sin_family == AF_INET, "got family %u\n", ret_addr.sin_family);
      ok(ret_addr.sin_port, "expected nonzero port\n");
@@ -96,8 +96,8 @@ index b38357954b7..89a86cc3aa4 100644
 +    closesocket(s);
  }
  
- static DWORD WINAPI recv_thread(LPVOID arg)
-@@ -6142,6 +6148,7 @@ static void test_WSARecv(void)
+ struct recv_thread_apc_param
+@@ -6824,6 +6830,7 @@ static void test_WSARecv(void)
      DWORD dwret;
      BOOL bret;
      HANDLE thread, event = NULL, io_port;
@@ -105,7 +105,7 @@ index b38357954b7..89a86cc3aa4 100644
  
      tcp_socketpair(&src, &dest);
  
-@@ -6290,6 +6297,10 @@ static void test_WSARecv(void)
+@@ -6989,6 +6996,10 @@ static void test_WSARecv(void)
  
      CloseHandle(io_port);
  
@@ -117,7 +117,7 @@ index b38357954b7..89a86cc3aa4 100644
      if (server != INVALID_SOCKET)
          closesocket(server);
 diff --git a/include/wine/afd.h b/include/wine/afd.h
-index efd5787e90a..b6aad067770 100644
+index 993730cacdb..04dad6ace21 100644
 --- a/include/wine/afd.h
 +++ b/include/wine/afd.h
 @@ -283,6 +283,7 @@ C_ASSERT( sizeof(struct afd_get_events_params) == 56 );
@@ -129,5 +129,5 @@ index efd5787e90a..b6aad067770 100644
  struct afd_iovec
  {
 -- 
-2.34.1
+2.35.1
 

staging/upstream-commit

@@ -1 +1 @@
-561a5b8f84db68e608df022a8dbd71803f506946
+35939bbe0c04534da07ece7f6a47a560d356f7a1