Rebase against c29f9e6ee7656aa028bb1630284e7d4873bd5b0f.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "568e3e8b697a960881c162671a33c28727921797"
+	echo "c29f9e6ee7656aa028bb1630284e7d4873bd5b0f"
 }
 
 # Show version information
@@ -4354,7 +4354,7 @@ fi
 # |
 # | Modified files:
 # |   *	configure.ac, dlls/windows.gaming.input.dll/Makefile.in, dlls/windows.gaming.input.dll/windows.gaming.input.spec,
-# | 	dlls/windows.gaming.input.dll/windows.gaming.input_main.c, include/objidl.idl, loader/wine.inf.in
+# | 	dlls/windows.gaming.input.dll/windows.gaming.input_main.c, loader/wine.inf.in
 # |
 if test "$enable_windows_gaming_input_dll" -eq 1; then
 	patch_apply windows.gaming.input-dll/0001-windows.gaming.input-Add-stub-dll.patch

patches/ws2_32-Connect_Time/0001-ws2_32-Implement-returning-the-proper-time-with-SO_C.patch

@@ -1,4 +1,4 @@
-From 750e6e7c7d5d3432136fc1560ffcf615ed5be03f Mon Sep 17 00:00:00 2001
+From 02727b15297b66c66d622cc28dfa5f6cf1b044ac Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 20 Nov 2014 13:27:24 +0100
 Subject: [PATCH] ws2_32: Implement returning the proper time with
@@ -10,16 +10,16 @@ To avoid calculations on the client-side, the server sends the connect time as r
 Needs tools/make_requests.
 ---
  dlls/ws2_32/socket.c     | 21 ++++++++++++++++-----
- dlls/ws2_32/tests/sock.c | 19 +++++++++++++++++++
+ dlls/ws2_32/tests/sock.c | 20 ++++++++++++++++++++
  server/protocol.def      |  1 +
  server/sock.c            |  1 +
- 4 files changed, 37 insertions(+), 5 deletions(-)
+ 4 files changed, 38 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
-index c36b7dc23dd..59dff66e37f 100644
+index 4568e7f1bae..60c243d14f0 100644
 --- a/dlls/ws2_32/socket.c
 +++ b/dlls/ws2_32/socket.c
-@@ -1175,6 +1175,21 @@ static DWORD sock_is_blocking(SOCKET s, BOOL *ret)
+@@ -1344,6 +1344,21 @@ static DWORD sock_is_blocking(SOCKET s, BOOL *ret)
      return err;
  }
  
@@ -41,7 +41,7 @@ index c36b7dc23dd..59dff66e37f 100644
  static unsigned int _get_sock_mask(SOCKET s)
  {
      unsigned int ret;
-@@ -3962,7 +3977,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
+@@ -3969,7 +3984,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
  
          case WS_SO_CONNECT_TIME:
          {
@@ -49,7 +49,7 @@ index c36b7dc23dd..59dff66e37f 100644
              struct WS_sockaddr addr;
              int len = sizeof(addr);
  
-@@ -3974,10 +3988,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
+@@ -3981,10 +3995,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
              if (WS_getpeername(s, &addr, &len) == SOCKET_ERROR)
                  *(DWORD *)optval = ~0u;
              else
@@ -62,10 +62,10 @@ index c36b7dc23dd..59dff66e37f 100644
              return ret;
          }
 diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index b32d1c053df..60360bacc21 100644
+index ba03e16ebb1..134433c4b6d 100644
 --- a/dlls/ws2_32/tests/sock.c
 +++ b/dlls/ws2_32/tests/sock.c
-@@ -5385,6 +5385,8 @@ static void test_send(void)
+@@ -4801,11 +4801,15 @@ static void test_send(void)
      OVERLAPPED ov;
      BOOL bret;
      DWORD id, bytes_sent, dwRet;
@@ -74,15 +74,14 @@ index b32d1c053df..60360bacc21 100644
  
      memset(&ov, 0, sizeof(ov));
  
-@@ -5393,6 +5395,7 @@ static void test_send(void)
-         ok(0, "creating socket pair failed, skipping test\n");
-         return;
-     }
-+    expected_time = GetTickCount();
+     tcp_socketpair(&src, &dst);
  
++    expected_time = GetTickCount();
++
      set_blocking(dst, FALSE);
      /* force disable buffering so we can get a pending overlapped request */
-@@ -5479,6 +5482,22 @@ static void test_send(void)
+     ret = setsockopt(dst, SOL_SOCKET, SO_SNDBUF, (char *) &zero, sizeof(zero));
+@@ -4878,6 +4882,22 @@ static void test_send(void)
      ok(ret == SOCKET_ERROR && WSAGetLastError() == ERROR_IO_PENDING,
         "Failed to start overlapped send %d - %d\n", ret, WSAGetLastError());
  
@@ -106,10 +105,10 @@ index b32d1c053df..60360bacc21 100644
      if (src != INVALID_SOCKET)
          closesocket(src);
 diff --git a/server/protocol.def b/server/protocol.def
-index af959ebdf82..8afe8e11435 100644
+index 8360b2611a1..f5f505d69fb 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -1399,6 +1399,7 @@ enum server_fd_type
+@@ -1433,6 +1433,7 @@ enum server_fd_type
      int family;                 /* family, see socket manpage */
      int type;                   /* type, see socket manpage */
      int protocol;               /* protocol, see socket manpage */
@@ -118,10 +117,10 @@ index af959ebdf82..8afe8e11435 100644
  
  
 diff --git a/server/sock.c b/server/sock.c
-index 040fa3d14b1..48ef19b4fbd 100644
+index 4f97fe72080..07e1cf3a2ca 100644
 --- a/server/sock.c
 +++ b/server/sock.c
-@@ -1331,6 +1331,7 @@ DECL_HANDLER(get_socket_info)
+@@ -1565,6 +1565,7 @@ DECL_HANDLER(get_socket_info)
      reply->family   = sock->family;
      reply->type     = sock->type;
      reply->protocol = sock->proto;
@@ -130,5 +129,5 @@ index 040fa3d14b1..48ef19b4fbd 100644
      release_object( &sock->obj );
  }
 -- 
-2.19.1
+2.28.0
 

staging/upstream-commit

@@ -1 +1 @@
-568e3e8b697a960881c162671a33c28727921797
+c29f9e6ee7656aa028bb1630284e7d4873bd5b0f