Release v6.0rc1

This patch would have to completely rewriten and hasn't been used for quite sometime.

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

@@ -1,4 +1,4 @@
-From 7529755fcc41fda650aac6b27f34438354435d34 Mon Sep 17 00:00:00 2001
+From b51fdc7e211f676d169c937209bf689e57252c5d 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 9280b5d32..2f0974a4c 100644
+index aa51c744297..7cad015480f 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -1887,7 +1887,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -2130,7 +2130,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 9280b5d32..2f0974a4c 100644
  }
  
  struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1895,7 +1895,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -2138,7 +2138,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -31,10 +31,10 @@ index 9280b5d32..2f0974a4c 100644
  
  static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index b9321157a..76ea23ba6 100644
+index 1f6201a6a93..35791d5c22e 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5895,7 +5895,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
+@@ -5886,7 +5886,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
@@ -42,7 +42,7 @@ index b9321157a..76ea23ba6 100644
 +        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,
+ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight,
 -- 
-2.24.0
+2.29.2
 

patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Allow-multiple-backends-to-coexist.patch

@@ -1,4 +1,4 @@
-From 885d9313f5fdd835fb753d2c2b30abfb49f54051 Mon Sep 17 00:00:00 2001
+From eaab7eaeb7533445473bc19d947c34bdc360566e Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 2 Oct 2020 11:29:24 -0500
 Subject: [PATCH] bcrypt: Allow multiple backends to coexist.
@@ -9,8 +9,8 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  dlls/bcrypt/bcrypt_internal.h |   3 +
  dlls/bcrypt/gnutls.c          |  32 ++++--
  dlls/bcrypt/macos.c           |  18 +++-
- dlls/bcrypt/unixlib.c         | 186 ++++++++++++++++++++++++++++++++++
- 5 files changed, 227 insertions(+), 15 deletions(-)
+ dlls/bcrypt/unixlib.c         | 194 ++++++++++++++++++++++++++++++++++
+ 5 files changed, 235 insertions(+), 15 deletions(-)
  create mode 100644 dlls/bcrypt/unixlib.c
 
 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
@@ -27,11 +27,11 @@ index 24803fb2d7c..46a20d473dd 100644
  
  RC_SRCS = version.rc
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 463672db470..90551868cf0 100644
+index e1777ed130b..86b1e3d28c3 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -215,4 +215,7 @@ struct key_funcs
-     NTSTATUS (CDECL *key_import_ecc)( struct key *, UCHAR *, ULONG );
+@@ -217,4 +217,7 @@ struct key_funcs
+     NTSTATUS (CDECL *key_import_rsa)( struct key *, UCHAR *, ULONG );
  };
  
 +struct key_funcs *gnutls_lib_init(DWORD reason);
@@ -39,10 +39,10 @@ index 463672db470..90551868cf0 100644
 +
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index 5ed51e8704c..7a1eada329c 100644
+index 162ac9ea732..a7fd8428dec 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -347,9 +347,12 @@ fail:
+@@ -358,9 +358,12 @@ fail:
  
  static void gnutls_uninitialize(void)
  {
@@ -58,8 +58,8 @@ index 5ed51e8704c..7a1eada329c 100644
  }
  
  struct buffer
-@@ -1848,19 +1851,28 @@ static const struct key_funcs key_funcs =
-     key_import_ecc
+@@ -1906,19 +1909,28 @@ static const struct key_funcs key_funcs =
+     key_import_rsa
  };
  
 -NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
@@ -95,11 +95,11 @@ index 5ed51e8704c..7a1eada329c 100644
 +}
 +#endif
 diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index d8bba46ad5c..8df5ca8645f 100644
+index 57edc3e262b..55dca5dde34 100644
 --- a/dlls/bcrypt/macos.c
 +++ b/dlls/bcrypt/macos.c
-@@ -287,11 +287,21 @@ static const struct key_funcs key_funcs =
-     key_import_ecc
+@@ -294,11 +294,21 @@ static const struct key_funcs key_funcs =
+     key_import_rsa
  };
  
 -NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
@@ -126,10 +126,10 @@ index d8bba46ad5c..8df5ca8645f 100644
  #endif
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
 new file mode 100644
-index 00000000000..791b5d54188
+index 00000000000..a158ec1630a
 --- /dev/null
 +++ b/dlls/bcrypt/unixlib.c
-@@ -0,0 +1,186 @@
+@@ -0,0 +1,194 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -250,6 +250,12 @@ index 00000000000..791b5d54188
 +    return STATUS_NOT_IMPLEMENTED;
 +}
 +
++static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key *key_copy )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
 +static void CDECL key_asymmetric_destroy( struct key *key )
 +{
 +    FIXME( "not implemented\n" );
@@ -267,6 +273,7 @@ index 00000000000..791b5d54188
 +    key_symmetric_destroy,
 +    key_asymmetric_init,
 +    key_asymmetric_generate,
++    key_asymmetric_duplicate,
 +    key_asymmetric_sign,
 +    key_asymmetric_verify,
 +    key_asymmetric_destroy,
@@ -299,6 +306,7 @@ index 00000000000..791b5d54188
 +        RESOLVE_FUNC(symmetric_destroy)
 +        RESOLVE_FUNC(asymmetric_init)
 +        RESOLVE_FUNC(asymmetric_generate)
++        RESOLVE_FUNC(asymmetric_duplicate)
 +        RESOLVE_FUNC(asymmetric_sign)
 +        RESOLVE_FUNC(asymmetric_verify)
 +        RESOLVE_FUNC(asymmetric_destroy)
@@ -317,5 +325,5 @@ index 00000000000..791b5d54188
 +
 +#endif
 -- 
-2.28.0
+2.29.2
 

patches/bcrypt-ECDHSecretAgreement/0002-bcrypt-Implement-BCryptSecretAgreement-with-libgcryp.patch

@@ -1,4 +1,4 @@
-From dd993178a8e0f8db6b09e059ba39820c9b609913 Mon Sep 17 00:00:00 2001
+From 6a38df1250c4bab1fab1a72e06fc347586a7c535 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 2 Oct 2020 12:11:49 -0500
 Subject: [PATCH] bcrypt: Implement BCryptSecretAgreement with libgcrypt.
@@ -9,16 +9,16 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  dlls/bcrypt/Makefile.in       |   1 +
  dlls/bcrypt/bcrypt_internal.h |   4 +
  dlls/bcrypt/bcrypt_main.c     |  55 ++++++-
- dlls/bcrypt/gcrypt.c          | 289 ++++++++++++++++++++++++++++++++++
+ dlls/bcrypt/gcrypt.c          | 290 ++++++++++++++++++++++++++++++++++
  dlls/bcrypt/gnutls.c          |   3 +-
  dlls/bcrypt/macos.c           |   3 +-
  dlls/bcrypt/tests/bcrypt.c    |   2 +-
  dlls/bcrypt/unixlib.c         |  15 +-
- 9 files changed, 376 insertions(+), 10 deletions(-)
+ 9 files changed, 377 insertions(+), 10 deletions(-)
  create mode 100644 dlls/bcrypt/gcrypt.c
 
 diff --git a/configure.ac b/configure.ac
-index 865aa924d07..35233aa5d08 100644
+index 029dcd45187..a18e271dd4c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -45,6 +45,7 @@ AC_ARG_WITH(faudio,    AS_HELP_STRING([--without-faudio],[do not use FAudio (XAu
@@ -29,7 +29,7 @@ index 865aa924d07..35233aa5d08 100644
  AC_ARG_WITH(gettext,   AS_HELP_STRING([--without-gettext],[do not use gettext]))
  AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]),
              [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi])
-@@ -2000,6 +2001,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
+@@ -1988,6 +1989,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
                   [vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.])
  test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no}
  
@@ -62,10 +62,10 @@ index 46a20d473dd..4a3016784af 100644
  	macos.c \
  	md2.c \
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 7563d19aac5..f4fcfebabd6 100644
+index 86b1e3d28c3..5d969b13dc3 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -191,6 +191,8 @@ struct key
+@@ -192,6 +192,8 @@ struct key
  struct secret
  {
      struct object hdr;
@@ -74,10 +74,10 @@ index 7563d19aac5..f4fcfebabd6 100644
  };
  
  struct key_funcs
-@@ -212,9 +214,11 @@ struct key_funcs
-     NTSTATUS (CDECL *key_export_ecc)( struct key *, UCHAR *, ULONG, ULONG * );
+@@ -215,9 +217,11 @@ struct key_funcs
      NTSTATUS (CDECL *key_import_dsa_capi)( struct key *, UCHAR *, ULONG );
      NTSTATUS (CDECL *key_import_ecc)( struct key *, UCHAR *, ULONG );
+     NTSTATUS (CDECL *key_import_rsa)( struct key *, UCHAR *, ULONG );
 +    NTSTATUS (CDECL *key_compute_secret_ecc)( unsigned char *privkey_in, struct key *pubkey_in, struct secret *secret );
  };
  
@@ -87,10 +87,10 @@ index 7563d19aac5..f4fcfebabd6 100644
  
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index a91f31e9f09..6787b0d66cb 100644
+index 591c01c710c..f2c344f3275 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1807,9 +1807,12 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
+@@ -1914,9 +1914,12 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
  {
      struct key *privkey = privatekey;
      struct key *pubkey = publickey;
@@ -104,7 +104,7 @@ index a91f31e9f09..6787b0d66cb 100644
  
      if (!privkey || privkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
      if (!pubkey || pubkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
-@@ -1818,18 +1821,39 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
+@@ -1925,18 +1928,39 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
      if (!(secret = heap_alloc_zero( sizeof(*secret) ))) return STATUS_NO_MEMORY;
      secret->hdr.magic = MAGIC_SECRET;
  
@@ -146,7 +146,7 @@ index a91f31e9f09..6787b0d66cb 100644
      heap_free( secret );
      return STATUS_SUCCESS;
  }
-@@ -1839,12 +1863,33 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
+@@ -1946,12 +1970,33 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
  {
      struct secret *secret = handle;
  
@@ -184,10 +184,10 @@ index a91f31e9f09..6787b0d66cb 100644
  BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 diff --git a/dlls/bcrypt/gcrypt.c b/dlls/bcrypt/gcrypt.c
 new file mode 100644
-index 00000000000..d127e1a2903
+index 00000000000..00849358c68
 --- /dev/null
 +++ b/dlls/bcrypt/gcrypt.c
-@@ -0,0 +1,289 @@
+@@ -0,0 +1,290 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -449,6 +449,7 @@ index 00000000000..d127e1a2903
 +    NULL,
 +    NULL,
 +    NULL,
++    NULL,
 +    key_compute_secret_ecc
 +};
 +
@@ -478,38 +479,38 @@ index 00000000000..d127e1a2903
 +}
 +#endif
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index cffaa2a5c77..aa60054d315 100644
+index a7fd8428dec..575aaa21309 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -1754,7 +1754,8 @@ static struct key_funcs key_funcs =
-     key_export_dsa_capi,
+@@ -1906,7 +1906,8 @@ static const struct key_funcs key_funcs =
      key_export_ecc,
      key_import_dsa_capi,
--    key_import_ecc
-+    key_import_ecc,
+     key_import_ecc,
+-    key_import_rsa
++    key_import_rsa,
 +    NULL
  };
  
  struct key_funcs * gnutls_lib_init( DWORD reason )
 diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 5868b445625..a631d42b3f1 100644
+index 55dca5dde34..fd7aeae9ec2 100644
 --- a/dlls/bcrypt/macos.c
 +++ b/dlls/bcrypt/macos.c
-@@ -277,7 +277,8 @@ static struct key_funcs key_funcs =
-     key_export_dsa_capi,
+@@ -291,7 +291,8 @@ static const struct key_funcs key_funcs =
      key_export_ecc,
      key_import_dsa_capi,
--    key_import_ecc
-+    key_import_ecc,
+     key_import_ecc,
+-    key_import_rsa
++    key_import_rsa,
 +    NULL
  };
  
  struct key_funcs * macos_lib_init( DWORD reason )
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index d499ce65a65..334694c4336 100644
+index 456727d04a9..6be406dee21 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -2102,7 +2102,7 @@ static void test_ECDH(void)
+@@ -2163,7 +2163,7 @@ static void test_ECDH(void)
          goto raw_secret_end;
      }
  
@@ -519,10 +520,10 @@ index d499ce65a65..334694c4336 100644
      if (status != STATUS_SUCCESS)
      {
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
-index 791b5d54188..a691d82afe2 100644
+index a158ec1630a..a01e2ad02ed 100644
 --- a/dlls/bcrypt/unixlib.c
 +++ b/dlls/bcrypt/unixlib.c
-@@ -123,6 +123,12 @@ static void CDECL key_asymmetric_destroy( struct key *key )
+@@ -129,6 +129,12 @@ static void CDECL key_asymmetric_destroy( struct key *key )
      FIXME( "not implemented\n" );
  }
  
@@ -535,7 +536,7 @@ index 791b5d54188..a691d82afe2 100644
  static struct key_funcs key_funcs =
  {
      key_set_property,
-@@ -141,13 +147,15 @@ static struct key_funcs key_funcs =
+@@ -148,13 +154,15 @@ static struct key_funcs key_funcs =
      key_export_dsa_capi,
      key_export_ecc,
      key_import_dsa_capi,
@@ -552,7 +553,7 @@ index 791b5d54188..a691d82afe2 100644
  
      if (reason == DLL_PROCESS_ATTACH)
      {
-@@ -155,7 +163,9 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
+@@ -162,7 +170,9 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
          if (macos_funcs && macos_funcs->key_##name) \
              key_funcs.key_##name = macos_funcs->key_##name; \
          if (gnutls_funcs && gnutls_funcs->key_##name) \
@@ -563,7 +564,7 @@ index 791b5d54188..a691d82afe2 100644
  
          RESOLVE_FUNC(set_property)
          RESOLVE_FUNC(symmetric_init)
-@@ -174,6 +184,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
+@@ -182,6 +192,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
          RESOLVE_FUNC(export_ecc)
          RESOLVE_FUNC(import_dsa_capi)
          RESOLVE_FUNC(import_ecc)
@@ -572,5 +573,5 @@ index 791b5d54188..a691d82afe2 100644
  #undef RESOLVE_FUNC
  
 -- 
-2.28.0
+2.29.2
 

patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch

@@ -1,8 +1,7 @@
-From 25b5e818272cf6fc52a8707c80b9ade3a5ca5df5 Mon Sep 17 00:00:00 2001
+From a207d7f2c77296798e047ed03d88d8a060139aff Mon Sep 17 00:00:00 2001
 From: Jason Edmeades <us@edmeades.me.uk>
 Date: Tue, 16 Jul 2019 13:49:18 +1000
-Subject: [PATCH 1/2] cmd: Support for launching programs based on file
- association
+Subject: [PATCH] cmd: Support for launching programs based on file association
 
 cmd already handles exe, cmd, bat etc but if you run a file with another extension,
 then use the associations set in the registry (for example via ftype / assoc) to
@@ -12,14 +11,14 @@ fred.msi for msiexec to be launched.
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18154
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36646
 ---
- programs/cmd/wcmdmain.c | 140 +++++++++++++++++++++++++++++-----------
- 1 file changed, 104 insertions(+), 36 deletions(-)
+ programs/cmd/wcmdmain.c | 138 +++++++++++++++++++++++++++++-----------
+ 1 file changed, 102 insertions(+), 36 deletions(-)
 
 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
-index 29e498a48d..2a9e4c75ee 100644
+index cacb7ea7751..19a807c1624 100644
 --- a/programs/cmd/wcmdmain.c
 +++ b/programs/cmd/wcmdmain.c
-@@ -1142,8 +1142,10 @@ void WCMD_run_program (WCHAR *command, BOOL called)
+@@ -1135,8 +1135,10 @@ void WCMD_run_program (WCHAR *command, BOOL called)
  
      /* 1. If extension supplied, see if that file exists */
      if (extensionsupplied) {
@@ -31,7 +30,7 @@ index 29e498a48d..2a9e4c75ee 100644
        }
      }
  
-@@ -1174,6 +1176,7 @@ void WCMD_run_program (WCHAR *command, BOOL called)
+@@ -1166,6 +1168,7 @@ void WCMD_run_program (WCHAR *command, BOOL called)
            }
  
            if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) {
@@ -39,17 +38,9 @@ index 29e498a48d..2a9e4c75ee 100644
              found = TRUE;
              thisExt = NULL;
            }
-@@ -1191,58 +1194,123 @@ void WCMD_run_program (WCHAR *command, BOOL called)
-       WCHAR *ext = wcsrchr( thisDir, '.' );
-       static const WCHAR batExt[] = {'.','b','a','t','\0'};
-       static const WCHAR cmdExt[] = {'.','c','m','d','\0'};
-+      static const WCHAR exeExt[] = {'.','e','x','e','\0'};
-+      static const WCHAR comExt[] = {'.','c','o','m','\0'};
- 
-       WINE_TRACE("Found as %s\n", wine_dbgstr_w(thisDir));
- 
+@@ -1187,52 +1190,115 @@ void WCMD_run_program (WCHAR *command, BOOL called)
        /* Special case BAT and CMD */
-       if (ext && (!wcsicmp(ext, batExt) || !wcsicmp(ext, cmdExt))) {
+       if (ext && (!wcsicmp(ext, L".bat") || !wcsicmp(ext, L".cmd"))) {
          BOOL oldinteractive = interactive;
 +        WINE_TRACE("Calling batch program\n");
          interactive = FALSE;
@@ -95,7 +86,7 @@ index 29e498a48d..2a9e4c75ee 100644
 +
 +      /* If it is not a .com or .exe, try to launch through ShellExecuteExW
 +         which takes into account the association for the extension.        */
-+      if (ext && (wcsicmp(ext, exeExt) && wcsicmp(ext, comExt))) {
++      if (ext && (wcsicmp(ext, L".exe") && wcsicmp(ext, L".com"))) {
 +
 +        SHELLEXECUTEINFOW shexw;
 +        BOOL              rc;
@@ -199,5 +190,5 @@ index 29e498a48d..2a9e4c75ee 100644
    }
  
 -- 
-2.17.1
+2.29.2
 

patches/color-sRGB-profile/0001-winspool-Add-sRGB-color-profile.patch

@@ -1,167 +0,0 @@
-From b037d19858277d7dde0df6cdf4678a55517366af Mon Sep 17 00:00:00 2001
-From: Alex Henrie <alexhenrie24@gmail.com>
-Date: Tue, 22 Sep 2020 22:00:11 -0600
-Subject: [PATCH] winspool: Add sRGB color profile
-
-"This profile is made available by the International Color Consortium,
-and may be copied, distributed, embedded, made, used, and sold without
-restriction. Altered versions of this profile shall have the original
-identification and copyright information removed and shall not be
-misrepresented as the original profile."
-
-See http://www.color.org/srgbprofiles.xalter
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37396
-Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
----
- .../winspool.drv/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes
- dlls/winspool.drv/winspool.rc                 |   3 ++
- dlls/winspool.drv/wspool.c                    |  38 ++++++++++++++++++
- dlls/winspool.drv/wspool.h                    |   2 +
- 4 files changed, 43 insertions(+)
- create mode 100644 dlls/winspool.drv/sRGB_Color_Space_Profile.icm
-
-diff --git a/dlls/winspool.drv/sRGB_Color_Space_Profile.icm b/dlls/winspool.drv/sRGB_Color_Space_Profile.icm
-new file mode 100644
-index 0000000000000000000000000000000000000000..49afbfef10f22a1832590b68369d2f248ea553b9
-GIT binary patch
-literal 3024
-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
-
-literal 0
-HcmV?d00001
-
-diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc
-index 50772ce60bb..1b573be096e 100644
---- a/dlls/winspool.drv/winspool.rc
-+++ b/dlls/winspool.drv/winspool.rc
-@@ -47,6 +47,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
- /* @makedep: generic.ppd */
- 1 PPDFILE generic.ppd
- 
-+/* @makedep: sRGB_Color_Space_Profile.icm */
-+IDR_SRGB_ICM RCDATA sRGB_Color_Space_Profile.icm
-+
- #define WINE_FILENAME_STR "winspool.drv"
- #define WINE_FILEDESCRIPTION_STR "Wine core printer driver"
- 
-diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c
-index bbfb0fb0f42..baa7bfdb455 100644
---- a/dlls/winspool.drv/wspool.c
-+++ b/dlls/winspool.drv/wspool.c
-@@ -104,6 +104,43 @@ BOOL load_backend(void)
-     return FALSE;
- }
- 
-+static void create_color_profiles(void)
-+{
-+    static const WCHAR color_dir[] = {'\\','s','p','o','o','l',
-+                                      '\\','d','r','i','v','e','r','s',
-+                                      '\\','c','o','l','o','r','\\',0};
-+    static const WCHAR srgb_icm[] = {'s','R','G','B',' ',
-+                                     'C','o','l','o','r',' ',
-+                                     'S','p','a','c','e',' ',
-+                                     'P','r','o','f','i','l','e','.','i','c','m',0};
-+    WCHAR profile_path[MAX_PATH];
-+    HANDLE file;
-+    HRSRC res;
-+    DWORD size, written;
-+    char *data;
-+    BOOL ret;
-+
-+    GetSystemDirectoryW(profile_path, ARRAY_SIZE(profile_path));
-+    lstrcatW(profile_path, color_dir);
-+    lstrcatW(profile_path, srgb_icm);
-+
-+    file = CreateFileW(profile_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
-+    if (file == INVALID_HANDLE_VALUE)
-+        return;
-+
-+    ret = ((res = FindResourceA(WINSPOOL_hInstance, MAKEINTRESOURCEA(IDR_SRGB_ICM), (const char *)RT_RCDATA)) &&
-+           (size = SizeofResource(WINSPOOL_hInstance, res)) &&
-+           (data = LoadResource(WINSPOOL_hInstance, res)) &&
-+           WriteFile(file, data, size, &written, NULL) &&
-+           written == size);
-+    CloseHandle(file);
-+    if (!ret)
-+    {
-+        ERR("Failed to create %s\n", wine_dbgstr_w(profile_path));
-+        DeleteFileW(profile_path);
-+    }
-+}
-+
- /******************************************************************************
-  *  DllMain
-  *
-@@ -118,6 +155,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved)
-       WINSPOOL_hInstance = hInstance;
-       DisableThreadLibraryCalls(hInstance);
-       WINSPOOL_LoadSystemPrinters();
-+      create_color_profiles();
-       break;
-     }
-     case DLL_PROCESS_DETACH:
-diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h
-index 06c28231330..a229b1ffe88 100644
---- a/dlls/winspool.drv/wspool.h
-+++ b/dlls/winspool.drv/wspool.h
-@@ -33,5 +33,7 @@ extern void WINSPOOL_LoadSystemPrinters(void) DECLSPEC_HIDDEN;
- #define IDS_FILE_EXISTS   11
- #define IDS_CANNOT_OPEN   12
- 
-+#define IDR_SRGB_ICM       2
-+
- #define FILENAME_DIALOG  100
- #define EDITBOX 201
--- 
-2.28.0
-

patches/color-sRGB-profile/definition

@@ -1 +0,0 @@
-Fixes: [37396] Add sRGB color profile.

patches/dinput-remap-joystick/0001-dinput-Allow-remapping-of-joystick-buttons.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] dinput: Allow remapping of joystick buttons
 Changed
 - Change the array to store the origial button.
 - Remove lookup loops.
-- Changed max Buttons to 32 to match DIJOYSTATE structure.
+- Changed max Buttons to 128 to match DIJOYSTATE2 structure.
 
 Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=35815
 ---
@@ -119,7 +119,7 @@ index e758cac..4a382c2 100644
  struct JoystickGenericImpl;
  
 +/* Number of buttons for which to allow remapping */
-+#define MAX_MAP_BUTTONS 32
++#define MAX_MAP_BUTTONS 128
 +
  typedef void joy_polldev_handler(LPDIRECTINPUTDEVICE8A iface);
  

patches/dwmapi-DwmGetTransportAttributes/0002-dwmapi-add-initial-tests.patch

@@ -1,36 +0,0 @@
-From b9eb0aeed5bc09d8a54c383c9d5149cacf36f1c3 Mon Sep 17 00:00:00 2001
-From: Louis Lenders <xerox.xerox2000x@gmail.com>
-Date: Wed, 5 Dec 2018 13:18:26 +0100
-Subject: [PATCH] dwmapi: Add tests for DwmGetTransportAttributes().
-
-Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
----
- dlls/dwmapi/tests/dwmapi.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c
-index 1904e283bba..d79861f53ed 100644
---- a/dlls/dwmapi/tests/dwmapi.c
-+++ b/dlls/dwmapi/tests/dwmapi.c
-@@ -33,7 +33,18 @@ static void test_DwmIsCompositionEnabled(void)
-     ok(enabled == TRUE || enabled == FALSE, "Got unexpected %#x.\n", enabled);
- }
- 
-+static void test_dwm_get_transport_attributes(void)
-+{
-+    BOOL isremoting, isconnected;
-+    DWORD generation;
-+    HRESULT hr;
-+
-+    hr = DwmGetTransportAttributes(&isremoting, &isconnected, &generation);
-+    ok(hr == S_OK || hr == DWM_E_COMPOSITIONDISABLED, "Got unexpected %#x.\n", hr);
-+}
-+
- START_TEST(dwmapi)
- {
-     test_DwmIsCompositionEnabled();
-+    test_dwm_get_transport_attributes();
- }
--- 
-2.27.0
-

patches/dwmapi-DwmGetTransportAttributes/definition

@@ -1 +0,0 @@
-# Tests for bug 31350.

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

@@ -1,301 +0,0 @@
-From 70a09ccf3108ded29c3049ab3ee5aea843b43215 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 15 Aug 2015 02:59:17 +0200
-Subject: [PATCH] dxdiagn: Enumerate DirectSound devices and add some basic
- properties.
-
----
- dlls/dxdiagn/Makefile.in       |   2 +-
- dlls/dxdiagn/provider.c        |  91 +++++++++++++++++++++++
- dlls/dxdiagn/tests/container.c | 131 +++++++++++++++++++++++++++++++++
- 3 files changed, 223 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
-index fa4b611f245..88c99803b06 100644
---- a/dlls/dxdiagn/Makefile.in
-+++ b/dlls/dxdiagn/Makefile.in
-@@ -1,5 +1,5 @@
- MODULE    = dxdiagn.dll
--IMPORTS   = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32
-+IMPORTS   = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound
- 
- EXTRADLLFLAGS = -mno-cygwin
- 
-diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
-index 6b6f4e640cc..4ae5046b818 100644
---- a/dlls/dxdiagn/provider.c
-+++ b/dlls/dxdiagn/provider.c
-@@ -36,6 +36,7 @@
- #include "wine/fil_data.h"
- #include "psapi.h"
- #include "wbemcli.h"
-+#include "dsound.h"
- 
- #include "wine/debug.h"
- 
-@@ -1364,11 +1365,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node)
-     return fill_display_information_fallback(node);
- }
- 
-+struct enum_context
-+{
-+    IDxDiagContainerImpl_Container *cont;
-+    HRESULT hr;
-+    int index;
-+};
-+
-+static const WCHAR szGUIDFmt[] =
-+{
-+    '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0',
-+    '2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2',
-+    'x','%','0','2','x','%','0','2','x','%','0','2','x',0
-+};
-+
-+static LPWSTR guid_to_string(LPWSTR lpwstr, REFGUID lpcguid)
-+{
-+    wsprintfW(lpwstr, szGUIDFmt, lpcguid->Data1, lpcguid->Data2,
-+        lpcguid->Data3, lpcguid->Data4[0], lpcguid->Data4[1],
-+        lpcguid->Data4[2], lpcguid->Data4[3], lpcguid->Data4[4],
-+        lpcguid->Data4[5], lpcguid->Data4[6], lpcguid->Data4[7]);
-+
-+    return lpwstr;
-+}
-+
-+BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID context)
-+{
-+    static const WCHAR deviceid_fmtW[] = {'%','u',0};
-+    static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0};
-+    static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0};
-+
-+    struct enum_context *enum_ctx = context;
-+    IDxDiagContainerImpl_Container *device;
-+    WCHAR buffer[256];
-+    const WCHAR *p, *name;
-+
-+    /* the default device is enumerated twice, one time without GUID */
-+    if (!guid) return TRUE;
-+
-+    _snwprintf(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index);
-+    device = allocate_information_node(buffer);
-+    if (!device)
-+    {
-+        enum_ctx->hr = E_OUTOFMEMORY;
-+        return FALSE;
-+    }
-+
-+    add_subcontainer(enum_ctx->cont, device);
-+
-+    guid_to_string(buffer, guid);
-+    enum_ctx->hr = add_bstr_property(device, szGuidDeviceID, buffer);
-+    if (FAILED(enum_ctx->hr))
-+        return FALSE;
-+
-+    enum_ctx->hr = add_bstr_property(device, szDescription, desc);
-+    if (FAILED(enum_ctx->hr))
-+        return FALSE;
-+
-+    enum_ctx->hr = add_bstr_property(device, szDriverPath, module);
-+    if (FAILED(enum_ctx->hr))
-+        return FALSE;
-+
-+    name = module;
-+    if ((p = wcsrchr(name, '\\'))) name = p + 1;
-+    if ((p = wcsrchr(name, '/'))) name = p + 1;
-+
-+    enum_ctx->hr = add_bstr_property(device, szDriverName, name);
-+    if (FAILED(enum_ctx->hr))
-+        return FALSE;
-+
-+    enum_ctx->index++;
-+    return TRUE;
-+}
-+
- static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node)
- {
-     static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0};
-     static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0};
- 
-+    struct enum_context enum_ctx;
-     IDxDiagContainerImpl_Container *cont;
- 
-     cont = allocate_information_node(DxDiag_SoundDevices);
-@@ -1377,12 +1452,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node)
- 
-     add_subcontainer(node, cont);
- 
-+    enum_ctx.cont = cont;
-+    enum_ctx.hr = S_OK;
-+    enum_ctx.index = 0;
-+
-+    DirectSoundEnumerateW(dsound_enum, &enum_ctx);
-+    if (FAILED(enum_ctx.hr))
-+        return enum_ctx.hr;
-+
-     cont = allocate_information_node(DxDiag_SoundCaptureDevices);
-     if (!cont)
-         return E_OUTOFMEMORY;
- 
-     add_subcontainer(node, cont);
- 
-+    enum_ctx.cont = cont;
-+    enum_ctx.hr = S_OK;
-+    enum_ctx.index = 0;
-+
-+    DirectSoundCaptureEnumerateW(dsound_enum, &enum_ctx);
-+    if (FAILED(enum_ctx.hr))
-+        return enum_ctx.hr;
-+
-     return S_OK;
- }
- 
-diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c
-index c011ff9cc07..3f9f9d6d29f 100644
---- a/dlls/dxdiagn/tests/container.c
-+++ b/dlls/dxdiagn/tests/container.c
-@@ -922,6 +922,135 @@ cleanup:
-     IDxDiagProvider_Release(pddp);
- }
- 
-+static void test_DxDiag_SoundDevices(void)
-+{
-+    static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0};
-+    static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0};
-+    static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0};
-+    static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0};
-+
-+    static const struct property_test property_tests[] =
-+    {
-+        {szDescription, VT_BSTR},
-+        {szGuidDeviceID, VT_BSTR},
-+        {szDriverName, VT_BSTR},
-+        {szDriverPath, VT_BSTR},
-+    };
-+
-+    IDxDiagContainer *sound_cont = NULL;
-+    DWORD count, i;
-+    HRESULT hr;
-+
-+    if (!create_root_IDxDiagContainer())
-+    {
-+        skip("Unable to create the root IDxDiagContainer\n");
-+        return;
-+    }
-+
-+    hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_SoundDevices", &sound_cont);
-+    ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr);
-+
-+    if (hr != S_OK)
-+        goto cleanup;
-+
-+    hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count);
-+    ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr);
-+    if (hr == S_OK)
-+        ok(count == 0, "Expected count to be 0, got %u\n", count);
-+
-+    hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count);
-+    ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr);
-+
-+    if (hr != S_OK)
-+        goto cleanup;
-+
-+    for (i = 0; i < count; i++)
-+    {
-+        WCHAR child_container[256];
-+        IDxDiagContainer *child;
-+
-+        hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR));
-+        ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr);
-+
-+        hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child);
-+        ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr);
-+
-+        if (hr == S_OK)
-+        {
-+            trace("Testing container %s\n", wine_dbgstr_w(child_container));
-+            test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0]));
-+        }
-+        IDxDiagContainer_Release(child);
-+    }
-+
-+cleanup:
-+    if (sound_cont) IDxDiagContainer_Release(sound_cont);
-+    IDxDiagContainer_Release(pddc);
-+    IDxDiagProvider_Release(pddp);
-+}
-+
-+static void test_DxDiag_SoundCaptureDevices(void)
-+{
-+    static const struct property_test property_tests[] =
-+    {
-+        {L"szDescription", VT_BSTR},
-+        {L"szGuidDeviceID", VT_BSTR},
-+        {L"szDriverPath", VT_BSTR},
-+        {L"szDriverName", VT_BSTR},
-+    };
-+
-+    IDxDiagContainer *sound_cont = NULL;
-+    DWORD count, i;
-+    HRESULT hr;
-+
-+    if (!create_root_IDxDiagContainer())
-+    {
-+        skip("Unable to create the root IDxDiagContainer\n");
-+        return;
-+    }
-+
-+    hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_SoundCaptureDevices", &sound_cont);
-+    ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr);
-+
-+    if (hr != S_OK)
-+        goto cleanup;
-+
-+    hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count);
-+    ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr);
-+    if (hr == S_OK)
-+        ok(count == 0, "Expected count to be 0, got %u\n", count);
-+
-+    hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count);
-+    ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr);
-+
-+    if (hr != S_OK)
-+        goto cleanup;
-+
-+    for (i = 0; i < count; i++)
-+    {
-+        WCHAR child_container[256];
-+        IDxDiagContainer *child;
-+
-+        hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR));
-+        ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr);
-+
-+        hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child);
-+        ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr);
-+
-+        if (hr == S_OK)
-+        {
-+            trace("Testing container %s\n", wine_dbgstr_w(child_container));
-+            test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0]));
-+        }
-+        IDxDiagContainer_Release(child);
-+    }
-+
-+cleanup:
-+    if (sound_cont) IDxDiagContainer_Release(sound_cont);
-+    IDxDiagContainer_Release(pddc);
-+    IDxDiagProvider_Release(pddp);
-+}
-+
- START_TEST(container)
- {
-     CoInitialize(NULL);
-@@ -936,5 +1065,7 @@ START_TEST(container)
-     test_root_children();
-     test_DxDiag_SystemInfo();
-     test_DxDiag_DisplayDevices();
-+    test_DxDiag_SoundDevices();
-+    test_DxDiag_SoundCaptureDevices();
-     CoUninitialize();
- }
--- 
-2.28.0
-

patches/dxdiagn-Enumerate_DirectSound/definition

@@ -1 +0,0 @@
-Fixes: [32613] Implement enumeration of sound devices and basic properties to dxdiagn

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

@@ -1,107 +0,0 @@
-From 8f0d1a97147714cdee9f69781f6b919bf005aed0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 15 Aug 2015 03:58:04 +0200
-Subject: [PATCH] dxdiagn: Calling GetChildContainer with an empty string on a
- leaf container returns the object itself
-
----
- dlls/dxdiagn/container.c       |  4 ++--
- dlls/dxdiagn/tests/container.c | 25 +++++++++++++++++++++++--
- 2 files changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c
-index 87d593a15a7..d84f185a795 100644
---- a/dlls/dxdiagn/container.c
-+++ b/dlls/dxdiagn/container.c
-@@ -167,7 +167,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i
-     TRACE("Trying to get parent container %s\n", debugstr_w(tmp));
-     hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer);
-     if (FAILED(hr))
--      goto on_error;
-+      goto out;
-     cur++; /* go after '.' (just replaced by \0) */
-     tmp = cur;
-     cur = wcschr(tmp, '.');
-@@ -181,7 +181,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i
-         TRACE("Succeeded in getting the container instance\n");
-   }
- 
--on_error:
-+out:
-   HeapFree(GetProcessHeap(), 0, orig_tmp);
-   return hr;
- }
-diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c
-index 18423779075..350b46a0253 100644
---- a/dlls/dxdiagn/tests/container.c
-+++ b/dlls/dxdiagn/tests/container.c
-@@ -819,7 +819,8 @@ static void test_DxDiag_SystemInfo(void)
-         {L"szProcessorEnglish", VT_BSTR},
-     };
- 
--    IDxDiagContainer *container;
-+    IDxDiagContainer *container, *container2;
-+    static const WCHAR empty[] = {0};
-     HRESULT hr;
- 
-     if (!create_root_IDxDiagContainer())
-@@ -828,6 +829,9 @@ static void test_DxDiag_SystemInfo(void)
-         return;
-     }
- 
-+    hr = IDxDiagContainer_GetChildContainer(pddc, empty, &container2);
-+    ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr);
-+
-     hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_SystemInfo", &container);
-     ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr);
- 
-@@ -835,6 +839,14 @@ static void test_DxDiag_SystemInfo(void)
-     {
-         trace("Testing container DxDiag_SystemInfo\n");
-         test_container_properties(container, property_tests, ARRAY_SIZE(property_tests));
-+
-+        container2 = NULL;
-+        hr = IDxDiagContainer_GetChildContainer(container, empty, &container2);
-+        ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr);
-+        ok(container2 != NULL, "Expected container2 != NULL\n");
-+        ok(container2 != container, "Expected container != container2\n");
-+        if (hr == S_OK) IDxDiagContainer_Release(container2);
-+
-         IDxDiagContainer_Release(container);
-     }
- 
-@@ -928,6 +940,7 @@ static void test_DxDiag_SoundDevices(void)
-     static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0};
-     static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0};
-     static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0};
-+    static const WCHAR empty[] = {0};
- 
-     static const struct property_test property_tests[] =
-     {
-@@ -967,7 +980,7 @@ static void test_DxDiag_SoundDevices(void)
-     for (i = 0; i < count; i++)
-     {
-         WCHAR child_container[256];
--        IDxDiagContainer *child;
-+        IDxDiagContainer *child, *child2;
- 
-         hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR));
-         ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr);
-@@ -980,6 +993,14 @@ static void test_DxDiag_SoundDevices(void)
-             trace("Testing container %s\n", wine_dbgstr_w(child_container));
-             test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0]));
-         }
-+
-+        child2 = NULL;
-+        hr = IDxDiagContainer_GetChildContainer(child, empty, &child2);
-+        ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr);
-+        ok(child2 != NULL, "Expected child2 != NULL\n");
-+        ok(child2 != child, "Expected child != child2\n");
-+        if (hr == S_OK) IDxDiagContainer_Release(child2);
-+
-         IDxDiagContainer_Release(child);
-     }
- 
--- 
-2.28.0
-

patches/dxdiagn-GetChildContainer_Leaf_Nodes/definition

@@ -1,2 +0,0 @@
-Fixes: [38014] Implement special handling for calling GetChildContainer with an empty string
-Depends: dxdiagn-Enumerate_DirectSound

patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch

@@ -1,4 +1,4 @@
-From d10e2324d1295c27e00975526420375a338b5eb1 Mon Sep 17 00:00:00 2001
+From e5418972013afdb97f857e49d0beb06833b3b474 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Thu, 7 Jun 2018 20:09:59 -0500
 Subject: [PATCH] server: Create server objects for eventfd-based
@@ -15,7 +15,7 @@ Subject: [PATCH] server: Create server objects for eventfd-based
  create mode 100644 server/esync.h
 
 diff --git a/server/Makefile.in b/server/Makefile.in
-index 9a695cefc30..8bd612b4728 100644
+index b58ce1e3002..5f225fd0591 100644
 --- a/server/Makefile.in
 +++ b/server/Makefile.in
 @@ -11,6 +11,7 @@ C_SRCS = \
@@ -381,18 +381,18 @@ index 00000000000..7ca4ca89394
 +extern int do_esync(void);
 +void esync_init(void);
 diff --git a/server/main.c b/server/main.c
-index 2b5065e1852..385ae5ee370 100644
+index dae08339874..f68888d0fa8 100644
 --- a/server/main.c
 +++ b/server/main.c
-@@ -36,6 +36,7 @@
- #include "file.h"
+@@ -37,6 +37,7 @@
  #include "thread.h"
  #include "request.h"
+ #include "unicode.h"
 +#include "esync.h"
  
  /* command-line options */
  int debug_level = 0;
-@@ -140,6 +141,9 @@ int main( int argc, char *argv[] )
+@@ -141,6 +142,9 @@ int main( int argc, char *argv[] )
      sock_init();
      open_master_socket();
  
@@ -403,10 +403,10 @@ index 2b5065e1852..385ae5ee370 100644
      set_current_time();
      init_scheduler();
 diff --git a/server/protocol.def b/server/protocol.def
-index 5ca762fdabf..552d504cc8d 100644
+index eba14534b9d..63fe88f9dda 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3665,3 +3665,27 @@ struct handle_info
+@@ -3657,3 +3657,27 @@ struct handle_info
  @REQ(resume_process)
      obj_handle_t handle;       /* process handle */
  @END
@@ -435,5 +435,5 @@ index 5ca762fdabf..552d504cc8d 100644
 +    unsigned int shm_idx;
 +@END
 -- 
-2.28.0
+2.29.2
 

patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch

@@ -1,4 +1,4 @@
-From c5e2bf28d7a1ce4008a8b6173fd66b035a2010d3 Mon Sep 17 00:00:00 2001
+From af7dc115ada8acf19aebedfc091e048b919c2478 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 8 Jun 2018 18:51:40 -0500
 Subject: [PATCH] server: Add an object operation to grab the esync file
@@ -11,7 +11,7 @@ Split off to decrease patch size.
  server/change.c     | 1 +
  server/clipboard.c  | 1 +
  server/completion.c | 1 +
- server/console.c    | 5 +++++
+ server/console.c    | 7 +++++++
  server/debugger.c   | 2 ++
  server/device.c     | 4 ++++
  server/directory.c  | 2 ++
@@ -39,10 +39,10 @@ Split off to decrease patch size.
  server/timer.c      | 1 +
  server/token.c      | 1 +
  server/winstation.c | 2 ++
- 33 files changed, 65 insertions(+)
+ 33 files changed, 67 insertions(+)
 
 diff --git a/server/async.c b/server/async.c
-index 24fed811da2..1b4f86a1b8b 100644
+index 81d575b52bd..bdd68663ab9 100644
 --- a/server/async.c
 +++ b/server/async.c
 @@ -70,6 +70,7 @@ static const struct object_ops async_ops =
@@ -110,18 +110,18 @@ index 0bad4d7a260..176cf1b817e 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/console.c b/server/console.c
-index d1e3cae8919..c0892b251c4 100644
+index 295db7767b2..a67f1918a3a 100644
 --- a/server/console.c
 +++ b/server/console.c
-@@ -80,6 +80,7 @@ static const struct object_ops console_input_ops =
-     no_add_queue,                     /* add_queue */
-     NULL,                             /* remove_queue */
-     NULL,                             /* signaled */
+@@ -82,6 +82,7 @@ static const struct object_ops console_ops =
+     add_queue,                        /* add_queue */
+     remove_queue,                     /* remove_queue */
+     console_signaled,                 /* signaled */
 +    NULL,                             /* get_esync_fd */
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
-     console_input_get_fd,             /* get_fd */
-@@ -151,6 +152,7 @@ static const struct object_ops console_server_ops =
+     console_get_fd,                   /* get_fd */
+@@ -157,6 +158,7 @@ static const struct object_ops console_server_ops =
      add_queue,                        /* add_queue */
      remove_queue,                     /* remove_queue */
      console_server_signaled,          /* signaled */
@@ -129,15 +129,15 @@ index d1e3cae8919..c0892b251c4 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_server_get_fd,            /* get_fd */
-@@ -218,6 +220,7 @@ static const struct object_ops screen_buffer_ops =
-     no_add_queue,                     /* add_queue */
+@@ -225,6 +227,7 @@ static const struct object_ops screen_buffer_ops =
+     screen_buffer_add_queue,          /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
 +    NULL,                             /* get_esync_fd */
      NULL,                             /* satisfied */
      no_signal,                        /* signal */
      screen_buffer_get_fd,             /* get_fd */
-@@ -265,6 +268,7 @@ static const struct object_ops console_device_ops =
+@@ -274,6 +277,7 @@ static const struct object_ops console_device_ops =
      no_add_queue,                     /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
@@ -145,7 +145,23 @@ index d1e3cae8919..c0892b251c4 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      no_get_fd,                        /* get_fd */
-@@ -303,6 +307,7 @@ static const struct object_ops console_connection_ops =
+@@ -311,6 +315,7 @@ static const struct object_ops console_input_ops =
+     console_input_add_queue,          /* add_queue */
+     NULL,                             /* remove_queue */
+     NULL,                             /* signaled */
++    NULL,                             /* get_esync_fd */
+     no_satisfied,                     /* satisfied */
+     no_signal,                        /* signal */
+     console_input_get_fd,             /* get_fd */
+@@ -367,6 +372,7 @@ static const struct object_ops console_output_ops =
+     console_output_add_queue,         /* add_queue */
+     NULL,                             /* remove_queue */
+     NULL,                             /* signaled */
++    NULL,                             /* get_esync_fd */
+     no_satisfied,                     /* satisfied */
+     no_signal,                        /* signal */
+     console_output_get_fd,            /* get_fd */
+@@ -424,6 +430,7 @@ static const struct object_ops console_connection_ops =
      no_add_queue,                     /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
@@ -210,7 +226,7 @@ index 652da83e1e2..cc9aa2358a4 100644
      no_signal,                        /* signal */
      device_file_get_fd,               /* get_fd */
 diff --git a/server/directory.c b/server/directory.c
-index 6f8fb179808..faf41585ed8 100644
+index 81d02d6f64e..1ffa35f0cc8 100644
 --- a/server/directory.c
 +++ b/server/directory.c
 @@ -57,6 +57,7 @@ static const struct object_ops object_type_ops =
@@ -298,10 +314,10 @@ index c3c53489212..d3b1e515b52 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/file.c b/server/file.c
-index 4690af2424e..2c0d24da21d 100644
+index 2cc4a9d978c..5c28b1c176d 100644
 --- a/server/file.c
 +++ b/server/file.c
-@@ -85,6 +85,7 @@ static const struct object_ops file_ops =
+@@ -86,6 +86,7 @@ static const struct object_ops file_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -310,7 +326,7 @@ index 4690af2424e..2c0d24da21d 100644
      no_signal,                    /* signal */
      file_get_fd,                  /* get_fd */
 diff --git a/server/handle.c b/server/handle.c
-index 15382256f10..2f123515c7c 100644
+index 2556a03901e..4d7e4231a07 100644
 --- a/server/handle.c
 +++ b/server/handle.c
 @@ -123,6 +123,7 @@ static const struct object_ops handle_table_ops =
@@ -334,7 +350,7 @@ index 2a3da247313..61b5014c442 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/mailslot.c b/server/mailslot.c
-index e0294d946e4..378c0bbb274 100644
+index 5d26c606080..2e09bab22fa 100644
 --- a/server/mailslot.c
 +++ b/server/mailslot.c
 @@ -78,6 +78,7 @@ static const struct object_ops mailslot_ops =
@@ -370,7 +386,7 @@ index e0294d946e4..378c0bbb274 100644
      no_signal,                              /* signal */
      mailslot_device_file_get_fd,            /* get_fd */
 diff --git a/server/mapping.c b/server/mapping.c
-index 769a986ae21..37da37d6ab3 100644
+index 6c2e7a1fd2b..d06ceaa1a66 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
 @@ -68,6 +68,7 @@ static const struct object_ops ranges_ops =
@@ -410,10 +426,10 @@ index 823ad54ffc3..fc236b3e623 100644
      mutex_signal,              /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/named_pipe.c b/server/named_pipe.c
-index 60bd059d93d..9ab99d915b9 100644
+index ff1fdbe3f07..cbf7cdf9874 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
-@@ -118,6 +118,7 @@ static const struct object_ops named_pipe_ops =
+@@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
      no_add_queue,                 /* add_queue */
      NULL,                         /* remove_queue */
      NULL,                         /* signaled */
@@ -421,7 +437,7 @@ index 60bd059d93d..9ab99d915b9 100644
      NULL,                         /* satisfied */
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
-@@ -162,6 +163,7 @@ static const struct object_ops pipe_server_ops =
+@@ -167,6 +168,7 @@ static const struct object_ops pipe_server_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -429,7 +445,7 @@ index 60bd059d93d..9ab99d915b9 100644
      no_satisfied,                 /* satisfied */
      no_signal,                    /* signal */
      pipe_end_get_fd,              /* get_fd */
-@@ -205,6 +207,7 @@ static const struct object_ops pipe_client_ops =
+@@ -210,6 +212,7 @@ static const struct object_ops pipe_client_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -437,7 +453,7 @@ index 60bd059d93d..9ab99d915b9 100644
      no_satisfied,                 /* satisfied */
      no_signal,                    /* signal */
      pipe_end_get_fd,              /* get_fd */
-@@ -252,6 +255,7 @@ static const struct object_ops named_pipe_device_ops =
+@@ -257,6 +260,7 @@ static const struct object_ops named_pipe_device_ops =
      no_add_queue,                     /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
@@ -445,7 +461,7 @@ index 60bd059d93d..9ab99d915b9 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      no_get_fd,                        /* get_fd */
-@@ -283,6 +287,7 @@ static const struct object_ops named_pipe_device_file_ops =
+@@ -288,6 +292,7 @@ static const struct object_ops named_pipe_device_file_ops =
      add_queue,                               /* add_queue */
      remove_queue,                            /* remove_queue */
      default_fd_signaled,                     /* signaled */
@@ -454,7 +470,7 @@ index 60bd059d93d..9ab99d915b9 100644
      no_signal,                               /* signal */
      named_pipe_device_file_get_fd,           /* get_fd */
 diff --git a/server/object.h b/server/object.h
-index 394a4aac463..10a049c8fb8 100644
+index 73058fd3f99..02878ef0e0e 100644
 --- a/server/object.h
 +++ b/server/object.h
 @@ -68,6 +68,8 @@ struct object_ops
@@ -467,7 +483,7 @@ index 394a4aac463..10a049c8fb8 100644
      void (*satisfied)(struct object *,struct wait_queue_entry *);
      /* signal an object */
 diff --git a/server/process.c b/server/process.c
-index 1786493a814..30699fbaeae 100644
+index 5b3e29e5dfd..a7db8332702 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -78,6 +78,7 @@ static const struct object_ops process_ops =
@@ -495,10 +511,10 @@ index 1786493a814..30699fbaeae 100644
      no_signal,                     /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/queue.c b/server/queue.c
-index 7e7e6fbdf29..0ee2da59bcd 100644
+index a552fed57bb..263bb46ea00 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -171,6 +171,7 @@ static const struct object_ops msg_queue_ops =
+@@ -172,6 +172,7 @@ static const struct object_ops msg_queue_ops =
      msg_queue_add_queue,       /* add_queue */
      msg_queue_remove_queue,    /* remove_queue */
      msg_queue_signaled,        /* signaled */
@@ -506,7 +522,7 @@ index 7e7e6fbdf29..0ee2da59bcd 100644
      msg_queue_satisfied,       /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -208,6 +209,7 @@ static const struct object_ops thread_input_ops =
+@@ -209,6 +210,7 @@ static const struct object_ops thread_input_ops =
      no_add_queue,                 /* add_queue */
      NULL,                         /* remove_queue */
      NULL,                         /* signaled */
@@ -527,10 +543,10 @@ index c937e051597..8110bbb340c 100644
      no_signal,               /* signal */
      no_get_fd,               /* get_fd */
 diff --git a/server/request.c b/server/request.c
-index 97bf1a746d2..20b0ec309f3 100644
+index 24cfda26110..72166ce2d33 100644
 --- a/server/request.c
 +++ b/server/request.c
-@@ -96,6 +96,7 @@ static const struct object_ops master_socket_ops =
+@@ -97,6 +97,7 @@ static const struct object_ops master_socket_ops =
      no_add_queue,                  /* add_queue */
      NULL,                          /* remove_queue */
      NULL,                          /* signaled */
@@ -575,10 +591,10 @@ index 7c2bf2cc154..b6d6dcfc4b6 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/sock.c b/server/sock.c
-index 4f97fe72080..8898b66f7a5 100644
+index 1ff56f7bbe5..57dd5a7c6d7 100644
 --- a/server/sock.c
 +++ b/server/sock.c
-@@ -172,6 +172,7 @@ static const struct object_ops sock_ops =
+@@ -188,6 +188,7 @@ static const struct object_ops sock_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      sock_signaled,                /* signaled */
@@ -586,7 +602,7 @@ index 4f97fe72080..8898b66f7a5 100644
      no_satisfied,                 /* satisfied */
      no_signal,                    /* signal */
      sock_get_fd,                  /* get_fd */
-@@ -1173,6 +1174,7 @@ static const struct object_ops ifchange_ops =
+@@ -1527,6 +1528,7 @@ static const struct object_ops ifchange_ops =
      add_queue,               /* add_queue */
      NULL,                    /* remove_queue */
      NULL,                    /* signaled */
@@ -594,7 +610,7 @@ index 4f97fe72080..8898b66f7a5 100644
      no_satisfied,            /* satisfied */
      no_signal,               /* signal */
      ifchange_get_fd,         /* get_fd */
-@@ -1393,6 +1395,7 @@ static const struct object_ops socket_device_ops =
+@@ -1748,6 +1750,7 @@ static const struct object_ops socket_device_ops =
      no_add_queue,               /* add_queue */
      NULL,                       /* remove_queue */
      NULL,                       /* signaled */
@@ -603,7 +619,7 @@ index 4f97fe72080..8898b66f7a5 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/symlink.c b/server/symlink.c
-index b620f2accb9..1f5ee0bf72b 100644
+index 0b85350e1a5..c7212618cac 100644
 --- a/server/symlink.c
 +++ b/server/symlink.c
 @@ -60,6 +60,7 @@ static const struct object_ops symlink_ops =
@@ -615,7 +631,7 @@ index b620f2accb9..1f5ee0bf72b 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/thread.c b/server/thread.c
-index 6da77ad17a3..1bde63120ed 100644
+index 0a0d957384b..c10f1710542 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -110,6 +110,7 @@ static const struct object_ops thread_apc_ops =
@@ -667,7 +683,7 @@ index 30320851436..fafa86f292c 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/winstation.c b/server/winstation.c
-index c9c85e50fff..12060b82c83 100644
+index 95e5c0c7d0d..22228d6f987 100644
 --- a/server/winstation.c
 +++ b/server/winstation.c
 @@ -64,6 +64,7 @@ static const struct object_ops winstation_ops =
@@ -687,5 +703,5 @@ index c9c85e50fff..12060b82c83 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 -- 
-2.28.0
+2.29.2
 

patches/eventfd_synchronization/0056-server-Create-esync-file-descriptors-for-console-ser.patch

@@ -1,4 +1,4 @@
-From 6202eab7a05dae145676e55f7fd7373569930cda Mon Sep 17 00:00:00 2001
+From fb450637e3b533b3dbef8792aa389ca3614bedf3 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Sat, 17 Oct 2020 19:13:16 -0500
 Subject: [PATCH] server: Create esync file descriptors for console servers.
@@ -8,7 +8,7 @@ Subject: [PATCH] server: Create esync file descriptors for console servers.
  1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/server/console.c b/server/console.c
-index c0892b251c4..99831b299b8 100644
+index dd1bf8f4119..887bba4e63c 100644
 --- a/server/console.c
 +++ b/server/console.c
 @@ -42,6 +42,7 @@
@@ -19,7 +19,7 @@ index c0892b251c4..99831b299b8 100644
  
  struct screen_buffer;
  
-@@ -134,11 +135,13 @@ struct console_server
+@@ -139,11 +140,13 @@ struct console_server
      int                   busy;        /* flag if server processing an ioctl */
      int                   term_fd;     /* UNIX terminal fd */
      struct termios        termios;     /* original termios */
@@ -31,9 +31,9 @@ index c0892b251c4..99831b299b8 100644
  static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry );
 +static int console_server_get_esync_fd( struct object *obj, enum esync_type *type );
  static struct fd *console_server_get_fd( struct object *obj );
- static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr );
- static struct object *console_server_open_file( struct object *obj, unsigned int access,
-@@ -152,7 +155,7 @@ static const struct object_ops console_server_ops =
+ static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name,
+                                                 unsigned int attr, struct object *root );
+@@ -158,7 +161,7 @@ static const struct object_ops console_server_ops =
      add_queue,                        /* add_queue */
      remove_queue,                     /* remove_queue */
      console_server_signaled,          /* signaled */
@@ -42,7 +42,7 @@ index c0892b251c4..99831b299b8 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_server_get_fd,            /* get_fd */
-@@ -427,6 +430,8 @@ static void disconnect_console_server( struct console_server *server )
+@@ -526,6 +529,8 @@ static void disconnect_console_server( struct console_server *server )
          list_remove( &call->entry );
          console_host_ioctl_terminate( call, STATUS_CANCELLED );
      }
@@ -51,7 +51,7 @@ index c0892b251c4..99831b299b8 100644
      while (!list_empty( &server->read_queue ))
      {
          struct console_host_ioctl *call = LIST_ENTRY( list_head( &server->read_queue ), struct console_host_ioctl, entry );
-@@ -764,6 +769,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry
+@@ -844,6 +849,13 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry
      return !server->console || !list_empty( &server->queue );
  }
  
@@ -65,7 +65,7 @@ index c0892b251c4..99831b299b8 100644
  static struct fd *console_server_get_fd( struct object* obj )
  {
      struct console_server *server = (struct console_server*)obj;
-@@ -794,6 +806,10 @@ static struct object *create_console_server( void )
+@@ -874,6 +886,10 @@ static struct object *create_console_server( void )
          return NULL;
      }
      allow_fd_caching(server->fd);
@@ -76,7 +76,7 @@ index c0892b251c4..99831b299b8 100644
  
      return &server->obj;
  }
-@@ -1219,6 +1235,8 @@ DECL_HANDLER(get_next_console_request)
+@@ -1388,6 +1404,8 @@ DECL_HANDLER(get_next_console_request)
          /* set result of previous ioctl */
          ioctl = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry );
          list_remove( &ioctl->entry );
@@ -85,7 +85,7 @@ index c0892b251c4..99831b299b8 100644
      }
  
      if (ioctl)
-@@ -1309,6 +1327,8 @@ DECL_HANDLER(get_next_console_request)
+@@ -1486,6 +1504,8 @@ DECL_HANDLER(get_next_console_request)
      {
          set_error( STATUS_PENDING );
      }
@@ -95,5 +95,5 @@ index c0892b251c4..99831b299b8 100644
      release_object( server );
  }
 -- 
-2.28.0
+2.29.2
 

patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch

@@ -1,4 +1,4 @@
-From 9a269d58ea099e115857ffe72700fdb7d5948ad5 Mon Sep 17 00:00:00 2001
+From 2543348eb9a6d0ab4cdac725d240b16e0648dce7 Mon Sep 17 00:00:00 2001
 From: "Olivier F. R. Dierick" <o.dierick@piezo-forte.be>
 Date: Tue, 19 Apr 2016 07:25:39 +0200
 Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
@@ -8,19 +8,19 @@ Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
  1 file changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index ff4e79ff2b7..5c25920ba5b 100644
+index ec37b66621f..cb15823c864 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -68,6 +68,8 @@ typedef struct
+@@ -49,6 +49,8 @@ typedef struct
      DWORD dwReserved;
  } LOADPARMS32;
  
 +static BOOL is_wow64;
 +
- HMODULE kernel32_handle = 0;
  SYSTEM_BASIC_INFORMATION system_info = { 0 };
  
-@@ -83,6 +85,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s',
+ /* Process flags */
+@@ -59,6 +61,7 @@ SYSTEM_BASIC_INFORMATION system_info = { 0 };
  #define PDB32_FILE_APIS_OEM 0x0040  /* File APIs are OEM */
  #define PDB32_WIN32S_PROC   0x8000  /* Win32s process */
  
@@ -28,7 +28,7 @@ index ff4e79ff2b7..5c25920ba5b 100644
  
  /***********************************************************************
   *           wait_input_idle
-@@ -201,7 +204,6 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
+@@ -177,7 +180,6 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
      return ret;
  }
  
@@ -36,7 +36,7 @@ index ff4e79ff2b7..5c25920ba5b 100644
  /***********************************************************************
   *           ExitProcess   (KERNEL32.@)
   *
-@@ -586,9 +588,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
+@@ -562,9 +564,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
   */
  BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
  {
@@ -76,5 +76,5 @@ index ff4e79ff2b7..5c25920ba5b 100644
  
  /**********************************************************************
 -- 
-2.28.0
+2.29.2
 

patches/libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch

@@ -1,75 +0,0 @@
-From a3c6f83abc21e88b69bb6b50e02892ab78a04774 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 27 May 2019 09:19:56 +1000
-Subject: [PATCH] libwine: Add process specific debug channels.
-
----
- dlls/ntdll/unix/debug.c | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c
-index 7bc7787c9de..cf4ce6fb9a6 100644
---- a/dlls/ntdll/unix/debug.c
-+++ b/dlls/ntdll/unix/debug.c
-@@ -34,6 +34,7 @@
- #endif
- 
- #include "wine/debug.h"
-+#include "wine/library.h"
- #include "ntdll_misc.h"
- 
- WINE_DECLARE_DEBUG_CHANNEL(pid);
-@@ -107,10 +108,22 @@ static void add_option( const char *name, unsigned char set, unsigned char clear
-     nb_debug_options++;
- }
- 
-+/* get name of the current process */
-+static const char *get_process_name( void )
-+{
-+    const char *ret, *tmp;
-+    if (__wine_main_argc < 2) return NULL;
-+    ret = __wine_main_argv[1];
-+    if ((tmp = strrchr(ret, '/'))) ret = ++tmp;
-+    if ((tmp = strrchr(ret, '\\'))) ret = ++tmp;
-+    return ret;
-+}
-+
- /* parse a set of debugging option specifications and add them to the option list */
- static void parse_options( const char *str )
- {
--    char *opt, *next, *options;
-+    char *opt, *next, *popt, *options;
-+    const char *process = get_process_name();
-     unsigned int i;
- 
-     if (!(options = strdup(str))) return;
-@@ -121,6 +134,17 @@ static void parse_options( const char *str )
- 
-         if ((next = strchr( opt, ',' ))) *next++ = 0;
- 
-+        if ((popt = strchr( opt, ':' )))
-+        {
-+            unsigned int inv = 0;
-+            *popt = 0;
-+            if (!process) continue;
-+            if (*opt == '-' || *opt == '+')
-+                inv = (*opt++ == '-');
-+            if (inv == !strcmp( opt, process )) continue;
-+            opt = ++popt;
-+        }
-+
-         p = opt + strcspn( opt, "+-" );
-         if (!p[0]) p = opt;  /* assume it's a debug channel name */
- 
-@@ -161,7 +185,7 @@ static void debug_usage(void)
- {
-     static const char usage[] =
-         "Syntax of the WINEDEBUG variable:\n"
--        "  WINEDEBUG=[class]+xxx,[class]-yyy,...\n\n"
-+        "  WINEDEBUG=[+process:][class]+xxx,[-process:][class]-yyy,...\n\n"
-         "Example: WINEDEBUG=+relay,warn-heap\n"
-         "    turns on relay traces, disable heap warnings\n"
-         "Available message classes: err, warn, fixme, trace\n";
--- 
-2.26.2
-

patches/libs-Debug_Channel/definition

@@ -1,4 +0,0 @@
-Fixes: Add support for process specific debug channels
-Disabled: true
-# set_process_name() mangles __wine_main_argv, causing dbg_init() to crash. This
-# worked before acd209d60 since the functions were called in the opposite order.

patches/mfplat-streaming-support/0001-mfmediaengine-Provide-the-partial-topology-to-the-me.patch

@@ -1,39 +0,0 @@
-From 3277e517f89730f9963d4fc619179a882e9911d0 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Fri, 16 Oct 2020 16:53:29 -0500
-Subject: [PATCH] mfmediaengine: Provide the partial topology to the media
- session.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/mfmediaengine/main.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
-index d93e2b2f38c..d1261e3cd73 100644
---- a/dlls/mfmediaengine/main.c
-+++ b/dlls/mfmediaengine/main.c
-@@ -418,7 +418,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
-             {
-                 sd_video = sd;
-                 IMFStreamDescriptor_AddRef(sd_video);
-+                /* TODO: reintroduce this once we set up video stream nodes */
-+#if 0
-                 IMFPresentationDescriptor_SelectStream(pd, i);
-+#endif
-             }
- 
-             IMFMediaTypeHandler_Release(type_handler);
-@@ -480,6 +483,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi
-             if (audio_src)
-                 IMFTopologyNode_Release(audio_src);
-         }
-+
-+        if (SUCCEEDED(hr))
-+            hr = IMFMediaSession_SetTopology(engine->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology);
-     }
- 
-     if (topology)
--- 
-2.28.0
-