Rebase against 1bc9c4fdb2e6c2762105c14cdafb7d4ea3370625

patches/ntdll-WRITECOPY/0001-ntdll-Trigger-write-watches-before-passing-userdata-.patch

@@ -1,8 +1,8 @@
-From a370fb90c05a5077a9285c1235767cf1b1b6fa5f Mon Sep 17 00:00:00 2001
+From 5eb4990fc228eec0ba5066ee319a730be2e624a3 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 4 Oct 2014 02:35:44 +0200
-Subject: ntdll: Trigger write watches before passing userdata pointer to
- wait_reply.
+Subject: [PATCH] ntdll: Trigger write watches before passing userdata pointer
+ to wait_reply.
 
 ---
  dlls/advapi32/tests/security.c | 1 -
@@ -10,10 +10,10 @@ Subject: ntdll: Trigger write watches before passing userdata pointer to
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 41219087421..5f5c59ed100 100644
+index ac444b4854e..671aaaa3fb4 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -1494,7 +1494,6 @@ todo_wine
+@@ -1587,7 +1587,6 @@ todo_wine
         "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err);
  todo_wine
      ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen);
@@ -22,12 +22,12 @@ index 41219087421..5f5c59ed100 100644
         "Access and/or AccessStatus were changed!\n");
  
 diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
-index 1e84fbf418e..f7aca1b07b0 100644
+index f82ab3ced95..9670b0abc2b 100644
 --- a/dlls/ntdll/server.c
 +++ b/dlls/ntdll/server.c
-@@ -314,9 +314,18 @@ unsigned int server_call_unlocked( void *req_ptr )
+@@ -316,9 +316,18 @@ unsigned int server_call_unlocked( void *req_ptr )
   */
- unsigned int wine_server_call( void *req_ptr )
+ unsigned int CDECL wine_server_call( void *req_ptr )
  {
 +    struct __server_request_info * const req = req_ptr;
      sigset_t old_set;
@@ -45,5 +45,5 @@ index 1e84fbf418e..f7aca1b07b0 100644
      ret = server_call_unlocked( req_ptr );
      pthread_sigmask( SIG_SETMASK, &old_set, NULL );
 -- 
-2.14.1
+2.20.1
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "4aa7fbe0561e6a27f098a05a63c5a7d12397e678"
+	echo "1bc9c4fdb2e6c2762105c14cdafb7d4ea3370625"
 }
 
 # Show version information
@@ -347,7 +347,6 @@ patch_enable_all ()
 	enable_winex11_wglShareLists="$1"
 	enable_winex11_drv_Query_server_position="$1"
 	enable_winex11_drv_mouse_coorrds="$1"
-	enable_winhttp_System_Proxy_Autoconfig="$1"
 	enable_wininet_Cleanup="$1"
 	enable_wininet_Http_Decoding="$1"
 	enable_winmm_Delay_Import_Depends="$1"
@@ -1167,9 +1166,6 @@ patch_enable ()
 		winex11.drv-mouse-coorrds)
 			enable_winex11_drv_mouse_coorrds="$2"
 			;;
-		winhttp-System_Proxy_Autoconfig)
-			enable_winhttp_System_Proxy_Autoconfig="$2"
-			;;
 		wininet-Cleanup)
 			enable_wininet_Cleanup="$2"
 			;;
@@ -7014,18 +7010,6 @@ if test "$enable_winex11_drv_mouse_coorrds" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset winhttp-System_Proxy_Autoconfig
-# |
-# | Modified files:
-# |   *	dlls/wininet/internet.c
-# |
-if test "$enable_winhttp_System_Proxy_Autoconfig" -eq 1; then
-	patch_apply winhttp-System_Proxy_Autoconfig/0002-wininet-Silence-wininet-no-support-on-this-platform-.patch
-	(
-		printf '%s\n' '+    { "Jarkko Korpi", "wininet: Silence wininet no support on this platform message.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wininet-Cleanup
 # |
 # | Modified files:

patches/winhttp-System_Proxy_Autoconfig/0002-wininet-Silence-wininet-no-support-on-this-platform-.patch

@@ -1,26 +0,0 @@
-From 39a3448740eddb5083e3508e51c3ec6922275c5b Mon Sep 17 00:00:00 2001
-From: Jarkko Korpi <jarkko_korpi@hotmail.com>
-Date: Sat, 1 Aug 2015 06:45:35 +0300
-Subject: wininet: Silence wininet no support on this platform message.
-
----
- dlls/wininet/internet.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
-index bd380dc..0680c7d 100644
---- a/dlls/wininet/internet.c
-+++ b/dlls/wininet/internet.c
-@@ -2311,7 +2311,8 @@ static WCHAR *get_proxy_autoconfig_url(void)
-     CFRelease( settings );
-     return ret;
- #else
--    FIXME( "no support on this platform\n" );
-+    static int once;
-+    if (!once++) FIXME( "no support on this platform\n" );
-     return NULL;
- #endif
- }
--- 
-2.8.0
-