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.

LICENSE.md

@@ -9,7 +9,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 ```
 Copyright (C) 2014-2017 the Wine Staging project authors.
 Copyright (C) 2018 Alistair Leslie-Hughes, Zebediah Figura
-Copyright (C) 2019 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
+Copyright (C) 2019-2020 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

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/activeds-ADsOpenObject/0001-include-Add-adserr.h.patch

@@ -1,16 +1,27 @@
-From f517c6095f355529ccbd44585d22458fb52f9197 Mon Sep 17 00:00:00 2001
+From e5500b9a3c7d36563725dc7975c2436a02165906 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 15 Nov 2019 15:46:23 +0800
-Subject: [PATCH 1/5] include: Add adserr.h.
-Content-Type: text/plain; charset=UTF-8
-To: wine-devel@winehq.org
+Subject: [PATCH] include: Add adserr.h.
 
 Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
 ---
- include/adserr.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
+ include/Makefile.in |  1 +
+ include/adserr.h    | 50 +++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 51 insertions(+)
  create mode 100644 include/adserr.h
 
+diff --git a/include/Makefile.in b/include/Makefile.in
+index cbad4d604f..2e0a10d650 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -7,6 +7,7 @@ SOURCES = \
+ 	activaut.idl \
+ 	activdbg.idl \
+ 	activscp.idl \
++	adserr.h \
+ 	adshlp.h \
+ 	advpub.h \
+ 	af_irda.h \
 diff --git a/include/adserr.h b/include/adserr.h
 new file mode 100644
 index 0000000000..83da568763
@@ -68,5 +79,5 @@ index 0000000000..83da568763
 +
 +#endif /* __ADSERR_H */
 -- 
-2.20.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/advapi32-Token_Integrity_Level/0001-advapi32-tests-Extend-security-label-token-integrity.patch

@@ -1,15 +1,16 @@
-From ba50fc98ee4690e62899d48efc856c2bc910536c Mon Sep 17 00:00:00 2001
+From 8044f571b7e674ce9e562488864d48646a9c7b88 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 7 Aug 2017 01:25:02 +0200
-Subject: advapi32/tests: Extend security label / token integrity tests.
+Subject: [PATCH] advapi32/tests: Extend security label / token integrity
+ tests.
 
 ---
  dlls/advapi32/tests/Makefile.in |   2 +-
- dlls/advapi32/tests/security.c  | 389 +++++++++++++++++++++++++++++++++++++++-
+ dlls/advapi32/tests/security.c  | 389 +++++++++++++++++++++++++++++++-
  2 files changed, 387 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in
-index 36ce031ef62..4437e6e5de7 100644
+index 12583e59f57..caee5fae308 100644
 --- a/dlls/advapi32/tests/Makefile.in
 +++ b/dlls/advapi32/tests/Makefile.in
 @@ -1,5 +1,5 @@
@@ -20,10 +21,10 @@ index 36ce031ef62..4437e6e5de7 100644
  C_SRCS = \
  	cred.c \
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 0fd41fe82fa..4a03db27e69 100644
+index a736dbffd22..4529469d932 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -7191,13 +7191,19 @@ static void test_token_security_descriptor(void)
+@@ -7034,13 +7034,19 @@ static void test_token_security_descriptor(void)
  {
      static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY},
                              {SECURITY_MANDATORY_LOW_RID}};
@@ -46,7 +47,7 @@ index 0fd41fe82fa..4a03db27e69 100644
      PROCESS_INFORMATION info;
      DWORD size, index, retd;
      ACCESS_ALLOWED_ACE *ace;
-@@ -7347,6 +7353,185 @@ static void test_token_security_descriptor(void)
+@@ -7190,6 +7196,185 @@ static void test_token_security_descriptor(void)
      /* The security label is also not inherited */
      if (pAddMandatoryAce)
      {
@@ -103,7 +104,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -165,7 +166,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -215,7 +216,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -232,7 +233,7 @@ index 0fd41fe82fa..4a03db27e69 100644
          ret = InitializeAcl(acl, 256, ACL_REVISION);
          ok(ret, "InitializeAcl failed with error %u\n", GetLastError());
  
-@@ -7362,6 +7547,90 @@ static void test_token_security_descriptor(void)
+@@ -7205,6 +7390,90 @@ static void test_token_security_descriptor(void)
  
          ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd);
          ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError());
@@ -272,7 +273,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +        if (sacl)
 +        {
-+            ret = pGetAce(sacl, 0, (void **)&ace);
++            ret = GetAce(sacl, 0, (void **)&ace);
 +            ok(ret, "GetAce failed with error %u\n", GetLastError());
 +            ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +               "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -310,7 +311,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +        if (sacl)
 +        {
-+            ret = pGetAce(sacl, 0, (void **)&ace);
++            ret = GetAce(sacl, 0, (void **)&ace);
 +            ok(ret, "GetAce failed with error %u\n", GetLastError());
 +            ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +               "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -323,7 +324,7 @@ index 0fd41fe82fa..4a03db27e69 100644
      }
      else
          win_skip("SYSTEM_MANDATORY_LABEL not supported\n");
-@@ -7467,6 +7736,116 @@ static void test_child_token_sd(void)
+@@ -7312,6 +7581,116 @@ static void test_child_token_sd(void)
      HeapFree(GetProcessHeap(), 0, sd);
  }
  
@@ -366,7 +367,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +    ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
 +    ok(!defaulted, "SACL defaulted\n");
 +    ok(acl->AceCount == 1, "Expected exactly one ACE\n");
-+    ret = pGetAce(acl, 0, (void **)&ace_label);
++    ret = GetAce(acl, 0, (void **)&ace_label);
 +    ok(ret, "GetAce failed with error %u\n", GetLastError());
 +    ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +       "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -421,7 +422,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +    ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
 +    ok(!defaulted, "SACL defaulted\n");
 +    ok(acl->AceCount == 1, "Expected exactly one ACE\n");
-+    ret = pGetAce(acl, 0, (void **)&ace_label);
++    ret = GetAce(acl, 0, (void **)&ace_label);
 +    ok(ret, "GetAce failed with error %u\n", GetLastError());
 +    ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +       "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -440,7 +441,7 @@ index 0fd41fe82fa..4a03db27e69 100644
  static void test_GetExplicitEntriesFromAclW(void)
  {
      static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
-@@ -7653,6 +8032,10 @@ START_TEST(security)
+@@ -7571,6 +7950,10 @@ START_TEST(security)
      {
          if (!strcmp(myARGV[2], "test_token_sd"))
              test_child_token_sd();
@@ -452,5 +453,5 @@ index 0fd41fe82fa..4a03db27e69 100644
              test_process_security_child();
          return;
 -- 
-2.13.1
+2.17.1
 

patches/cmd-launch-association/definition

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

patches/combase-GetRestrictedErrorInfo/0002-combase-Add-GetRestrictedErrorInfo-and-RoOriginateLa.patch

@@ -1,105 +0,0 @@
-From 61b96f3dab24d3aec26237c8760d75f964474bc5 Mon Sep 17 00:00:00 2001
-From: Louis Lenders <xerox.xerox2000x@gmail.com>
-Date: Mon, 8 Apr 2019 17:06:58 +0200
-Subject: [PATCH 2/2] combase: Add GetRestrictedErrorInfo and
- RoOriginateLanguageException stubs.
-
-Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
----
- .../api-ms-win-core-winrt-error-l1-1-0.spec           |  2 +-
- .../api-ms-win-core-winrt-error-l1-1-1.spec           |  4 ++--
- dlls/combase/combase.spec                             |  4 ++--
- dlls/combase/roapi.c                                  | 19 +++++++++++++++++++
- 4 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-index de0a6d8..99f1ca3 100644
---- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-@@ -1,4 +1,4 @@
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo
- @ stub RoCaptureErrorContext
- @ stub RoFailFastWithErrorContext
- @ stub RoGetErrorReportingFlags
-diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-index b1ad813..0b390f1 100644
---- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-@@ -1,4 +1,4 @@
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo
- @ stub IsErrorPropagationEnabled
- @ stub RoCaptureErrorContext
- @ stub RoClearError
-@@ -9,7 +9,7 @@
- @ stub RoInspectThreadErrorInfo
- @ stub RoOriginateError
- @ stub RoOriginateErrorW
--@ stub RoOriginateLanguageException
-+@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException
- @ stub RoReportFailedDelegate
- @ stub RoReportUnhandledError
- @ stub RoResolveRestrictedErrorInfoReference
-diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
-index 93575d5..f67527a 100644
---- a/dlls/combase/combase.spec
-+++ b/dlls/combase/combase.spec
-@@ -180,7 +180,7 @@
- @ stub GetFuncDescs
- @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream
- @ stub GetHookInterface
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr)
- @ stub HSTRING_UserFree
- @ stub HSTRING_UserFree64
- @ stub HSTRING_UserMarshal
-@@ -260,7 +260,7 @@
- @ stub RoInspectThreadErrorInfo
- @ stub RoOriginateError
- @ stub RoOriginateErrorW
--@ stub RoOriginateLanguageException
-+@ stdcall RoOriginateLanguageException(long ptr ptr)
- @ stub RoParameterizedTypeExtraGetTypeSignature
- @ stdcall RoRegisterActivationFactories(ptr ptr long ptr)
- @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr)
-diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
-index c9fe80f..2a6dcdf 100644
---- a/dlls/combase/roapi.c
-+++ b/dlls/combase/roapi.c
-@@ -21,6 +21,7 @@
- #include "initguid.h"
- #include "roapi.h"
- #include "roparameterizediid.h"
-+#include "restrictederrorinfo.h"
- #include "winstring.h"
- 
- #include "wine/debug.h"
-@@ -276,6 +277,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF
- }
- 
- /***********************************************************************
-+ *      GetRestrictedErrorInfo (combase.@)
-+ */
-+HRESULT WINAPI GetRestrictedErrorInfo( IRestrictedErrorInfo **info )
-+{
-+    FIXME( "(%p)\n", info );
-+    return E_NOTIMPL;
-+}
-+
-+/***********************************************************************
-+ *      RoOriginateLanguageException (combase.@)
-+ */
-+BOOL WINAPI RoOriginateLanguageException( HRESULT error, HSTRING message, IUnknown *language_exception )
-+{
-+    FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception);
-+    return FALSE;
-+}
-+
-+/***********************************************************************
-  *      CleanupTlsOleState (combase.@)
-  */
- void WINAPI CleanupTlsOleState(void *unknown)
--- 
-1.9.1
-

patches/combase-GetRestrictedErrorInfo/definition

@@ -1 +0,0 @@
-Fixes: [46972] combase: Add GetRestrictedErrorInfo/RoOriginateLanguageException stubs.

patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch

@@ -56,57 +56,6 @@ index 56e2563..a35f5f2 100644
  
              if (subitemstage & CDRF_NOTIFYPOSTPAINT)
                  subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd);
-diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
-index ec87e3b..eb4db0e 100644
---- a/dlls/comctl32/tests/listview.c
-+++ b/dlls/comctl32/tests/listview.c
-@@ -1830,12 +1830,16 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
-                 clr = GetBkColor(nmlvcd->nmcd.hdc);
-                 ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk);
-                 ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText);
--                todo_wine_if(nmlvcd->iSubItem)
--                    ok(clr == c0ffee, "clr=%.8x\n", clr);
-+                if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS))
-+                {
-+                    todo_wine_if(nmlvcd->iSubItem)
-+                        ok(clr == c0ffee, "clr=%.8x\n", clr);
-+                }
-                 return CDRF_NOTIFYPOSTPAINT;
-             case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM:
-                 clr = GetBkColor(nmlvcd->nmcd.hdc);
--                todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
-+                if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS))
-+                    todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
-                 ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk);
-                 ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText);
-                 return CDRF_DODEFAULT;
-@@ -1851,6 +1855,7 @@ static void test_customdraw(void)
- {
-     HWND hwnd;
-     WNDPROC oldwndproc;
-+    LVITEMA item;
- 
-     hwnd = create_listview_control(LVS_REPORT);
- 
-@@ -1870,6 +1875,18 @@ static void test_customdraw(void)
-     UpdateWindow(hwnd);
-     ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE);
- 
-+    /* check colors when item is selected */
-+    SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | LVS_SHOWSELALWAYS);
-+    item.mask = LVIF_STATE;
-+    item.stateMask = LVIS_SELECTED;
-+    item.state = LVIS_SELECTED;
-+    SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item);
-+
-+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
-+    InvalidateRect(hwnd, NULL, TRUE);
-+    UpdateWindow(hwnd);
-+    ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT, selection", FALSE);
-+
-     DestroyWindow(hwnd);
- 
-     hwnd = create_listview_control(LVS_LIST);
 -- 
 2.9.0
 

patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch

@@ -0,0 +1,57 @@
+From ad23e816eb724d81032306f8ac6d4faa96ccaf4a Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Tue, 12 Nov 2019 18:13:20 +0800
+Subject: [PATCH] comctl32: Bump version to 6.0.
+
+An application that I have here checks comctl32.dll version information
+and refuses to run, changing DLL version to 6.0 makes it run.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/comctl32/comctl32.h  | 2 +-
+ dlls/comctl32/comctl32.rc | 2 +-
+ include/commctrl.h        | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
+index 78e97983381..42b434a96d9 100644
+--- a/dlls/comctl32/comctl32.h
++++ b/dlls/comctl32/comctl32.h
+@@ -192,7 +192,7 @@ INT  Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
+ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
+ BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
+ 
+-#define COMCTL32_VERSION_MINOR 81
++#define COMCTL32_VERSION_MINOR 0
+ 
+ /* Our internal stack structure of the window procedures to subclass */
+ typedef struct _SUBCLASSPROCS {
+diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc
+index c9aa1ba6253..be6e2425193 100644
+--- a/dlls/comctl32/comctl32.rc
++++ b/dlls/comctl32/comctl32.rc
+@@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+ #define WINE_FILEDESCRIPTION_STR "Wine Common Controls"
+ #define WINE_FILENAME_STR "comctl32.dll"
+ #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100
+-#define WINE_FILEVERSION_STR "5.81"
++#define WINE_FILEVERSION_STR "6.00.4704.1100"
+ #define WINE_PRODUCTVERSION WINE_FILEVERSION
+ #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
+ 
+diff --git a/include/commctrl.h b/include/commctrl.h
+index 700b335fbb7..029a4b45457 100644
+--- a/include/commctrl.h
++++ b/include/commctrl.h
+@@ -51,7 +51,7 @@ enum _LI_METRIC
+ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
+ HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
+ 
+-#define COMCTL32_VERSION                5  /* dll version */
++#define COMCTL32_VERSION                6  /* dll version */
+ 
+ #ifndef _WIN32_IE
+ #define _WIN32_IE 0x0400
+-- 
+2.24.1
+

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