Release v4.19

Silence a noisy FIXME, by github user Guy1524

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

@@ -1,4 +1,4 @@
-From 5e4c31d0796f2e559889d4f84cdb571130217e7d Mon Sep 17 00:00:00 2001
+From 14f3c7debf91be0e5b36299f330541f3146d00ca Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
 Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
@@ -9,10 +9,10 @@ Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index f50133d..1bc7b59 100644
+index be9ff88fe44..44c4426c9ff 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -1815,7 +1815,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -1781,7 +1781,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -21,7 +21,7 @@ index f50133d..1bc7b59 100644
  }
  
  struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1823,7 +1823,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1789,7 +1789,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -31,18 +31,18 @@ index f50133d..1bc7b59 100644
  
  void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index f27fe9f..ee1eb5a 100644
+index b9c712cd7fb..358d13963a7 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5715,7 +5715,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
--        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
-+        CONTAINING_RECORD((IDWriteTextFormat2 *)iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
+-        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
++        CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
  }
  
  HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
 -- 
-1.9.1
+2.23.0
 

patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

@@ -1,4 +1,4 @@
-From ee1533db82fa2a955765b6a00f5300900350d2fe Mon Sep 17 00:00:00 2001
+From 9e585de1f2f28e1ef18c1edca875779c491375cb Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] kernel32: Add winediag message to show warning, that this
@@ -9,7 +9,7 @@ Subject: [PATCH] kernel32: Add winediag message to show warning, that this
  1 file changed, 10 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 0a3fd70..206224f 100644
+index 36ed82bff8c..b8a677c5485 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
 @@ -65,6 +65,7 @@
@@ -18,9 +18,9 @@ index 0a3fd70..206224f 100644
  WINE_DECLARE_DEBUG_CHANNEL(relay);
 +WINE_DECLARE_DEBUG_CHANNEL(winediag);
  
- #ifdef __APPLE__
- extern char **__wine_get_main_environment(void);
-@@ -1090,6 +1091,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
+ typedef struct
+ {
+@@ -997,6 +998,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
  
      __TRY
      {
@@ -37,5 +37,5 @@ index 0a3fd70..206224f 100644
              being_debugged = FALSE;
  
 -- 
-1.9.1
+2.23.0
 

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

@@ -1,7 +1,7 @@
-From 83517396c266c2de290670128d678770f5d79cc9 Mon Sep 17 00:00:00 2001
+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: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
+Subject: [PATCH] advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
 
 ---
  dlls/advapi32/security.c       | 7 +++++--
@@ -9,10 +9,10 @@ Subject: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index d27b2e7..2362dd5 100644
+index a7707f15d39..73c1f054d5c 100644
 --- a/dlls/advapi32/security.c
 +++ b/dlls/advapi32/security.c
-@@ -191,7 +191,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
+@@ -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 };
@@ -21,7 +21,7 @@ index d27b2e7..2362dd5 100644
  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 };
-@@ -2206,7 +2206,10 @@ LookupAccountSidW(
+@@ -1185,7 +1185,10 @@ LookupAccountSidW(
                              ac = Domain_Admins;
                              break;
                          case DOMAIN_GROUP_RID_USERS:
@@ -34,20 +34,23 @@ index d27b2e7..2362dd5 100644
                          case DOMAIN_GROUP_RID_GUESTS:
                              ac = Domain_Guests;
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 573119f..490ce26 100644
+index 5f65ed385dd..a9d745cfe39 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -2578,8 +2578,8 @@ static void test_process_security(void)
+@@ -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);
--    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
 +    ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
-+    ok(!strcmp(account, "None"), "expect None, got %s\n", account);
+     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.3.5
+2.17.1
 

patches/combase-GetRestrictedErrorInfo/0001-include-Add-restrictederrorinfo.idl.patch

@@ -1,68 +0,0 @@
-From e72b9a5931139e2d4c651e62f9b5ac226af2bedd Mon Sep 17 00:00:00 2001
-From: Louis Lenders <xerox.xerox2000x@gmail.com>
-Date: Mon, 8 Apr 2019 08:26:43 +0200
-Subject: [PATCH 1/2] include: Add restrictederrorinfo.idl.
-
-Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
----
- include/Makefile.in             |  1 +
- include/restrictederrorinfo.idl | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 36 insertions(+)
- create mode 100644 include/restrictederrorinfo.idl
-
-diff --git a/include/Makefile.in b/include/Makefile.in
-index b03b967..5bc8dde 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -545,6 +545,7 @@ SOURCES = \
- 	reason.h \
- 	regstr.h \
- 	restartmanager.h \
-+	restrictederrorinfo.idl \
- 	richedit.h \
- 	richole.idl \
- 	rmxfguid.h \
-diff --git a/include/restrictederrorinfo.idl b/include/restrictederrorinfo.idl
-new file mode 100644
-index 0000000..e444256
---- /dev/null
-+++ b/include/restrictederrorinfo.idl
-@@ -0,0 +1,35 @@
-+/*
-+ * Copyright 2019 Louis Lenders
-+ *
-+ * 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";
-+
-+[
-+    object,
-+    uuid(82ba7092-4c88-427d-a7bc-16dd93feb67e),
-+    pointer_default(unique)
-+]
-+interface IRestrictedErrorInfo : IUnknown
-+{
-+    HRESULT GetErrorDetails (
-+        [out] BSTR *desc,
-+        [out] HRESULT *error,
-+        [out] BSTR *restricted_desc,
-+        [out] BSTR *sid);
-+
-+    HRESULT GetReference ([out] BSTR *reference);
-+}
--- 
-1.9.1
-

patches/crypt32-MS_Root_Certs/0001-crypt32-Add-MS-root-CA-2010-2011.patch

@@ -1,128 +0,0 @@
-From 50ba23f4d3f7e40bf02cb8f3cdcc4d729f6d68d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 27 Feb 2017 20:42:27 +0100
-Subject: crypt32: Add MS root CA 2010.
-
----
- dlls/crypt32/rootstore.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 98 insertions(+)
-
-diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
-index 73d954f7404..d6c0dfbc819 100644
---- a/dlls/crypt32/rootstore.c
-+++ b/dlls/crypt32/rootstore.c
-@@ -666,6 +666,103 @@ static const BYTE rootcertauthority[] = {
- 0x7e,0x6c,0x9e,0xdb,0x73,0x13,0x64,0x62,0x69,0xa5,0x2f,0x7d,0xca,0x96,0x6d,0x9f,
- 0xf8,0x04,0x4d,0x30,0x92,0x3d,0x6e,0x21,0x14,0x21,0xc9,0x3d,0xe0,0xc3,0xfd,0x8a,
- 0x6b,0x9d,0x4a,0xfd,0xd1,0xa1,0x9d,0x99,0x43,0x77,0x3f,0xb0,0xda };
-+static const BYTE rootcertauthority2010[] = {
-+0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x28,
-+0xcc,0x3a,0x25,0xbf,0xba,0x44,0xac,0x44,0x9a,0x9b,0x58,0x6b,0x43,0x39,0xaa,0x30,
-+0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x30,0x81,
-+0x88,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,
-+0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,
-+0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,
-+0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,
-+0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,
-+0x61,0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,
-+0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,
-+0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,
-+0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x30,0x30,0x1e,0x17,0x0d,0x31,0x30,0x30,
-+0x36,0x32,0x33,0x32,0x31,0x35,0x37,0x32,0x34,0x5a,0x17,0x0d,0x33,0x35,0x30,0x36,
-+0x32,0x33,0x32,0x32,0x30,0x34,0x30,0x31,0x5a,0x30,0x81,0x88,0x31,0x0b,0x30,0x09,
-+0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,
-+0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10,
-+0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64,
-+0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f,
-+0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,
-+0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f,
-+0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66,
-+0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79,0x20,
-+0x32,0x30,0x31,0x30,0x30,0x82,0x02,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,
-+0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0f,0x00,0x30,0x82,0x02,0x0a,
-+0x02,0x82,0x02,0x01,0x00,0xb9,0x08,0x9e,0x28,0xe4,0xe4,0xec,0x06,0x4e,0x50,0x68,
-+0xb3,0x41,0xc5,0x7b,0xeb,0xae,0xb6,0x8e,0xaf,0x81,0xba,0x22,0x44,0x1f,0x65,0x34,
-+0x69,0x4c,0xbe,0x70,0x40,0x17,0xf2,0x16,0x7b,0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39,
-+0xf4,0x1b,0xa8,0xad,0x92,0x90,0x1e,0xcb,0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10,
-+0x2e,0x3c,0x05,0x8d,0x8a,0x6d,0x24,0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50,
-+0x9c,0x15,0xa5,0x17,0x74,0x88,0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4,
-+0x6f,0x28,0x78,0xce,0x5c,0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe,0xa1,
-+0x9a,0x2c,0x96,0x15,0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31,0x11,0xc4,
-+0x28,0x36,0x94,0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00,0xb2,0x5b,0x0c,
-+0xe6,0x96,0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b,0xd7,0xcb,0xb7,0x21,
-+0x62,0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a,0x46,0x98,0xc0,0x9b,0xc0,
-+0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a,0x8e,0xf2,0x9f,0x18,0x89,0xe4,
-+0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5,0x0e,0xd8,0x6f,0x9c,0xed,0xe2,0x45,
-+0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81,0x45,0xe3,0xaa,0x21,0x40,0x26,0xa1,0x72,
-+0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e,0xee,0x83,0x58,0xb1,0x5e,0x06,0x63,0x99,0x62,
-+0x91,0x78,0x82,0xb7,0x0d,0x93,0x0c,0x24,0x6a,0xb4,0x1b,0xdb,0x27,0xec,0x5f,0x95,
-+0x04,0x3f,0x93,0x4a,0x30,0xf5,0x97,0x18,0xb3,0xa7,0xf9,0x19,0xa7,0x93,0x33,0x1d,
-+0x01,0xc8,0xdb,0x22,0x52,0x5c,0xd7,0x25,0xc9,0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43,
-+0xbe,0x9b,0x62,0xb1,0x8d,0x2d,0x86,0x44,0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09,
-+0xfa,0xae,0x89,0xc4,0x41,0x2a,0x22,0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c,
-+0xa8,0xca,0x0d,0x2f,0xfb,0x52,0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f,
-+0xad,0x67,0xd6,0xa7,0x50,0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a,0x43,
-+0xb7,0xfb,0xae,0xf9,0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9,0xc3,0xee,
-+0xb0,0xc2,0x85,0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c,0x3f,0xd6,0x5d,
-+0xa3,0xe5,0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00,0xe3,0xb8,0x38,0xab,
-+0x83,0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3,0x30,0xd1,0x1a,0x5a,0xc8,
-+0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad,0x7a,0xec,0xcb,0x41,0x60,0xf3,
-+0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51,0xc6,0x2e,0x80,0xc2,0xe2,0x77,0x15,
-+0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91,0xee,0x00,0xb5,0xa3,0x70,0xec,0x9f,0xe3,
-+0x8d,0x80,0x68,0x83,0x76,0xba,0xaf,0x5d,0x70,0x52,0x22,0x16,0xe2,0x66,0xfb,0xba,
-+0xb3,0xc5,0xc2,0xf7,0x3e,0x2f,0x77,0xa6,0xca,0xde,0xc1,0xa6,0xc6,0x48,0x4c,0xc3,
-+0x37,0x51,0x23,0xd3,0x27,0xd7,0xb8,0x4e,0x70,0x96,0xf0,0xa1,0x44,0x76,0xaf,0x78,
-+0xcf,0x9a,0xe1,0x66,0x13,0x02,0x03,0x01,0x00,0x01,0xa3,0x51,0x30,0x4f,0x30,0x0b,
-+0x06,0x03,0x55,0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55,
-+0x1d,0x13,0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03,
-+0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0xd5,0xf6,0x56,0xcb,0x8f,0xe8,0xa2,0x5c,0x62,
-+0x68,0xd1,0x3d,0x94,0x90,0x5b,0xd7,0xce,0x9a,0x18,0xc4,0x30,0x10,0x06,0x09,0x2b,
-+0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30,0x0d,0x06,
-+0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03,0x82,0x02,0x01,
-+0x00,0xac,0xa5,0x96,0x8c,0xbf,0xbb,0xae,0xa6,0xf6,0xd7,0x71,0x87,0x43,0x31,0x56,
-+0x88,0xfd,0x1c,0x32,0x71,0x5b,0x35,0xb7,0xd4,0xf0,0x91,0xf2,0xaf,0x37,0xe2,0x14,
-+0xf1,0xf3,0x02,0x26,0x05,0x3e,0x16,0x14,0x7f,0x14,0xba,0xb8,0x4f,0xfb,0x89,0xb2,
-+0xb2,0xe7,0xd4,0x09,0xcc,0x6d,0xb9,0x5b,0x3b,0x64,0x65,0x70,0x66,0xb7,0xf2,0xb1,
-+0x5a,0xdf,0x1a,0x02,0xf3,0xf5,0x51,0xb8,0x67,0x6d,0x79,0xf3,0xbf,0x56,0x7b,0xe4,
-+0x84,0xb9,0x2b,0x1e,0x9b,0x40,0x9c,0x26,0x34,0xf9,0x47,0x18,0x98,0x69,0xd8,0x1c,
-+0xd7,0xb6,0xd1,0xbf,0x8f,0x61,0xc2,0x67,0xc4,0xb5,0xef,0x60,0x43,0x8e,0x10,0x1b,
-+0x36,0x49,0xe4,0x20,0xca,0xad,0xa7,0xc1,0xb1,0x27,0x65,0x09,0xf8,0xcd,0xf5,0x5b,
-+0x2a,0xd0,0x84,0x33,0xf3,0xef,0x1f,0xf2,0xf5,0x9c,0x0b,0x58,0x93,0x37,0xa0,0x75,
-+0xa0,0xde,0x72,0xde,0x6c,0x75,0x2a,0x66,0x22,0xf5,0x8c,0x06,0x30,0x56,0x9f,0x40,
-+0xb9,0x30,0xaa,0x40,0x77,0x15,0x82,0xd7,0x8b,0xec,0xc0,0xd3,0xb2,0xbd,0x83,0xc5,
-+0x77,0x0c,0x1e,0xae,0xaf,0x19,0x53,0xa0,0x4d,0x79,0x71,0x9f,0x0f,0xaf,0x30,0xce,
-+0x67,0xf9,0xd6,0x2c,0xcc,0x22,0x41,0x7a,0x07,0xf2,0x97,0x42,0x18,0xce,0x59,0x79,
-+0x10,0x55,0xde,0x6f,0x10,0xe4,0xb8,0xda,0x83,0x66,0x40,0x16,0x09,0x68,0x23,0x5b,
-+0x97,0x2e,0x26,0x9a,0x02,0xbb,0x57,0x8c,0xc5,0xb8,0xba,0x69,0x62,0x32,0x80,0x89,
-+0x9e,0xa1,0xfd,0xc0,0x92,0x7c,0x7b,0x2b,0x33,0x19,0x84,0x2a,0x63,0xc5,0x00,0x68,
-+0x62,0xfa,0x9f,0x47,0x8d,0x99,0x7a,0x45,0x3a,0xa7,0xe9,0xed,0xee,0x69,0x42,0xb5,
-+0xf3,0x81,0x9b,0x47,0x56,0x10,0x7b,0xfc,0x70,0x36,0x84,0x18,0x73,0xea,0xef,0xf9,
-+0x97,0x4d,0x9e,0x33,0x23,0xdd,0x26,0x0b,0xba,0x2a,0xb7,0x3f,0x44,0xdc,0x83,0x27,
-+0xff,0xbd,0x61,0x59,0x2b,0x11,0xb7,0xca,0x4f,0xdb,0xc5,0x8b,0x0c,0x1c,0x31,0xae,
-+0x32,0xf8,0xf8,0xb9,0x42,0xf7,0x7f,0xdc,0x61,0x9a,0x76,0xb1,0x5a,0x04,0xe1,0x11,
-+0x3d,0x66,0x45,0xb7,0x18,0x71,0xbe,0xc9,0x24,0x85,0xd6,0xf3,0xd4,0xba,0x41,0x34,
-+0x5d,0x12,0x2d,0x25,0xb9,0x8d,0xa6,0x13,0x48,0x6d,0x4b,0xb0,0x07,0x7d,0x99,0x93,
-+0x09,0x61,0x81,0x74,0x57,0x26,0x8a,0xab,0x69,0xe3,0xe4,0xd9,0xc7,0x88,0xcc,0x24,
-+0xd8,0xec,0x52,0x24,0x5c,0x1e,0xbc,0x91,0x14,0xe2,0x96,0xde,0xeb,0x0a,0xda,0x9e,
-+0xdd,0x5f,0xb3,0x5b,0xdb,0xd4,0x82,0xec,0xc6,0x20,0x50,0x87,0x25,0x40,0x3a,0xfb,
-+0xc7,0xee,0xcd,0xfe,0x33,0xe5,0x6e,0xc3,0x84,0x09,0x55,0x03,0x25,0x39,0xc0,0xe9,
-+0x35,0x5d,0x65,0x31,0xa8,0xf6,0xbf,0xa0,0x09,0xcd,0x29,0xc7,0xb3,0x36,0x32,0x2e,
-+0xdc,0x95,0xf3,0x83,0xc1,0x5a,0xcf,0x8b,0x8d,0xf6,0xea,0xb3,0x21,0xf8,0xa4,0xed,
-+0x1e,0x31,0x0e,0xb6,0x4c,0x11,0xab,0x60,0x0b,0xa4,0x12,0x23,0x22,0x17,0xa3,0x36,
-+0x64,0x82,0x91,0x04,0x12,0xe0,0xab,0x6f,0x1e,0xcb,0x50,0x05,0x61,0xb4,0x40,0xff,
-+0x59,0x86,0x71,0xd1,0xd5,0x33,0x69,0x7c,0xa9,0x73,0x8a,0x38,0xd7,0x64,0x0c,0xf1,
-+0x69 };
- static const BYTE rootcertauthority2011[] = {
- 0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x3f,
- 0x8b,0xc8,0xb5,0xfc,0x9f,0xb2,0x96,0x43,0xb5,0x69,0xd6,0x6c,0x42,0xe1,0x44,0x30,
-@@ -771,6 +868,7 @@ static const struct CONST_BLOB {
-     { authenticode, sizeof(authenticode) },
-     { rootauthority, sizeof(rootauthority) },
-     { rootcertauthority, sizeof(rootcertauthority) },
-+    { rootcertauthority2010, sizeof(rootcertauthority2010) },
-     { rootcertauthority2011, sizeof(rootcertauthority2011) },
- };
- 
--- 
-2.14.1
-

patches/crypt32-MS_Root_Certs/definition

@@ -1 +0,0 @@
-Fixes: Add MS root certificates 2010/2011

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

@@ -1,15 +1,15 @@
-From 50dfa70735f6a0f8cf9e77c70143a91555627a5a Mon Sep 17 00:00:00 2001
+From 896b9be78dfd979ddea8f098ae66473956d4147c Mon Sep 17 00:00:00 2001
 From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
 Date: Sat, 24 Sep 2016 06:51:24 +0300
 Subject: [PATCH] d3d11: Add stub deferred rendering context.
 
 ---
- dlls/d3d11/device.c      | 1267 +++++++++++++++++++++++++++++++++-----
+ dlls/d3d11/device.c      | 1268 +++++++++++++++++++++++++++++++++-----
  dlls/d3d11/tests/d3d11.c |    4 +-
- 2 files changed, 1132 insertions(+), 139 deletions(-)
+ 2 files changed, 1132 insertions(+), 140 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 08579164bd..dca5a88caa 100644
+index 31c7f35fc25..dca5a88caa0 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
 @@ -22,6 +22,16 @@
@@ -1352,13 +1352,14 @@ index 08579164bd..dca5a88caa 100644
              iface, byte_code, byte_code_length, class_linkage, shader);
  
      if (class_linkage)
-@@ -3362,9 +4340,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface
+@@ -3362,10 +4340,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface
  static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device2 *iface, UINT flags,
          ID3D11DeviceContext **context)
  {
 -    FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context);
 +    struct d3d11_deferred_context *object;
  
+-    *context = NULL;
 -    return E_NOTIMPL;
 +    TRACE("iface %p, flags %#x, context %p.\n", iface, flags, context);
 +
@@ -1378,7 +1379,7 @@ index 08579164bd..dca5a88caa 100644
  
  static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *iface, HANDLE resource, REFIID iid,
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index d58319df58..e653fb30b2 100644
+index da4627d7a85..dadeac27662 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
 @@ -2231,6 +2231,8 @@ static void test_create_deferred_context(void)
@@ -1400,5 +1401,5 @@ index d58319df58..e653fb30b2 100644
          goto done;
      refcount = get_refcount(device);
 -- 
-2.21.0
+2.23.0
 

patches/d3d11-Deferred_Context/0043-d3d11-tests-Add-a-basic-test-for-drawing-with-deferr.patch

@@ -1,15 +1,15 @@
-From 31a800096eb212cda55f6fbea955f05c650ea2c1 Mon Sep 17 00:00:00 2001
+From c01cbb5811cb9de58a0c3fa7822382f45900b435 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Fri, 27 Sep 2019 16:26:04 +0300
 Subject: [PATCH] d3d11/tests: Add a basic test for drawing with deferred
  context.
 
 ---
- dlls/d3d11/tests/d3d11.c | 101 +++++++++++++++++++++++++++++++--------
- 1 file changed, 81 insertions(+), 20 deletions(-)
+ dlls/d3d11/tests/d3d11.c | 100 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 81 insertions(+), 19 deletions(-)
 
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index e653fb30b2..202179174b 100644
+index 7f11a59d0cb..c63bae8bbab 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
 @@ -1692,10 +1692,11 @@ static void release_test_context_(unsigned int line, struct d3d11_test_context *
@@ -158,7 +158,7 @@ index e653fb30b2..202179174b 100644
  static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level)
  {
      struct device_desc device_desc;
-@@ -29400,11 +29462,11 @@ START_TEST(d3d11)
+@@ -29639,11 +29701,11 @@ START_TEST(d3d11)
      }
  
      print_adapter_info();
@@ -171,13 +171,6 @@ index e653fb30b2..202179174b 100644
      queue_test(test_create_texture1d);
      queue_test(test_texture1d_interfaces);
      queue_test(test_create_texture2d);
-@@ -29538,6 +29600,5 @@ START_TEST(d3d11)
-     queue_test(test_render_a8);
-     queue_test(test_standard_pattern);
-     queue_test(test_desktop_window);
--
-     run_queued_tests();
- }
 -- 
-2.21.0
+2.17.1
 

patches/d3dx9_36-Texture_Align/0001-d3dx9_36-Align-texture-dimensions-to-block-size-for-.patch

@@ -1,53 +0,0 @@
-From 5d633f126af17add8eaefc10c08e400616ff5fc9 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Tue, 4 Nov 2014 22:22:03 +0100
-Subject: [PATCH] d3dx9_36: Align texture dimensions to block size for
- compressed textures in D3DXCheckTextureRequirements.
-
----
- dlls/d3dx9_36/tests/texture.c | 9 +++++++++
- dlls/d3dx9_36/texture.c       | 8 ++++----
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
-index fc1589d25e..93a7fcd911 100644
---- a/dlls/d3dx9_36/tests/texture.c
-+++ b/dlls/d3dx9_36/tests/texture.c
-@@ -448,6 +448,15 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device)
-         ok(width == 4, "Got unexpected width %d.\n", width);
-         ok(height == 4, "Got unexpected height %d.\n", height);
-         ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format);
-+
-+        width = 5; height = 5;
-+        mipmaps = 1;
-+        hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT);
-+        ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK);
-+        ok(width == 8, "Returned width %d, expected %d\n", width, 8);
-+        ok(height == 8, "Returned height %d, expected %d\n", height, 8);
-+        ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1);
-+        ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5);
-     }
-     else
-     {
-diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index 4ae924999e..a592b7ba1e 100644
---- a/dlls/d3dx9_36/texture.c
-+++ b/dlls/d3dx9_36/texture.c
-@@ -339,10 +339,10 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN
- 
-     if (fmt->block_width != 1 || fmt->block_height != 1)
-     {
--        if (w < fmt->block_width)
--            w = fmt->block_width;
--        if (h < fmt->block_height)
--            h = fmt->block_height;
-+        if (w % fmt->block_width)
-+            w += fmt->block_width - w % fmt->block_width;
-+        if (h % fmt->block_height)
-+            h += fmt->block_height - h % fmt->block_height;
-     }
- 
-     if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w)))
--- 
-2.21.0
-

patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch

@@ -1,10 +1,9 @@
-From 1a21bd1a5584a1d2b54a8a6df9944d44a83b05d1 Mon Sep 17 00:00:00 2001
+From 2dbc476ab7a1edb75f07108a6a44ea2700513797 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 29 Jul 2015 17:09:50 +0200
 Subject: [PATCH] ddraw: Create rendering targets in video memory if possible.
 
 Based on a patch by Henri Verbeet.
-
 ---
  dlls/ddraw/ddraw.c         |  6 +++---
  dlls/ddraw/ddraw_private.h |  3 ++-
@@ -13,10 +12,10 @@ Based on a patch by Henri Verbeet.
  4 files changed, 56 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 68e9286590..1141739e78 100644
+index e77aab1cc5c..7df9cf5b28f 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
-@@ -4296,7 +4296,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
+@@ -4297,7 +4297,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
      TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -25,7 +24,7 @@ index 68e9286590..1141739e78 100644
      {
          *device = &object->IDirect3DDevice7_iface;
      }
-@@ -4325,7 +4325,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
+@@ -4326,7 +4326,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
          return CLASS_E_NOAGGREGATION;
  
      wined3d_mutex_lock();
@@ -34,7 +33,7 @@ index 68e9286590..1141739e78 100644
      {
          *device = &device_impl->IDirect3DDevice3_iface;
      }
-@@ -4351,7 +4351,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
+@@ -4352,7 +4352,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
              iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -44,10 +43,10 @@ index 68e9286590..1141739e78 100644
          *device = &device_impl->IDirect3DDevice2_iface;
      }
 diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
-index 771b2a44d1..4bf0e46462 100644
+index 4ecd83d006b..c11f4f0aa80 100644
 --- a/dlls/ddraw/ddraw_private.h
 +++ b/dlls/ddraw/ddraw_private.h
-@@ -307,6 +307,7 @@ struct d3d_device
+@@ -309,6 +309,7 @@ struct d3d_device
      IUnknown IUnknown_inner;
      LONG ref;
      UINT version;
@@ -55,8 +54,8 @@ index 771b2a44d1..4bf0e46462 100644
  
      IUnknown *outer_unknown;
      struct wined3d_device *wined3d_device;
-@@ -354,7 +355,7 @@ struct d3d_device
-     struct wined3d_stateblock *recording;
+@@ -356,7 +357,7 @@ struct d3d_device
+     struct wined3d_stateblock *recording, *state, *update_state;
  };
  
 -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface,
@@ -65,7 +64,7 @@ index 771b2a44d1..4bf0e46462 100644
  enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN;
  
 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index 43e5d0aa92..5d18a129f7 100644
+index 3702454bde0..cc43cdc8840 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
 @@ -1854,7 +1854,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface,
@@ -95,7 +94,7 @@ index 43e5d0aa92..5d18a129f7 100644
      {
          WARN("Surface %p is not in video memory.\n", target_impl);
          IDirectDrawSurface_AddRef(target);
-@@ -6933,7 +6933,7 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device
+@@ -6947,7 +6947,7 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device
      return WINED3D_ZB_TRUE;
  }
  
@@ -104,7 +103,7 @@ index 43e5d0aa92..5d18a129f7 100644
          struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown)
  {
      static const D3DMATRIX ident =
-@@ -6956,6 +6956,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
+@@ -6970,6 +6970,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
      device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl;
      device->ref = 1;
      device->version = version;
@@ -112,7 +111,7 @@ index 43e5d0aa92..5d18a129f7 100644
  
      if (outer_unknown)
          device->outer_unknown = outer_unknown;
-@@ -7009,14 +7010,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
+@@ -7026,14 +7027,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
      return D3D_OK;
  }
  
@@ -134,7 +133,7 @@ index 43e5d0aa92..5d18a129f7 100644
  
      if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
              || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER))
-@@ -7039,7 +7044,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
+@@ -7056,7 +7061,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
          return DDERR_OUTOFMEMORY;
      }
  
@@ -143,7 +142,7 @@ index 43e5d0aa92..5d18a129f7 100644
      {
          WARN("Surface %p is not in video memory.\n", target);
          return D3DERR_SURFACENOTINVIDMEM;
-@@ -7057,7 +7062,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
+@@ -7074,7 +7079,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
          return DDERR_OUTOFMEMORY;
      }
  
@@ -153,7 +152,7 @@ index 43e5d0aa92..5d18a129f7 100644
          WARN("Failed to initialize device, hr %#x.\n", hr);
          heap_free(object);
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index 66e5a9e616..31ccce29b8 100644
+index 0c03120662b..3e0d6d66573 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
 @@ -223,7 +223,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
@@ -165,7 +164,7 @@ index 66e5a9e616..31ccce29b8 100644
                          1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface)))
                  {
                      This->device1 = NULL;
-@@ -6197,7 +6197,42 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
+@@ -6198,7 +6198,42 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
  
      if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)
      {
@@ -210,5 +209,5 @@ index 66e5a9e616..31ccce29b8 100644
      }
      else
 -- 
-2.21.0
+2.17.1
 

patches/dinput-joy-mappings/0001-dinput-Load-users-Joystick-mappings.patch

@@ -1,16 +1,16 @@
-From 3d90cc93c56571a6c1d7d25054094106595e7c03 Mon Sep 17 00:00:00 2001
+From 290d6b2b773e9729c38495ec8c1291b40678bc31 Mon Sep 17 00:00:00 2001
 From: Jetro Jormalainen <jje-wine@jv.jetro.fi>
 Date: Tue, 30 Apr 2019 09:20:20 +1000
-Subject: [PATCH] dinput: Load users Joystick mappings.
+Subject: [PATCH 1/3] dinput: Load users Joystick mappings.
 
 ---
  dlls/dinput/device.c         |  2 +-
  dlls/dinput/device_private.h |  2 ++
- dlls/dinput/joystick.c       | 18 ++++++++++++++++++
- 3 files changed, 21 insertions(+), 1 deletion(-)
+ dlls/dinput/joystick.c       | 25 +++++++++++++++++++++++++
+ 3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index ade7947..648a4cc 100644
+index 28329d03b5..d1bf934a82 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
 @@ -714,7 +714,7 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
@@ -23,10 +23,10 @@ index ade7947..648a4cc 100644
      HKEY hkey;
      WCHAR *guid_str;
 diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
-index d9e2997..af8d99d 100644
+index 27e9c26286..ea794d7396 100644
 --- a/dlls/dinput/device_private.h
 +++ b/dlls/dinput/device_private.h
-@@ -123,6 +123,8 @@ extern const char *_dump_dinput_GUID(const GUID *guid)  DECLSPEC_HIDDEN;
+@@ -125,6 +125,8 @@ extern const char *_dump_dinput_GUID(const GUID *guid)  DECLSPEC_HIDDEN;
  
  extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type)   DECLSPEC_HIDDEN;
  
@@ -36,23 +36,26 @@ index d9e2997..af8d99d 100644
  extern HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN;
  
 diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
-index 20d9ee4..62b57bc 100644
+index 2220b5d576..8341e0313a 100644
 --- a/dlls/dinput/joystick.c
 +++ b/dlls/dinput/joystick.c
-@@ -28,6 +28,7 @@
+@@ -28,8 +28,10 @@
  
  #include <stdio.h>
  
 +#include "device_private.h"
  #include "joystick_private.h"
  #include "wine/debug.h"
++#include "wine/heap.h"
  #include "winreg.h"
-@@ -792,9 +793,26 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+@@ -825,9 +827,32 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
      JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface);
      unsigned int i, j;
      BOOL has_actions = FALSE;
-+    WCHAR username[MAX_PATH];
-+    DWORD username_size = MAX_PATH;
++    WCHAR *username;
++    DWORD size;
 +    BOOL load_success = FALSE;
  
      FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags);
@@ -60,13 +63,19 @@ index 20d9ee4..62b57bc 100644
 +    /* Unless asked the contrary by these flags, try to load a previous mapping */
 +    if (!(dwFlags & DIDBAM_HWDEFAULTS))
 +    {
-+        /* Retrieve logged user name if necessary */
-+        if (lpszUserName == NULL)
-+            GetUserNameW(username, &username_size);
++        if (!lpszUserName)
++            GetUserNameW(NULL, &size);
 +        else
-+            lstrcpynW(username, lpszUserName, MAX_PATH);
++            size = lstrlenW(lpszUserName) + 1;
++
++        username = heap_alloc(size * sizeof(WCHAR));
++        if (!lpszUserName)
++            GetUserNameW(username, &size);
++        else
++            lstrcpynW(username, lpszUserName, size);
 +
 +        load_success = load_mapping_settings((IDirectInputDeviceImpl *) This, lpdiaf, username);
++        heap_free(username);
 +    }
 +
 +    if (load_success) return DI_OK;
@@ -75,5 +84,5 @@ index 20d9ee4..62b57bc 100644
      {
          DWORD inst = (0x000000ff & (lpdiaf->rgoAction[i].dwSemantic)) - 1;
 -- 
-1.9.1
+2.17.1
 

patches/dinput-joy-mappings/0002-dinput-Allow-empty-Joystick-mappings.patch

@@ -1,21 +1,29 @@
-From 920014b62ddd2218477e3d82f45c4515742f9e28 Mon Sep 17 00:00:00 2001
+From bce769d9179ffbcbc634e73ad124528e28c5c7a8 Mon Sep 17 00:00:00 2001
 From: Jetro Jormalainen <jje-wine@jv.jetro.fi>
 Date: Tue, 30 Apr 2019 09:20:54 +1000
-Subject: [PATCH 2/3] dinput: Allow empty Joystick mappings.
+Subject: [PATCH] dinput: Allow empty Joystick mappings.
 
 ---
- dlls/dinput/device.c        | 82 +++++++++++++++++++++++++++++++++++++--------
- dlls/dinput/joystick.c      |  2 ++
- dlls/dinput/keyboard.c      |  2 ++
- dlls/dinput/mouse.c         |  2 ++
- dlls/dinput8/tests/device.c | 50 +++++++++++++++++++++++++++
- 5 files changed, 124 insertions(+), 14 deletions(-)
+ dlls/dinput/device.c        | 82 ++++++++++++++++++++++++++++++-------
+ dlls/dinput/joystick.c      |  4 +-
+ dlls/dinput/keyboard.c      |  2 +
+ dlls/dinput/mouse.c         |  2 +
+ dlls/dinput8/tests/device.c | 50 ++++++++++++++++++++++
+ 5 files changed, 125 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index 2150db7..a7cfe36 100644
+index d1bf934a827..6107ab26538 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
-@@ -643,12 +643,30 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic)
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include "wine/debug.h"
+ #include "wine/unicode.h"
++#include "wine/heap.h"
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winreg.h"
+@@ -643,12 +644,29 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic)
      return type | (0x0000ff00 & (obj_instance << 8));
  }
  
@@ -27,14 +35,13 @@ index 2150db7..a7cfe36 100644
 +        'M','a','p','p','i','n','g','s','\\','%','s','\\','%','s','\\','%','s','\0'};
 +    WCHAR *keyname;
 +
-+    keyname = HeapAlloc(GetProcessHeap(), 0,
-+        sizeof(WCHAR) * (lstrlenW(subkey) + strlenW(username) + strlenW(device) + strlenW(guid)));
++    keyname = heap_alloc(sizeof(WCHAR) * (lstrlenW(subkey) + strlenW(username) + strlenW(device) + strlenW(guid)));
 +    sprintfW(keyname, subkey, username, device, guid);
 +
 +    /* Remove old key mappings so there will be no overlapping mappings */
 +    RegDeleteKeyW(HKEY_CURRENT_USER, keyname);
 +
-+    HeapFree(GetProcessHeap(), 0, keyname);
++    heap_free(keyname);
 +}
 +
  /*
@@ -97,12 +104,12 @@ index 2150db7..a7cfe36 100644
 -            lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT;
 -            mapped += 1;
 +            lpdiaf->rgoAction[i].dwHow = DIAH_USERCONFIG;
-         }
++        }
 +        else
 +        {
 +            memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID));
 +            lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED;
-+        }
+         }
 +
      }
  
@@ -187,10 +194,19 @@ index 2150db7..a7cfe36 100644
      This->num_actions = num_actions;
  
 diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
-index b146712..267f932 100644
+index 66d6cfdffb9..73215dac0d5 100644
 --- a/dlls/dinput/joystick.c
 +++ b/dlls/dinput/joystick.c
-@@ -907,6 +907,8 @@ HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+@@ -847,7 +847,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
+         else
+             lstrcpynW(username, lpszUserName, size);
+ 
+-        load_success = load_mapping_settings((IDirectInputDeviceImpl *) This, lpdiaf, username);
++        load_success = load_mapping_settings(&This->base, lpdiaf, username);
+         heap_free(username);
+     }
+ 
+@@ -957,6 +957,8 @@ HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
  
      hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags);
  
@@ -200,10 +216,10 @@ index b146712..267f932 100644
      HeapFree(GetProcessHeap(), 0, lpszUserNameW);
  
 diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
-index 42c0759..5c5aa14 100644
+index b5e665933ec..0747f5d8c8b 100644
 --- a/dlls/dinput/keyboard.c
 +++ b/dlls/dinput/keyboard.c
-@@ -693,6 +693,8 @@ static HRESULT WINAPI SysKeyboardAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+@@ -690,6 +690,8 @@ static HRESULT WINAPI SysKeyboardAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
  
      hr = SysKeyboardWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags);
  
@@ -213,10 +229,10 @@ index 42c0759..5c5aa14 100644
      HeapFree(GetProcessHeap(), 0, lpszUserNameW);
  
 diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
-index f3ec8e4..0adba03 100644
+index 52a766b2a1a..796f1fa2977 100644
 --- a/dlls/dinput/mouse.c
 +++ b/dlls/dinput/mouse.c
-@@ -863,6 +863,8 @@ static HRESULT WINAPI SysMouseAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+@@ -862,6 +862,8 @@ static HRESULT WINAPI SysMouseAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
  
      hr = SysMouseWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags);
  
@@ -226,7 +242,7 @@ index f3ec8e4..0adba03 100644
      HeapFree(GetProcessHeap(), 0, lpszUserNameW);
  
 diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
-index 1bfb34a..46a1e4a 100644
+index f3e7b542355..bec2a6b863c 100644
 --- a/dlls/dinput8/tests/device.c
 +++ b/dlls/dinput8/tests/device.c
 @@ -38,6 +38,8 @@ struct enum_data {
@@ -301,5 +317,5 @@ index 1bfb34a..46a1e4a 100644
      IDirectInput_Release(pDI);
  }
 -- 
-1.9.1
+2.17.1
 

patches/dinput-joy-mappings/0003-dinput-Support-username-in-Config-dialog.patch

@@ -1,20 +1,34 @@
-From af785463a8e9fc8ff47ead4143151e9831cbbddf Mon Sep 17 00:00:00 2001
+From ed590782f6149f56c0e4c6747cea5a297543047b Mon Sep 17 00:00:00 2001
 From: Jetro Jormalainen <jje-wine@jv.jetro.fi>
 Date: Tue, 30 Apr 2019 09:21:24 +1000
 Subject: [PATCH] dinput: Support username in Config dialog.
 
 ---
- dlls/dinput/config.c         | 183 ++++++++++++++++++++++++++++++-------------
+ dlls/dinput/config.c         | 187 ++++++++++++++++++++++++-----------
  dlls/dinput/device.c         |   2 +-
  dlls/dinput/device_private.h |   1 +
- dlls/dinput/dinput_main.c    |  27 +++++++
- 4 files changed, 156 insertions(+), 57 deletions(-)
+ dlls/dinput/dinput_main.c    |  28 ++++++
+ 4 files changed, 161 insertions(+), 57 deletions(-)
 
 diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c
-index bf44898..cd2c4b9 100644
+index bf44898589..c7a33d2da0 100644
 --- a/dlls/dinput/config.c
 +++ b/dlls/dinput/config.c
-@@ -29,6 +29,9 @@ typedef struct {
+@@ -18,17 +18,23 @@
+ 
+ #define NONAMELESSUNION
+ 
++
+ #include "wine/unicode.h"
+ #include "objbase.h"
+ #include "dinput_private.h"
+ #include "device_private.h"
+ #include "resource.h"
+ 
++#include "wine/heap.h"
++
+ typedef struct {
+     int nobjects;
      IDirectInputDevice8W *lpdid;
      DIDEVICEINSTANCEW ddi;
      DIDEVICEOBJECTINSTANCEW ddo[256];
@@ -24,7 +38,7 @@ index bf44898..cd2c4b9 100644
  } DeviceData;
  
  typedef struct {
-@@ -38,10 +41,11 @@ typedef struct {
+@@ -38,10 +44,11 @@ typedef struct {
  
  typedef struct {
      IDirectInput8W *lpDI;
@@ -37,7 +51,7 @@ index bf44898..cd2c4b9 100644
  } ConfigureDevicesData;
  
  /*
-@@ -57,27 +61,42 @@ static BOOL CALLBACK collect_objects(LPCDIDEVICEOBJECTINSTANCEW lpddo, LPVOID pv
+@@ -57,27 +64,42 @@ static BOOL CALLBACK collect_objects(LPCDIDEVICEOBJECTINSTANCEW lpddo, LPVOID pv
      return DIENUM_CONTINUE;
  }
  
@@ -71,15 +85,15 @@ index bf44898..cd2c4b9 100644
      IDirectInputDevice_EnumObjects(lpdid, collect_objects, (LPVOID) device, DIDFT_ALL);
  
 -    data->ndevices++;
-+    device->user_afs = HeapAlloc(GetProcessHeap(), 0, sizeof(*device->user_afs)*data->nusernames);
-+    memset(device->user_afs, 0, sizeof(*device->user_afs)*data->nusernames);
++    device->user_afs = heap_alloc(sizeof(*device->user_afs) * data->nusernames);
++    memset(device->user_afs, 0, sizeof(*device->user_afs) * data->nusernames);
 +    for (i = 0; i < data->nusernames; i++)
 +    {
 +        DIACTIONFORMATW *user_af = &device->user_afs[i];
 +        user_af->dwNumActions = data->original_lpdiaf->dwNumActions;
 +        user_af->guidActionMap = data->original_lpdiaf->guidActionMap;
-+        user_af->rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*data->original_lpdiaf->dwNumActions);
-+        memset(user_af->rgoAction, 0, sizeof(DIACTIONW)*data->original_lpdiaf->dwNumActions);
++        user_af->rgoAction = heap_alloc(sizeof(DIACTIONW) * data->original_lpdiaf->dwNumActions);
++        memset(user_af->rgoAction, 0, sizeof(DIACTIONW) * data->original_lpdiaf->dwNumActions);
 +        for (j = 0; j < user_af->dwNumActions; j++)
 +        {
 +            user_af->rgoAction[j].dwSemantic = data->original_lpdiaf->rgoAction[j].dwSemantic;
@@ -92,7 +106,7 @@ index bf44898..cd2c4b9 100644
      return DIENUM_CONTINUE;
  }
  
-@@ -170,10 +189,18 @@ static DeviceData* get_cur_device(HWND dialog)
+@@ -170,10 +192,18 @@ static DeviceData* get_cur_device(HWND dialog)
      return &data->devices_data.devices[sel];
  }
  
@@ -113,7 +127,7 @@ index bf44898..cd2c4b9 100644
  }
  
  static int dialog_display_only(HWND dialog)
-@@ -182,40 +209,36 @@ static int dialog_display_only(HWND dialog)
+@@ -182,40 +212,36 @@ static int dialog_display_only(HWND dialog)
      return data->display_only;
  }
  
@@ -155,8 +169,8 @@ index bf44898..cd2c4b9 100644
 +    {
          IDirectInputDevice8_Release(devices_data->devices[i].lpdid);
 +        for (j=0; j < data->nusernames; j++)
-+            HeapFree(GetProcessHeap(), 0, devices_data->devices[i].user_afs[j].rgoAction);
-+        HeapFree(GetProcessHeap(), 0, devices_data->devices[i].user_afs);
++            heap_free(devices_data->devices[i].user_afs[j].rgoAction);
++        heap_free(devices_data->devices[i].user_afs);
 +    }
  
      HeapFree(GetProcessHeap(), 0, devices_data->devices);
@@ -167,7 +181,7 @@ index bf44898..cd2c4b9 100644
  }
  
  static void fill_device_object_list(HWND dialog)
-@@ -231,6 +254,7 @@ static void fill_device_object_list(HWND dialog)
+@@ -231,6 +257,7 @@ static void fill_device_object_list(HWND dialog)
      /* Add each object */
      for (i=0; i < device->nobjects; i++)
      {
@@ -175,7 +189,7 @@ index bf44898..cd2c4b9 100644
          int action = -1;
  
          item.mask = LVIF_TEXT | LVIF_PARAM;
-@@ -241,12 +265,20 @@ static void fill_device_object_list(HWND dialog)
+@@ -241,12 +268,20 @@ static void fill_device_object_list(HWND dialog)
  
          /* Add the item */
          SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTITEMW, 0, (LPARAM) &item);
@@ -198,7 +212,7 @@ index bf44898..cd2c4b9 100644
              {
                  action = j;
                  break;
-@@ -260,7 +292,7 @@ static void fill_device_object_list(HWND dialog)
+@@ -260,7 +295,7 @@ static void fill_device_object_list(HWND dialog)
  static void show_suitable_actions(HWND dialog)
  {
      DeviceData *device = get_cur_device(dialog);
@@ -207,7 +221,7 @@ index bf44898..cd2c4b9 100644
      int i, added = 0;
      int obj = lv_get_cur_item(dialog);
  
-@@ -329,24 +361,35 @@ static void assign_action(HWND dialog)
+@@ -329,24 +364,35 @@ static void assign_action(HWND dialog)
      lv_set_action(dialog, obj, action, lpdiaf);
  }
  
@@ -255,7 +269,7 @@ index bf44898..cd2c4b9 100644
  }
  
  static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam)
-@@ -358,21 +401,16 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w
+@@ -358,21 +404,16 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w
              ConfigureDevicesData *data = (ConfigureDevicesData*) lParam;
  
              /* Initialize action format and enumerate devices */
@@ -279,7 +293,7 @@ index bf44898..cd2c4b9 100644
              fill_device_object_list(dialog);
  
              ShowCursor(TRUE);
-@@ -414,6 +452,7 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w
+@@ -414,6 +455,7 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w
                      break;
  
                  case IDC_CONTROLLERCOMBO:
@@ -287,7 +301,7 @@ index bf44898..cd2c4b9 100644
  
                      switch (HIWORD(wParam))
                      {
-@@ -424,12 +463,12 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w
+@@ -424,12 +466,12 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w
                      break;
  
                  case IDOK:
@@ -301,13 +315,13 @@ index bf44898..cd2c4b9 100644
                      EndDialog(dialog, 0);
                      destroy_data(dialog);
                      break;
-@@ -452,15 +491,47 @@ HRESULT _configure_devices(IDirectInput8W *iface,
+@@ -452,15 +494,48 @@ HRESULT _configure_devices(IDirectInput8W *iface,
                             LPVOID pvRefData
  )
  {
 +    int i;
-+    DWORD default_username_size = MAX_PATH;
-+    WCHAR *default_username = 0;
++    DWORD size;
++    WCHAR *username = NULL;
      ConfigureDevicesData data;
      data.lpDI = iface;
 -    data.lpdiaf = lpdiCDParams->lprgFormats;
@@ -317,16 +331,17 @@ index bf44898..cd2c4b9 100644
 +    if (lpdiCDParams->lptszUserNames == NULL)
 +    {
 +        /* Get default user name */
-+        default_username = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*MAX_PATH);
++        GetUserNameW(NULL, &size);
++        username = heap_alloc(size * sizeof(WCHAR) );
++        GetUserNameW(username, &size);
 +        data.nusernames = 1;
-+        data.usernames = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *));
-+        data.usernames[0] = default_username;
-+        GetUserNameW(default_username, &default_username_size);
++        data.usernames = heap_alloc(sizeof(WCHAR *));
++        data.usernames[0] = username;
 +    }
 +    else
 +    {
 +        WCHAR *p = lpdiCDParams->lptszUserNames;
-+        data.usernames = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)*data.nusernames);
++        data.usernames = heap_alloc(sizeof(WCHAR *) * data.nusernames);
 +        for (i = 0; i < data.nusernames; i++)
 +        {
 +            if (*p)
@@ -345,13 +360,13 @@ index bf44898..cd2c4b9 100644
      DialogBoxParamW(DINPUT_instance, (const WCHAR *)MAKEINTRESOURCE(IDD_CONFIGUREDEVICES),
              lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM)&data);
  
-+    HeapFree(GetProcessHeap(), 0, default_username);
-+    HeapFree(GetProcessHeap(), 0, data.usernames);
++    heap_free(username);
++    heap_free(data.usernames);
 +
      return DI_OK;
  }
 diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index b441743..0c94326 100644
+index 6107ab2653..30483fe691 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
 @@ -692,7 +692,7 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
@@ -364,10 +379,10 @@ index b441743..0c94326 100644
      WCHAR *guid_str = NULL;
      DIDEVICEINSTANCEW didev;
 diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
-index af8d99d..36b71f7 100644
+index ea794d7396..114e3971ed 100644
 --- a/dlls/dinput/device_private.h
 +++ b/dlls/dinput/device_private.h
-@@ -123,6 +123,7 @@ extern const char *_dump_dinput_GUID(const GUID *guid)  DECLSPEC_HIDDEN;
+@@ -125,6 +125,7 @@ extern const char *_dump_dinput_GUID(const GUID *guid)  DECLSPEC_HIDDEN;
  
  extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type)   DECLSPEC_HIDDEN;
  
@@ -376,10 +391,18 @@ index af8d99d..36b71f7 100644
  
  extern HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df)  DECLSPEC_HIDDEN;
 diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
-index 198c6a8..ee319f0 100644
+index 0855cb41cd..7af377026c 100644
 --- a/dlls/dinput/dinput_main.c
 +++ b/dlls/dinput/dinput_main.c
-@@ -1251,9 +1251,34 @@ static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices(
+@@ -39,6 +39,7 @@
+ #define NONAMELESSUNION
+ 
+ #include "wine/debug.h"
++#include "wine/heap.h"
+ #include "wine/unicode.h"
+ #include "wine/asm.h"
+ #include "windef.h"
+@@ -1253,9 +1254,34 @@ static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices(
  
      /* Copy parameters */
      diCDParamsW.dwSize = sizeof(DICONFIGUREDEVICESPARAMSW);
@@ -414,15 +437,15 @@ index 198c6a8..ee319f0 100644
  
      diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiCDParams->lprgFormats->dwNumActions);
      _copy_diactionformatAtoW(&diafW, lpdiCDParams->lprgFormats);
-@@ -1281,6 +1306,8 @@ static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices(
+@@ -1283,6 +1309,8 @@ static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices(
  
      HeapFree(GetProcessHeap(), 0, diafW.rgoAction);
  
-+    HeapFree(GetProcessHeap(), 0, (void*) diCDParamsW.lptszUserNames);
++    heap_free((void*) diCDParamsW.lptszUserNames);
 +
      return hr;
  }
  
 -- 
-1.9.1
+2.17.1
 

patches/dinput-joy-mappings/0004-dinput-Dont-allow-Fixed-actions-to-be-changed.patch

@@ -0,0 +1,33 @@
+From 629a5f7eea3b17f56606d3b588a5fd96ded99fef Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 4 Oct 2019 16:24:06 +1000
+Subject: [PATCH] dinput: Dont allow Fixed actions to be changed.
+
+---
+ dlls/dinput/config.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c
+index cd2c4b921e7..bfb535c9b2a 100644
+--- a/dlls/dinput/config.c
++++ b/dlls/dinput/config.c
+@@ -91,6 +91,7 @@ static BOOL CALLBACK collect_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDev
+         for (j = 0; j < user_af->dwNumActions; j++)
+         {
+             user_af->rgoAction[j].dwSemantic = data->original_lpdiaf->rgoAction[j].dwSemantic;
++            user_af->rgoAction[j].dwFlags = data->original_lpdiaf->rgoAction[j].dwFlags;
+             user_af->rgoAction[j].u.lptszActionName = data->original_lpdiaf->rgoAction[j].u.lptszActionName;
+         }
+         IDirectInputDevice8_BuildActionMap(lpdid, user_af, data->usernames[i], 0);
+@@ -334,6 +335,8 @@ static void assign_action(HWND dialog)
+ 
+     if (old_action == action) return;
+     if (obj < 0) return;
++    if (lpdiaf->rgoAction[old_action].dwFlags & DIA_APPFIXED) return;
++
+     type = device->ddo[obj].dwType;
+ 
+     /* Clear old action */
+-- 
+2.23.0
+

patches/eventfd_synchronization/0085-server-Only-signal-the-APC-fd-for-user-APCs.patch

@@ -0,0 +1,26 @@
+From 9e4df70f7282b04849153b3fa2edf15dc24eaf4f Mon Sep 17 00:00:00 2001
+From: Zebediah Figura <zfigura@codeweavers.com>
+Date: Tue, 23 Jul 2019 18:39:06 -0500
+Subject: [PATCH] server: Only signal the APC fd for user APCs.
+
+Otherwise we might incorrectly return WAIT_IO_COMPLETION to the user when a system APC runs.
+---
+ server/thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/thread.c b/server/thread.c
+index fc751c2cb..2e77e5ff2 100644
+--- a/server/thread.c
++++ b/server/thread.c
+@@ -1057,7 +1057,7 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr
+     {
+         wake_thread( thread );
+ 
+-        if (do_esync())
++        if (do_esync() && queue == &thread->user_apc)
+             esync_wake_fd( thread->esync_apc_fd );
+     }
+ 
+-- 
+2.23.0
+

patches/eventfd_synchronization/0086-ntdll-Check-the-APC-fd-first.patch

@@ -0,0 +1,43 @@
+From 836f1b6b0560bd178efb8d52900b4b136f87ae30 Mon Sep 17 00:00:00 2001
+From: Zebediah Figura <zfigura@codeweavers.com>
+Date: Tue, 23 Jul 2019 17:22:20 -0500
+Subject: [PATCH] ntdll: Check the APC fd first.
+
+---
+ dlls/ntdll/esync.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
+index fc621ccfb..0adb4ad77 100644
+--- a/dlls/ntdll/esync.c
++++ b/dlls/ntdll/esync.c
+@@ -1046,6 +1046,14 @@ static NTSTATUS __esync_wait_objects( DWORD count, const HANDLE *handles,
+             ret = do_poll( fds, pollcount, timeout ? &end : NULL );
+             if (ret > 0)
+             {
++                /* We must check this first! The server may set an event that
++                 * we're waiting on, but we need to return STATUS_USER_APC. */
++                if (alertable)
++                {
++                    if (fds[pollcount - 1].revents & POLLIN)
++                        goto userapc;
++                }
++
+                 /* Find out which object triggered the wait. */
+                 for (i = 0; i < count; i++)
+                 {
+@@ -1089,11 +1097,6 @@ static NTSTATUS __esync_wait_objects( DWORD count, const HANDLE *handles,
+                         return count - 1;
+                     }
+                 }
+-                if (alertable)
+-                {
+-                    if (fds[i++].revents & POLLIN)
+-                        goto userapc;
+-                }
+ 
+                 /* If we got here, someone else stole (or reset, etc.) whatever
+                  * we were waiting for. So keep waiting. */
+-- 
+2.23.0
+

patches/eventfd_synchronization/0087-ntdll-esync-Lock-accessing-the-shm_addrs-array.patch

@@ -0,0 +1,52 @@
+From c1804983dc8e9509c088c35914212cda1bd5a48a Mon Sep 17 00:00:00 2001
+From: Zebediah Figura <zfigura@codeweavers.com>
+Date: Wed, 7 Aug 2019 17:14:54 -0500
+Subject: [PATCH] ntdll/esync: Lock accessing the shm_addrs array.
+
+---
+ dlls/ntdll/esync.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
+index 0adb4ad77..2f030c141 100644
+--- a/dlls/ntdll/esync.c
++++ b/dlls/ntdll/esync.c
+@@ -155,10 +155,22 @@ void esync_init(void)
+     shm_addrs_size = 128;
+ }
+ 
++static RTL_CRITICAL_SECTION shm_addrs_section;
++static RTL_CRITICAL_SECTION_DEBUG shm_addrs_debug =
++{
++    0, 0, &shm_addrs_section,
++    { &shm_addrs_debug.ProcessLocksList, &shm_addrs_debug.ProcessLocksList },
++      0, 0, { (DWORD_PTR)(__FILE__ ": shm_addrs_section") }
++};
++static RTL_CRITICAL_SECTION shm_addrs_section = { &shm_addrs_debug, -1, 0, 0, 0, 0 };
++
+ static void *get_shm( unsigned int idx )
+ {
+     int entry  = (idx * 8) / pagesize;
+     int offset = (idx * 8) % pagesize;
++    void *ret;
++
++    RtlEnterCriticalSection(&shm_addrs_section);
+ 
+     if (entry >= shm_addrs_size)
+     {
+@@ -180,7 +192,11 @@ static void *get_shm( unsigned int idx )
+             munmap( addr, pagesize ); /* someone beat us to it */
+     }
+ 
+-    return (void *)((unsigned long)shm_addrs[entry] + offset);
++    ret = (void *)((unsigned long)shm_addrs[entry] + offset);
++
++    RtlLeaveCriticalSection(&shm_addrs_section);
++
++    return ret;
+ }
+ 
+ /* We'd like lookup to be fast. To that end, we use a static list indexed by handle.
+-- 
+2.23.0
+

patches/eventfd_synchronization/0088-ntdll-Get-rid-of-the-per-event-spinlock-for-auto-res.patch

@@ -0,0 +1,206 @@
+From c41dc5b8c422be3914cd31c239ec586a091b8a3b Mon Sep 17 00:00:00 2001
+From: Zebediah Figura <zfigura@codeweavers.com>
+Date: Mon, 10 Jun 2019 11:25:34 -0400
+Subject: [PATCH] ntdll: Get rid of the per-event spinlock for auto-reset
+ events.
+
+It's not necessary. Much like semaphores, the shm state is just a hint.
+---
+ dlls/ntdll/esync.c | 74 +++++++++++++++++++++++++++++++++++-----------
+ server/esync.c     | 32 +++++++++++++-------
+ 2 files changed, 78 insertions(+), 28 deletions(-)
+
+diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
+index 2f030c141..87f303403 100644
+--- a/dlls/ntdll/esync.c
++++ b/dlls/ntdll/esync.c
+@@ -570,6 +570,14 @@ static inline void small_pause(void)
+  * problem at all.
+  */
+ 
++/* Removing this spinlock is harder than it looks. esync_wait_objects() can
++ * deal with inconsistent state well enough, and a race between SetEvent() and
++ * ResetEvent() gives us license to yield either result as long as we act
++ * consistently, but that's not enough. Notably, esync_wait_objects() should
++ * probably act like a fence, so that the second half of esync_set_event() does
++ * not seep past a subsequent reset. That's one problem, but no guarantee there
++ * aren't others. */
++
+ NTSTATUS esync_set_event( HANDLE handle, LONG *prev )
+ {
+     static const uint64_t value = 1;
+@@ -583,21 +591,36 @@ NTSTATUS esync_set_event( HANDLE handle, LONG *prev )
+     if ((ret = get_object( handle, &obj ))) return ret;
+     event = obj->shm;
+ 
+-    /* Acquire the spinlock. */
+-    while (interlocked_cmpxchg( &event->locked, 1, 0 ))
+-        small_pause();
++    if (obj->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Acquire the spinlock. */
++        while (interlocked_cmpxchg( &event->locked, 1, 0 ))
++            small_pause();
++    }
++
++    /* For manual-reset events, as long as we're in a lock, we can take the
++     * optimization of only calling write() if the event wasn't already
++     * signaled.
++     *
++     * For auto-reset events, esync_wait_objects() must grab the kernel object.
++     * Thus if we got into a race so that the shm state is signaled but the
++     * eventfd is unsignaled (i.e. reset shm, set shm, set fd, reset fd), we
++     * *must* signal the fd now, or any waiting threads will never wake up. */
+ 
+     /* Only bother signaling the fd if we weren't already signaled. */
+-    if (!(current = interlocked_xchg( &event->signaled, 1 )))
++    if (!(current = interlocked_xchg( &event->signaled, 1 )) || obj->type == ESYNC_AUTO_EVENT)
+     {
+         if (write( obj->fd, &value, sizeof(value) ) == -1)
+-            return FILE_GetNtStatus();
++            ERR("write: %s\n", strerror(errno));
+     }
+ 
+     if (prev) *prev = current;
+ 
+-    /* Release the spinlock. */
+-    event->locked = 0;
++    if (obj->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Release the spinlock. */
++        event->locked = 0;
++    }
+ 
+     return STATUS_SUCCESS;
+ }
+@@ -615,21 +638,34 @@ NTSTATUS esync_reset_event( HANDLE handle, LONG *prev )
+     if ((ret = get_object( handle, &obj ))) return ret;
+     event = obj->shm;
+ 
+-    /* Acquire the spinlock. */
+-    while (interlocked_cmpxchg( &event->locked, 1, 0 ))
+-        small_pause();
++    if (obj->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Acquire the spinlock. */
++        while (interlocked_cmpxchg( &event->locked, 1, 0 ))
++            small_pause();
++    }
+ 
+-    /* Only bother signaling the fd if we weren't already signaled. */
+-    if ((current = interlocked_xchg( &event->signaled, 0 )))
++    /* For manual-reset events, as long as we're in a lock, we can take the
++     * optimization of only calling read() if the event was already signaled.
++     *
++     * For auto-reset events, we have no guarantee that the previous "signaled"
++     * state is actually correct. We need to leave both states unsignaled after
++     * leaving this function, so we always have to read(). */
++    if ((current = interlocked_xchg( &event->signaled, 0 )) || obj->type == ESYNC_AUTO_EVENT)
+     {
+-        /* we don't care about the return value */
+-        read( obj->fd, &value, sizeof(value) );
++        if (read( obj->fd, &value, sizeof(value) ) == -1 && errno != EWOULDBLOCK && errno != EAGAIN)
++        {
++            ERR("read: %s\n", strerror(errno));
++        }
+     }
+ 
+     if (prev) *prev = current;
+ 
+-    /* Release the spinlock. */
+-    event->locked = 0;
++    if (obj->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Release the spinlock. */
++        event->locked = 0;
++    }
+ 
+     return STATUS_SUCCESS;
+ }
+@@ -844,8 +880,9 @@ static void update_grabbed_object( struct esync *obj )
+     else if (obj->type == ESYNC_AUTO_EVENT)
+     {
+         struct event *event = obj->shm;
+-        /* We don't have to worry about a race between this and read(), for
+-         * reasons described near esync_set_event(). */
++        /* We don't have to worry about a race between this and read(), since
++         * this is just a hint, and the real state is in the kernel object.
++         * This might already be 0, but that's okay! */
+         event->signaled = 0;
+     }
+ }
+@@ -1094,6 +1131,7 @@ static NTSTATUS __esync_wait_objects( DWORD count, const HANDLE *handles,
+                         }
+                         else
+                         {
++                            /* FIXME: Could we check the poll or shm state first? Should we? */
+                             if ((size = read( fds[i].fd, &value, sizeof(value) )) == sizeof(value))
+                             {
+                                 /* We found our object. */
+diff --git a/server/esync.c b/server/esync.c
+index 4521993d4..84d0951cb 100644
+--- a/server/esync.c
++++ b/server/esync.c
+@@ -396,9 +396,12 @@ void esync_set_event( struct esync *esync )
+     if (debug_level)
+         fprintf( stderr, "esync_set_event() fd=%d\n", esync->fd );
+ 
+-    /* Acquire the spinlock. */
+-    while (interlocked_cmpxchg( &event->locked, 1, 0 ))
+-        small_pause();
++    if (esync->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Acquire the spinlock. */
++        while (interlocked_cmpxchg( &event->locked, 1, 0 ))
++            small_pause();
++    }
+ 
+     if (!interlocked_xchg( &event->signaled, 1 ))
+     {
+@@ -406,8 +409,11 @@ void esync_set_event( struct esync *esync )
+             perror( "esync: write" );
+     }
+ 
+-    /* Release the spinlock. */
+-    event->locked = 0;
++    if (esync->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Release the spinlock. */
++        event->locked = 0;
++    }
+ }
+ 
+ void esync_reset_event( struct esync *esync )
+@@ -421,9 +427,12 @@ void esync_reset_event( struct esync *esync )
+     if (debug_level)
+         fprintf( stderr, "esync_reset_event() fd=%d\n", esync->fd );
+ 
+-    /* Acquire the spinlock. */
+-    while (interlocked_cmpxchg( &event->locked, 1, 0 ))
+-        small_pause();
++    if (esync->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Acquire the spinlock. */
++        while (interlocked_cmpxchg( &event->locked, 1, 0 ))
++            small_pause();
++    }
+ 
+     /* Only bother signaling the fd if we weren't already signaled. */
+     if (interlocked_xchg( &event->signaled, 0 ))
+@@ -432,8 +441,11 @@ void esync_reset_event( struct esync *esync )
+         read( esync->fd, &value, sizeof(value) );
+     }
+ 
+-    /* Release the spinlock. */
+-    event->locked = 0;
++    if (esync->type == ESYNC_MANUAL_EVENT)
++    {
++        /* Release the spinlock. */
++        event->locked = 0;
++    }
+ }
+ 
+ DECL_HANDLER(create_esync)
+-- 
+2.23.0
+

patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch

@@ -1,4 +1,4 @@
-From 8289235edb964f494c221044e36f2ea4294721ae Mon Sep 17 00:00:00 2001
+From b0eec9e5d8736bfa86096fd2d69cfb73dba7a5fe Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 1 Apr 2016 01:29:51 +0200
 Subject: [PATCH] fsutil: Add fsutil program with support for creating hard
@@ -14,7 +14,7 @@ Subject: [PATCH] fsutil: Add fsutil program with support for creating hard
  create mode 100644 programs/fsutil/resources.h
 
 diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in
-index 64307e83ac..e10bd433ba 100644
+index 64307e83aca..e10bd433baa 100644
 --- a/programs/fsutil/Makefile.in
 +++ b/programs/fsutil/Makefile.in
 @@ -1,6 +1,9 @@
@@ -29,7 +29,7 @@ index 64307e83ac..e10bd433ba 100644
 +RC_SRCS = fsutil.rc
 diff --git a/programs/fsutil/fsutil.rc b/programs/fsutil/fsutil.rc
 new file mode 100644
-index 0000000000..593f8175a2
+index 00000000000..593f8175a23
 --- /dev/null
 +++ b/programs/fsutil/fsutil.rc
 @@ -0,0 +1,34 @@
@@ -68,7 +68,7 @@ index 0000000000..593f8175a2
 +    STRING_HARDLINK_CREATE_USAGE, "Syntax: fsutil hardlink create old new\n\n"
 +}
 diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c
-index 2bce87edc8..6f7974ad1d 100644
+index eb4e3412976..ffef8aecbb1 100644
 --- a/programs/fsutil/main.c
 +++ b/programs/fsutil/main.c
 @@ -1,5 +1,6 @@
@@ -191,7 +191,7 @@ index 2bce87edc8..6f7974ad1d 100644
 +    return ret;
 +}
 +
- int wmain(int argc, WCHAR *argv[])
+ int __cdecl wmain(int argc, WCHAR *argv[])
  {
 -    int i;
 +    static const WCHAR hardlinkW[]={'h','a','r','d','l','i','n','k',0};
@@ -222,7 +222,7 @@ index 2bce87edc8..6f7974ad1d 100644
  }
 diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h
 new file mode 100644
-index 0000000000..b85826ac42
+index 00000000000..b85826ac421
 --- /dev/null
 +++ b/programs/fsutil/resources.h
 @@ -0,0 +1,25 @@
@@ -252,5 +252,5 @@ index 0000000000..b85826ac42
 +#define STRING_HARDLINK_USAGE           104
 +#define STRING_HARDLINK_CREATE_USAGE    105
 -- 
-2.23.0.rc1
+2.17.1
 

patches/kernel32-Job_Tests/0001-kernel32-tests-Add-tests-for-job-object-accounting.patch

@@ -1,18 +1,18 @@
-From 6addfba7928c62ea5a1a7e9717c564f745523957 Mon Sep 17 00:00:00 2001
+From e9f5574ee2a3b6a0b2668747aef7d95c176ece8f Mon Sep 17 00:00:00 2001
 From: Mark Jansen <mark.jansen@reactos.org>
 Date: Sun, 24 Sep 2017 22:45:22 +0200
-Subject: kernel32/tests: Add tests for job object accounting
+Subject: [PATCH] kernel32/tests: Add tests for job object accounting
 
 Signed-off-by: Mark Jansen <mark.jansen@reactos.org>
 ---
- dlls/kernel32/tests/process.c | 95 +++++++++++++++++++++++++++++++++++++++++++
+ dlls/kernel32/tests/process.c | 95 +++++++++++++++++++++++++++++++++++
  1 file changed, 95 insertions(+)
 
 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index 07daea82aec..5379684e28d 100644
+index f181536e7a6..4c2709cce0e 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
-@@ -2364,6 +2364,69 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION
+@@ -2423,6 +2423,69 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION
      ok_(__FILE__, line)(ret, "CreateProcess error %u\n", GetLastError());
  }
  
@@ -82,7 +82,7 @@ index 07daea82aec..5379684e28d 100644
  
  static void test_IsProcessInJob(void)
  {
-@@ -2390,11 +2453,15 @@ static void test_IsProcessInJob(void)
+@@ -2449,11 +2512,15 @@ static void test_IsProcessInJob(void)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(!out, "IsProcessInJob returned out=%u\n", out);
@@ -96,9 +96,9 @@ index 07daea82aec..5379684e28d 100644
 +    test_assigned_proc(job2, 0);
 +    test_accounting(job2, 0, 0, 0);
  
-     out = TRUE;
-     ret = pIsProcessInJob(pi.hProcess, NULL, &out);
-@@ -2408,11 +2475,15 @@ static void test_IsProcessInJob(void)
+     ret = pAssignProcessToJobObject(job, pi.hProcess);
+     ok(ret, "AssignProcessToJobObject error %u\n", GetLastError());
+@@ -2462,11 +2529,15 @@ static void test_IsProcessInJob(void)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(out, "IsProcessInJob returned out=%u\n", out);
@@ -114,7 +114,7 @@ index 07daea82aec..5379684e28d 100644
  
      out = FALSE;
      ret = pIsProcessInJob(pi.hProcess, NULL, &out);
-@@ -2428,6 +2499,8 @@ static void test_IsProcessInJob(void)
+@@ -2482,6 +2553,8 @@ static void test_IsProcessInJob(void)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(out, "IsProcessInJob returned out=%u\n", out);
@@ -123,7 +123,7 @@ index 07daea82aec..5379684e28d 100644
  
      CloseHandle(pi.hProcess);
      CloseHandle(pi.hThread);
-@@ -2444,11 +2517,15 @@ static void test_TerminateJobObject(void)
+@@ -2498,11 +2571,15 @@ static void test_TerminateJobObject(void)
  
      job = pCreateJobObjectW(NULL, NULL);
      ok(job != NULL, "CreateJobObject error %u\n", GetLastError());
@@ -139,7 +139,7 @@ index 07daea82aec..5379684e28d 100644
  
      ret = pTerminateJobObject(job, 123);
      ok(ret, "TerminateJobObject error %u\n", GetLastError());
-@@ -2456,6 +2533,8 @@ static void test_TerminateJobObject(void)
+@@ -2510,6 +2587,8 @@ static void test_TerminateJobObject(void)
      dwret = WaitForSingleObject(pi.hProcess, 1000);
      ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
      if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0);
@@ -148,7 +148,7 @@ index 07daea82aec..5379684e28d 100644
  
      ret = GetExitCodeProcess(pi.hProcess, &dwret);
      ok(ret, "GetExitCodeProcess error %u\n", GetLastError());
-@@ -2475,6 +2554,8 @@ static void test_TerminateJobObject(void)
+@@ -2529,6 +2608,8 @@ static void test_TerminateJobObject(void)
      ret = pAssignProcessToJobObject(job, pi.hProcess);
      ok(!ret, "AssignProcessToJobObject unexpectedly succeeded\n");
      expect_eq_d(ERROR_ACCESS_DENIED, GetLastError());
@@ -157,7 +157,7 @@ index 07daea82aec..5379684e28d 100644
  
      CloseHandle(pi.hProcess);
      CloseHandle(pi.hThread);
-@@ -2661,11 +2742,15 @@ static void test_KillOnJobClose(void)
+@@ -2715,11 +2796,15 @@ static void test_KillOnJobClose(void)
          return;
      }
      ok(ret, "SetInformationJobObject error %u\n", GetLastError());
@@ -173,7 +173,7 @@ index 07daea82aec..5379684e28d 100644
  
      CloseHandle(job);
  
-@@ -2769,6 +2854,8 @@ static HANDLE test_AddSelfToJob(void)
+@@ -2823,6 +2908,8 @@ static HANDLE test_AddSelfToJob(void)
  
      ret = pAssignProcessToJobObject(job, GetCurrentProcess());
      ok(ret, "AssignProcessToJobObject error %u\n", GetLastError());
@@ -182,7 +182,7 @@ index 07daea82aec..5379684e28d 100644
  
      return job;
  }
-@@ -2796,6 +2883,8 @@ static void test_jobInheritance(HANDLE job)
+@@ -2850,6 +2937,8 @@ static void test_jobInheritance(HANDLE job)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(out, "IsProcessInJob returned out=%u\n", out);
@@ -191,7 +191,7 @@ index 07daea82aec..5379684e28d 100644
  
      dwret = WaitForSingleObject(pi.hProcess, 1000);
      ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
-@@ -2824,6 +2913,8 @@ static void test_BreakawayOk(HANDLE job)
+@@ -2878,6 +2967,8 @@ static void test_BreakawayOk(HANDLE job)
      ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi);
      ok(!ret, "CreateProcessA expected failure\n");
      expect_eq_d(ERROR_ACCESS_DENIED, GetLastError());
@@ -200,7 +200,7 @@ index 07daea82aec..5379684e28d 100644
  
      if (ret)
      {
-@@ -2846,6 +2937,8 @@ static void test_BreakawayOk(HANDLE job)
+@@ -2900,6 +2991,8 @@ static void test_BreakawayOk(HANDLE job)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(!out, "IsProcessInJob returned out=%u\n", out);
@@ -209,7 +209,7 @@ index 07daea82aec..5379684e28d 100644
  
      dwret = WaitForSingleObject(pi.hProcess, 1000);
      ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
-@@ -2863,6 +2956,8 @@ static void test_BreakawayOk(HANDLE job)
+@@ -2917,6 +3010,8 @@ static void test_BreakawayOk(HANDLE job)
      ret = pIsProcessInJob(pi.hProcess, job, &out);
      ok(ret, "IsProcessInJob error %u\n", GetLastError());
      ok(!out, "IsProcessInJob returned out=%u\n", out);
@@ -219,5 +219,5 @@ index 07daea82aec..5379684e28d 100644
      dwret = WaitForSingleObject(pi.hProcess, 1000);
      ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret);
 -- 
-2.14.1
+2.23.0