Release v6.0-rc3

Restore file.

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/Staging/definition

@@ -1 +1 @@
-#Depends: ntdll-FLS_Callbacks
+#Depends: ntdll-NtAlertThreadByThreadId

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 3478a4e41c07a66e7e913c54bcf5ad52e16a8fee 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.
@@ -8,13 +8,13 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  dlls/bcrypt/Makefile.in       |   3 +-
  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/macos.c           |  18 ++-
+ dlls/bcrypt/unixlib.c         | 211 ++++++++++++++++++++++++++++++++++
+ 5 files changed, 252 insertions(+), 15 deletions(-)
  create mode 100644 dlls/bcrypt/unixlib.c
 
 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
-index 24803fb2d7c..46a20d473dd 100644
+index 24803fb2d7cb..46a20d473dd7 100644
 --- a/dlls/bcrypt/Makefile.in
 +++ b/dlls/bcrypt/Makefile.in
 @@ -11,6 +11,7 @@ C_SRCS = \
@@ -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 eb1361115093..3c7110d05f84 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 );
+@@ -218,4 +218,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 c065ac31fba3..9490ea8612a8 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -347,9 +347,12 @@ fail:
+@@ -371,9 +371,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
+@@ -1949,19 +1952,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 44906519cef0..2a88aec8362c 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
+@@ -302,11 +302,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 000000000000..9cbb25f5740c
 --- /dev/null
 +++ b/dlls/bcrypt/unixlib.c
-@@ -0,0 +1,186 @@
+@@ -0,0 +1,211 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -250,11 +250,30 @@ 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" );
 +}
 +
++static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len,
++        UCHAR *output, ULONG *output_len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_import_rsa( struct key *key, UCHAR *input, ULONG input_len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
 +static struct key_funcs key_funcs =
 +{
 +    key_set_property,
@@ -267,13 +286,16 @@ index 00000000000..791b5d54188
 +    key_symmetric_destroy,
 +    key_asymmetric_init,
 +    key_asymmetric_generate,
++    key_asymmetric_decrypt,
++    key_asymmetric_duplicate,
 +    key_asymmetric_sign,
 +    key_asymmetric_verify,
 +    key_asymmetric_destroy,
 +    key_export_dsa_capi,
 +    key_export_ecc,
 +    key_import_dsa_capi,
-+    key_import_ecc
++    key_import_ecc,
++    key_import_rsa,
 +};
 +
 +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
@@ -299,6 +321,8 @@ index 00000000000..791b5d54188
 +        RESOLVE_FUNC(symmetric_destroy)
 +        RESOLVE_FUNC(asymmetric_init)
 +        RESOLVE_FUNC(asymmetric_generate)
++        RESOLVE_FUNC(asymmetric_decrypt)
++        RESOLVE_FUNC(asymmetric_duplicate)
 +        RESOLVE_FUNC(asymmetric_sign)
 +        RESOLVE_FUNC(asymmetric_verify)
 +        RESOLVE_FUNC(asymmetric_destroy)
@@ -306,6 +330,7 @@ index 00000000000..791b5d54188
 +        RESOLVE_FUNC(export_ecc)
 +        RESOLVE_FUNC(import_dsa_capi)
 +        RESOLVE_FUNC(import_ecc)
++        RESOLVE_FUNC(import_rsa)
 +
 +#undef RESOLVE_FUNC
 +
@@ -317,5 +342,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 e2442f39015a5982bfd15479ee06d7163d36771d 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,19 +9,19 @@ 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          | 292 ++++++++++++++++++++++++++++++++++
  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(-)
+ dlls/bcrypt/unixlib.c         |  13 +-
+ 9 files changed, 378 insertions(+), 9 deletions(-)
  create mode 100644 dlls/bcrypt/gcrypt.c
 
 diff --git a/configure.ac b/configure.ac
-index 865aa924d07..35233aa5d08 100644
+index b6b8d49342f3..7c1c8a7ddaf4 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
+@@ -46,6 +46,7 @@ AC_ARG_WITH(faudio,    AS_HELP_STRING([--without-faudio],[do not use FAudio (XAu
  AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms]))
  AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]))
  AC_ARG_WITH(freetype,  AS_HELP_STRING([--without-freetype],[do not use the FreeType library]))
@@ -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"],
+@@ -1989,6 +1990,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}
  
@@ -50,7 +50,7 @@ index 865aa924d07..35233aa5d08 100644
  
  AC_SUBST(EXTRACFLAGS,"")
 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
-index 46a20d473dd..4a3016784af 100644
+index 46a20d473dd7..4a3016784af3 100644
 --- a/dlls/bcrypt/Makefile.in
 +++ b/dlls/bcrypt/Makefile.in
 @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin
@@ -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 3c7110d05f84..e7991eac077a 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 * );
+@@ -216,9 +218,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 a1423dcd8368..0655c5dcfe81 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
+@@ -1932,9 +1932,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
+@@ -1943,18 +1946,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
+@@ -1964,12 +1988,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 000000000000..e72c27feb519
 --- /dev/null
 +++ b/dlls/bcrypt/gcrypt.c
-@@ -0,0 +1,289 @@
+@@ -0,0 +1,292 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -449,6 +449,9 @@ index 00000000000..d127e1a2903
 +    NULL,
 +    NULL,
 +    NULL,
++    NULL,
++    NULL,
++    NULL,
 +    key_compute_secret_ecc
 +};
 +
@@ -478,38 +481,38 @@ index 00000000000..d127e1a2903
 +}
 +#endif
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index cffaa2a5c77..aa60054d315 100644
+index 9490ea8612a8..78d0f2d95966 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,
+@@ -1949,7 +1949,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 2a88aec8362c..3ee3515f9de2 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,
+@@ -299,7 +299,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 456727d04a96..6be406dee21f 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,11 +522,11 @@ 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 9cbb25f5740c..6f8ff7f97887 100644
 --- a/dlls/bcrypt/unixlib.c
 +++ b/dlls/bcrypt/unixlib.c
-@@ -123,6 +123,12 @@ static void CDECL key_asymmetric_destroy( struct key *key )
-     FIXME( "not implemented\n" );
+@@ -142,6 +142,12 @@ static NTSTATUS CDECL key_import_rsa( struct key *key, UCHAR *input, ULONG input
+     return STATUS_NOT_IMPLEMENTED;
  }
  
 +static NTSTATUS CDECL key_compute_secret_ecc (unsigned char *privkey_in, struct key *pubkey_in, struct secret *secret)
@@ -535,13 +538,11 @@ index 791b5d54188..a691d82afe2 100644
  static struct key_funcs key_funcs =
  {
      key_set_property,
-@@ -141,13 +147,15 @@ static struct key_funcs key_funcs =
-     key_export_dsa_capi,
-     key_export_ecc,
+@@ -164,12 +170,14 @@ static struct key_funcs key_funcs =
      key_import_dsa_capi,
--    key_import_ecc
-+    key_import_ecc,
-+    key_compute_secret_ecc
+     key_import_ecc,
+     key_import_rsa,
++    key_compute_secret_ecc,
  };
  
  NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
@@ -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
+@@ -177,7 +185,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,14 +564,14 @@ 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
-         RESOLVE_FUNC(export_ecc)
+@@ -199,6 +209,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
          RESOLVE_FUNC(import_dsa_capi)
          RESOLVE_FUNC(import_ecc)
+         RESOLVE_FUNC(import_rsa)
 +        RESOLVE_FUNC(compute_secret_ecc)
  
  #undef RESOLVE_FUNC
  
 -- 
-2.28.0
+2.29.2
 

patches/bcrypt-ECDHSecretAgreement/0003-bcrypt-Implement-BCRYPT_KDF_HASH.patch

@@ -1,4 +1,4 @@
-From 01530fae68970b0c0af8811c5f6c5ea85c14372c Mon Sep 17 00:00:00 2001
+From 305131e59c071ca84e4447ab053b04bf4023fee8 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 7 Jan 2020 14:22:49 -0600
 Subject: [PATCH] bcrypt: Implement BCRYPT_KDF_HASH.
@@ -11,10 +11,10 @@ Signed-off-by: Derek Lesho <dlesho at codeweavers.com>
  2 files changed, 108 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 8dae41a2e2e..67be417aa61 100644
+index 0655c5dcfe81..70e914bd41f1 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1837,7 +1837,113 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
+@@ -1993,7 +1993,113 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
      if (!secret || secret->hdr.magic != MAGIC_SECRET) return STATUS_INVALID_HANDLE;
      if (!kdf) return STATUS_INVALID_PARAMETER;
  
@@ -130,10 +130,10 @@ index 8dae41a2e2e..67be417aa61 100644
          ULONG n;
          ULONG secret_length = secret->len;
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 5701a0a30ce..d4ffb3fe69c 100644
+index 6be406dee21f..b13432523d15 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -2132,7 +2132,7 @@ static void test_ECDH(void)
+@@ -2180,7 +2180,7 @@ static void test_ECDH(void)
      raw_secret_end:
  
      status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0);
@@ -142,7 +142,7 @@ index 5701a0a30ce..d4ffb3fe69c 100644
  
      if (status != STATUS_SUCCESS)
      {
-@@ -2666,7 +2666,6 @@ static void test_SecretAgreement(void)
+@@ -2716,7 +2716,6 @@ static void test_SecretAgreement(void)
      ok(status == STATUS_INVALID_PARAMETER, "got %08x\n", status);
  
      status = pBCryptDeriveKey(secret, L"HASH", NULL, NULL, 0, &size, 0);
@@ -151,5 +151,5 @@ index 5701a0a30ce..d4ffb3fe69c 100644
  
      status = pBCryptDestroyHash(secret);
 -- 
-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/d3drm-IDirect3D3-support/0001-d3drm-Support-IDirect3D3-when-creating-device.patch

@@ -0,0 +1,76 @@
+From 9ea60091ba885b5f63266374f49f0d63e2cf2767 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 16 Dec 2020 11:07:05 +1100
+Subject: [PATCH] d3drm: Support IDirect3D3 when creating device
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39346
+---
+ dlls/d3drm/device.c | 26 ++++++++++++++++++++++++--
+ 1 file changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
+index 2e1b5f2d24f..fff272197bf 100644
+--- a/dlls/d3drm/device.c
++++ b/dlls/d3drm/device.c
+@@ -124,7 +124,9 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw
+     IDirectDrawSurface *ds = NULL;
+     IDirect3DDevice *device1 = NULL;
+     IDirect3DDevice2 *device2 = NULL;
++    IDirect3DDevice3 *device3 = NULL;
+     IDirect3D2 *d3d2 = NULL;
++    IDirect3D3 *d3d3 = NULL;
+     DDSURFACEDESC desc, surface_desc;
+     HRESULT hr;
+ 
+@@ -171,19 +173,29 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw
+ 
+     if (version == 1)
+         hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DRGBDevice, (void **)&device1);
+-    else
++    else if (version == 2)
+     {
+         IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D2, (void**)&d3d2);
+         hr = IDirect3D2_CreateDevice(d3d2, &IID_IDirect3DRGBDevice, surface, &device2);
+         IDirect3D2_Release(d3d2);
+     }
++    else
++    {
++        IDirectDrawSurface4 *surface4 = NULL;
++
++        IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface4, (void**)&surface4);
++        IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D3, (void**)&d3d3);
++        hr = IDirect3D3_CreateDevice(d3d3, &IID_IDirect3DRGBDevice, surface4, &device3, NULL);
++        IDirectDrawSurface4_Release(surface4);
++        IDirect3D3_Release(d3d3);
++    }
+     if (FAILED(hr))
+     {
+         IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
+         return hr;
+     }
+ 
+-    if (version != 1)
++    if (version == 2)
+     {
+         hr = IDirect3DDevice2_QueryInterface(device2, &IID_IDirect3DDevice, (void**)&device1);
+         IDirect3DDevice2_Release(device2);
+@@ -193,6 +205,16 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw
+             return hr;
+         }
+     }
++    else if (version == 3)
++    {
++        hr = IDirect3DDevice3_QueryInterface(device3, &IID_IDirect3DDevice, (void**)&device1);
++        IDirect3DDevice3_Release(device3);
++        if (FAILED(hr))
++        {
++            IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
++            return hr;
++        }
++    }
+     device->device = device1;
+     device->width = desc.dwWidth;
+     device->height = desc.dwHeight;
+-- 
+2.29.2
+

patches/d3drm-IDirect3D3-support/definition

@@ -0,0 +1 @@
+Fixes: [39346] Support IDirect3D3 when creating device.

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/dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch

@@ -0,0 +1,134 @@
+From 484d1c91138f4122cfa56d9e9cad87d17d97d82c Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:41:57 -0500
+Subject: [PATCH] d3dpmesh: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac                  |  1 +
+ dlls/d3dpmesh/Makefile.in     |  8 +++++++
+ dlls/d3dpmesh/d3dpmesh.spec   |  1 +
+ dlls/d3dpmesh/d3dpmesh_main.c | 42 +++++++++++++++++++++++++++++++++++
+ dlls/d3dpmesh/version.rc      | 26 ++++++++++++++++++++++
+ 5 files changed, 78 insertions(+)
+ create mode 100644 dlls/d3dpmesh/Makefile.in
+ create mode 100644 dlls/d3dpmesh/d3dpmesh.spec
+ create mode 100644 dlls/d3dpmesh/d3dpmesh_main.c
+ create mode 100644 dlls/d3dpmesh/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index dafa8489b71..0672b0ad816 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3103,6 +3103,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47)
+ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests)
+ WINE_CONFIG_MAKEFILE(dlls/d3dim)
+ WINE_CONFIG_MAKEFILE(dlls/d3dim700)
++WINE_CONFIG_MAKEFILE(dlls/d3dpmesh)
+ WINE_CONFIG_MAKEFILE(dlls/d3drm)
+ WINE_CONFIG_MAKEFILE(dlls/d3drm/tests)
+ WINE_CONFIG_MAKEFILE(dlls/d3dx10_33)
+diff --git a/dlls/d3dpmesh/Makefile.in b/dlls/d3dpmesh/Makefile.in
+new file mode 100644
+index 00000000000..2a7546832c2
+--- /dev/null
++++ b/dlls/d3dpmesh/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = d3dpmesh.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	d3dpmesh_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/d3dpmesh/d3dpmesh.spec b/dlls/d3dpmesh/d3dpmesh.spec
+new file mode 100644
+index 00000000000..d4b9a46bd7a
+--- /dev/null
++++ b/dlls/d3dpmesh/d3dpmesh.spec
+@@ -0,0 +1 @@
++@ stub CreateD3DRMPMeshVisual
+diff --git a/dlls/d3dpmesh/d3dpmesh_main.c b/dlls/d3dpmesh/d3dpmesh_main.c
+new file mode 100644
+index 00000000000..3d84a693a45
+--- /dev/null
++++ b/dlls/d3dpmesh/d3dpmesh_main.c
+@@ -0,0 +1,42 @@
++/*
++ *
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(d3dpmesh);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+diff --git a/dlls/d3dpmesh/version.rc b/dlls/d3dpmesh/version.rc
+new file mode 100644
+index 00000000000..87e601a95a7
+--- /dev/null
++++ b/dlls/d3dpmesh/version.rc
+@@ -0,0 +1,26 @@
++/*
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#define WINE_FILEDESCRIPTION_STR "Wine d3dpmesh"
++#define WINE_FILENAME_STR "d3dpmesh.dll"
++#define WINE_FILEVERSION 5,0,2134,1
++#define WINE_FILEVERSION_STR "5.0.2134.1"
++#define WINE_PRODUCTVERSION 5,0,2134,1
++#define WINE_PRODUCTVERSION_STR "5.0.2134.1"
++
++#include "wine/wine_common_ver.rc"
+-- 
+2.29.2
+

patches/dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch

@@ -0,0 +1,137 @@
+From 4bf34b5b1a03c6a92211ed5bbb54e6070c28b569 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:43:09 -0500
+Subject: [PATCH] diactfrm: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac                  |  1 +
+ dlls/diactfrm/Makefile.in     |  8 +++++++
+ dlls/diactfrm/diactfrm.spec   |  4 ++++
+ dlls/diactfrm/diactfrm_main.c | 42 +++++++++++++++++++++++++++++++++++
+ dlls/diactfrm/version.rc      | 26 ++++++++++++++++++++++
+ 5 files changed, 81 insertions(+)
+ create mode 100644 dlls/diactfrm/Makefile.in
+ create mode 100644 dlls/diactfrm/diactfrm.spec
+ create mode 100644 dlls/diactfrm/diactfrm_main.c
+ create mode 100644 dlls/diactfrm/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index 0672b0ad816..12efadbab64 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3161,6 +3161,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc)
+ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx)
++WINE_CONFIG_MAKEFILE(dlls/diactfrm)
+ WINE_CONFIG_MAKEFILE(dlls/difxapi)
+ WINE_CONFIG_MAKEFILE(dlls/dinput)
+ WINE_CONFIG_MAKEFILE(dlls/dinput/tests)
+diff --git a/dlls/diactfrm/Makefile.in b/dlls/diactfrm/Makefile.in
+new file mode 100644
+index 00000000000..7d83e518017
+--- /dev/null
++++ b/dlls/diactfrm/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = diactfrm.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	diactfrm_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/diactfrm/diactfrm.spec b/dlls/diactfrm/diactfrm.spec
+new file mode 100644
+index 00000000000..c5fc87af6d5
+--- /dev/null
++++ b/dlls/diactfrm/diactfrm.spec
+@@ -0,0 +1,4 @@
++@ stub DllCanUnloadNow
++@ stub DllGetClassObject
++@ stub DllRegisterServer
++@ stub DllUnregisterServer
+diff --git a/dlls/diactfrm/diactfrm_main.c b/dlls/diactfrm/diactfrm_main.c
+new file mode 100644
+index 00000000000..309374507bb
+--- /dev/null
++++ b/dlls/diactfrm/diactfrm_main.c
+@@ -0,0 +1,42 @@
++/*
++ *
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(diactfrm);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+diff --git a/dlls/diactfrm/version.rc b/dlls/diactfrm/version.rc
+new file mode 100644
+index 00000000000..b6b6692b831
+--- /dev/null
++++ b/dlls/diactfrm/version.rc
+@@ -0,0 +1,26 @@
++/*
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#define WINE_FILEDESCRIPTION_STR "Wine diactfrm"
++#define WINE_FILENAME_STR "diactfrm.dll"
++#define WINE_FILEVERSION 5,1,2600,881
++#define WINE_FILEVERSION_STR "5.1.2600.881"
++#define WINE_PRODUCTVERSION 5,1,2600,881
++#define WINE_PRODUCTVERSION_STR "5.1.2600.881"
++
++#include "wine/wine_common_ver.rc"
+-- 
+2.29.2
+

patches/dxdiag-new-dlls/0003-dimap-add-stub-dll.patch

@@ -0,0 +1,135 @@
+From e60fe7940374842cbf933321d10c1b55161b998f Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:43:19 -0500
+Subject: [PATCH] dimap: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac            |  1 +
+ dlls/dimap/Makefile.in  |  8 ++++++++
+ dlls/dimap/dimap.spec   |  2 ++
+ dlls/dimap/dimap_main.c | 42 +++++++++++++++++++++++++++++++++++++++++
+ dlls/dimap/version.rc   | 26 +++++++++++++++++++++++++
+ 5 files changed, 79 insertions(+)
+ create mode 100644 dlls/dimap/Makefile.in
+ create mode 100644 dlls/dimap/dimap.spec
+ create mode 100644 dlls/dimap/dimap_main.c
+ create mode 100644 dlls/dimap/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index 12efadbab64..f2be9e7db7a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3163,6 +3163,7 @@ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx)
+ WINE_CONFIG_MAKEFILE(dlls/diactfrm)
+ WINE_CONFIG_MAKEFILE(dlls/difxapi)
++WINE_CONFIG_MAKEFILE(dlls/dimap)
+ WINE_CONFIG_MAKEFILE(dlls/dinput)
+ WINE_CONFIG_MAKEFILE(dlls/dinput/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dinput8)
+diff --git a/dlls/dimap/Makefile.in b/dlls/dimap/Makefile.in
+new file mode 100644
+index 00000000000..05030d9cce6
+--- /dev/null
++++ b/dlls/dimap/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dimap.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	dimap_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dimap/dimap.spec b/dlls/dimap/dimap.spec
+new file mode 100644
+index 00000000000..cacaa27a2ca
+--- /dev/null
++++ b/dlls/dimap/dimap.spec
+@@ -0,0 +1,2 @@
++@ stub DllCanUnloadNow
++@ stub DllGetClassObject
+diff --git a/dlls/dimap/dimap_main.c b/dlls/dimap/dimap_main.c
+new file mode 100644
+index 00000000000..0f393dfb243
+--- /dev/null
++++ b/dlls/dimap/dimap_main.c
+@@ -0,0 +1,42 @@
++/*
++ *
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(dimap);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+diff --git a/dlls/dimap/version.rc b/dlls/dimap/version.rc
+new file mode 100644
+index 00000000000..d0341dfcb77
+--- /dev/null
++++ b/dlls/dimap/version.rc
+@@ -0,0 +1,26 @@
++/*
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#define WINE_FILEDESCRIPTION_STR "Wine dimap"
++#define WINE_FILENAME_STR "dimap.dll"
++#define WINE_FILEVERSION 5,1,2600,881
++#define WINE_FILEVERSION_STR "5.1.2600.881"
++#define WINE_PRODUCTVERSION 5,1,2600,881
++#define WINE_PRODUCTVERSION_STR "5.1.2600.881"
++
++#include "wine/wine_common_ver.rc"
+-- 
+2.29.2
+

patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch

@@ -0,0 +1,135 @@
+From 17b2eb4b74795bb729025f72459697214bfc7a31 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:42:02 -0500
+Subject: [PATCH] dpmodemx: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac                  |  1 +
+ dlls/dpmodemx/Makefile.in     |  8 +++++++
+ dlls/dpmodemx/dpmodemx.spec   |  1 +
+ dlls/dpmodemx/dpmodemx_main.c | 42 +++++++++++++++++++++++++++++++++++
+ dlls/dpmodemx/version.rc      | 26 ++++++++++++++++++++++
+ 5 files changed, 78 insertions(+)
+ create mode 100644 dlls/dpmodemx/Makefile.in
+ create mode 100644 dlls/dpmodemx/dpmodemx.spec
+ create mode 100644 dlls/dpmodemx/dpmodemx_main.c
+ create mode 100644 dlls/dpmodemx/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index f2be9e7db7a..c6198dd71b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3197,6 +3197,7 @@ WINE_CONFIG_MAKEFILE(dlls/dnsapi/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dplay)
+ WINE_CONFIG_MAKEFILE(dlls/dplayx)
+ WINE_CONFIG_MAKEFILE(dlls/dplayx/tests)
++WINE_CONFIG_MAKEFILE(dlls/dpmodemx)
+ WINE_CONFIG_MAKEFILE(dlls/dpnaddr)
+ WINE_CONFIG_MAKEFILE(dlls/dpnet)
+ WINE_CONFIG_MAKEFILE(dlls/dpnet/tests)
+diff --git a/dlls/dpmodemx/Makefile.in b/dlls/dpmodemx/Makefile.in
+new file mode 100644
+index 00000000000..e074ca33164
+--- /dev/null
++++ b/dlls/dpmodemx/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dpmodemx.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	dpmodemx_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec
+new file mode 100644
+index 00000000000..14fb05053a8
+--- /dev/null
++++ b/dlls/dpmodemx/dpmodemx.spec
+@@ -0,0 +1 @@
++@ stub SPInit
+\ No newline at end of file
+diff --git a/dlls/dpmodemx/dpmodemx_main.c b/dlls/dpmodemx/dpmodemx_main.c
+new file mode 100644
+index 00000000000..f5d7a8340ca
+--- /dev/null
++++ b/dlls/dpmodemx/dpmodemx_main.c
+@@ -0,0 +1,42 @@
++/*
++ *
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(dpmodemx);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+diff --git a/dlls/dpmodemx/version.rc b/dlls/dpmodemx/version.rc
+new file mode 100644
+index 00000000000..b0c644aed83
+--- /dev/null
++++ b/dlls/dpmodemx/version.rc
+@@ -0,0 +1,26 @@
++/*
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#define WINE_FILEDESCRIPTION_STR "Wine dpmodemx"
++#define WINE_FILENAME_STR "dpmodemx.dll"
++#define WINE_FILEVERSION 5,3,2600,5512
++#define WINE_FILEVERSION_STR "5.3.2600.5512"
++#define WINE_PRODUCTVERSION 5,3,2600,5512
++#define WINE_PRODUCTVERSION_STR "5.3.2600.5512"
++
++#include "wine/wine_common_ver.rc"
+-- 
+2.29.2
+

patches/dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch

@@ -0,0 +1,139 @@
+From ccab4054c8596d7383904175d6efaad028268cfc Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:43:44 -0500
+Subject: [PATCH] dpnhupnp: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac                  |  1 +
+ dlls/dpnhupnp/Makefile.in     |  8 +++++++
+ dlls/dpnhupnp/dpnhupnp.spec   |  5 +++++
+ dlls/dpnhupnp/dpnhupnp_main.c | 42 +++++++++++++++++++++++++++++++++++
+ dlls/dpnhupnp/version.rc      | 26 ++++++++++++++++++++++
+ 5 files changed, 82 insertions(+)
+ create mode 100644 dlls/dpnhupnp/Makefile.in
+ create mode 100644 dlls/dpnhupnp/dpnhupnp.spec
+ create mode 100644 dlls/dpnhupnp/dpnhupnp_main.c
+ create mode 100644 dlls/dpnhupnp/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index c6198dd71b6..d562902f0f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3199,6 +3199,7 @@ WINE_CONFIG_MAKEFILE(dlls/dplayx)
+ WINE_CONFIG_MAKEFILE(dlls/dplayx/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dpmodemx)
+ WINE_CONFIG_MAKEFILE(dlls/dpnaddr)
++WINE_CONFIG_MAKEFILE(dlls/dpnhupnp)
+ WINE_CONFIG_MAKEFILE(dlls/dpnet)
+ WINE_CONFIG_MAKEFILE(dlls/dpnet/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dpnhpast)
+diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in
+new file mode 100644
+index 00000000000..7ac77c99471
+--- /dev/null
++++ b/dlls/dpnhupnp/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dpnhupnp.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	dpnhupnp_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec
+new file mode 100644
+index 00000000000..acc698e99ab
+--- /dev/null
++++ b/dlls/dpnhupnp/dpnhupnp.spec
+@@ -0,0 +1,5 @@
++@ stub DirectPlayNATHelpCreate
++@ stub DllRegisterServer
++@ stub DllCanUnloadNow
++@ stub DllGetClassObject
++@ stub DllUnregisterServer
+\ No newline at end of file
+diff --git a/dlls/dpnhupnp/dpnhupnp_main.c b/dlls/dpnhupnp/dpnhupnp_main.c
+new file mode 100644
+index 00000000000..f7b67d6574f
+--- /dev/null
++++ b/dlls/dpnhupnp/dpnhupnp_main.c
+@@ -0,0 +1,42 @@
++/*
++ *
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(dpnhupnp);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+diff --git a/dlls/dpnhupnp/version.rc b/dlls/dpnhupnp/version.rc
+new file mode 100644
+index 00000000000..21633a49815
+--- /dev/null
++++ b/dlls/dpnhupnp/version.rc
+@@ -0,0 +1,26 @@
++/*
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#define WINE_FILEDESCRIPTION_STR "Wine dpnhupnp"
++#define WINE_FILENAME_STR "dpnhupnp.dll"
++#define WINE_FILEVERSION 5,3,2600,5512
++#define WINE_FILEVERSION_STR "5.3.2600.5512"
++#define WINE_PRODUCTVERSION 5,3,2600,5512
++#define WINE_PRODUCTVERSION_STR "5.3.2600.5512"
++
++#include "wine/wine_common_ver.rc"
+-- 
+2.29.2
+

patches/dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch

@@ -0,0 +1,138 @@
+From de1a88b3f30897fc1e99476f81d7e3c883d69d09 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:42:02 -0500
+Subject: [PATCH] dpvacm: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac              |  1 +
+ dlls/dpvacm/Makefile.in   |  8 ++++++++
+ dlls/dpvacm/dpvacm.spec   |  4 ++++
+ dlls/dpvacm/dpvacm_main.c | 42 +++++++++++++++++++++++++++++++++++++++
+ dlls/dpvacm/version.rc    | 26 ++++++++++++++++++++++++
+ 5 files changed, 81 insertions(+)
+ create mode 100644 dlls/dpvacm/Makefile.in
+ create mode 100644 dlls/dpvacm/dpvacm.spec
+ create mode 100644 dlls/dpvacm/dpvacm_main.c
+ create mode 100644 dlls/dpvacm/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index d562902f0f7..814de0cda49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3204,6 +3204,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnet)
+ WINE_CONFIG_MAKEFILE(dlls/dpnet/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dpnhpast)
+ WINE_CONFIG_MAKEFILE(dlls/dpnlobby)
++WINE_CONFIG_MAKEFILE(dlls/dpvacm)
+ WINE_CONFIG_MAKEFILE(dlls/dpvoice)
+ WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dpwsockx)
+diff --git a/dlls/dpvacm/Makefile.in b/dlls/dpvacm/Makefile.in
+new file mode 100644
+index 00000000000..04d8b9b5f80
+--- /dev/null
++++ b/dlls/dpvacm/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dpvacm.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	dpvacm_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dpvacm/dpvacm.spec b/dlls/dpvacm/dpvacm.spec
+new file mode 100644
+index 00000000000..fc4ae4a44c0
+--- /dev/null
++++ b/dlls/dpvacm/dpvacm.spec
+@@ -0,0 +1,4 @@
++@ stub DllRegisterServer
++@ stub DllCanUnloadNow
++@ stub DllGetClassObject
++@ stub DllUnregisterServer
+\ No newline at end of file
+diff --git a/dlls/dpvacm/dpvacm_main.c b/dlls/dpvacm/dpvacm_main.c
+new file mode 100644
+index 00000000000..83fd0ab027c
+--- /dev/null
++++ b/dlls/dpvacm/dpvacm_main.c
+@@ -0,0 +1,42 @@
++/*
++ *
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(dpvacm);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+diff --git a/dlls/dpvacm/version.rc b/dlls/dpvacm/version.rc
+new file mode 100644
+index 00000000000..7c463bca22e
+--- /dev/null
++++ b/dlls/dpvacm/version.rc
+@@ -0,0 +1,26 @@
++/*
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#define WINE_FILEDESCRIPTION_STR "Wine dpvacm"
++#define WINE_FILENAME_STR "dpvacm.dll"
++#define WINE_FILEVERSION 5,3,2600,5512
++#define WINE_FILEVERSION_STR "5.3.2600.5512"
++#define WINE_PRODUCTVERSION 5,3,2600,5512
++#define WINE_PRODUCTVERSION_STR "5.3.2600.5512"
++
++#include "wine/wine_common_ver.rc"
+-- 
+2.29.2
+

patches/dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch

@@ -0,0 +1,138 @@
+From bfc43910ce09b06ae1618bc6e2cd1af00526d676 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:42:02 -0500
+Subject: [PATCH] dpvvox: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac              |  1 +
+ dlls/dpvvox/Makefile.in   |  8 ++++++++
+ dlls/dpvvox/dpvvox.spec   |  4 ++++
+ dlls/dpvvox/dpvvox_main.c | 42 +++++++++++++++++++++++++++++++++++++++
+ dlls/dpvvox/version.rc    | 26 ++++++++++++++++++++++++
+ 5 files changed, 81 insertions(+)
+ create mode 100644 dlls/dpvvox/Makefile.in
+ create mode 100644 dlls/dpvvox/dpvvox.spec
+ create mode 100644 dlls/dpvvox/dpvvox_main.c
+ create mode 100644 dlls/dpvvox/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index 814de0cda49..e8505848dc3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3207,6 +3207,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnlobby)
+ WINE_CONFIG_MAKEFILE(dlls/dpvacm)
+ WINE_CONFIG_MAKEFILE(dlls/dpvoice)
+ WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests)
++WINE_CONFIG_MAKEFILE(dlls/dpvvox)
+ WINE_CONFIG_MAKEFILE(dlls/dpwsockx)
+ WINE_CONFIG_MAKEFILE(dlls/drmclien)
+ WINE_CONFIG_MAKEFILE(dlls/dsdmo)
+diff --git a/dlls/dpvvox/Makefile.in b/dlls/dpvvox/Makefile.in
+new file mode 100644
+index 00000000000..4107042f785
+--- /dev/null
++++ b/dlls/dpvvox/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dpvvox.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	dpvvox_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dpvvox/dpvvox.spec b/dlls/dpvvox/dpvvox.spec
+new file mode 100644
+index 00000000000..fc4ae4a44c0
+--- /dev/null
++++ b/dlls/dpvvox/dpvvox.spec
+@@ -0,0 +1,4 @@
++@ stub DllRegisterServer
++@ stub DllCanUnloadNow
++@ stub DllGetClassObject
++@ stub DllUnregisterServer
+\ No newline at end of file
+diff --git a/dlls/dpvvox/dpvvox_main.c b/dlls/dpvvox/dpvvox_main.c
+new file mode 100644
+index 00000000000..8e813cc13d2
+--- /dev/null
++++ b/dlls/dpvvox/dpvvox_main.c
+@@ -0,0 +1,42 @@
++/*
++ *
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#include <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(dpvvox);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+diff --git a/dlls/dpvvox/version.rc b/dlls/dpvvox/version.rc
+new file mode 100644
+index 00000000000..d4e3a34c0a8
+--- /dev/null
++++ b/dlls/dpvvox/version.rc
+@@ -0,0 +1,26 @@
++/*
++ * Copyright 2020 Austin English
++ *
++ * 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
++ */
++
++#define WINE_FILEDESCRIPTION_STR "Wine dpvvox"
++#define WINE_FILENAME_STR "dpvvox.dll"
++#define WINE_FILEVERSION 5,3,2600,5512
++#define WINE_FILEVERSION_STR "5.3.2600.5512"
++#define WINE_PRODUCTVERSION 5,3,2600,5512
++#define WINE_PRODUCTVERSION_STR "5.3.2600.5512"
++
++#include "wine/wine_common_ver.rc"
+-- 
+2.29.2
+