Rebase against ad576b6965fe9ce695bbf91ac229b04459af02d3

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "d9c7d4147b569553bc97ef57c6200002fe81565e"
+	echo "ad576b6965fe9ce695bbf91ac229b04459af02d3"
 }
 
 # Show version information
@@ -407,7 +407,6 @@ patch_enable_all ()
 	enable_xaudio2_7_CreateFX_FXEcho="$1"
 	enable_xaudio2_7_WMA_support="$1"
 	enable_xaudio2_CommitChanges="$1"
-	enable_xinput1_3_XInputSetState="$1"
 }
 
 # Enable or disable a specific patchset
@@ -1386,9 +1385,6 @@ patch_enable ()
 		xaudio2_CommitChanges)
 			enable_xaudio2_CommitChanges="$2"
 			;;
-		xinput1_3-XInputSetState)
-			enable_xinput1_3_XInputSetState="$2"
-			;;
 		*)
 			return 1
 			;;
@@ -5738,7 +5734,7 @@ fi
 if test "$enable_server_Signal_Thread" -eq 1; then
 	patch_apply server-Signal_Thread/0001-server-Do-not-signal-thread-until-it-is-really-gone.patch
 	(
-		printf '%s\n' '+    { "Sebastian Lackner", "server: Do not signal thread until it is really gone.", 1 },';
+		printf '%s\n' '+    { "Sebastian Lackner", "server: Do not signal violently terminated threads until they are really gone.", 1 },';
 	) >> "$patchlist"
 fi
 
@@ -8134,21 +8130,6 @@ if test "$enable_xaudio2_CommitChanges" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset xinput1_3-XInputSetState
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#45992] Report SUCCESS from XInputSetState when FFB isn't available.
-# |
-# | Modified files:
-# |   *	dlls/xinput1_3/hid.c
-# |
-if test "$enable_xinput1_3_XInputSetState" -eq 1; then
-	patch_apply xinput1_3-XInputSetState/0001-xinput1_3-Report-SUCCESS-from-XInputSetState-when-FF.patch
-	(
-		printf '%s\n' '+    { "Beren Minor", "xinput1_3: Report SUCCESS from XInputSetState when FFB isn'\''t available.", 1 },';
-	) >> "$patchlist"
-fi
-
 
 if test "$enable_patchlist" -eq 1; then
 

patches/winhttp-Accept_Headers/0001-winhttp-Fix-handling-of-Accept-headers.patch

@@ -1,4 +1,4 @@
-From 6a223f7cb1fc344c3fa09490a2d72ea5db63a991 Mon Sep 17 00:00:00 2001
+From 70361946ecd7e0b78ac89f97a37c862e4473b928 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 21 Dec 2016 00:54:37 +0100
 Subject: [PATCH] winhttp: Fix handling of Accept headers.
@@ -10,7 +10,7 @@ Subject: [PATCH] winhttp: Fix handling of Accept headers.
  3 files changed, 7 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
-index 77d5315862b..76fe5ea4d14 100644
+index 7f3ef4c..301dc2f 100644
 --- a/dlls/winhttp/request.c
 +++ b/dlls/winhttp/request.c
 @@ -398,7 +398,7 @@ static BOOL delete_header( request_t *request, DWORD index )
@@ -22,7 +22,7 @@ index 77d5315862b..76fe5ea4d14 100644
  {
      int index;
      struct header hdr;
-@@ -2227,16 +2227,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
+@@ -2179,16 +2179,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
      session_t *session = connect->session;
      char *wire_req;
      int bytes_sent;
@@ -41,10 +41,10 @@ index 77d5315862b..76fe5ea4d14 100644
          process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE );
  
 diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
-index 93c10e06795..e134fbca956 100644
+index 8804346..87413ca 100644
 --- a/dlls/winhttp/session.c
 +++ b/dlls/winhttp/session.c
-@@ -641,8 +641,6 @@ static void request_destroy( object_header_t *hdr )
+@@ -641,8 +641,6 @@ static void request_destroy( struct object_header *hdr )
          heap_free( request->headers[i].value );
      }
      heap_free( request->headers );
@@ -53,7 +53,7 @@ index 93c10e06795..e134fbca956 100644
      for (i = 0; i < TARGET_MAX; i++)
      {
          for (j = 0; j < SCHEME_MAX; j++)
-@@ -1059,32 +1057,14 @@ static const object_vtbl_t request_vtbl =
+@@ -1059,32 +1057,14 @@ static const struct object_vtbl request_vtbl =
  
  static BOOL store_accept_types( request_t *request, const WCHAR **accept_types )
  {
@@ -90,7 +90,7 @@ index 93c10e06795..e134fbca956 100644
      }
      return TRUE;
 diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
-index cbf9a365993..0203012d351 100644
+index 999f3d7..e10b052 100644
 --- a/dlls/winhttp/winhttp_private.h
 +++ b/dlls/winhttp/winhttp_private.h
 @@ -198,8 +198,6 @@ typedef struct
@@ -104,7 +104,7 @@ index cbf9a365993..0203012d351 100644
      HANDLE task_wait;
 @@ -292,6 +290,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;
  
- void release_host( hostdata_t *host ) DECLSPEC_HIDDEN;
+ void release_host( struct hostdata *host ) DECLSPEC_HIDDEN;
  
 +BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) DECLSPEC_HIDDEN;
 +
@@ -112,5 +112,5 @@ index cbf9a365993..0203012d351 100644
  void release_typelib( void ) DECLSPEC_HIDDEN;
  
 -- 
-2.19.1
+1.9.1
 

patches/xinput1_3-XInputSetState/0001-xinput1_3-Report-SUCCESS-from-XInputSetState-when-FF.patch

@@ -1,27 +0,0 @@
-From 29bf6ebc75921647868d65f2eb851f00cf8f6401 Mon Sep 17 00:00:00 2001
-From: Beren Minor <beren.minor+git@gmail.com>
-Date: Mon, 15 Oct 2018 02:36:14 +0200
-Subject: [PATCH] xinput1_3: Report SUCCESS from XInputSetState when FFB isn't
- available.
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45992
----
- dlls/xinput1_3/hid.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c
-index 8a35443..7883352 100644
---- a/dlls/xinput1_3/hid.c
-+++ b/dlls/xinput1_3/hid.c
-@@ -460,7 +460,7 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state)
-         return ERROR_SUCCESS;
-     }
- 
--    return ERROR_NOT_SUPPORTED;
-+    return ERROR_SUCCESS;
- }
- 
- void HID_enable(xinput_controller* device, BOOL enable)
--- 
-1.9.1
-

patches/xinput1_3-XInputSetState/definition

@@ -1 +0,0 @@
-Fixes: [45992] Report SUCCESS from XInputSetState when FFB isn't available.