Release v5.1

The parameter checks in d3d11 are not particularly necessary; there is no known application that passes NULL here, and such an application would be easy to detect.

The additional reference to the UAV resource need not be taken, since wined3d_cs_exec_copy_uav_counter() never touches the resource (only the UAV itself).

The offset parameter check is not borne out by native Windows; indeed passing an invalid offset leaves the device in a broken state.

patches/Staging/0004-loader-Add-commandline-option-check-libs.patch

@@ -1,21 +1,21 @@
-From 9618572cf2eace39198fb83b747a70d1865015e3 Mon Sep 17 00:00:00 2001
+From 540ee9ebdee96f7c67224bfae699375c8cb4c90c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 May 2014 19:50:51 +0200
 Subject: [PATCH] loader: Add commandline option --check-libs.
 
 ---
  include/wine/library.h |   2 +
- libs/wine/config.c     | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
- libs/wine/loader.c     |  36 ++++++++++++++
+ libs/wine/config.c     | 124 +++++++++++++++++++++++++++++++++++++++++
+ libs/wine/loader.c     |  36 ++++++++++++
  libs/wine/wine.map     |   2 +
- loader/main.c          |  50 +++++++++++++++++++-
+ loader/main.c          |  50 ++++++++++++++++-
  5 files changed, 213 insertions(+), 1 deletion(-)
 
 diff --git a/include/wine/library.h b/include/wine/library.h
-index fae73fe..7395a11 100644
+index 511bf4722a0..557cec20cf8 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
-@@ -40,6 +40,7 @@ extern "C" {
+@@ -44,6 +44,7 @@ extern "C" {
  extern const char *wine_get_build_dir(void);
  extern const char *wine_get_config_dir(void);
  extern const char *wine_get_data_dir(void);
@@ -23,7 +23,7 @@ index fae73fe..7395a11 100644
  extern const char *wine_get_server_dir(void);
  extern const char *wine_get_user_name(void);
  extern const char *wine_get_version(void);
-@@ -52,6 +53,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
+@@ -56,6 +57,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
  
  typedef void (*load_dll_callback_t)( void *, const char * );
  
@@ -32,10 +32,10 @@ index fae73fe..7395a11 100644
  extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
  extern int wine_dlclose( void *handle, char *error, size_t errorsize );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 5da6263..6cedfb7 100644
+index 5b66c063db6..e0988513e14 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -488,6 +488,130 @@ const char *wine_get_build_dir(void)
+@@ -470,6 +470,130 @@ const char *wine_get_build_dir(void)
      return build_dir;
  }
  
@@ -167,13 +167,14 @@ index 5da6263..6cedfb7 100644
  const char *wine_get_server_dir(void)
  {
 diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index 649aa22..367dde3 100644
+index 2a569f5b739..5f10c3f9d3e 100644
 --- a/libs/wine/loader.c
 +++ b/libs/wine/loader.c
-@@ -1064,6 +1064,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
+@@ -1072,6 +1072,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
+     return ret;
  }
  
- /***********************************************************************
++/***********************************************************************
 + *      wine_dladdr
 + */
 +int wine_dladdr( void *addr, void *info, char *error, size_t errorsize )
@@ -209,23 +210,22 @@ index 649aa22..367dde3 100644
 +#endif
 +}
 +
-+/***********************************************************************
+ /***********************************************************************
   *		wine_dlsym
   */
- void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize )
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 7cb2918..72ffed8 100644
+index 5edee0d9235..8e3382168d5 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
-@@ -65,6 +65,7 @@ WINE_1.0
-     wine_dbg_sprintf;
-     wine_dbgstr_an;
-     wine_dbgstr_wn;
+@@ -16,6 +16,7 @@ WINE_1.0
+     wine_cp_wcstombs;
+     wine_cpsymbol_mbstowcs;
+     wine_cpsymbol_wcstombs;
 +    wine_dladdr;
      wine_dlclose;
      wine_dll_enum_load_path;
-     wine_dll_get_owner;
-@@ -85,6 +86,7 @@ WINE_1.0
+     wine_dll_set_callback;
+@@ -32,6 +33,7 @@ WINE_1.0
      wine_get_es;
      wine_get_fs;
      wine_get_gs;
@@ -234,7 +234,7 @@ index 7cb2918..72ffed8 100644
      wine_get_sortkey;
      wine_get_ss;
 diff --git a/loader/main.c b/loader/main.c
-index f662912..a2dc40c 100644
+index f6629128de1..a2dc40c51cc 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -36,6 +36,12 @@
@@ -309,5 +309,5 @@ index f662912..a2dc40c 100644
  
  
 -- 
-1.9.1
+2.17.1
 

patches/advapi32-LsaLookupSids/0002-advapi32-Prepend-a-hidden-LSA_TRUST_INFORMATION-in-L.patch

@@ -1,47 +0,0 @@
-From 246cb6b72666dcb77fb2f553d318d7dabbe8811d Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 7 Apr 2015 13:18:47 +0800
-Subject: advapi32: Prepend a hidden LSA_TRUST_INFORMATION in LsaLookupSids to
- avoid crash when Domains[-1] incorrectly accessed by application. (try 2)
-
----
- dlls/advapi32/lsa.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 69c29c5..dfe25b3 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -488,14 +488,17 @@ NTSTATUS WINAPI LsaLookupSids(
-     if (!(*Names = heap_alloc(name_fullsize))) return STATUS_NO_MEMORY;
-     /* maximum count of stored domain infos is Count, allocate it like that cause really needed
-        count could only be computed after sid data is retrieved */
--    domain_fullsize = sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*Count;
-+    domain_fullsize = sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION) * (Count + 1);
-     if (!(*ReferencedDomains = heap_alloc(domain_fullsize)))
-     {
-         heap_free(*Names);
-         return STATUS_NO_MEMORY;
-     }
-     (*ReferencedDomains)->Entries = 0;
--    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
-+    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains +
-+                                    sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
-+    (*ReferencedDomains)->Domains[-1].Sid = NULL;
-+    RtlInitUnicodeStringEx(&(*ReferencedDomains)->Domains[-1].Name, NULL);
- 
-     /* Get full names data length and full length needed to store domain name and SID */
-     for (i = 0; i < Count; i++)
-@@ -555,7 +558,8 @@ NTSTATUS WINAPI LsaLookupSids(
- 
-     *ReferencedDomains = heap_realloc(*ReferencedDomains, domain_fullsize);
-     /* fix pointer after reallocation */
--    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
-+    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains +
-+                                    sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
-     domain_data = (char*)(*ReferencedDomains)->Domains + sizeof(LSA_TRUST_INFORMATION)*Count;
- 
-     mapped = 0;
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/0003-advapi32-Prepend-a-hidden-LSA_TRUST_INFORMATION-in-L.patch

@@ -1,39 +0,0 @@
-From ce254ac3659e0c040136341d035629f99ec6d1ea Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 7 Apr 2015 13:19:06 +0800
-Subject: advapi32: Prepend a hidden LSA_TRUST_INFORMATION in LsaLookupNames2
- to avoid crash when Domains[-1] incorrectly accessed by application. (try 2)
-
----
- dlls/advapi32/lsa.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index dfe25b3..258b8ca 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -404,14 +404,18 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count,
-     sid = (SID *)(*sids + count);
- 
-     /* use maximum domain count */
--    if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*count +
--                                sid_size_total + domainname_size_total*sizeof(WCHAR))))
-+    if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION) * (count + 1) +
-+                                sid_size_total + domainname_size_total * sizeof(WCHAR))))
-     {
-         heap_free(*sids);
-         return STATUS_NO_MEMORY;
-     }
-     (*domains)->Entries = 0;
--    (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
-+    (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains +
-+                          sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
-+    (*domains)->Domains[-1].Sid = NULL;
-+    RtlInitUnicodeStringEx(&(*domains)->Domains[-1].Name, NULL);
-+
-     domain_data = (char*)(*domains)->Domains + sizeof(LSA_TRUST_INFORMATION)*count;
- 
-     domain.Buffer = heap_alloc(domain_size_max*sizeof(WCHAR));
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/0004-advapi32-Fallback-to-Sid-string-when-LookupAccountSi.patch

@@ -1,68 +0,0 @@
-From 77d43d721793edda9b419f7426442a35f0cb5918 Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 7 Apr 2015 11:23:34 +0800
-Subject: advapi32: Fallback to Sid string when LookupAccountSid fails.
-
----
- dlls/advapi32/lsa.c | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 1b270a80829..b8dedbd6d58 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -29,6 +29,7 @@
- #include "winbase.h"
- #include "winreg.h"
- #include "winternl.h"
-+#include "sddl.h"
- #include "advapi32_misc.h"
- 
- #include "wine/debug.h"
-@@ -562,6 +563,21 @@ NTSTATUS WINAPI LsaLookupSids(
-                 domain.MaximumLength = sizeof(WCHAR);
-             }
-         }
-+        else
-+        {
-+            WCHAR *strsid = NULL;
-+
-+            if (ConvertSidToStringSidW(Sids[i], &strsid))
-+            {
-+                name_size = strlenW(strsid) + 1;
-+
-+                (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR);
-+                (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR);
-+                name_fullsize += (*Names)[i].Name.MaximumLength;
-+
-+                LocalFree(strsid);
-+            }
-+        }
-     }
- 
-     /* now we have full length needed for both */
-@@ -605,6 +621,21 @@ NTSTATUS WINAPI LsaLookupSids(
-             (*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data);
-             heap_free(domain.Buffer);
-         }
-+        else
-+        {
-+            WCHAR *strsid = NULL;
-+
-+            if (ConvertSidToStringSidW(Sids[i], &strsid))
-+            {
-+                name_size = strlenW(strsid) + 1;
-+                mapped++;
-+
-+                (*Names)[i].Name.Buffer = name_buffer;
-+                memcpy((*Names)[i].Name.Buffer, strsid, name_size * sizeof(WCHAR));
-+
-+                LocalFree(strsid);
-+            }
-+        }
- 
-         name_buffer += name_size;
-     }
--- 
-2.11.0
-

patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch

@@ -1,56 +0,0 @@
-From 486ec8b5ea1b39195d92cfdbfe3a334280780a14 Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 28 Apr 2015 23:00:08 +0800
-Subject: [PATCH] advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
-
----
- dlls/advapi32/security.c       | 7 +++++--
- dlls/advapi32/tests/security.c | 4 ++--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index a7707f15d39..73c1f054d5c 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -187,7 +187,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
- static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 };
- static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 };
- static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 };
--static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 };
-+static const WCHAR None[] = { 'N','o','n','e',0 };
- static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 };
- static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 };
- static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 };
-@@ -1185,7 +1185,10 @@ LookupAccountSidW(
-                             ac = Domain_Admins;
-                             break;
-                         case DOMAIN_GROUP_RID_USERS:
--                            ac = Domain_Users;
-+                            /* MSDN says the name of DOMAIN_GROUP_RID_USERS is Domain Users,
-+                             * tests show that MSDN seems to be wrong. */
-+                            ac = None;
-+                            use = 2;
-                             break;
-                         case DOMAIN_GROUP_RID_GUESTS:
-                             ac = Domain_Guests;
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 5f65ed385dd..a9d745cfe39 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -3003,11 +3003,11 @@ static void test_process_security(void)
-     dom_size = sizeof(domain);
-     ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
-     ok(ret, "LookupAccountSid failed with %d\n", ret);
--    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
-+    ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
-     if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH)
-         skip("Non-English locale (test with hardcoded 'None')\n");
-     else
--        todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
-+        ok(!strcmp(account, "None"), "expect None, got %s\n", account);
- 
-     res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
-     ok(!res, "Expected failure, got %d\n", res);
--- 
-2.17.1
-

patches/advapi32-LsaLookupSids/definition

@@ -1,3 +0,0 @@
-# Originally sent 2015 April by Qian Hong, apparently dropped off the list:
-# <https://www.winehq.org/pipermail/wine-patches/2015-April/138515.html>
-# Some of the patches were labeled as for Cygwin.

patches/cmd-launch-association/definition

@@ -1,2 +1 @@
 Fixes: [18154] cmd: Support for launching programs based on file association
-# Fixes: [36646]

patches/d2d1-ID2D1Factory1/0001-d2d1-Use-ID2D1Factory2-in-d2d_geometry.patch

@@ -1,211 +0,0 @@
-From 7be7006fb497490d61c283f419d73c13ef532ccf Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucian.poston@gmail.com>
-Date: Thu, 3 May 2018 00:38:06 -0700
-Subject: [PATCH] d2d1: Use ID2D1Factory2 in d2d_geometry
-
-https://bugs.winehq.org/show_bug.cgi?id=44052
-
-Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
----
- dlls/d2d1/d2d1_private.h | 10 +++++-----
- dlls/d2d1/factory.c      |  8 ++++----
- dlls/d2d1/geometry.c     | 38 +++++++++++++++++++++++++++-----------
- 3 files changed, 36 insertions(+), 20 deletions(-)
-
-diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
-index 2e42d6d550..1cacb6c1a9 100644
---- a/dlls/d2d1/d2d1_private.h
-+++ b/dlls/d2d1/d2d1_private.h
-@@ -426,7 +426,7 @@ struct d2d_geometry
-     ID2D1Geometry ID2D1Geometry_iface;
-     LONG refcount;
- 
--    ID2D1Factory *factory;
-+    ID2D1Factory2 *factory;
- 
-     D2D_MATRIX_3X2_F transform;
- 
-@@ -496,12 +496,12 @@ struct d2d_geometry
-     } u;
- };
- 
--void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory) DECLSPEC_HIDDEN;
-+void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory) DECLSPEC_HIDDEN;
- HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry,
--        ID2D1Factory *factory, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN;
--void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
-+        ID2D1Factory2 *factory, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN;
-+void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory,
-         ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN;
--HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
-+HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory,
-         D2D1_FILL_MODE fill_mode, ID2D1Geometry **src_geometries, unsigned int geometry_count) DECLSPEC_HIDDEN;
- struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN;
- 
-diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
-index 48a2efb96b..a1bc6dd296 100644
---- a/dlls/d2d1/factory.c
-+++ b/dlls/d2d1/factory.c
-@@ -138,7 +138,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor
-     if (!(object = heap_alloc_zero(sizeof(*object))))
-         return E_OUTOFMEMORY;
- 
--    if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect)))
-+    if (FAILED(hr = d2d_rectangle_geometry_init(object, iface, rect)))
-     {
-         WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr);
-         heap_free(object);
-@@ -179,7 +179,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 *
-     if (!(object = heap_alloc_zero(sizeof(*object))))
-         return E_OUTOFMEMORY;
- 
--    if (FAILED(hr = d2d_geometry_group_init(object, (ID2D1Factory *)iface, fill_mode, geometries, geometry_count)))
-+    if (FAILED(hr = d2d_geometry_group_init(object, iface, fill_mode, geometries, geometry_count)))
-     {
-         WARN("Failed to initialize geometry group, hr %#x.\n", hr);
-         heap_free(object);
-@@ -204,7 +204,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact
-     if (!(object = heap_alloc_zero(sizeof(*object))))
-         return E_OUTOFMEMORY;
- 
--    d2d_transformed_geometry_init(object, (ID2D1Factory *)iface, src_geometry, transform);
-+    d2d_transformed_geometry_init(object, iface, src_geometry, transform);
- 
-     TRACE("Created transformed geometry %p.\n", object);
-     *transformed_geometry = (ID2D1TransformedGeometry *)&object->ID2D1Geometry_iface;
-@@ -221,7 +221,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory2 *i
-     if (!(object = heap_alloc_zero(sizeof(*object))))
-         return E_OUTOFMEMORY;
- 
--    d2d_path_geometry_init(object, (ID2D1Factory *)iface);
-+    d2d_path_geometry_init(object, iface);
- 
-     TRACE("Created path geometry %p.\n", object);
-     *geometry = (ID2D1PathGeometry *)&object->ID2D1Geometry_iface;
-diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
-index 23049d015e..79850f1c20 100644
---- a/dlls/d2d1/geometry.c
-+++ b/dlls/d2d1/geometry.c
-@@ -2338,15 +2338,15 @@ static void d2d_geometry_cleanup(struct d2d_geometry *geometry)
-     heap_free(geometry->fill.bezier_vertices);
-     heap_free(geometry->fill.faces);
-     heap_free(geometry->fill.vertices);
--    ID2D1Factory_Release(geometry->factory);
-+    ID2D1Factory2_Release(geometry->factory);
- }
- 
--static void d2d_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
-+static void d2d_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory,
-         const D2D1_MATRIX_3X2_F *transform, const struct ID2D1GeometryVtbl *vtbl)
- {
-     geometry->ID2D1Geometry_iface.lpVtbl = vtbl;
-     geometry->refcount = 1;
--    ID2D1Factory_AddRef(geometry->factory = factory);
-+    ID2D1Factory2_AddRef(geometry->factory = factory);
-     geometry->transform = *transform;
- }
- 
-@@ -3035,10 +3035,14 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac
- static void STDMETHODCALLTYPE d2d_path_geometry_GetFactory(ID2D1PathGeometry *iface, ID2D1Factory **factory)
- {
-     struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
-+    HRESULT hr;
- 
-     TRACE("iface %p, factory %p.\n", iface, factory);
- 
--    ID2D1Factory_AddRef(*factory = geometry->factory);
-+    if (FAILED(hr = ID2D1Factory2_QueryInterface(geometry->factory, &IID_ID2D1Factory, (void **)factory)))
-+    {
-+        WARN("Unable to query ID2D1Factory interface %#x", hr);
-+    }
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry *iface,
-@@ -3486,7 +3490,7 @@ static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl =
-     d2d_path_geometry_GetFigureCount,
- };
- 
--void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory)
-+void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory)
- {
-     d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_path_geometry_vtbl);
-     geometry->u.path.ID2D1GeometrySink_iface.lpVtbl = &d2d_geometry_sink_vtbl;
-@@ -3551,10 +3555,14 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom
- static void STDMETHODCALLTYPE d2d_rectangle_geometry_GetFactory(ID2D1RectangleGeometry *iface, ID2D1Factory **factory)
- {
-     struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface);
-+    HRESULT hr;
- 
-     TRACE("iface %p, factory %p.\n", iface, factory);
- 
--    ID2D1Factory_AddRef(*factory = geometry->factory);
-+    if (FAILED(hr = ID2D1Factory2_QueryInterface(geometry->factory, &IID_ID2D1Factory, (void **)factory)))
-+    {
-+        WARN("Unable to query ID2D1Factory interface %#x", hr);
-+    }
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_GetBounds(ID2D1RectangleGeometry *iface,
-@@ -3774,7 +3782,7 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl =
-     d2d_rectangle_geometry_GetRect,
- };
- 
--HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect)
-+HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory, const D2D1_RECT_F *rect)
- {
-     struct d2d_face *f;
-     D2D1_POINT_2F *v;
-@@ -3895,10 +3903,14 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform
-         ID2D1Factory **factory)
- {
-     struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface);
-+    HRESULT hr;
- 
-     TRACE("iface %p, factory %p.\n", iface, factory);
- 
--    ID2D1Factory_AddRef(*factory = geometry->factory);
-+    if (FAILED(hr = ID2D1Factory2_QueryInterface(geometry->factory, &IID_ID2D1Factory, (void **)factory)))
-+    {
-+        WARN("Unable to query ID2D1Factory interface %#x", hr);
-+    }
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetBounds(ID2D1TransformedGeometry *iface,
-@@ -4091,7 +4103,7 @@ static const struct ID2D1TransformedGeometryVtbl d2d_transformed_geometry_vtbl =
-     d2d_transformed_geometry_GetTransform,
- };
- 
--void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
-+void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory,
-         ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform)
- {
-     struct d2d_geometry *src_impl;
-@@ -4167,11 +4179,15 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *if
- static void STDMETHODCALLTYPE d2d_geometry_group_GetFactory(ID2D1GeometryGroup *iface,
-         ID2D1Factory **factory)
- {
-+    HRESULT hr;
-     struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface);
- 
-     TRACE("iface %p, factory %p.\n", iface, factory);
- 
--    ID2D1Factory_AddRef(*factory = geometry->factory);
-+    if (FAILED(hr = ID2D1Factory2_QueryInterface(geometry->factory, &IID_ID2D1Factory, (void **)factory)))
-+    {
-+        WARN("Unable to query ID2D1Factory interface %#x", hr);
-+    }
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetBounds(ID2D1GeometryGroup *iface,
-@@ -4347,7 +4363,7 @@ static const struct ID2D1GeometryGroupVtbl d2d_geometry_group_vtbl =
-     d2d_geometry_group_GetSourceGeometries,
- };
- 
--HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
-+HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory,
-         D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, unsigned int geometry_count)
- {
-     unsigned int i;
--- 
-2.17.1
-

patches/d2d1-ID2D1Factory1/definition

@@ -1 +0,0 @@
-Fixes: [44052] - Add ID2D1Bitmap1/ID2D1Factory1 support

patches/d3dx9_36-D3DXCreateKeyframedAnimationSet/0001-d3dx9_36-Implement-D3DXCreateKeyframedAnimationSet.patch

@@ -1,4 +1,4 @@
-From 953112b017a794a550491f0008d599bd78b37dd0 Mon Sep 17 00:00:00 2001
+From a5e6898b23b0c163eebb4e88b48030fe19152116 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 1 Jul 2019 15:40:59 +1000
 Subject: [PATCH] d3dx9_36: Implement D3DXCreateKeyframedAnimationSet
@@ -11,7 +11,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  2 files changed, 394 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c
-index de6d69d383..4828f2b8d0 100644
+index de6d69d383..6b3a79b296 100644
 --- a/dlls/d3dx9_36/animation.c
 +++ b/dlls/d3dx9_36/animation.c
 @@ -468,14 +468,378 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets,
@@ -295,7 +295,7 @@ index de6d69d383..4828f2b8d0 100644
 +{
 +    struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface);
 +    FIXME("framed %p, name %s, num_scale_keys %u, num_rotation_keys %u, rotation_keys %p, num_translation_keys %u, scale_keys %p, "
-+           "rotation_keys %u, translation_keys %p, animation_index %p stub.\n",
++           "rotation_keys %p, translation_keys %p, animation_index %p stub.\n",
 +                framed, debugstr_a(name), num_scale_keys, num_rotation_keys, rotation_keys, num_translation_keys, scale_keys,
 +                rotation_keys, translation_keys, animation_index);
 +    return E_NOTIMPL;
@@ -397,7 +397,7 @@ index de6d69d383..4828f2b8d0 100644
 +    return D3D_OK;
  }
 diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index da9b80c578..b75e3fce85 100644
+index 3882bb404a..fc07ac1228 100644
 --- a/dlls/d3dx9_36/tests/mesh.c
 +++ b/dlls/d3dx9_36/tests/mesh.c
 @@ -11119,6 +11119,32 @@ static void D3DXCreateAnimationControllerTest(void)
@@ -442,5 +442,5 @@ index da9b80c578..b75e3fce85 100644
      test_get_decl_vertex_size();
      test_fvf_decl_conversion();
 -- 
-2.17.1
+2.24.1
 

patches/d3dx9_36-DrawText/0003-d3dx9_36-Support-NULL-terminated-strings-in-ID3DXFon.patch

@@ -1,4 +1,4 @@
-From 657fcdbe239c1c1b37414acb82df75a27f643f38 Mon Sep 17 00:00:00 2001
+From 0b6fc918564f580a9d62f14d76da83349075574f Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 4 Dec 2015 09:22:35 +1100
 Subject: [PATCH] d3dx9_36: Support NULL terminated strings in
@@ -7,14 +7,14 @@ Subject: [PATCH] d3dx9_36: Support NULL terminated strings in
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
  dlls/d3dx9_36/font.c       | 10 ++++++++--
- dlls/d3dx9_36/tests/core.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 52 insertions(+), 2 deletions(-)
+ dlls/d3dx9_36/tests/core.c |  1 -
+ 2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
-index 921dada..518a9dc 100644
+index ad1eb2383e4..83fec560fc5 100644
 --- a/dlls/d3dx9_36/font.c
 +++ b/dlls/d3dx9_36/font.c
-@@ -213,9 +213,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
+@@ -210,9 +210,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite,
      TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
              iface,  sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color);
  
@@ -28,7 +28,7 @@ index 921dada..518a9dc 100644
      countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0);
      stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR));
      if (stringW)
-@@ -238,9 +241,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
+@@ -235,9 +238,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
      TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
              iface,  sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color);
  
@@ -42,68 +42,6 @@ index 921dada..518a9dc 100644
      /* Strip terminating NULL characters */
      while (count > 0 && !string[count-1])
          count--;
-diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
-index 91e458b..b95c23f 100644
---- a/dlls/d3dx9_36/tests/core.c
-+++ b/dlls/d3dx9_36/tests/core.c
-@@ -306,6 +306,7 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device)
- static void test_ID3DXFont(IDirect3DDevice9 *device)
- {
-     static const WCHAR testW[] = {'t','e','s','t',0};
-+    static const char testA[] = "test";
-     static const struct
-     {
-         int font_height;
-@@ -637,6 +638,49 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
- 
-         ID3DXFont_Release(font);
-     }
-+
-+    /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */
-+    hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font);
-+    if (SUCCEEDED(hr)) {
-+        RECT rect;
-+        int height;
-+
-+        SetRect(&rect, 10, 10, 200, 200);
-+
-+        height = ID3DXFont_DrawTextA(font, NULL, testA, -2, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextA(font, NULL, testA, -1, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextA(font, NULL, testA, 0, &rect, 0, 0xFF00FF);
-+        ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
-+
-+        height = ID3DXFont_DrawTextA(font, NULL, testA, 1, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+if (0) { /* Causes a lockup on windows 7. */
-+        height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
-+}
-+
-+        height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF);
-+        ok(height == 0, "DrawTextW returned %d, expected 0.\n", height);
-+
-+        height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
-+
-+        ID3DXFont_Release(font);
-+    }
- }
- 
- static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)
 -- 
-1.9.1
+2.17.1
 

patches/d3dx9_36-DrawText/0004-d3dx9_36-ID3DXFont_DrawText-calc_rect-can-be-null.patch

@@ -1,19 +1,18 @@
-From 5b46372b7cc36f07d61bce63d5e3ae8aa766aa5a Mon Sep 17 00:00:00 2001
+From ccf7cfe0cd7cbaa15ee34b4390dd6c30cf7e84ec Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 5 Dec 2015 15:31:06 +1100
-Subject: d3dx9_36: ID3DXFont_DrawText calc_rect can be null
+Subject: [PATCH] d3dx9_36: ID3DXFont_DrawText calc_rect can be null
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- dlls/d3dx9_36/font.c       |  8 ++++++--
- dlls/d3dx9_36/tests/core.c | 18 ++++++++++++++++++
- 2 files changed, 24 insertions(+), 2 deletions(-)
+ dlls/d3dx9_36/font.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
-index 63aa828..2262db9 100644
+index 83fec560fc5..f5c704ebabb 100644
 --- a/dlls/d3dx9_36/font.c
 +++ b/dlls/d3dx9_36/font.c
-@@ -236,7 +236,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
+@@ -232,7 +232,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
          const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color)
  {
      struct d3dx_font *This = impl_from_ID3DXFont(iface);
@@ -22,7 +21,7 @@ index 63aa828..2262db9 100644
      INT height;
  
      TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n",
-@@ -252,11 +252,15 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
+@@ -248,11 +248,15 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
      while (count > 0 && !string[count-1])
          count--;
  
@@ -39,42 +38,6 @@ index 63aa828..2262db9 100644
          return height;
      }
  
-diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
-index c931260..1cf0db6 100644
---- a/dlls/d3dx9_36/tests/core.c
-+++ b/dlls/d3dx9_36/tests/core.c
-@@ -616,6 +616,15 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
-         height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF);
-         ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
- 
-+        height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, DT_CALCRECT, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF);
-+        ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
-+
- if (0) { /* Causes a lockup on windows 7. */
-         height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF);
-         ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
-@@ -633,6 +642,15 @@ if (0) { /* Causes a lockup on windows 7. */
-         height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF);
-         ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
- 
-+        height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF);
-+        ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
-+
-+        height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF);
-+        ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
-+
-         ID3DXFont_Release(font);
-     }
- }
 -- 
-2.6.2
+2.17.1
 

patches/d3dx9_36-Optimize_Inplace/definition

@@ -0,0 +1 @@
+Fixes: [48529] Avencast fails to launch

patches/ddraw-IDirect3DTexture2_Load/definition

@@ -1 +1 @@
-Fixes: Fix scaling behaviour of images and mipmap levels in IDirect3DTexture2_Load (needed for example by Prezzie Hunt)
+Fixes: [48537] Prezzie Hunt fails to launch

patches/ddraw-version-check/definition

@@ -6,5 +6,5 @@
 #   Resident Evil
 #   Carmageddon 2 demo
 #   The Sims Online
-Fixes: [19153] https://bugs.winehq.org/show_bug.cgi?id=19153
+Fixes: [19153] Resident Evil 1 fails to start (needs IDirect3D3::EnumDevices() to return a device named "RGB Emulation")
 Depends: ddraw-Device_Caps

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

@@ -1,14 +1,15 @@
-From 87860f6a1666321684e9dd5e7553a40e1656a9b4 Mon Sep 17 00:00:00 2001
+From 75add3c0c65775eb3fa825aafbe46373c0bd08f1 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.
+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
+index c7e585c50f4..84a41996700 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
 @@ -893,8 +893,15 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
@@ -18,7 +19,7 @@ index 0c9432698ae..00b97bd24bd 100644
 -        if (IsEqualGUID(&This->guid, &lpdiaf->rgoAction[i].guidInstance))
 +    {
 +        if (IsEqualGUID(&This->guid, &lpdiaf->rgoAction[i].guidInstance) ||
-+                (IsEqualGUID(&IID_NULL, &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 */) ))
 +        {
@@ -69,5 +70,5 @@ index 0c9432698ae..00b97bd24bd 100644
      IDirectInputDevice8_SetDataFormat(iface, &data_format);
  
 -- 
-2.17.1
+2.24.1
 

patches/directmanipulation-new-dll/0001-include-Add-directmanipulation.idl.patch

@@ -1,136 +0,0 @@
-From c61d77e4a22c35890ac4cc789a879d6a70a942e2 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 17 Jul 2019 08:17:16 +1000
-Subject: [PATCH 1/6] include: Add directmanipulation.idl
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- include/Makefile.in            |   1 +
- include/directmanipulation.idl | 103 +++++++++++++++++++++++++++++++++
- 2 files changed, 104 insertions(+)
- create mode 100644 include/directmanipulation.idl
-
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 69135879a9..a7fd4dc929 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -199,6 +199,7 @@ SOURCES = \
- 	dimm.idl \
- 	dinput.h \
- 	dinputd.h \
-+	directmanipulation.idl \
- 	dispdib.h \
- 	dispex.idl \
- 	dlgs.h \
-diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl
-new file mode 100644
-index 0000000000..9dc2366cc3
---- /dev/null
-+++ b/include/directmanipulation.idl
-@@ -0,0 +1,103 @@
-+/*
-+ * Copyright 2019 Alistair Leslie-Hughes
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+import "oaidl.idl";
-+import "ocidl.idl";
-+
-+cpp_quote("#if 0")
-+typedef void* HWND;
-+cpp_quote("#endif")
-+
-+typedef enum DIRECTMANIPULATION_HITTEST_TYPE
-+{
-+    DIRECTMANIPULATION_HITTEST_TYPE_ASYNCHRONOUS     = 0x00000000,
-+    DIRECTMANIPULATION_HITTEST_TYPE_SYNCHRONOUS      = 0x00000001,
-+    DIRECTMANIPULATION_HITTEST_TYPE_AUTO_SYNCHRONOUS = 0x00000002
-+} DIRECTMANIPULATION_HITTEST_TYPE;
-+
-+[
-+    local,
-+    object,
-+    uuid(fb759dba-6f4c-4c01-874e-19c8a05907f9),
-+    pointer_default(unique)
-+]
-+interface IDirectManipulationFrameInfoProvider : IUnknown
-+{
-+    HRESULT GetNextFrameInfo([out] ULONGLONG *time, [out] ULONGLONG *process, [out] ULONGLONG *composition);
-+}
-+
-+[
-+    local,
-+    object,
-+    uuid(fbf5d3b4-70c7-4163-9322-5a6f660d6fbc),
-+    pointer_default(unique)
-+]
-+interface IDirectManipulationManager : IUnknown
-+{
-+    HRESULT Activate([in] HWND window);
-+
-+    HRESULT Deactivate([in] HWND window);
-+
-+    HRESULT RegisterHitTestTarget([in] HWND window, [in] HWND hittest, [in] DIRECTMANIPULATION_HITTEST_TYPE type);
-+
-+    HRESULT ProcessInput([in] const MSG *msg, [out, retval] BOOL *handled);
-+
-+    HRESULT GetUpdateManager([in] REFIID riid, [out, iid_is(riid), retval,] void **obj);
-+
-+    HRESULT CreateViewport([in] IDirectManipulationFrameInfoProvider *frame, [in] HWND window,
-+                           [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
-+
-+    HRESULT CreateContent([in] IDirectManipulationFrameInfoProvider *frame, [in] REFCLSID clsid,
-+                          [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
-+}
-+
-+[
-+    local,
-+    object,
-+    uuid(fa1005e9-3d16-484c-bfc9-62b61e56ec4e),
-+    pointer_default(unique)
-+]
-+interface IDirectManipulationManager2 : IDirectManipulationManager
-+{
-+    HRESULT CreateBehavior([in] REFCLSID clsid, [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
-+}
-+
-+[
-+    uuid(9fbedf98-f6d8-4e3b-b488-fa66dbf5e9f3),
-+    version(1.0)
-+]
-+library DirectManipulation
-+{
-+    [
-+        uuid(54e211b6-3650-4f75-8334-fa359598e1c5)
-+    ]
-+    coclass DirectManipulationManager
-+    {
-+        interface IDirectManipulationManager2;
-+        [default] interface IDirectManipulationManager;
-+    }
-+
-+    [
-+        uuid(99793286-77cc-4b57-96db-3b354f6f9fb5)
-+    ]
-+    coclass DirectManipulationSharedManager
-+    {
-+        interface IDirectManipulationManager2;
-+        [default] interface IDirectManipulationManager;
-+    }
-+}
--- 
-2.17.1
-

patches/directmanipulation-new-dll/0005-include-Add-DCompManipulationCompositor-coclass-and-.patch

@@ -1,108 +0,0 @@
-From 6ee51b2ae31c53d05fef808c0aa1cfd47534e6af Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 19 Jul 2019 08:46:01 +1000
-Subject: [PATCH 5/6] include: Add DCompManipulationCompositor coclass and
- supporting interfaces.
-
----
- include/directmanipulation.idl | 79 ++++++++++++++++++++++++++++++++++
- 1 file changed, 79 insertions(+)
-
-diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl
-index 9dc2366cc3..c2fd831c6c 100644
---- a/include/directmanipulation.idl
-+++ b/include/directmanipulation.idl
-@@ -66,6 +66,76 @@ interface IDirectManipulationManager : IUnknown
-                           [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
- }
- 
-+[
-+    local,
-+    object,
-+    uuid(b89962cb-3d89-442b-bb58-5098fa0f9f16),
-+    pointer_default(unique)
-+]
-+interface IDirectManipulationContent : IUnknown
-+{
-+    HRESULT GetContentRect([out] RECT *size);
-+
-+    HRESULT SetContentRect([in] const RECT *size);
-+
-+    HRESULT GetViewport([in] REFIID riid, [out, iid_is(riid)] void **object);
-+
-+    HRESULT GetTag([in] REFIID riid, [out, iid_is(riid)] void **object, [out] UINT32 *id);
-+
-+    HRESULT SetTag([in, unique] IUnknown *object, [in] UINT32 id);
-+
-+    HRESULT GetOutputTransform([out] float *matrix, [in] DWORD count);
-+
-+    HRESULT GetContentTransform([out] float *matrix, [in] DWORD count);
-+
-+    HRESULT SyncContentTransform([in] const float *matrix, [in] DWORD count);
-+}
-+
-+[
-+    local,
-+    object,
-+    uuid(790b6337-64f8-4ff5-a269-b32bc2af27a7),
-+    pointer_default(unique)
-+]
-+interface IDirectManipulationUpdateHandler : IUnknown
-+{
-+    HRESULT Update();
-+}
-+
-+[
-+    local,
-+    object,
-+    uuid(b0ae62fd-be34-46e7-9caa-d361facbb9cc),
-+    pointer_default(unique)
-+]
-+interface IDirectManipulationUpdateManager : IUnknown
-+{
-+    HRESULT RegisterWaitHandleCallback([in] HANDLE handle, [in] IDirectManipulationUpdateHandler *handler,
-+                                       [out] DWORD *cookie);
-+
-+    HRESULT UnregisterWaitHandleCallback([in] DWORD cookie);
-+
-+    HRESULT Update([in] IDirectManipulationFrameInfoProvider *provider);
-+}
-+
-+[
-+    local,
-+    object,
-+    uuid(537a0825-0387-4efa-b62f-71eb1f085a7e),
-+    pointer_default(unique)
-+]
-+interface IDirectManipulationCompositor : IUnknown
-+{
-+    HRESULT AddContent([in] IDirectManipulationContent *content, [in] IUnknown *device,
-+                       [in] IUnknown *parent, [in] IUnknown *child);
-+
-+    HRESULT RemoveContent([in] IDirectManipulationContent *content);
-+
-+    HRESULT SetUpdateManager([in] IDirectManipulationUpdateManager *manager);
-+
-+    HRESULT Flush();
-+}
-+
- [
-     local,
-     object,
-@@ -100,4 +170,13 @@ library DirectManipulation
-         interface IDirectManipulationManager2;
-         [default] interface IDirectManipulationManager;
-     }
-+
-+    [
-+        uuid(79dea627-a08a-43ac-8ef5-6900b9299126)
-+    ]
-+    coclass DCompManipulationCompositor
-+    {
-+        [default] interface IDirectManipulationCompositor;
-+        interface IDirectManipulationFrameInfoProvider;
-+    }
- }
--- 
-2.17.1
-