Release v4.10

Fixes a regression introduced in 3287f0fc9b

patches/Compiler_Warnings/0033-evr-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,25 +0,0 @@
-From b4586e37df817f205c8bebe319b4765dea5c62d5 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 24 Sep 2017 19:21:06 +0200
-Subject: evr: Avoid implicit cast of interface pointer.
-
----
- dlls/evr/evr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
-index c2d2933211e..5533f38a649 100644
---- a/dlls/evr/evr.c
-+++ b/dlls/evr/evr.c
-@@ -136,7 +136,7 @@ static const IUnknownVtbl evr_inner_vtbl =
- 
- static inline evr_filter *impl_from_IBaseFilter(IBaseFilter *iface)
- {
--    return CONTAINING_RECORD(iface, evr_filter, filter);
-+    return CONTAINING_RECORD(iface, evr_filter, filter.IBaseFilter_iface);
- }
- 
- static HRESULT WINAPI filter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv)
--- 
-2.14.1
-

patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch

@@ -1,26 +1,26 @@
-From 7f05362e86a285551a5694e98fa9abecb99018a0 Mon Sep 17 00:00:00 2001
+From 19efcf925a49a5d7e0b82eb6e4797b0ac725f2dc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:07:35 +0100
 Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
  XamlBehaviorEnabled.
 
 ---
- configure.ac                                  |  1 +
- dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in   |  4 +++
- .../ext-ms-win-xaml-pal-l1-1-0.spec           |  6 ++++
- dlls/ext-ms-win-xaml-pal-l1-1-0/main.c        | 35 +++++++++++++++++++
+ configure.ac                                       |  1 +
+ dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in        |  4 +++
+ .../ext-ms-win-xaml-pal-l1-1-0.spec                |  6 ++++
+ dlls/ext-ms-win-xaml-pal-l1-1-0/main.c             | 35 ++++++++++++++++++++++
  4 files changed, 46 insertions(+)
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 420f6311db3..30718491bb8 100644
+index 8484c83..a9b51d2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3289,6 +3289,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0)
+@@ -3255,6 +3255,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0)
+ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0)
+ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-shell32-l1-2-0)
  WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0)
 +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0)
  WINE_CONFIG_MAKEFILE(dlls/faultrep)
@@ -28,7 +28,7 @@ index 420f6311db3..30718491bb8 100644
  WINE_CONFIG_MAKEFILE(dlls/feclient)
 diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
 new file mode 100644
-index 00000000000..6382d85272b
+index 0000000..6382d85
 --- /dev/null
 +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
 @@ -0,0 +1,4 @@
@@ -38,7 +38,7 @@ index 00000000000..6382d85272b
 +	main.c
 diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
 new file mode 100644
-index 00000000000..c167f5e753e
+index 0000000..c167f5e
 --- /dev/null
 +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
 @@ -0,0 +1,6 @@
@@ -50,7 +50,7 @@ index 00000000000..c167f5e753e
 +@ stub XamlPalUninitialize
 diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 new file mode 100644
-index 00000000000..3e282758f41
+index 0000000..3e28275
 --- /dev/null
 +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 @@ -0,0 +1,35 @@
@@ -90,5 +90,5 @@ index 00000000000..3e282758f41
 +    return TRUE;
 +}
 -- 
-2.17.0
+1.9.1
 

patches/bcrypt-BCryptSecretAgreement/0001-bcrypt-Add-BCryptDestroySecret-BCryptSecretAgreement.patch

@@ -1,115 +0,0 @@
-From aff69d94c931851302d870316b05772193568e29 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 5 Feb 2019 10:00:26 +1100
-Subject: [PATCH 1/2] bcrypt: Add BCryptDestroySecret/BCryptSecretAgreement
- stubs
-
----
- dlls/bcrypt/bcrypt.spec   |  4 ++--
- dlls/bcrypt/bcrypt_main.c | 16 ++++++++++++++++
- dlls/ncrypt/ncrypt.spec   |  4 ++--
- include/bcrypt.h          |  3 +++
- 4 files changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 052a099..dfe08e7 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -11,7 +11,7 @@
- @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long)
- @ stdcall BCryptDestroyHash(ptr)
- @ stdcall BCryptDestroyKey(ptr)
--@ stub BCryptDestroySecret
-+@ stdcall BCryptDestroySecret(ptr)
- @ stdcall BCryptDuplicateHash(ptr ptr ptr long long)
- @ stdcall BCryptDuplicateKey(ptr ptr ptr long long)
- @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long)
-@@ -44,7 +44,7 @@
- @ stdcall BCryptRemoveContextFunction(long wstr long wstr)
- @ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr)
- @ stub BCryptResolveProviders
--@ stub BCryptSecretAgreement
-+@ stdcall BCryptSecretAgreement(ptr ptr ptr long)
- @ stub BCryptSetAuditingInterface
- @ stub BCryptSetContextFunctionProperty
- @ stdcall BCryptSetProperty(ptr wstr ptr long long)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index b9c51a1..18783f0 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1580,6 +1580,22 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO
-     return STATUS_SUCCESS;
- }
- 
-+NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE key, BCRYPT_SECRET_HANDLE *secret, ULONG flags)
-+{
-+    FIXME( "%p, %p, %p, %08x\n", handle, key, secret, flags );
-+
-+    if(secret)
-+        *secret = (BCRYPT_SECRET_HANDLE *)0xDEADFEED;
-+
-+    return STATUS_SUCCESS;
-+}
-+
-+NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret)
-+{
-+    FIXME( "%p\n", secret );
-+    return STATUS_SUCCESS;
-+}
-+
- BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
- {
-     switch (reason)
-diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
-index 85fa5c0..d4a32ed 100644
---- a/dlls/ncrypt/ncrypt.spec
-+++ b/dlls/ncrypt/ncrypt.spec
-@@ -12,7 +12,7 @@
- @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2
- @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash
- @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey
--@ stub BCryptDestroySecret
-+@ stdcall BCryptDestroySecret(ptr) bcrypt.BCryptDestroySecret
- @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash
- @ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey
- @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt
-@@ -46,7 +46,7 @@
- @ stdcall BCryptRemoveContextFunction(long wstr long wstr) bcrypt.BCryptRemoveContextFunction
- @ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) bcrypt.BCryptRemoveContextFunctionProvider
- @ stub BCryptResolveProviders
--@ stub BCryptSecretAgreement
-+@ stdcall BCryptSecretAgreement(ptr ptr ptr long) bcrypt.BCryptSecretAgreement
- @ stub BCryptSetAuditingInterface
- @ stub BCryptSetContextFunctionProperty
- @ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index a0b0d52..f0185d1 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -211,6 +211,7 @@ typedef PVOID BCRYPT_ALG_HANDLE;
- typedef PVOID BCRYPT_KEY_HANDLE;
- typedef PVOID BCRYPT_HANDLE;
- typedef PVOID BCRYPT_HASH_HANDLE;
-+typedef PVOID BCRYPT_SECRET_HANDLE;
- 
- /* Flags for BCryptGenRandom */
- #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001
-@@ -231,6 +232,7 @@ NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR,
- NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
- NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
-+NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE);
- NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
-@@ -245,6 +247,7 @@ NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCH
- NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptImportKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG);
-+NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, BCRYPT_SECRET_HANDLE *, ULONG);
- NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG);
- 
--- 
-1.9.1
-

patches/bcrypt-BCryptSecretAgreement/0002-bcrypt-Add-BCryptDeriveKey-stub.patch

@@ -1,92 +0,0 @@
-From 01c7d3e8e745c3b443e0a8e712f32eadc56f59a8 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 5 Feb 2019 10:09:59 +1100
-Subject: [PATCH 2/2] bcrypt: Add BCryptDeriveKey stub
-
----
- dlls/bcrypt/bcrypt.spec   |  2 +-
- dlls/bcrypt/bcrypt_main.c |  7 +++++++
- dlls/ncrypt/ncrypt.spec   |  2 +-
- include/bcrypt.h          | 15 +++++++++++++++
- 4 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index dfe08e7..4946ee5 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -7,7 +7,7 @@
- @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long)
- @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long)
- @ stub BCryptDeleteContext
--@ stub BCryptDeriveKey
-+@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long)
- @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long)
- @ stdcall BCryptDestroyHash(ptr)
- @ stdcall BCryptDestroyKey(ptr)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 18783f0..399626d 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1596,6 +1596,13 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret)
-     return STATUS_SUCCESS;
- }
- 
-+NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE secret, LPCWSTR kdf, BCryptBufferDesc *parameter,
-+        PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags)
-+{
-+    FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags );
-+    return STATUS_INTERNAL_ERROR;
-+}
-+
- BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
- {
-     switch (reason)
-diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
-index d4a32ed..d35f8a9 100644
---- a/dlls/ncrypt/ncrypt.spec
-+++ b/dlls/ncrypt/ncrypt.spec
-@@ -7,7 +7,7 @@
- @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash
- @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt
- @ stub BCryptDeleteContext
--@ stub BCryptDeriveKey
-+@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey
- @ stub BCryptDeriveKeyCapi
- @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2
- @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index f0185d1..b1799d0 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -204,6 +204,20 @@ typedef struct _BCRYPT_KEY_DATA_BLOB_HEADER
-     ULONG cbKeyData;
- } BCRYPT_KEY_DATA_BLOB_HEADER, *PBCRYPT_KEY_DATA_BLOB_HEADER;
- 
-+typedef struct _BCryptBuffer
-+{
-+    ULONG cbBuffer;
-+    ULONG BufferType;
-+    void  *pvBuffer;
-+} BCryptBuffer, *PBCryptBuffer;
-+
-+typedef struct _BCryptBufferDesc
-+{
-+    ULONG ulVersion;
-+    ULONG cBuffers;
-+    PBCryptBuffer pBuffers;
-+} BCryptBufferDesc, *PBCryptBufferDesc;
-+
- #define BCRYPT_KEY_DATA_BLOB_MAGIC    0x4d42444b
- #define BCRYPT_KEY_DATA_BLOB_VERSION1 1
- 
-@@ -229,6 +243,7 @@ typedef PVOID BCRYPT_SECRET_HANDLE;
- NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG);
- NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
-+NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc*, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
- NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
--- 
-1.9.1
-

patches/bcrypt-BCryptSecretAgreement/definition

@@ -1 +0,0 @@
-Fixes: [46564] Add BCryptDestroySecret/BCryptSecretAgreement stubs.

patches/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch

@@ -1,4 +1,4 @@
-From fb8bd7d53bea2e6deb38994741d884eb10bc31ad Mon Sep 17 00:00:00 2001
+From 27517cacf7df657e32e7ca7068c3e86723cb4a3c Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 13 Feb 2016 15:29:37 +0100
 Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
@@ -6,11 +6,11 @@ Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
 Changes in v2 (by Christian Costa):
   * More generic code for D3DXDisassembleShader.
 ---
- dlls/d3dx9_36/shader.c | 330 ++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 328 insertions(+), 2 deletions(-)
+ dlls/d3dx9_36/shader.c | 331 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 328 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index f372494..01ed335 100644
+index c59fc791e..79d47b95c 100644
 --- a/dlls/d3dx9_36/shader.c
 +++ b/dlls/d3dx9_36/shader.c
 @@ -1,6 +1,7 @@
@@ -21,15 +21,16 @@ index f372494..01ed335 100644
   * Copyright 2011 Travis Athougies
   *
   * This library is free software; you can redistribute it and/or
-@@ -20,6 +21,7 @@
+@@ -18,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
  
- #include "config.h"
- #include "wine/port.h"
+-
 +#include <stdio.h>
- 
  #include "d3dx9_private.h"
  #include "d3dcommon.h"
-@@ -2144,10 +2146,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
+ #include "d3dcompiler.h"
+@@ -2138,10 +2139,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
      return D3D_OK;
  }
  
@@ -367,5 +368,5 @@ index f372494..01ed335 100644
  
  struct d3dx9_texture_shader
 -- 
-1.9.1
+2.21.0
 

patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch

@@ -1,4 +1,4 @@
-From 1c46cc796a20b263f708aebf5428e59408fea200 Mon Sep 17 00:00:00 2001
+From 4595b49c9c878e8a86fcd22dc82a9f5cfadfc7a8 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 30 Mar 2018 08:22:02 +0000
 Subject: [PATCH] d3dx9_36: add DXTn support
@@ -17,8 +17,8 @@ Subject: [PATCH] d3dx9_36: add DXTn support
  dlls/d3dx9_34/Makefile.in     |   2 +-
  dlls/d3dx9_35/Makefile.in     |   2 +-
  dlls/d3dx9_36/Makefile.in     |   2 +-
- dlls/d3dx9_36/surface.c       | 102 ++++++++++++++++++++++++++++++++++++++----
- dlls/d3dx9_36/tests/surface.c |   8 ++--
+ dlls/d3dx9_36/surface.c       | 102 +++++++++++++++++++++++++++++++---
+ dlls/d3dx9_36/tests/surface.c |   8 +--
  dlls/d3dx9_37/Makefile.in     |   2 +-
  dlls/d3dx9_38/Makefile.in     |   2 +-
  dlls/d3dx9_39/Makefile.in     |   2 +-
@@ -29,7 +29,7 @@ Subject: [PATCH] d3dx9_36: add DXTn support
  22 files changed, 118 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
-index 02e64d3..0484639 100644
+index 99db5f355..0c3fb8a90 100644
 --- a/dlls/d3dx9_24/Makefile.in
 +++ b/dlls/d3dx9_24/Makefile.in
 @@ -1,6 +1,6 @@
@@ -41,7 +41,7 @@ index 02e64d3..0484639 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
-index 57ed1da..3461967 100644
+index 9e54aba2c..4419b18b8 100644
 --- a/dlls/d3dx9_25/Makefile.in
 +++ b/dlls/d3dx9_25/Makefile.in
 @@ -1,6 +1,6 @@
@@ -53,7 +53,7 @@ index 57ed1da..3461967 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
-index 04d9ba4..291daf3 100644
+index 104f7c19b..cfc9711ef 100644
 --- a/dlls/d3dx9_26/Makefile.in
 +++ b/dlls/d3dx9_26/Makefile.in
 @@ -1,6 +1,6 @@
@@ -65,7 +65,7 @@ index 04d9ba4..291daf3 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
-index faec9b2..5a52b60 100644
+index db04c8310..d598c9bbf 100644
 --- a/dlls/d3dx9_27/Makefile.in
 +++ b/dlls/d3dx9_27/Makefile.in
 @@ -1,6 +1,6 @@
@@ -77,7 +77,7 @@ index faec9b2..5a52b60 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
-index b8aad93..8eecbc0 100644
+index 8a2b9c690..8e9979092 100644
 --- a/dlls/d3dx9_28/Makefile.in
 +++ b/dlls/d3dx9_28/Makefile.in
 @@ -1,6 +1,6 @@
@@ -89,7 +89,7 @@ index b8aad93..8eecbc0 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
-index 29c76c4..0299369 100644
+index 6e1f45c02..efe538fde 100644
 --- a/dlls/d3dx9_29/Makefile.in
 +++ b/dlls/d3dx9_29/Makefile.in
 @@ -1,6 +1,6 @@
@@ -101,7 +101,7 @@ index 29c76c4..0299369 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
-index 810edc9..7bdc074 100644
+index 092a6b154..4a1ee6304 100644
 --- a/dlls/d3dx9_30/Makefile.in
 +++ b/dlls/d3dx9_30/Makefile.in
 @@ -1,6 +1,6 @@
@@ -113,7 +113,7 @@ index 810edc9..7bdc074 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
-index fce2b53..0ef9c91 100644
+index 48c67e6e0..dcbb7a01b 100644
 --- a/dlls/d3dx9_31/Makefile.in
 +++ b/dlls/d3dx9_31/Makefile.in
 @@ -1,6 +1,6 @@
@@ -125,7 +125,7 @@ index fce2b53..0ef9c91 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
-index ad53b26..25e2a1c 100644
+index d51d6a0db..fb89ea7c2 100644
 --- a/dlls/d3dx9_32/Makefile.in
 +++ b/dlls/d3dx9_32/Makefile.in
 @@ -1,6 +1,6 @@
@@ -137,7 +137,7 @@ index ad53b26..25e2a1c 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
-index 318ddce..a6ec6db 100644
+index 52cdde13a..487255e43 100644
 --- a/dlls/d3dx9_33/Makefile.in
 +++ b/dlls/d3dx9_33/Makefile.in
 @@ -1,6 +1,6 @@
@@ -149,7 +149,7 @@ index 318ddce..a6ec6db 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
-index 451a371..ff79b58 100644
+index 37f431228..9b0b500f7 100644
 --- a/dlls/d3dx9_34/Makefile.in
 +++ b/dlls/d3dx9_34/Makefile.in
 @@ -1,6 +1,6 @@
@@ -161,7 +161,7 @@ index 451a371..ff79b58 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
-index 978d0b0..aa8ea65 100644
+index 4441b5f6e..ac4291359 100644
 --- a/dlls/d3dx9_35/Makefile.in
 +++ b/dlls/d3dx9_35/Makefile.in
 @@ -1,6 +1,6 @@
@@ -173,7 +173,7 @@ index 978d0b0..aa8ea65 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
-index 847edec..1427571 100644
+index 5e76ab7f5..c95dc0707 100644
 --- a/dlls/d3dx9_36/Makefile.in
 +++ b/dlls/d3dx9_36/Makefile.in
 @@ -1,7 +1,7 @@
@@ -184,12 +184,12 @@ index 847edec..1427571 100644
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
+ EXTRADLLFLAGS = -mno-cygwin
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index d236feb..3c308d3 100644
+index 57d9818cd..f05bad5ab 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -27,6 +27,8 @@
+@@ -25,6 +25,8 @@
  #include "ole2.h"
  #include "wincodec.h"
  
@@ -198,12 +198,12 @@ index d236feb..3c308d3 100644
  WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
  
  HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**);
-@@ -1876,6 +1878,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
+@@ -1772,6 +1774,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
      }
  }
  
-+typedef BOOL (*dxtn_conversion_func)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out,
-+                                     enum wined3d_format_id format, unsigned int w, unsigned int h);
++typedef BOOL (__cdecl *dxtn_conversion_func)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out,
++        enum wined3d_format_id format, unsigned int w, unsigned int h);
 +
 +static dxtn_conversion_func get_dxtn_conversion_func(D3DFORMAT format, BOOL encode)
 +{
@@ -223,7 +223,7 @@ index d236feb..3c308d3 100644
  /************************************************************
   * D3DXLoadSurfaceFromMemory
   *
-@@ -1915,10 +1935,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1811,10 +1831,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
  {
      const struct pixel_format_desc *srcformatdesc, *destformatdesc;
      IDirect3DSurface9 *surface;
@@ -237,7 +237,7 @@ index d236feb..3c308d3 100644
  
      TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n",
              dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format,
-@@ -1999,18 +2021,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1895,18 +1917,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
      }
      else /* Stretching or format conversion. */
      {
@@ -307,7 +307,7 @@ index d236feb..3c308d3 100644
          }
          else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */
          {
-@@ -2019,12 +2088,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1915,12 +1984,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
  
              /* Always apply a point filter until D3DX_FILTER_LINEAR,
               * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */
@@ -341,10 +341,10 @@ index d236feb..3c308d3 100644
  
  /************************************************************
 diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
-index 2c83dc2..95b64a0 100644
+index 56b79d80c..8614cec4c 100644
 --- a/dlls/d3dx9_36/tests/surface.c
 +++ b/dlls/d3dx9_36/tests/surface.c
-@@ -1224,7 +1224,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1225,7 +1225,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -353,7 +353,7 @@ index 2c83dc2..95b64a0 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1250,7 +1250,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1251,7 +1251,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -362,7 +362,7 @@ index 2c83dc2..95b64a0 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1263,10 +1263,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1264,10 +1264,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -376,7 +376,7 @@ index 2c83dc2..95b64a0 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
 diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
-index a05068c..e5b29d3 100644
+index ea0a04807..a710cef03 100644
 --- a/dlls/d3dx9_37/Makefile.in
 +++ b/dlls/d3dx9_37/Makefile.in
 @@ -1,6 +1,6 @@
@@ -388,7 +388,7 @@ index a05068c..e5b29d3 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
-index b092e62..0a37204 100644
+index af62f823d..543a482af 100644
 --- a/dlls/d3dx9_38/Makefile.in
 +++ b/dlls/d3dx9_38/Makefile.in
 @@ -1,6 +1,6 @@
@@ -400,7 +400,7 @@ index b092e62..0a37204 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
-index 4d17120..d0e2cc9 100644
+index ab71712d4..cacb0c00d 100644
 --- a/dlls/d3dx9_39/Makefile.in
 +++ b/dlls/d3dx9_39/Makefile.in
 @@ -1,6 +1,6 @@
@@ -412,7 +412,7 @@ index 4d17120..d0e2cc9 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
-index 59f6f3d..0a0d36b 100644
+index 76428d2fd..a58a99ef2 100644
 --- a/dlls/d3dx9_40/Makefile.in
 +++ b/dlls/d3dx9_40/Makefile.in
 @@ -1,6 +1,6 @@
@@ -424,7 +424,7 @@ index 59f6f3d..0a0d36b 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
-index f18443a..f477a20 100644
+index d3647f895..93fb6b508 100644
 --- a/dlls/d3dx9_41/Makefile.in
 +++ b/dlls/d3dx9_41/Makefile.in
 @@ -1,6 +1,6 @@
@@ -436,7 +436,7 @@ index f18443a..f477a20 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
-index cb142b7..4d93a84 100644
+index 88bd746da..197d0d45b 100644
 --- a/dlls/d3dx9_42/Makefile.in
 +++ b/dlls/d3dx9_42/Makefile.in
 @@ -1,6 +1,6 @@
@@ -448,7 +448,7 @@ index cb142b7..4d93a84 100644
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
-index 3e6111a..5812d03 100644
+index 2f6b8634a..17895954a 100644
 --- a/dlls/d3dx9_43/Makefile.in
 +++ b/dlls/d3dx9_43/Makefile.in
 @@ -1,6 +1,6 @@
@@ -460,5 +460,5 @@ index 3e6111a..5812d03 100644
  DELAYIMPORTS = windowscodecs
  
 -- 
-1.9.1
+2.21.0
 

patches/d3dx9_36-DXTn/definition

@@ -3,3 +3,7 @@ Fixes: [33768] Fix texture corruption in CSI: Fatal Conspiracy
 Fixes: [37391] Exception during start of fr-043 caused by missing DXTn support
 Fixes: [34692] Fix wrong colors in Wolfenstein (2009)
 Fixes: [24983] Fix crash in Space Rangers2 caused by missing DXTn support
+# 9fb5745a7997bbfe033779650f1193d85369cef2 broke this, in a way that's not
+# trivial to fix. Guess we'll wait to see what Alexandre has in mind for the
+# other D3D DLLs.
+Disabled: true

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,7 +1,7 @@
-From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001
+From e920f461eaf4c5d19c0cfc8e9c9a40671269dd93 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
-Subject: dbghelp: Always check for debug symbols in BINDIR.
+Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
 
 ---
  dlls/dbghelp/Makefile.in  | 2 +-
@@ -9,7 +9,7 @@ Subject: dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 3e120e8afe9..6746ca7dbd9 100644
+index f08464cd422..aa7a767110b 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -1,6 +1,6 @@
@@ -18,13 +18,13 @@ index 3e120e8afe9..6746ca7dbd9 100644
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="\"${bindir}\""
  DELAYIMPORTS = version
+ EXTRAINCL = $(Z_CFLAGS)
  EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)
- 
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index 6428955941c..75c0a4c2453 100644
+index 96b16fd5c0c..611533ee098 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
-@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
+@@ -1644,9 +1644,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
      if (!ret && !strchrW(filename, '/'))
      {
          ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr,
@@ -40,5 +40,5 @@ index 6428955941c..75c0a4c2453 100644
                                                      load_offset, dyn_addr, elf_info);
      }
 -- 
-2.11.0
+2.20.1
 

patches/ddraw-Fix_Typos/0001-ddraw-tests-Fix-function-name-in-multiple-ok-message.patch

@@ -1,40 +0,0 @@
-From 022f6d01b0f3dc9a30aa12b34f85881c0a1dafc6 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 7 Mar 2016 08:40:24 +0100
-Subject: ddraw/tests: Fix function name in multiple ok() messages. (resend)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Spotted by Michael Müller.
-
-Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
----
- dlls/ddraw/tests/dsurface.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
-index 781fa56..c43d207 100644
---- a/dlls/ddraw/tests/dsurface.c
-+++ b/dlls/ddraw/tests/dsurface.c
-@@ -3238,7 +3238,7 @@ static void zbufferbitdepth_test(void)
-     U3(ddsd.ddpfPixelFormat).dwZBitMask = 0x0000ffff;
-     surface = NULL;
-     hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL);
--    ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr);
-+    ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr);
-     reset_ddsd(&ddsd);
-     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &ddsd);
-     ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr);
-@@ -3313,7 +3313,7 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const
-     if (SUCCEEDED(hr))
-     {
-         hr = IDirectDrawSurface_Unlock(surface, NULL);
--        ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr);
-+        ok(SUCCEEDED(hr), "IDirectDrawSurface_Unlock failed, hr %#x.\n", hr);
- 
-         /* DDSD_ZBUFFERBITDEPTH is never set on Nvidia, but follows GetSurfaceDesc rules on AMD */
-         if (!expect_zd)
--- 
-2.7.1
-

patches/dinput-SetActionMap-genre/0001-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch

@@ -0,0 +1,73 @@
+From 87860f6a1666321684e9dd5e7553a40e1656a9b4 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 24 May 2019 16:16:13 +1000
+Subject: [PATCH] dinput: Allow mapping of controls based of Genre type.
+
+---
+ dlls/dinput/device.c | 41 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
+index 0c9432698ae..00b97bd24bd 100644
+--- a/dlls/dinput/device.c
++++ b/dlls/dinput/device.c
+@@ -893,8 +893,15 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
+ 
+     /* Count the actions */
+     for (i=0; i < lpdiaf->dwNumActions; i++)
+-        if (IsEqualGUID(&This->guid, &lpdiaf->rgoAction[i].guidInstance))
++    {
++        if (IsEqualGUID(&This->guid, &lpdiaf->rgoAction[i].guidInstance) ||
++                (IsEqualGUID(&IID_NULL, &lpdiaf->rgoAction[i].guidInstance) && 
++                  ((lpdiaf->rgoAction[i].dwSemantic & lpdiaf->dwGenre) == lpdiaf->dwGenre ||
++                   (lpdiaf->rgoAction[i].dwSemantic & 0xff000000) == 0xff000000 /* Any Axis */) ))
++        {
+             num_actions++;
++        }
++    }
+ 
+     /* Should return DI_NOEFFECT if we dont have any actions and actionformat has not changed */
+     if (num_actions == 0 && lpdiaf->dwCRC == new_crc && !(dwFlags & DIDSAM_FORCESAVE)) return DI_NOEFFECT;
+@@ -934,7 +941,39 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
+ 
+             action++;
+         }
++        else if ((lpdiaf->rgoAction[i].dwSemantic & lpdiaf->dwGenre) == lpdiaf->dwGenre ||
++                 (lpdiaf->rgoAction[i].dwSemantic & 0xff000000) == 0xff000000 /* Any Axis */)
++        {
++            DWORD obj_id = semantic_to_obj_id(This, lpdiaf->rgoAction[i].dwSemantic);
++            DWORD type = DIDFT_GETTYPE(obj_id);
++            DWORD inst = DIDFT_GETINSTANCE(obj_id);
++            LPDIOBJECTDATAFORMAT obj;
++
++            if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON;
++            else if (type == DIDFT_RELAXIS) type = DIDFT_AXIS;
++
++            obj = dataformat_to_odf_by_type(df, inst, type);
++            TRACE("obj %p, inst 0x%08x, type 0x%08x\n", obj, inst, type);
++            if(obj)
++            {
++                memcpy(&obj_df[action], obj, df->dwObjSize);
++
++                This->action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData;
++                This->action_map[action].offset = offset;
++                obj_df[action].dwOfs = offset;
++                offset += (type & DIDFT_BUTTON) ? 1 : 4;
++
++                action++;
++            }
++        }
++    }
++
++    if (action == 0)
++    {
++        HeapFree(GetProcessHeap(), 0, obj_df);
++        return DI_NOEFFECT;
+     }
++    data_format.dwNumObjs = action;
+ 
+     IDirectInputDevice8_SetDataFormat(iface, &data_format);
+ 
+-- 
+2.17.1
+

patches/dinput-SetActionMap-genre/0002-dinput-Improved-tracing-of-Semantic-value.patch

@@ -0,0 +1,46 @@
+From a4cf8d9241b8dd94937408c9a1d20aacfb9dd2e3 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 28 May 2019 14:37:25 +1000
+Subject: [PATCH 2/2] dinput: Improved tracing of Semantic value.
+
+---
+ dlls/dinput/dinput_main.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
+index cf050cb71ed..79ef9620de9 100644
+--- a/dlls/dinput/dinput_main.c
++++ b/dlls/dinput/dinput_main.c
+@@ -290,6 +290,20 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags)
+     TRACE("\n");
+ }
+ 
++static char *dump_semantic(DWORD semantic)
++{
++    if((semantic & 0xff000000) == 0xff000000)
++        return "Any AXIS";
++    else if((semantic & 0x82000000) == 0x82000000)
++        return "Mouse";
++    else if((semantic & 0x81000000) == 0x81000000)
++        return "Keybaord";
++    else if((semantic & DIVIRTUAL_FLYING_HELICOPTER) == DIVIRTUAL_FLYING_HELICOPTER)
++        return "Helicopter";
++
++    return "Unknown";
++}
++
+ static void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat)
+ {
+     unsigned int i;
+@@ -312,7 +326,7 @@ static void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat)
+     {
+         TRACE("diaf.rgoAction[%u]:\n", i);
+         TRACE("\tuAppData=0x%lx\n", lpdiActionFormat->rgoAction[i].uAppData);
+-        TRACE("\tdwSemantic=0x%08x\n", lpdiActionFormat->rgoAction[i].dwSemantic);
++        TRACE("\tdwSemantic=0x%08x (%s)\n", lpdiActionFormat->rgoAction[i].dwSemantic, dump_semantic(lpdiActionFormat->rgoAction[i].dwSemantic));
+         TRACE("\tdwFlags=0x%x\n", lpdiActionFormat->rgoAction[i].dwFlags);
+         TRACE("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName));
+         TRACE("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance));
+-- 
+2.20.1
+

patches/dinput-SetActionMap-genre/definition

@@ -0,0 +1,2 @@
+Fixes: [47326] dinput: Allow mapping of controls based of genre type.
+Depends: dinput-joy-mappings

patches/dinput-axis-recalc/0001-dinput-Recalculated-Axis-after-deadzone-change.patch

@@ -1,19 +1,19 @@
-From b5311918d5fbdc15b3321fed444daa0d0c8507de Mon Sep 17 00:00:00 2001
+From 24829b2ba6d5efd950f178b8282dda826c4d1df0 Mon Sep 17 00:00:00 2001
 From: Bruno Jesus <bjesus@codeweavers.com>
 Date: Thu, 28 Feb 2019 15:56:18 +1100
 Subject: [PATCH] dinput: Recalculated Axis after deadzone change.
 
 Wine-bugs: https://bugs.winehq.org/show_bug.cgi?id=41317
 ---
- dlls/dinput/joystick.c | 149 ++++++++++++++++++++++++++-----------------------
+ dlls/dinput/joystick.c | 149 ++++++++++++++++++++++-------------------
  1 file changed, 80 insertions(+), 69 deletions(-)
 
 diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
-index 0ec1ceb..fd3d44d 100644
+index 433348cd04..c150528e3d 100644
 --- a/dlls/dinput/joystick.c
 +++ b/dlls/dinput/joystick.c
-@@ -271,6 +271,76 @@ BOOL device_disabled_registry(const char* name)
-     return do_disable;
+@@ -312,6 +312,76 @@ BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid)
+     return (devcaps->dwAxes == 6 && devcaps->dwButtons >= 14);
  }
  
 +static void remap_init(JoystickGenericImpl *This, int obj, ObjProps *remap_props)
@@ -89,7 +89,7 @@ index 0ec1ceb..fd3d44d 100644
  /******************************************************************************
    *     SetProperty : change input device properties
    */
-@@ -278,7 +348,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+@@ -319,7 +389,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
  {
      JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface);
      DWORD i;
@@ -97,7 +97,7 @@ index 0ec1ceb..fd3d44d 100644
  
      TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
  
-@@ -295,69 +364,15 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+@@ -336,69 +405,15 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
          case (DWORD_PTR)DIPROP_RANGE: {
              LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph;
              if (ph->dwHow == DIPH_DEVICE) {
@@ -171,7 +171,7 @@ index 0ec1ceb..fd3d44d 100644
              }
              break;
          }
-@@ -366,15 +381,13 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+@@ -407,15 +422,13 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
              if (ph->dwHow == DIPH_DEVICE) {
                  TRACE("deadzone(%d) all\n", pd->dwData);
                  for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)
@@ -190,7 +190,7 @@ index 0ec1ceb..fd3d44d 100644
              }
              break;
          }
-@@ -383,15 +396,13 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+@@ -424,15 +437,13 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
              if (ph->dwHow == DIPH_DEVICE) {
                  TRACE("saturation(%d) all\n", pd->dwData);
                  for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)
@@ -210,5 +210,5 @@ index 0ec1ceb..fd3d44d 100644
              break;
          }
 -- 
-1.9.1
+2.17.1
 

patches/dsound-EAX/0002-dsound-Add-EAX-v1-constants-and-structs.patch

@@ -1,10 +1,10 @@
-From 85367d69fb057ba4557d9195b324425bd0e84316 Mon Sep 17 00:00:00 2001
+From 0204d4b3482b55cf3b4d74bbcabd8e95e6e192ef Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 15 Mar 2015 18:04:16 +0000
-Subject: dsound: Add EAX v1 constants and structs.
+Subject: [PATCH] dsound: Add EAX v1 constants and structs.
 
 ---
- dlls/dsound/dsound_eax.h     | 89 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/dsound/dsound_eax.h     | 89 ++++++++++++++++++++++++++++++++++++
  dlls/dsound/dsound_private.h |  1 +
  2 files changed, 90 insertions(+)
  create mode 100644 dlls/dsound/dsound_eax.h
@@ -105,7 +105,7 @@ index 00000000000..600029fa94f
 +
 +#endif
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 45232cbd729..58163646fd7 100644
+index b19acba2b98..eb9f5c9e3bc 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -29,6 +29,7 @@
@@ -115,7 +115,7 @@ index 45232cbd729..58163646fd7 100644
 +#include "dsound_eax.h"
  
  #include "wine/list.h"
- #include "wine/unicode.h"
+ 
 -- 
-2.13.1
+2.17.1
 

patches/dxdiagn-Enumerate_DirectSound/0001-dxdiagn-Enumerate-DirectSound-devices-and-add-some-b.patch

@@ -1,4 +1,4 @@
-From 51ba80615215fac54b251e56a374dfab9a2b834b Mon Sep 17 00:00:00 2001
+From 3c3c84a7c1ff6ba6b785bd3d70b5a93912c39d0a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 15 Aug 2015 02:59:17 +0200
 Subject: [PATCH] dxdiagn: Enumerate DirectSound devices and add some basic
@@ -11,7 +11,7 @@ Subject: [PATCH] dxdiagn: Enumerate DirectSound devices and add some basic
  3 files changed, 233 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
-index c16396e464b..e926d3b2a8a 100644
+index fa4b611f245..88c99803b06 100644
 --- a/dlls/dxdiagn/Makefile.in
 +++ b/dlls/dxdiagn/Makefile.in
 @@ -1,5 +1,5 @@
@@ -19,13 +19,13 @@ index c16396e464b..e926d3b2a8a 100644
 -IMPORTS   = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32
 +IMPORTS   = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound
  
- C_SRCS = \
- 	container.c \
+ EXTRADLLFLAGS = -mno-cygwin
+ 
 diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
-index 1fdab5e2db0..6fb9e585dbd 100644
+index 6b6f4e640cc..2626e4e77cb 100644
 --- a/dlls/dxdiagn/provider.c
 +++ b/dlls/dxdiagn/provider.c
-@@ -38,6 +38,7 @@
+@@ -36,6 +36,7 @@
  #include "wine/fil_data.h"
  #include "psapi.h"
  #include "wbemcli.h"
@@ -33,7 +33,7 @@ index 1fdab5e2db0..6fb9e585dbd 100644
  
  #include "wine/debug.h"
  
-@@ -1354,11 +1355,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node)
+@@ -1364,11 +1365,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node)
      return fill_display_information_fallback(node);
  }
  
@@ -75,7 +75,7 @@ index 1fdab5e2db0..6fb9e585dbd 100644
 +    /* the default device is enumerated twice, one time without GUID */
 +    if (!guid) return TRUE;
 +
-+    snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index);
++    _snwprintf(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index);
 +    device = allocate_information_node(buffer);
 +    if (!device)
 +    {
@@ -99,8 +99,8 @@ index 1fdab5e2db0..6fb9e585dbd 100644
 +        return FALSE;
 +
 +    name = module;
-+    if ((p = strrchrW(name, '\\'))) name = p + 1;
-+    if ((p = strrchrW(name, '/'))) name = p + 1;
++    if ((p = wcsrchr(name, '\\'))) name = p + 1;
++    if ((p = wcsrchr(name, '/'))) name = p + 1;
 +
 +    enum_ctx->hr = add_bstr_property(device, szDriverName, name);
 +    if (FAILED(enum_ctx->hr))
@@ -119,7 +119,7 @@ index 1fdab5e2db0..6fb9e585dbd 100644
      IDxDiagContainerImpl_Container *cont;
  
      cont = allocate_information_node(DxDiag_SoundDevices);
-@@ -1367,12 +1442,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node)
+@@ -1377,12 +1452,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node)
  
      add_subcontainer(node, cont);
  
@@ -314,5 +314,5 @@ index 936707632a4..c80717cd392 100644
      CoUninitialize();
  }
 -- 
-2.18.0
+2.20.1
 

patches/dxdiagn-GetChildContainer_Leaf_Nodes/0001-dxdiagn-Calling-GetChildContainer-with-an-empty-stri.patch

@@ -1,34 +1,19 @@
-From 2c3c01aeaef843cbebf27f6c72384bbd353755a1 Mon Sep 17 00:00:00 2001
+From d1aa9a4e9abd6db9d164d390fa7e942a10efc5cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 15 Aug 2015 03:58:04 +0200
 Subject: [PATCH] dxdiagn: Calling GetChildContainer with an empty string on a
  leaf container returns the object itself
 
 ---
- dlls/dxdiagn/container.c       | 12 ++++++++++--
+ dlls/dxdiagn/container.c       |  4 ++--
  dlls/dxdiagn/tests/container.c | 25 +++++++++++++++++++++++--
- 2 files changed, 33 insertions(+), 4 deletions(-)
+ 2 files changed, 25 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c
-index d167043..6e068e5 100644
+index 87d593a15a7..d84f185a795 100644
 --- a/dlls/dxdiagn/container.c
 +++ b/dlls/dxdiagn/container.c
-@@ -162,6 +162,14 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i
-   if (NULL == tmp) return E_FAIL;
-   lstrcpynW(tmp, pwszContainer, tmp_len);
- 
-+  /* special handling for an empty string and leaf container */
-+  if (!tmp[0] && list_empty(&pContainer->subContainers)) {
-+    hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pContainer, This->pProv, (void **)ppInstance);
-+    if (SUCCEEDED(hr))
-+      TRACE("Succeeded in getting the container instance\n");
-+    goto out;
-+  }
-+
-   cur = strchrW(tmp, '.');
-   while (NULL != cur) {
-     *cur = '\0'; /* cut tmp string to '.' */
-@@ -169,7 +177,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i
+@@ -167,7 +167,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i
      TRACE("Trying to get parent container %s\n", debugstr_w(tmp));
      hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer);
      if (FAILED(hr))
@@ -36,8 +21,8 @@ index d167043..6e068e5 100644
 +      goto out;
      cur++; /* go after '.' (just replaced by \0) */
      tmp = cur;
-     cur = strchrW(tmp, '.');
-@@ -183,7 +191,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i
+     cur = wcschr(tmp, '.');
+@@ -181,7 +181,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i
          TRACE("Succeeded in getting the container instance\n");
    }
  
@@ -47,7 +32,7 @@ index d167043..6e068e5 100644
    return hr;
  }
 diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c
-index c80717c..7f09fb5 100644
+index c80717cd392..7f09fb5cb82 100644
 --- a/dlls/dxdiagn/tests/container.c
 +++ b/dlls/dxdiagn/tests/container.c
 @@ -901,7 +901,8 @@ static void test_DxDiag_SystemInfo(void)
@@ -118,5 +103,5 @@ index c80717c..7f09fb5 100644
      }
  
 -- 
-1.9.1
+2.20.1
 

patches/dxva2-Video_Decoder/0001-dxva2-Implement-semi-stub-for-Direct3DDeviceManager9.patch

@@ -1,25 +1,28 @@
-From 52d613dcbeb8d00cf334c0cc46aed7d91eec355e Mon Sep 17 00:00:00 2001
+From 34fefc056a65053060d7de738087f2527b7ed6bb Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 10 Feb 2015 16:34:05 +0100
-Subject: dxva2: Implement semi-stub for Direct3DDeviceManager9 interface.
+Subject: [PATCH] dxva2: Implement semi-stub for Direct3DDeviceManager9
+ interface.
 
 ---
  dlls/dxva2/Makefile.in     |   2 +
- dlls/dxva2/devicemanager.c | 212 +++++++++++++++++++++++++++++++++++++++++++++
- dlls/dxva2/dxva2_private.h |  21 +++++
+ dlls/dxva2/devicemanager.c | 212 +++++++++++++++++++++++++++++++++++++
+ dlls/dxva2/dxva2_private.h |  21 ++++
  dlls/dxva2/main.c          |   7 +-
  4 files changed, 240 insertions(+), 2 deletions(-)
  create mode 100644 dlls/dxva2/devicemanager.c
  create mode 100644 dlls/dxva2/dxva2_private.h
 
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
-index 7b9ef6fe7c0..27c653d3f20 100644
+index 44e125e9b5f..5c3e3842d79 100644
 --- a/dlls/dxva2/Makefile.in
 +++ b/dlls/dxva2/Makefile.in
-@@ -1,4 +1,6 @@
+@@ -1,6 +1,8 @@
  MODULE = dxva2.dll
 +IMPORTS = ole32
  
+ EXTRADLLFLAGS = -mno-cygwin
+ 
  C_SRCS = \
 +	devicemanager.c \
  	main.c
@@ -297,5 +300,5 @@ index 782f0dfa3d4..df8f2030104 100644
  
  HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv )
 -- 
-2.11.0
+2.20.1
 

patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch

@@ -1,20 +1,20 @@
-From 161924178484a0b2835946704241d2ae287202f1 Mon Sep 17 00:00:00 2001
+From 935b985d2e4fab7402030c71ff1a6ba0abdd9874 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:25:20 +0100
-Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using
- vaapi backend.
+Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using vaapi
+ backend.
 
 ---
  configure.ac                |  16 +
  dlls/dxva2/Makefile.in      |  12 +-
- dlls/dxva2/backend.idl      |  96 ++++++
- dlls/dxva2/dxva2_private.h  | 115 ++++++-
- dlls/dxva2/genericdecoder.c | 432 +++++++++++++++++++++++++
+ dlls/dxva2/backend.idl      |  96 +++++
+ dlls/dxva2/dxva2_private.h  | 115 +++++-
+ dlls/dxva2/genericdecoder.c | 432 ++++++++++++++++++++
  dlls/dxva2/main.c           |  70 +++-
  dlls/dxva2/tests/dxva2.c    |  23 +-
- dlls/dxva2/vaapi-mpeg2.c    | 753 +++++++++++++++++++++++++++++++++++++++++++
- dlls/dxva2/vaapi.c          | 767 ++++++++++++++++++++++++++++++++++++++++++++
- dlls/dxva2/videoservices.c  |  74 ++---
+ dlls/dxva2/vaapi-mpeg2.c    | 753 +++++++++++++++++++++++++++++++++++
+ dlls/dxva2/vaapi.c          | 767 ++++++++++++++++++++++++++++++++++++
+ dlls/dxva2/videoservices.c  |  74 ++--
  10 files changed, 2292 insertions(+), 66 deletions(-)
  create mode 100644 dlls/dxva2/backend.idl
  create mode 100644 dlls/dxva2/genericdecoder.c
@@ -22,19 +22,19 @@ Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using
  create mode 100644 dlls/dxva2/vaapi.c
 
 diff --git a/configure.ac b/configure.ac
-index 4a93549..f5a20d5 100644
+index 58e5211e9bc..53aea6188ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -107,6 +107,8 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
+@@ -110,6 +110,8 @@ AC_ARG_WITH(xslt,      AS_HELP_STRING([--without-xslt],[do not use XSLT]))
+ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
              [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi])
- AC_ARG_WITH(zlib,      AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]),
-             [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi])
+ AC_ARG_WITH(zlib,      AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]))
 +AC_ARG_WITH(va,        AS_HELP_STRING([--without-va],[do not use VA (GPU video acceleration)]),
 +            [if test "x$withval" = "xno"; then ac_cv_header_va_va_x11_h=no; fi])
  
  AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
  AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
-@@ -1210,6 +1212,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+@@ -1292,6 +1294,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
      WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
  OpenGL and Direct3D won't be supported.])
  
@@ -56,10 +56,10 @@ index 4a93549..f5a20d5 100644
  else
      X_CFLAGS=""
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
-index d484cb1..68a7e3c 100644
+index e4c90b5231e..b42cfae525e 100644
 --- a/dlls/dxva2/Makefile.in
 +++ b/dlls/dxva2/Makefile.in
-@@ -1,8 +1,14 @@
+@@ -1,10 +1,16 @@
  MODULE = dxva2.dll
 -IMPORTS = ole32
 +IMPORTS = ole32 advapi32
@@ -67,6 +67,8 @@ index d484cb1..68a7e3c 100644
 +IDL_SRCS = \
 +	backend.idl
  
+ EXTRADLLFLAGS = -mno-cygwin
+ 
  C_SRCS = \
  	devicemanager.c \
 +	genericdecoder.c \
@@ -79,7 +81,7 @@ index d484cb1..68a7e3c 100644
 +	videoservices.c
 diff --git a/dlls/dxva2/backend.idl b/dlls/dxva2/backend.idl
 new file mode 100644
-index 0000000..8d48835
+index 00000000000..8d488351ff2
 --- /dev/null
 +++ b/dlls/dxva2/backend.idl
 @@ -0,0 +1,96 @@
@@ -180,7 +182,7 @@ index 0000000..8d48835
 +        [out] IWineVideoDecoder **decoder);
 +}
 diff --git a/dlls/dxva2/dxva2_private.h b/dlls/dxva2/dxva2_private.h
-index f0068b6..f518637 100644
+index f0068b68891..f51863739b0 100644
 --- a/dlls/dxva2/dxva2_private.h
 +++ b/dlls/dxva2/dxva2_private.h
 @@ -1,5 +1,5 @@
@@ -315,7 +317,7 @@ index f0068b6..f518637 100644
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/genericdecoder.c b/dlls/dxva2/genericdecoder.c
 new file mode 100644
-index 0000000..3903d6b
+index 00000000000..3903d6b0b46
 --- /dev/null
 +++ b/dlls/dxva2/genericdecoder.c
 @@ -0,0 +1,432 @@
@@ -752,7 +754,7 @@ index 0000000..3903d6b
 +    return S_OK;
 +}
 diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
-index 0382b5f..3006f17 100644
+index 0382b5fb00a..3006f175b7f 100644
 --- a/dlls/dxva2/main.c
 +++ b/dlls/dxva2/main.c
 @@ -32,6 +32,8 @@
@@ -846,7 +848,7 @@ index 0382b5f..3006f17 100644
  
      return TRUE;
 diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c
-index dcbb990..c28be4d 100644
+index dcbb990ee5c..c28be4d8e3c 100644
 --- a/dlls/dxva2/tests/dxva2.c
 +++ b/dlls/dxva2/tests/dxva2.c
 @@ -1,7 +1,7 @@
@@ -927,7 +929,7 @@ index dcbb990..c28be4d 100644
      IDirectXVideoDecoderService_Release(service);
 diff --git a/dlls/dxva2/vaapi-mpeg2.c b/dlls/dxva2/vaapi-mpeg2.c
 new file mode 100644
-index 0000000..7b7f61d
+index 00000000000..7b7f61db755
 --- /dev/null
 +++ b/dlls/dxva2/vaapi-mpeg2.c
 @@ -0,0 +1,753 @@
@@ -1686,7 +1688,7 @@ index 0000000..7b7f61d
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/vaapi.c b/dlls/dxva2/vaapi.c
 new file mode 100644
-index 0000000..80e63bf
+index 00000000000..80e63bf38d9
 --- /dev/null
 +++ b/dlls/dxva2/vaapi.c
 @@ -0,0 +1,767 @@
@@ -2458,7 +2460,7 @@ index 0000000..80e63bf
 +
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/videoservices.c b/dlls/dxva2/videoservices.c
-index 46e431a..84222dc 100644
+index 46e431a7f29..84222dce558 100644
 --- a/dlls/dxva2/videoservices.c
 +++ b/dlls/dxva2/videoservices.c
 @@ -1,5 +1,5 @@
@@ -2635,5 +2637,5 @@ index 46e431a..84222dc 100644
          return E_NOINTERFACE;
      }
 -- 
-2.7.4
+2.20.1
 

patches/dxva2-Video_Decoder/0013-Revert-dxva2-Build-with-msvcrt.patch

@@ -0,0 +1,26 @@
+From 942e949aefa0ced5829eb69580ca6a00492fb542 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 5 Jun 2019 08:54:39 +1000
+Subject: [PATCH] Revert "dxva2: Build with msvcrt."
+
+This reverts commit 63cb594f01f25572e78356d0950790437bf99c34.
+---
+ dlls/dxva2/Makefile.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
+index 12ce8b2c1f2..35c42715b0f 100644
+--- a/dlls/dxva2/Makefile.in
++++ b/dlls/dxva2/Makefile.in
+@@ -4,8 +4,6 @@ IMPORTS = ole32 advapi32
+ IDL_SRCS = \
+ 	backend.idl
+ 
+-EXTRADLLFLAGS = -mno-cygwin
+-
+ C_SRCS = \
+ 	devicemanager.c \
+ 	genericdecoder.c \
+-- 
+2.20.1
+