Updated bcrypt-BCryptGenerateKeyPair patchset

This is to fix the macos build.

patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,7 +1,7 @@
-From 744549e1ecc76c3764079d337c09445d01a3527e Mon Sep 17 00:00:00 2001
+From 5e4c31d0796f2e559889d4f84cdb571130217e7d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
-Subject: dwrite: Avoid implicit cast of interface pointer.
+Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
 
 ---
  dlls/dwrite/font.c   | 4 ++--
@@ -9,10 +9,10 @@ Subject: dwrite: Avoid implicit cast of interface pointer.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index d9ddce0..0a90c20 100644
+index f50133d..1bc7b59 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -1684,7 +1684,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -1815,7 +1815,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -20,8 +20,8 @@ index d9ddce0..0a90c20 100644
 +    return CONTAINING_RECORD((IDWriteFont3 *)iface, struct dwrite_font, IDWriteFont3_iface);
  }
  
- static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1692,7 +1692,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace
+ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1823,7 +1823,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -31,10 +31,10 @@ index d9ddce0..0a90c20 100644
  
  void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 706ed4e..c76a909 100644
+index f27fe9f..ee1eb5a 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5196,7 +5196,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
@@ -44,5 +44,5 @@ index 706ed4e..c76a909 100644
  
  HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
 -- 
-2.9.0
+1.9.1
 

patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch

@@ -1,13 +1,12 @@
-From a4d5c33bb2fc98fd0f84ea05575e0d3eeb5a1bcd Mon Sep 17 00:00:00 2001
+From ab6be2f28c6a3501a056e890a41b44d49c1e2eb0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:02:34 +0200
 Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
 
 ---
- dlls/uiautomationcore/Makefile.in           |  1 +
- dlls/uiautomationcore/uia_main.c            | 53 +++++++++++++++++++++++++----
- dlls/uiautomationcore/uiautomationcore.spec |  6 ++++
- 3 files changed, 54 insertions(+), 6 deletions(-)
+ dlls/uiautomationcore/Makefile.in |  1 +
+ dlls/uiautomationcore/uia_main.c  | 53 ++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 48 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
 index 78d6254..029fc2e 100644
@@ -121,41 +120,6 @@ index 31b7d3e..cc4831e 100644
      return 0;
  }
  
-diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
-index 48a06b2..8e676ad 100644
---- a/dlls/uiautomationcore/uiautomationcore.spec
-+++ b/dlls/uiautomationcore/uiautomationcore.spec
-@@ -53,6 +53,8 @@
- @ stub TransformPattern_Rotate
- @ stub UiaAddEvent
- @ stdcall UiaClientsAreListening()
-+@ stub UiaDisconnectAllProviders
-+@ stub UiaDisconnectProvider
- @ stub UiaEventAddWindow
- @ stub UiaEventRemoveWindow
- @ stub UiaFind
-@@ -69,6 +71,7 @@
- @ stub UiaHUiaNodeFromVariant
- @ stub UiaHasServerSideProvider
- @ stub UiaHostProviderFromHwnd
-+@ stub UiaIAccessibleFromProvider
- @ stdcall UiaLookupId(long ptr)
- @ stub UiaNavigate
- @ stub UiaNodeFromFocus
-@@ -77,10 +80,13 @@
- @ stub UiaNodeFromProvider
- @ stub UiaNodeRelease
- @ stub UiaPatternRelease
-+@ stub UiaProviderForNonClient
-+@ stub UiaProviderFromIAccessible
- @ stub UiaRaiseAsyncContentLoadedEvent
- @ stdcall UiaRaiseAutomationEvent(ptr long)
- @ stub UiaRaiseAutomationPropertyChangedEvent
- @ stub UiaRaiseStructureChangedEvent
-+@ stub UiaRaiseTextEditTextChangedEvent
- @ stub UiaRegisterProviderCallback
- @ stub UiaRemoveEvent
- @ stdcall UiaReturnRawElementProvider(long long long ptr)
 -- 
 1.9.1
 

patches/bcrypt-BCryptGenerateKeyPair/0001-bcrypt-Add-support-for-algorithm-ECDH-P256.patch

@@ -1,58 +0,0 @@
-From ee38b7a672771d088ee5c4e58300623259020fb6 Mon Sep 17 00:00:00 2001
-From: Maxime Lombard <berillions@gmail.com>
-Date: Sun, 10 Jun 2018 14:47:01 +0200
-Subject: [PATCH 1/3] bcrypt: Add support for algorithm ECDH P256.
-
----
- dlls/bcrypt/bcrypt_internal.h | 1 +
- dlls/bcrypt/bcrypt_main.c     | 2 ++
- include/bcrypt.h              | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 11c8b30..fd8cc90 100644
---- a/dlls/bcrypt/bcrypt_internal.h
-+++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -137,6 +137,7 @@ enum alg_id
-     ALG_ID_SHA256,
-     ALG_ID_SHA384,
-     ALG_ID_SHA512,
-+    ALG_ID_ECDH_P256,
-     ALG_ID_ECDSA_P256,
-     ALG_ID_ECDSA_P384,
- };
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 24065c1..003e8f3 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -114,6 +114,7 @@ alg_props[] =
-     /* ALG_ID_SHA256 */ {  286,   32,  512, BCRYPT_SHA256_ALGORITHM, FALSE },
-     /* ALG_ID_SHA384 */ {  382,   48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE },
-     /* ALG_ID_SHA512 */ {  382,   64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE },
-+    /* ALG_ID_ECDH_P256 */  { 0,   0,     0, BCRYPT_ECDH_P256_ALGORITHM, FALSE },
-     /* ALG_ID_ECDSA_P256 */ { 0,   0,     0, BCRYPT_ECDSA_P256_ALGORITHM, FALSE  },
-     /* ALG_ID_ECDSA_P384 */ { 0,   0,     0, BCRYPT_ECDSA_P384_ALGORITHM, FALSE  },
- };
-@@ -184,6 +185,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
-     else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256;
-     else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384;
-     else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512;
-+    else if (!strcmpW( id, BCRYPT_ECDH_P256_ALGORITHM )) alg_id = ALG_ID_ECDH_P256;
-     else if (!strcmpW( id, BCRYPT_ECDSA_P256_ALGORITHM )) alg_id = ALG_ID_ECDSA_P256;
-     else if (!strcmpW( id, BCRYPT_ECDSA_P384_ALGORITHM )) alg_id = ALG_ID_ECDSA_P384;
-     else
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index d3e4b99..676db72 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -81,6 +81,7 @@ typedef LONG NTSTATUS;
- #define BCRYPT_SHA256_ALGORITHM     (const WCHAR []){'S','H','A','2','5','6',0}
- #define BCRYPT_SHA384_ALGORITHM     (const WCHAR []){'S','H','A','3','8','4',0}
- #define BCRYPT_SHA512_ALGORITHM     (const WCHAR []){'S','H','A','5','1','2',0}
-+#define BCRYPT_ECDH_P256_ALGORITHM  (const WCHAR []){'E','C','D','H','_','P','2','5','6',0}
- #define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0}
- #define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0}
- #define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0}
--- 
-1.9.1
-

patches/bcrypt-BCryptGenerateKeyPair/0002-bcrypt-Add-BCryptGenerateKeyPair-stub.patch

@@ -1,70 +0,0 @@
-From 480ec9b4f559237e618ede31ecd158340783ab80 Mon Sep 17 00:00:00 2001
-From: Maxime Lombard <berillions@gmail.com>
-Date: Sun, 10 Jun 2018 14:50:31 +0200
-Subject: [PATCH 2/3] bcrypt: Add BCryptGenerateKeyPair stub.
-
----
- dlls/bcrypt/bcrypt.spec   | 2 +-
- dlls/bcrypt/bcrypt_main.c | 6 ++++++
- dlls/ncrypt/ncrypt.spec   | 2 +-
- include/bcrypt.h          | 1 +
- 4 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 78824d7..ccfec63 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -25,7 +25,7 @@
- @ stdcall BCryptFinishHash(ptr ptr long long)
- @ stub BCryptFreeBuffer
- @ stdcall BCryptGenRandom(ptr ptr long long)
--@ stub BCryptGenerateKeyPair
-+@ stdcall BCryptGenerateKeyPair(ptr ptr long long)
- @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long)
- @ stdcall BCryptGetFipsAlgorithmMode(ptr)
- @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 0381b65..623ccb5 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -160,6 +160,12 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-+NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, ULONG input_len, ULONG flags)
-+{
-+    FIXME("%p, %p, %u, %08x - stub\n", algorithm, handle, input_len, flags);
-+    return STATUS_SUCCESS;
-+}
-+
- NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
- {
-     const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
-diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
-index e7b12e0..e667e75 100644
---- a/dlls/ncrypt/ncrypt.spec
-+++ b/dlls/ncrypt/ncrypt.spec
-@@ -27,7 +27,7 @@
- @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash
- @ stub BCryptFreeBuffer
- @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom
--@ stub BCryptGenerateKeyPair
-+@ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair
- @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey
- @ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode
- @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index 7966f76..2ef073b 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -223,6 +223,7 @@ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
- NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
- NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
-+NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *);
--- 
-1.9.1
-

patches/bcrypt-BCryptGenerateKeyPair/0003-bcrypt-Add-BCryptFinalizeKeyPair-stub.patch

@@ -1,70 +0,0 @@
-From e765bec7193e3ffa27492abe76ed4e56db0f4fc7 Mon Sep 17 00:00:00 2001
-From: Maxime Lombard <berillions@gmail.com>
-Date: Sun, 10 Jun 2018 14:52:31 +0200
-Subject: [PATCH 3/3] bcrypt: Add BCryptFinalizeKeyPair stub.
-
----
- dlls/bcrypt/bcrypt.spec   | 2 +-
- dlls/bcrypt/bcrypt_main.c | 6 ++++++
- dlls/ncrypt/ncrypt.spec   | 2 +-
- include/bcrypt.h          | 1 +
- 4 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index ccfec63..891381f 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -21,7 +21,7 @@
- @ stub BCryptEnumProviders
- @ stub BCryptEnumRegisteredProviders
- @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long)
--@ stub BCryptFinalizeKeyPair
-+@ stdcall BCryptFinalizeKeyPair(ptr long)
- @ stdcall BCryptFinishHash(ptr ptr long long)
- @ stub BCryptFreeBuffer
- @ stdcall BCryptGenRandom(ptr ptr long long)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 623ccb5..90af6aa 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -166,6 +166,12 @@ NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HA
-     return STATUS_SUCCESS;
- }
- 
-+NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE key, ULONG dwflags)
-+{
-+    FIXME("%p, %08x - stub\n", key, dwflags);
-+    return STATUS_SUCCESS;
-+}
-+
- NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
- {
-     const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
-diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
-index e667e75..c6e7f7f 100644
---- a/dlls/ncrypt/ncrypt.spec
-+++ b/dlls/ncrypt/ncrypt.spec
-@@ -23,7 +23,7 @@
- @ stub BCryptEnumProviders
- @ stub BCryptEnumRegisteredProviders
- @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey
--@ stub BCryptFinalizeKeyPair
-+@ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair
- @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash
- @ stub BCryptFreeBuffer
- @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index 2ef073b..6826c86 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -222,6 +222,7 @@ NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
- NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
- NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
-+NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE, ULONG);
- NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
--- 
-1.9.1
-

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

@@ -0,0 +1,91 @@
+From 72d00367b9863fd84d47623b6811552e155fca84 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] bcrypt: Add BCryptDestroySecret/BCryptSecretAgreement stubs
+
+---
+ dlls/bcrypt/bcrypt.spec   |  4 ++--
+ dlls/bcrypt/bcrypt_main.c | 16 ++++++++++++++++
+ include/bcrypt.h          |  3 +++
+ 3 files changed, 21 insertions(+), 2 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 80bd14b..36451c9 100644
+--- a/dlls/bcrypt/bcrypt_main.c
++++ b/dlls/bcrypt/bcrypt_main.c
+@@ -1556,6 +1556,22 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle,
+     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/include/bcrypt.h b/include/bcrypt.h
+index ba78c1d..866914c 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
+@@ -228,6 +229,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);
+@@ -242,6 +244,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

@@ -0,0 +1,78 @@
+From 315b52406fbddcaf9289b2a47e8498fba49f8278 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] bcrypt: Add BCryptDeriveKey stub
+
+---
+ dlls/bcrypt/bcrypt.spec   |  2 +-
+ dlls/bcrypt/bcrypt_main.c |  7 +++++++
+ include/bcrypt.h          | 15 +++++++++++++++
+ 3 files changed, 23 insertions(+), 1 deletion(-)
+
+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 36451c9..ca2f274 100644
+--- a/dlls/bcrypt/bcrypt_main.c
++++ b/dlls/bcrypt/bcrypt_main.c
+@@ -1572,6 +1572,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/include/bcrypt.h b/include/bcrypt.h
+index 866914c..a5abf23 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
+ 
+@@ -226,6 +240,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

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

patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch

@@ -1362,7 +1362,7 @@ index c930248..80f73de 100644
 +    object->device = iface;
 +    object->refcount = 1;
 +
-+    ID3D11Device_AddRef(iface);
++    ID3D11Device2_AddRef(iface);
 +    wined3d_private_store_init(&object->private_store);
 +
 +    *context = &object->ID3D11DeviceContext_iface;

patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch

@@ -1,4 +1,4 @@
-From b8d301b085b39fba7f61409a0ebe17a4ff7b810a Mon Sep 17 00:00:00 2001
+From 07c70b0b20919d9908b408322d65c62ad459f09e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 19 Jan 2017 16:56:56 +0100
 Subject: [PATCH] d3d11: Initial implementation for deferred contexts.
@@ -8,7 +8,7 @@ Subject: [PATCH] d3d11: Initial implementation for deferred contexts.
  1 file changed, 1040 insertions(+), 31 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 9127d01..94156e4 100644
+index ebe8c03..791b959 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
 @@ -19,12 +19,181 @@
@@ -725,7 +725,7 @@ index 9127d01..94156e4 100644
  static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
  
  static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
-@@ -1217,7 +1908,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
+@@ -1221,7 +1912,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
  static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext1 *iface,
          ID3D11CommandList *command_list, BOOL restore_state)
  {
@@ -747,7 +747,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext1 *iface,
-@@ -2972,6 +3676,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
+@@ -2855,6 +3559,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
  
      if (!refcount)
      {
@@ -755,7 +755,7 @@ index 9127d01..94156e4 100644
          wined3d_private_store_cleanup(&context->private_store);
          ID3D11Device_Release(context->device);
          HeapFree(GetProcessHeap(), 0, context);
-@@ -3023,43 +3728,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
+@@ -2906,43 +3611,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -848,7 +848,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface,
-@@ -3072,53 +3820,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
+@@ -2955,53 +3703,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource,
          UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource)
  {
@@ -1027,7 +1027,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface,
-@@ -3147,7 +4011,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
+@@ -3030,7 +3894,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
  static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface,
          D3D11_PRIMITIVE_TOPOLOGY topology)
  {
@@ -1045,7 +1045,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3207,8 +4080,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
+@@ -3090,8 +3963,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
          UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views,
          ID3D11DepthStencilView *depth_stencil_view)
  {
@@ -1075,7 +1075,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorderedAccessViews(
-@@ -3228,15 +4121,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
+@@ -3111,15 +4004,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetBlendState(ID3D11DeviceContext *iface,
          ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask)
  {
@@ -1122,7 +1122,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count,
-@@ -3278,13 +4200,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
+@@ -3161,13 +4083,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetState(ID3D11DeviceContext *iface,
          ID3D11RasterizerState *rasterizer_state)
  {
@@ -1159,7 +1159,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetScissorRects(ID3D11DeviceContext *iface,
-@@ -3399,8 +4342,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
+@@ -3282,8 +4225,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceContext *iface,
          ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
  {
@@ -1179,7 +1179,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface,
-@@ -3413,36 +4366,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
+@@ -3296,36 +4249,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -1247,7 +1247,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3743,7 +4722,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
+@@ -3626,7 +4605,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_ClearState(ID3D11DeviceContext *iface)
  {
@@ -1264,7 +1264,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Flush(ID3D11DeviceContext *iface)
-@@ -3768,9 +4755,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
+@@ -3651,9 +4638,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_FinishCommandList(ID3D11DeviceContext *iface,
          BOOL restore, ID3D11CommandList **command_list)
  {
@@ -1296,13 +1296,13 @@ index 9127d01..94156e4 100644
  }
  
  static const struct ID3D11DeviceContextVtbl d3d11_deferred_context_vtbl =
-@@ -4385,6 +5392,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
+@@ -4268,6 +5275,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
      object->device = iface;
      object->refcount = 1;
  
 +    list_init(&object->commands);
 +
-     ID3D11Device_AddRef(iface);
+     ID3D11Device2_AddRef(iface);
      wined3d_private_store_init(&object->private_store);
  
 -- 

patches/d3d8-ValidateShader/0001-d3d8-Improve-ValidateVertexShader-stub.patch

@@ -1,44 +1,39 @@
-From 3dc821fe683d1e17976ca9367465c1412e1140b4 Mon Sep 17 00:00:00 2001
+From 577b48296711a6ad2bd507687a05f3aac9d7a54a Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 14 Jan 2017 07:50:36 +0100
-Subject: d3d8: Improve ValidateVertexShader stub.
+Subject: [PATCH] d3d8: Improve ValidateVertexShader stub.
 
 ---
- dlls/d3d8/d3d8_main.c    | 43 ++++++++++++++++++++++---------------------
+ dlls/d3d8/d3d8_main.c    | 39 ++++++++++++++++++++++-----------------
  dlls/d3d8/tests/device.c | 40 +++++++++++++++++++++++++---------------
- 2 files changed, 47 insertions(+), 36 deletions(-)
+ 2 files changed, 47 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c
-index 8ac704c364c..2ab0414b7f2 100644
+index 5fbd165..c48b397 100644
 --- a/dlls/d3d8/d3d8_main.c
 +++ b/dlls/d3d8/d3d8_main.c
-@@ -58,38 +58,39 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version)
- 
- /***********************************************************************
-  *              ValidateVertexShader (D3D8.@)
-- *
-- * I've seen reserved1 and reserved2 always passed as 0's
-- * bool seems always passed as 0 or 1, but other values work as well...
-- * toto       result?
+@@ -64,33 +64,38 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version)
+  * boolean seems always passed as 0 or 1, but other values work as well...
+  * toto       result?
   */
--HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto)
+-HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto)
 +HRESULT WINAPI ValidateVertexShader(DWORD *vertexshader, DWORD *reserved1, DWORD *reserved2,
 +                                    BOOL return_error, char **errors)
  {
 -  HRESULT ret;
 -  static BOOL warned;
--
--  if (TRACE_ON(d3d8) || !warned) {
--      FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto);
--      warned = TRUE;
--  }
 +    const char *message = "";
 +    HRESULT hr = E_FAIL;
  
--  if (!vertexshader)
--      return E_FAIL;
+-  if (TRACE_ON(d3d8) || !warned) {
+-      FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto);
+-      warned = TRUE;
+-  }
 +    TRACE("(%p %p %p %d %p): semi-stub\n", vertexshader, reserved1, reserved2, return_error, errors);
  
+-  if (!vertexshader)
+-      return E_FAIL;
+-
 -  if (reserved1 || reserved2)
 -      return E_FAIL;
 +    if (!vertexshader)
@@ -74,10 +69,10 @@ index 8ac704c364c..2ab0414b7f2 100644
  
  /***********************************************************************
 diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
-index 28c6af32e0c..1368ce3a2cf 100644
+index 884cdb1..6b9e70d 100644
 --- a/dlls/d3d8/tests/device.c
 +++ b/dlls/d3d8/tests/device.c
-@@ -50,7 +50,7 @@ struct device_desc
+@@ -51,7 +51,7 @@ struct device_desc
  
  static DEVMODEW registry_mode;
  
@@ -86,7 +81,7 @@ index 28c6af32e0c..1368ce3a2cf 100644
  static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *);
  
  static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO);
-@@ -4238,18 +4238,31 @@ static void test_validate_vs(void)
+@@ -4369,18 +4369,31 @@ static void test_validate_vs(void)
          0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003,                         /* dp4 oPos.w, v0, c3           */
          0x0000ffff,                                                             /* end                          */
      };
@@ -120,7 +115,7 @@ index 28c6af32e0c..1368ce3a2cf 100644
      *vs = 0xfffe0100;                                                           /* vs_1_0                       */
      hr = ValidateVertexShader(vs, 0, 0, 0, 0);
      ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
-@@ -4257,21 +4270,18 @@ static void test_validate_vs(void)
+@@ -4388,21 +4401,18 @@ static void test_validate_vs(void)
      *vs = 0xfffe0102;                                                           /* bogus version                */
      hr = ValidateVertexShader(vs, 0, 0, 1, 0);
      ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
@@ -152,5 +147,5 @@ index 28c6af32e0c..1368ce3a2cf 100644
  
  static void test_validate_ps(void)
 -- 
-2.11.0
+1.9.1
 

patches/d3d8-ValidateShader/0002-d3d8-Improve-ValidatePixelShader-stub.patch

@@ -1,7 +1,7 @@
-From 29d2dd7606178f391c8802f8d5767a7bd83c4e30 Mon Sep 17 00:00:00 2001
+From f13fda7095a5fa275232f7440d7737a54c1f1c6c Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 14 Jan 2017 07:54:39 +0100
-Subject: d3d8: Improve ValidatePixelShader stub.
+Subject: [PATCH] d3d8: Improve ValidatePixelShader stub.
 
 ---
  dlls/d3d8/d3d8_main.c    | 37 +++++++++++++++++--------------------
@@ -9,10 +9,10 @@ Subject: d3d8: Improve ValidatePixelShader stub.
  2 files changed, 37 insertions(+), 34 deletions(-)
 
 diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c
-index a562c1c7e30..41f411c30a8 100644
+index c48b397..6feb8e5 100644
 --- a/dlls/d3d8/d3d8_main.c
 +++ b/dlls/d3d8/d3d8_main.c
-@@ -101,39 +101,36 @@ done:
+@@ -100,39 +100,36 @@ done:
  
  /***********************************************************************
   *              ValidatePixelShader (D3D8.@)
@@ -20,14 +20,14 @@ index a562c1c7e30..41f411c30a8 100644
 - * PARAMS
 - * toto       result?
   */
--HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto)
+-HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto)
 +HRESULT WINAPI ValidatePixelShader(DWORD *pixelshader, DWORD *reserved1, BOOL return_error, char **errors)
  {
 -  HRESULT ret;
 -  static BOOL warned;
 -
 -  if (TRACE_ON(d3d8) || !warned) {
--      FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto);
+-      FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto);
 -      warned = TRUE;
 -  }
 +    const char *message = "";
@@ -70,10 +70,10 @@ index a562c1c7e30..41f411c30a8 100644
  
  void d3d8_resource_cleanup(struct d3d8_resource *resource)
 diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
-index 1368ce3a2cf..9ff3be71776 100644
+index 6b9e70d..4a4c0e5 100644
 --- a/dlls/d3d8/tests/device.c
 +++ b/dlls/d3d8/tests/device.c
-@@ -51,7 +51,7 @@ struct device_desc
+@@ -52,7 +52,7 @@ struct device_desc
  static DEVMODEW registry_mode;
  
  static HRESULT (WINAPI *ValidateVertexShader)(DWORD *, DWORD *, DWORD *, BOOL, char **);
@@ -82,7 +82,7 @@ index 1368ce3a2cf..9ff3be71776 100644
  
  static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO);
  
-@@ -4296,33 +4296,39 @@ static void test_validate_ps(void)
+@@ -4427,33 +4427,39 @@ static void test_validate_ps(void)
          0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000,                         /* mul r0, t0, r0               */
          0x0000ffff,                                                             /* end                          */
      };
@@ -136,5 +136,5 @@ index 1368ce3a2cf..9ff3be71776 100644
  
  static void test_volume_get_container(void)
 -- 
-2.11.0
+1.9.1
 

patches/d3dx9_36-D3DXMatrixTransformation/definition

@@ -1 +0,0 @@
-Fixes: [33456] d3dx9_36: D3DXMatrixTransformation support NULL scaling matrix

patches/d3dx9_36-D3DXSHProjectCubeMap/0001-d3dx9_-Add-D3DXSHProjectCubeMap-stub.patch

@@ -0,0 +1,317 @@
+From a8d19eb67828f3c4f157f0734d0d22c47cc11882 Mon Sep 17 00:00:00 2001
+From: Andrey Gusev <andrey.goosev@gmail.com>
+Date: Mon, 17 Dec 2018 12:23:40 +1100
+Subject: [PATCH] d3dx9_*: Add D3DXSHProjectCubeMap stub
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284
+---
+ dlls/d3dx9_24/d3dx9_24.spec |  2 +-
+ dlls/d3dx9_25/d3dx9_25.spec |  2 +-
+ dlls/d3dx9_26/d3dx9_26.spec |  2 +-
+ dlls/d3dx9_27/d3dx9_27.spec |  2 +-
+ dlls/d3dx9_28/d3dx9_28.spec |  2 +-
+ dlls/d3dx9_29/d3dx9_29.spec |  2 +-
+ dlls/d3dx9_30/d3dx9_30.spec |  2 +-
+ dlls/d3dx9_31/d3dx9_31.spec |  2 +-
+ dlls/d3dx9_32/d3dx9_32.spec |  2 +-
+ dlls/d3dx9_33/d3dx9_33.spec |  2 +-
+ dlls/d3dx9_34/d3dx9_34.spec |  2 +-
+ dlls/d3dx9_35/d3dx9_35.spec |  2 +-
+ dlls/d3dx9_36/math.c        | 14 ++++++++++++++
+ dlls/d3dx9_37/d3dx9_37.spec |  2 +-
+ dlls/d3dx9_38/d3dx9_38.spec |  2 +-
+ dlls/d3dx9_39/d3dx9_39.spec |  2 +-
+ dlls/d3dx9_40/d3dx9_40.spec |  2 +-
+ dlls/d3dx9_41/d3dx9_41.spec |  2 +-
+ dlls/d3dx9_42/d3dx9_42.spec |  2 +-
+ dlls/d3dx9_43/d3dx9_43.spec |  2 +-
+ include/d3dx9math.h         |  1 +
+ 21 files changed, 34 insertions(+), 19 deletions(-)
+
+diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
+index 7002e2b..06fb3ca 100644
+--- a/dlls/d3dx9_24/d3dx9_24.spec
++++ b/dlls/d3dx9_24/d3dx9_24.spec
+@@ -256,7 +256,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
+index 3010005..e7b5f6b 100644
+--- a/dlls/d3dx9_25/d3dx9_25.spec
++++ b/dlls/d3dx9_25/d3dx9_25.spec
+@@ -256,7 +256,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
+index fe641a7..c4a6c9f 100644
+--- a/dlls/d3dx9_26/d3dx9_26.spec
++++ b/dlls/d3dx9_26/d3dx9_26.spec
+@@ -260,7 +260,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
+index fe641a7..c4a6c9f 100644
+--- a/dlls/d3dx9_27/d3dx9_27.spec
++++ b/dlls/d3dx9_27/d3dx9_27.spec
+@@ -260,7 +260,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
+index acbcf26..480396b 100644
+--- a/dlls/d3dx9_28/d3dx9_28.spec
++++ b/dlls/d3dx9_28/d3dx9_28.spec
+@@ -265,7 +265,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
+index acbcf26..480396b 100644
+--- a/dlls/d3dx9_29/d3dx9_29.spec
++++ b/dlls/d3dx9_29/d3dx9_29.spec
+@@ -265,7 +265,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
+index fdf5ee4..09014db 100644
+--- a/dlls/d3dx9_30/d3dx9_30.spec
++++ b/dlls/d3dx9_30/d3dx9_30.spec
+@@ -265,7 +265,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
+index ed842cd..3506942 100644
+--- a/dlls/d3dx9_31/d3dx9_31.spec
++++ b/dlls/d3dx9_31/d3dx9_31.spec
+@@ -262,7 +262,7 @@
+ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
+index af5624c..4d24919 100644
+--- a/dlls/d3dx9_32/d3dx9_32.spec
++++ b/dlls/d3dx9_32/d3dx9_32.spec
+@@ -267,7 +267,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
+index af5624c..4d24919 100644
+--- a/dlls/d3dx9_33/d3dx9_33.spec
++++ b/dlls/d3dx9_33/d3dx9_33.spec
+@@ -267,7 +267,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
+index af5624c..4d24919 100644
+--- a/dlls/d3dx9_34/d3dx9_34.spec
++++ b/dlls/d3dx9_34/d3dx9_34.spec
+@@ -267,7 +267,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
+index af5624c..4d24919 100644
+--- a/dlls/d3dx9_35/d3dx9_35.spec
++++ b/dlls/d3dx9_35/d3dx9_35.spec
+@@ -267,7 +267,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c
+index 8909c3c..bc1a7fc 100644
+--- a/dlls/d3dx9_36/math.c
++++ b/dlls/d3dx9_36/math.c
+@@ -3007,6 +3007,20 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in)
+     out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35];
+ }
+ 
++HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout)
++{
++    FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout);
++
++    if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER)
++        return D3DERR_INVALIDCALL;
++
++    *rout = 0.0f;
++    *gout = 0.0f;
++    *bout = 0.0f;
++
++    return D3D_OK;
++}
++
+ FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in)
+ {
+     FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36];
+diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
+index de8b12c..10395ff 100644
+--- a/dlls/d3dx9_37/d3dx9_37.spec
++++ b/dlls/d3dx9_37/d3dx9_37.spec
+@@ -269,7 +269,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
+index de8b12c..10395ff 100644
+--- a/dlls/d3dx9_38/d3dx9_38.spec
++++ b/dlls/d3dx9_38/d3dx9_38.spec
+@@ -269,7 +269,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
+index de8b12c..10395ff 100644
+--- a/dlls/d3dx9_39/d3dx9_39.spec
++++ b/dlls/d3dx9_39/d3dx9_39.spec
+@@ -269,7 +269,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
+index de8b12c..10395ff 100644
+--- a/dlls/d3dx9_40/d3dx9_40.spec
++++ b/dlls/d3dx9_40/d3dx9_40.spec
+@@ -269,7 +269,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
+index de8b12c..10395ff 100644
+--- a/dlls/d3dx9_41/d3dx9_41.spec
++++ b/dlls/d3dx9_41/d3dx9_41.spec
+@@ -269,7 +269,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
+index c3bd9d5..5524bd0 100644
+--- a/dlls/d3dx9_42/d3dx9_42.spec
++++ b/dlls/d3dx9_42/d3dx9_42.spec
+@@ -262,7 +262,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
+index c3bd9d5..5524bd0 100644
+--- a/dlls/d3dx9_43/d3dx9_43.spec
++++ b/dlls/d3dx9_43/d3dx9_43.spec
+@@ -262,7 +262,7 @@
+ @ stub D3DXSHMultiply6(ptr ptr ptr)
+ @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
+ @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
+-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+ @ stdcall D3DXSHRotate(ptr long ptr ptr)
+ @ stdcall D3DXSHRotateZ(ptr long float ptr)
+ @ stdcall D3DXSHScale(ptr long ptr float)
+diff --git a/include/d3dx9math.h b/include/d3dx9math.h
+index bf03ca3..9296400d 100644
+--- a/include/d3dx9math.h
++++ b/include/d3dx9math.h
+@@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA
+ FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b);
+ FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b);
+ FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b);
++HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout);
+ FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in);
+ FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in);
+ FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);
+-- 
+1.9.1
+

patches/d3dx9_36-D3DXSHProjectCubeMap/definition

@@ -0,0 +1 @@
+Fixes: [46284] Add D3DXSHProjectCubeMap stub

patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch

@@ -1,33 +1,33 @@
-From f9702dad952fdc873a72b4a2781bf2171ff3f814 Mon Sep 17 00:00:00 2001
+From 4e692713dface59a0e717e4ab9e2abf6b8223995 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:29:30 +0100
-Subject: d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds
- file.
+Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
+ texture to dds file.
 
 ---
- dlls/d3dx9_36/d3dx9_private.h    |  2 ++
- dlls/d3dx9_36/surface.c          | 62 ++++++++++++++++++++++++++++++++++++++++
- dlls/d3dx9_36/texture.c          |  5 +---
+ dlls/d3dx9_36/d3dx9_private.h |  2 ++
+ dlls/d3dx9_36/surface.c       | 62 +++++++++++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/texture.c       |  5 +---
  3 files changed, 65 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 79f3b76..41bed31 100644
+index 5a28f2e..158aae3 100644
 --- a/dlls/d3dx9_36/d3dx9_private.h
 +++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -97,6 +97,8 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d
-     const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
- HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data,
-     const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
+@@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock,
+         IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN;
+ HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock,
+         IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN;
 +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
 +    const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN;
  
  unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN;
  float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN;
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 58b676d..79e8d53 100644
+index f5dc799..e0d84fd 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -527,6 +527,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
+@@ -611,6 +611,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
      return D3D_OK;
  }
  
@@ -97,10 +97,10 @@ index 58b676d..79e8d53 100644
      const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
      const D3DXIMAGE_INFO *src_info)
 diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index 38349e2..5c06700 100644
+index e2dfab8..9f0e541 100644
 --- a/dlls/d3dx9_36/texture.c
 +++ b/dlls/d3dx9_36/texture.c
-@@ -1873,10 +1873,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
+@@ -1906,10 +1906,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
      if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
  
      if (file_format == D3DXIFF_DDS)
@@ -113,5 +113,5 @@ index 38349e2..5c06700 100644
      type = IDirect3DBaseTexture9_GetType(src_texture);
      switch (type)
 -- 
-2.6.4
+1.9.1
 

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

@@ -1,4 +1,4 @@
-From 30578b99bc059003a1223e2e9752bb07d449c34e Mon Sep 17 00:00:00 2001
+From 1c46cc796a20b263f708aebf5428e59408fea200 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       | 101 +++++++++++++++++++++++++++++++---
- 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 +-
@@ -26,10 +26,10 @@ Subject: [PATCH] d3dx9_36: add DXTn support
  dlls/d3dx9_41/Makefile.in     |   2 +-
  dlls/d3dx9_42/Makefile.in     |   2 +-
  dlls/d3dx9_43/Makefile.in     |   2 +-
- 22 files changed, 117 insertions(+), 32 deletions(-)
+ 22 files changed, 118 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
-index 482c92d64e2..d969a55b106 100644
+index 02e64d3..0484639 100644
 --- a/dlls/d3dx9_24/Makefile.in
 +++ b/dlls/d3dx9_24/Makefile.in
 @@ -1,6 +1,6 @@
@@ -38,10 +38,10 @@ index 482c92d64e2..d969a55b106 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
-index be4c76980e1..b232290d255 100644
+index 57ed1da..3461967 100644
 --- a/dlls/d3dx9_25/Makefile.in
 +++ b/dlls/d3dx9_25/Makefile.in
 @@ -1,6 +1,6 @@
@@ -50,10 +50,10 @@ index be4c76980e1..b232290d255 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
-index c5e9e85bfb7..525009d292c 100644
+index 04d9ba4..291daf3 100644
 --- a/dlls/d3dx9_26/Makefile.in
 +++ b/dlls/d3dx9_26/Makefile.in
 @@ -1,6 +1,6 @@
@@ -62,10 +62,10 @@ index c5e9e85bfb7..525009d292c 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
-index ee7f0e2449c..da98482d243 100644
+index faec9b2..5a52b60 100644
 --- a/dlls/d3dx9_27/Makefile.in
 +++ b/dlls/d3dx9_27/Makefile.in
 @@ -1,6 +1,6 @@
@@ -74,10 +74,10 @@ index ee7f0e2449c..da98482d243 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
-index 094420013d0..d50e035853f 100644
+index b8aad93..8eecbc0 100644
 --- a/dlls/d3dx9_28/Makefile.in
 +++ b/dlls/d3dx9_28/Makefile.in
 @@ -1,6 +1,6 @@
@@ -86,10 +86,10 @@ index 094420013d0..d50e035853f 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
-index 88cb110ff5e..cfc1a150349 100644
+index 29c76c4..0299369 100644
 --- a/dlls/d3dx9_29/Makefile.in
 +++ b/dlls/d3dx9_29/Makefile.in
 @@ -1,6 +1,6 @@
@@ -98,10 +98,10 @@ index 88cb110ff5e..cfc1a150349 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
-index 6ab2ff24514..726c92e8fd5 100644
+index 810edc9..7bdc074 100644
 --- a/dlls/d3dx9_30/Makefile.in
 +++ b/dlls/d3dx9_30/Makefile.in
 @@ -1,6 +1,6 @@
@@ -110,10 +110,10 @@ index 6ab2ff24514..726c92e8fd5 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
-index 3d44da147dc..201430127ce 100644
+index fce2b53..0ef9c91 100644
 --- a/dlls/d3dx9_31/Makefile.in
 +++ b/dlls/d3dx9_31/Makefile.in
 @@ -1,6 +1,6 @@
@@ -122,10 +122,10 @@ index 3d44da147dc..201430127ce 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
-index 37cc2797afd..442258d8f31 100644
+index ad53b26..25e2a1c 100644
 --- a/dlls/d3dx9_32/Makefile.in
 +++ b/dlls/d3dx9_32/Makefile.in
 @@ -1,6 +1,6 @@
@@ -134,10 +134,10 @@ index 37cc2797afd..442258d8f31 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
-index 5b03ec134dd..cc98ed25016 100644
+index 318ddce..a6ec6db 100644
 --- a/dlls/d3dx9_33/Makefile.in
 +++ b/dlls/d3dx9_33/Makefile.in
 @@ -1,6 +1,6 @@
@@ -146,10 +146,10 @@ index 5b03ec134dd..cc98ed25016 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
-index b7f9c46d5e7..4862fe94af1 100644
+index 451a371..ff79b58 100644
 --- a/dlls/d3dx9_34/Makefile.in
 +++ b/dlls/d3dx9_34/Makefile.in
 @@ -1,6 +1,6 @@
@@ -158,10 +158,10 @@ index b7f9c46d5e7..4862fe94af1 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
-index 9c196ea038b..3f529c99154 100644
+index 978d0b0..aa8ea65 100644
 --- a/dlls/d3dx9_35/Makefile.in
 +++ b/dlls/d3dx9_35/Makefile.in
 @@ -1,6 +1,6 @@
@@ -170,10 +170,10 @@ index 9c196ea038b..3f529c99154 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
-index da8098dd8d1..166031e6a4e 100644
+index 847edec..1427571 100644
 --- a/dlls/d3dx9_36/Makefile.in
 +++ b/dlls/d3dx9_36/Makefile.in
 @@ -1,7 +1,7 @@
@@ -182,11 +182,11 @@ index da8098dd8d1..166031e6a4e 100644
  IMPORTLIB = d3dx9
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ DELAYIMPORTS = windowscodecs
  
  C_SRCS = \
- 	animation.c \
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 7d48cc6b132..85db27acadf 100644
+index d236feb..3c308d3 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
 @@ -27,6 +27,8 @@
@@ -197,8 +197,8 @@ index 7d48cc6b132..85db27acadf 100644
 +
  WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
  
- 
-@@ -1715,6 +1717,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
+ 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
      }
  }
  
@@ -223,14 +223,12 @@ index 7d48cc6b132..85db27acadf 100644
  /************************************************************
   * D3DXLoadSurfaceFromMemory
   *
-@@ -1753,12 +1773,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
-         DWORD filter, D3DCOLOR color_key)
+@@ -1915,10 +1935,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
  {
      const struct pixel_format_desc *srcformatdesc, *destformatdesc;
+     IDirect3DSurface9 *surface;
 +    void *tmp_src_memory = NULL, *tmp_dst_memory = NULL;
 +    dxtn_conversion_func pre_convert = NULL, post_convert = NULL;
-     IDirect3DSurface9 *surface = dst_surface;
-     IDirect3DDevice9 *device;
      D3DSURFACE_DESC surfdesc;
      D3DLOCKED_RECT lockrect;
      struct volume src_size, dst_size;
@@ -239,7 +237,7 @@ index 7d48cc6b132..85db27acadf 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,
-@@ -1856,18 +1878,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1999,18 +2021,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
      }
      else /* Stretching or format conversion. */
      {
@@ -254,8 +252,8 @@ index 7d48cc6b132..85db27acadf 100644
 +                (!post_convert && !is_conversion_to_supported(destformatdesc)))
          {
              FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format);
-             hr = E_NOTIMPL;
-             goto done;
+             unlock_surface(dst_surface, &lockrect, surface, FALSE);
+             return E_NOTIMPL;
          }
  
 +        /* handle pre-conversion */
@@ -309,7 +307,7 @@ index 7d48cc6b132..85db27acadf 100644
          }
          else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */
          {
-@@ -1876,12 +1945,22 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -2019,12 +2088,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. */
@@ -326,33 +324,27 @@ index 7d48cc6b132..85db27acadf 100644
 +                    WINED3DFMT_B8G8R8A8_UNORM, dst_size.width, dst_size.height))
 +            {
 +                hr = E_FAIL;
-+                goto done;
 +            }
          }
      }
  
--    hr = D3D_OK;
- done:
-     IDirect3DSurface9_UnlockRect(surface);
-     if (surface != dst_surface)
-@@ -1893,6 +1972,12 @@ done:
-             IDirect3DDevice9_Release(device);
-         }
-         IDirect3DSurface9_Release(surface);
+-    return unlock_surface(dst_surface, &lockrect, surface, TRUE);
++done:
++    if (pre_convert)
++        HeapFree(GetProcessHeap(), 0, tmp_src_memory);
++    if (post_convert)
++        HeapFree(GetProcessHeap(), 0, tmp_dst_memory);
 +
-+        if (pre_convert)
-+            HeapFree(GetProcessHeap(), 0, tmp_src_memory);
-+        if (post_convert)
-+            HeapFree(GetProcessHeap(), 0, tmp_dst_memory);
-+        IDirect3DSurface9_UnlockRect(dst_surface);
-     }
++    unlock_surface(dst_surface, &lockrect, surface, TRUE);
++    return hr;
+ }
  
-     return hr;
+ /************************************************************
 diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
-index f153cd92c65..9cdf60a54c7 100644
+index 2c83dc2..95b64a0 100644
 --- a/dlls/d3dx9_36/tests/surface.c
 +++ b/dlls/d3dx9_36/tests/surface.c
-@@ -1199,7 +1199,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1224,7 +1224,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);
@@ -361,7 +353,7 @@ index f153cd92c65..9cdf60a54c7 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1225,7 +1225,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1250,7 +1250,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);
@@ -370,7 +362,7 @@ index f153cd92c65..9cdf60a54c7 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1238,10 +1238,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1263,10 +1263,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);
@@ -384,7 +376,7 @@ index f153cd92c65..9cdf60a54c7 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 ab790a4d5c4..51382c7109a 100644
+index a05068c..e5b29d3 100644
 --- a/dlls/d3dx9_37/Makefile.in
 +++ b/dlls/d3dx9_37/Makefile.in
 @@ -1,6 +1,6 @@
@@ -393,10 +385,10 @@ index ab790a4d5c4..51382c7109a 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
-index 6125c2da678..f6257cbdec7 100644
+index b092e62..0a37204 100644
 --- a/dlls/d3dx9_38/Makefile.in
 +++ b/dlls/d3dx9_38/Makefile.in
 @@ -1,6 +1,6 @@
@@ -405,10 +397,10 @@ index 6125c2da678..f6257cbdec7 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
-index d97a787c67a..a68ee9f3ad5 100644
+index 4d17120..d0e2cc9 100644
 --- a/dlls/d3dx9_39/Makefile.in
 +++ b/dlls/d3dx9_39/Makefile.in
 @@ -1,6 +1,6 @@
@@ -417,10 +409,10 @@ index d97a787c67a..a68ee9f3ad5 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
-index 36c5a210cdb..7f2cfe1a47c 100644
+index 59f6f3d..0a0d36b 100644
 --- a/dlls/d3dx9_40/Makefile.in
 +++ b/dlls/d3dx9_40/Makefile.in
 @@ -1,6 +1,6 @@
@@ -429,10 +421,10 @@ index 36c5a210cdb..7f2cfe1a47c 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
-index d4552cf608e..c5c3ab1aae5 100644
+index f18443a..f477a20 100644
 --- a/dlls/d3dx9_41/Makefile.in
 +++ b/dlls/d3dx9_41/Makefile.in
 @@ -1,6 +1,6 @@
@@ -441,10 +433,10 @@ index d4552cf608e..c5c3ab1aae5 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
-index 5806fce66c6..e9a8e89da5f 100644
+index cb142b7..4d93a84 100644
 --- a/dlls/d3dx9_42/Makefile.in
 +++ b/dlls/d3dx9_42/Makefile.in
 @@ -1,6 +1,6 @@
@@ -453,10 +445,10 @@ index 5806fce66c6..e9a8e89da5f 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
-index 72ba8b4c1e0..33185bf7a8a 100644
+index 3e6111a..5812d03 100644
 --- a/dlls/d3dx9_43/Makefile.in
 +++ b/dlls/d3dx9_43/Makefile.in
 @@ -1,6 +1,6 @@
@@ -465,8 +457,8 @@ index 72ba8b4c1e0..33185bf7a8a 100644
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
  PARENTSRC = ../d3dx9_36
+ DELAYIMPORTS = windowscodecs
  
- C_SRCS = \
 -- 
-2.19.1
+1.9.1
 

patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch

@@ -1,4 +1,4 @@
-From 8397d7b777db5ef44825b639d4009f6e372ca9ad Mon Sep 17 00:00:00 2001
+From 1b741a4b555ad98a769fdb9fa659134b83293a4e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Mar 2016 22:22:42 +0100
 Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@@ -12,10 +12,10 @@ Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
  5 files changed, 106 insertions(+)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 8247214..d70f2e2 100644
+index fad185e..ebf91b3 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
-@@ -1544,6 +1544,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
+@@ -1543,6 +1543,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
      caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
      caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
  
@@ -25,10 +25,10 @@ index 8247214..d70f2e2 100644
  
      if(DriverCaps)
 diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
-index 1f93a97..9a862e1 100644
+index 59d07b7..5d81abb 100644
 --- a/dlls/ddraw/tests/ddraw1.c
 +++ b/dlls/ddraw/tests/ddraw1.c
-@@ -11543,6 +11543,31 @@ static void test_execute_data(void)
+@@ -11581,6 +11581,31 @@ static void test_execute_data(void)
      DestroyWindow(window);
  }
  
@@ -60,7 +60,7 @@ index 1f93a97..9a862e1 100644
  static void test_viewport(void)
  {
      static struct
-@@ -12030,6 +12055,7 @@ START_TEST(ddraw1)
+@@ -12068,6 +12093,7 @@ START_TEST(ddraw1)
      test_depth_readback();
      test_clear();
      test_enum_surfaces();
@@ -69,10 +69,10 @@ index 1f93a97..9a862e1 100644
      test_viewport();
      test_find_device();
 diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
-index 95cdf8b..d317cc1 100644
+index 8b9b249..b9b964d 100644
 --- a/dlls/ddraw/tests/ddraw2.c
 +++ b/dlls/ddraw/tests/ddraw2.c
-@@ -12805,6 +12805,31 @@ static void test_enum_surfaces(void)
+@@ -12862,6 +12862,31 @@ static void test_enum_surfaces(void)
      IDirectDraw2_Release(ddraw);
  }
  
@@ -104,7 +104,7 @@ index 95cdf8b..d317cc1 100644
  static void test_viewport(void)
  {
      static struct
-@@ -13321,6 +13346,7 @@ START_TEST(ddraw2)
+@@ -13378,6 +13403,7 @@ START_TEST(ddraw2)
      test_depth_readback();
      test_clear();
      test_enum_surfaces();
@@ -113,11 +113,11 @@ index 95cdf8b..d317cc1 100644
      test_find_device();
      test_killfocus();
 diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
-index a62aaf0..e11ec0c 100644
+index 1c48418..306f233 100644
 --- a/dlls/ddraw/tests/ddraw4.c
 +++ b/dlls/ddraw/tests/ddraw4.c
-@@ -15318,6 +15318,31 @@ static void test_killfocus(void)
-     UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL));
+@@ -15472,6 +15472,31 @@ static void test_sysmem_draw(void)
+     DestroyWindow(window);
  }
  
 +static void test_caps(void)
@@ -148,7 +148,7 @@ index a62aaf0..e11ec0c 100644
  START_TEST(ddraw4)
  {
      DDDEVICEIDENTIFIER identifier;
-@@ -15443,6 +15468,7 @@ START_TEST(ddraw4)
+@@ -15597,6 +15622,7 @@ START_TEST(ddraw4)
      test_depth_readback();
      test_clear();
      test_enum_surfaces();
@@ -157,11 +157,11 @@ index a62aaf0..e11ec0c 100644
      test_find_device();
      test_killfocus();
 diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
-index 04048d4..ad4f63d 100644
+index a125200..da777d8 100644
 --- a/dlls/ddraw/tests/ddraw7.c
 +++ b/dlls/ddraw/tests/ddraw7.c
-@@ -15106,6 +15106,31 @@ static void test_killfocus(void)
-     UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL));
+@@ -15198,6 +15198,31 @@ static void test_sysmem_draw(void)
+     DestroyWindow(window);
  }
  
 +static void test_caps(void)
@@ -192,14 +192,14 @@ index 04048d4..ad4f63d 100644
  START_TEST(ddraw7)
  {
      DDDEVICEIDENTIFIER2 identifier;
-@@ -15243,6 +15268,7 @@ START_TEST(ddraw7)
+@@ -15335,6 +15360,7 @@ START_TEST(ddraw7)
      test_enum_surfaces();
      test_viewport();
      test_device_load();
 +    test_caps();
      test_color_vertex();
      test_killfocus();
- }
+     test_sysmem_draw();
 -- 
 1.9.1