Rebase against ad03df1222c2bb22e991641dcc0d9e4ed684158b.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5c756468656afc9207c0f51f774bbc29267e1469"
+	echo "ad03df1222c2bb22e991641dcc0d9e4ed684158b"
 }
 
 # Show version information

patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch

@@ -1,4 +1,4 @@
-From 0c4efb2f3ff519fdf2a93e7dc4741c9321315a51 Mon Sep 17 00:00:00 2001
+From 221f46fd34a5bd6260024c5bf90842b8ed897de0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:38:38 +0200
 Subject: [PATCH] win32k.sys: Add stub driver.
@@ -16,10 +16,10 @@ Subject: [PATCH] win32k.sys: Add stub driver.
  create mode 100644 dlls/win32k.sys/win32k.sys.spec
 
 diff --git a/configure.ac b/configure.ac
-index 0972051831f..e277f1bdd23 100644
+index 00e9e32ee36..c859d852102 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3821,6 +3821,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
+@@ -3808,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
  WINE_CONFIG_MAKEFILE(dlls/wiaservc)
  WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
  WINE_CONFIG_MAKEFILE(dlls/wimgapi)
@@ -337,17 +337,17 @@ index 00000000000..c79439151e4
 +@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
 +@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index b47926d0701..7f10100f9df 100644
+index af6c94c9f0b..bfa5c0cfce4 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2921,6 +2921,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2922,6 +2922,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,explorer.exe
  11,,iexplore.exe
  11,,notepad.exe
 +11,,win32k.sys
  11,,winetest.exe,-
- ; skip .NET fake dlls in Wine Mono package
- 11,,aspnet_regiis.exe,-
+ ; themes
+ 10,resources\themes\light,light.msstyles
 diff --git a/tools/make_specfiles b/tools/make_specfiles
 index e6a831025c6..da3e87edec5 100755
 --- a/tools/make_specfiles

patches/ws2_32-getsockopt/0001-ws2_32-Divide-values-returned-by-SO_RCVBUF-and-SO_SN.patch

@@ -1,4 +1,4 @@
-From 8b906a7da1bd6311293a53bc62b03be5633ec049 Mon Sep 17 00:00:00 2001
+From 34d03cc739e932b56597eb3b07a56be6bacfe101 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 8 Feb 2016 02:31:00 +0100
 Subject: [PATCH] ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF
@@ -10,10 +10,10 @@ Subject: [PATCH] ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
-index cf824f8d..7a272d6 100644
+index ab111f726a9..cb78fa6a218 100644
 --- a/dlls/ws2_32/socket.c
 +++ b/dlls/ws2_32/socket.c
-@@ -3874,6 +3874,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
+@@ -2116,6 +2116,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
                  SetLastError(wsaErrno());
                  ret = SOCKET_ERROR;
              }
@@ -27,12 +27,12 @@ index cf824f8d..7a272d6 100644
 +        #endif
              release_sock_fd( s, fd );
              return ret;
-         case WS_SO_ACCEPTCONN:
+ 
 diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index 1acf784..b5d4a76 100644
+index 7534e75edb3..9d328226e71 100644
 --- a/dlls/ws2_32/tests/sock.c
 +++ b/dlls/ws2_32/tests/sock.c
-@@ -1462,7 +1462,7 @@ static void test_set_getsockopt(void)
+@@ -1214,7 +1214,7 @@ static void test_set_getsockopt(void)
      value = 0xdeadbeef;
      err = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&value, &size);
      ok( !err, "getsockopt(SO_SNDBUF) failed error: %u\n", WSAGetLastError() );
@@ -41,7 +41,7 @@ index 1acf784..b5d4a76 100644
  
      /* SO_RCVBUF */
      value = 4096;
-@@ -1472,7 +1472,7 @@ static void test_set_getsockopt(void)
+@@ -1224,7 +1224,7 @@ static void test_set_getsockopt(void)
      value = 0xdeadbeef;
      err = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&value, &size);
      ok( !err, "getsockopt(SO_RCVBUF) failed error: %u\n", WSAGetLastError() );
@@ -51,5 +51,5 @@ index 1acf784..b5d4a76 100644
      /* SO_LINGER */
      for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) {
 -- 
-1.9.1
+2.30.2
 

staging/upstream-commit

@@ -1 +1 @@
-5c756468656afc9207c0f51f774bbc29267e1469
+ad03df1222c2bb22e991641dcc0d9e4ed684158b