Release v6.1

The program itself later updated not to use that interrupt, and nobody seems to have an old copy of it.

patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch

@@ -0,0 +1,35 @@
+From ce5e1fc75139e4de9d92dfe27b4a513a96da013c Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 2 Oct 2014 19:53:46 +0200
+Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
+
+---
+ Makefile.in            | 2 +-
+ dlls/ntdll/Makefile.in | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 307a95b3b1a..61019fed949 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -116,7 +116,7 @@ install-manpages:: manpages
+ # Rules for generated source files
+ 
+ dlls/ntdll/unix/version.c: dummy
+-	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
++	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
+ 
+ programs/winetest/build.rc: dummy
+ 	@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
+diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
+index f39ffb42c6f..67847bb9392 100644
+--- a/dlls/ntdll/Makefile.in
++++ b/dlls/ntdll/Makefile.in
+@@ -79,3 +79,4 @@ unix_loader_EXTRADEFS = \
+ 	-DBINDIR=\"${bindir}\" \
+ 	-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
+ 	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
++
+-- 
+2.28.0
+

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

@@ -1,4 +1,4 @@
-From eaab7eaeb7533445473bc19d947c34bdc360566e 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         | 194 ++++++++++++++++++++++++++++++++++
- 5 files changed, 235 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,10 +27,10 @@ index 24803fb2d7c..46a20d473dd 100644
  
  RC_SRCS = version.rc
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index e1777ed130b..86b1e3d28c3 100644
+index eb1361115093..3c7110d05f84 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -217,4 +217,7 @@ struct key_funcs
+@@ -218,4 +218,7 @@ struct key_funcs
      NTSTATUS (CDECL *key_import_rsa)( struct key *, UCHAR *, ULONG );
  };
  
@@ -39,10 +39,10 @@ index e1777ed130b..86b1e3d28c3 100644
 +
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index 162ac9ea732..a7fd8428dec 100644
+index c065ac31fba3..9490ea8612a8 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -358,9 +358,12 @@ fail:
+@@ -371,9 +371,12 @@ fail:
  
  static void gnutls_uninitialize(void)
  {
@@ -58,7 +58,7 @@ index 162ac9ea732..a7fd8428dec 100644
  }
  
  struct buffer
-@@ -1906,19 +1909,28 @@ static const struct key_funcs key_funcs =
+@@ -1949,19 +1952,28 @@ static const struct key_funcs key_funcs =
      key_import_rsa
  };
  
@@ -95,10 +95,10 @@ index 162ac9ea732..a7fd8428dec 100644
 +}
 +#endif
 diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 57edc3e262b..55dca5dde34 100644
+index 44906519cef0..2a88aec8362c 100644
 --- a/dlls/bcrypt/macos.c
 +++ b/dlls/bcrypt/macos.c
-@@ -294,11 +294,21 @@ static const struct key_funcs key_funcs =
+@@ -302,11 +302,21 @@ static const struct key_funcs key_funcs =
      key_import_rsa
  };
  
@@ -126,10 +126,10 @@ index 57edc3e262b..55dca5dde34 100644
  #endif
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
 new file mode 100644
-index 00000000000..a158ec1630a
+index 000000000000..9cbb25f5740c
 --- /dev/null
 +++ b/dlls/bcrypt/unixlib.c
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,211 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -261,6 +261,19 @@ index 00000000000..a158ec1630a
 +    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,
@@ -273,6 +286,7 @@ index 00000000000..a158ec1630a
 +    key_symmetric_destroy,
 +    key_asymmetric_init,
 +    key_asymmetric_generate,
++    key_asymmetric_decrypt,
 +    key_asymmetric_duplicate,
 +    key_asymmetric_sign,
 +    key_asymmetric_verify,
@@ -280,7 +294,8 @@ index 00000000000..a158ec1630a
 +    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 )
@@ -306,6 +321,7 @@ index 00000000000..a158ec1630a
 +        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)
@@ -314,6 +330,7 @@ index 00000000000..a158ec1630a
 +        RESOLVE_FUNC(export_ecc)
 +        RESOLVE_FUNC(import_dsa_capi)
 +        RESOLVE_FUNC(import_ecc)
++        RESOLVE_FUNC(import_rsa)
 +
 +#undef RESOLVE_FUNC
 +

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

@@ -1,4 +1,4 @@
-From 6a38df1250c4bab1fab1a72e06fc347586a7c535 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          | 290 ++++++++++++++++++++++++++++++++++
+ 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, 377 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 029dcd45187..a18e271dd4c 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 029dcd45187..a18e271dd4c 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])
-@@ -1988,6 +1989,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 029dcd45187..a18e271dd4c 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,7 +62,7 @@ index 46a20d473dd..4a3016784af 100644
  	macos.c \
  	md2.c \
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 86b1e3d28c3..5d969b13dc3 100644
+index 3c7110d05f84..e7991eac077a 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
 @@ -192,6 +192,8 @@ struct key
@@ -74,7 +74,7 @@ index 86b1e3d28c3..5d969b13dc3 100644
  };
  
  struct key_funcs
-@@ -215,9 +217,11 @@ struct key_funcs
+@@ -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 );
@@ -87,10 +87,10 @@ index 86b1e3d28c3..5d969b13dc3 100644
  
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 591c01c710c..f2c344f3275 100644
+index a1423dcd8368..0655c5dcfe81 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1914,9 +1914,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 591c01c710c..f2c344f3275 100644
  
      if (!privkey || privkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
      if (!pubkey || pubkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
-@@ -1925,18 +1928,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 591c01c710c..f2c344f3275 100644
      heap_free( secret );
      return STATUS_SUCCESS;
  }
-@@ -1946,12 +1970,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 591c01c710c..f2c344f3275 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..00849358c68
+index 000000000000..e72c27feb519
 --- /dev/null
 +++ b/dlls/bcrypt/gcrypt.c
-@@ -0,0 +1,290 @@
+@@ -0,0 +1,292 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -450,6 +450,8 @@ index 00000000000..00849358c68
 +    NULL,
 +    NULL,
 +    NULL,
++    NULL,
++    NULL,
 +    key_compute_secret_ecc
 +};
 +
@@ -479,10 +481,10 @@ index 00000000000..00849358c68
 +}
 +#endif
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index a7fd8428dec..575aaa21309 100644
+index 9490ea8612a8..78d0f2d95966 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -1906,7 +1906,8 @@ static const struct key_funcs key_funcs =
+@@ -1949,7 +1949,8 @@ static const struct key_funcs key_funcs =
      key_export_ecc,
      key_import_dsa_capi,
      key_import_ecc,
@@ -493,10 +495,10 @@ index a7fd8428dec..575aaa21309 100644
  
  struct key_funcs * gnutls_lib_init( DWORD reason )
 diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 55dca5dde34..fd7aeae9ec2 100644
+index 2a88aec8362c..3ee3515f9de2 100644
 --- a/dlls/bcrypt/macos.c
 +++ b/dlls/bcrypt/macos.c
-@@ -291,7 +291,8 @@ static const struct key_funcs key_funcs =
+@@ -299,7 +299,8 @@ static const struct key_funcs key_funcs =
      key_export_ecc,
      key_import_dsa_capi,
      key_import_ecc,
@@ -507,7 +509,7 @@ index 55dca5dde34..fd7aeae9ec2 100644
  
  struct key_funcs * macos_lib_init( DWORD reason )
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 456727d04a9..6be406dee21 100644
+index 456727d04a96..6be406dee21f 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
 @@ -2163,7 +2163,7 @@ static void test_ECDH(void)
@@ -520,11 +522,11 @@ index 456727d04a9..6be406dee21 100644
      if (status != STATUS_SUCCESS)
      {
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
-index a158ec1630a..a01e2ad02ed 100644
+index 9cbb25f5740c..6f8ff7f97887 100644
 --- a/dlls/bcrypt/unixlib.c
 +++ b/dlls/bcrypt/unixlib.c
-@@ -129,6 +129,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)
@@ -536,13 +538,11 @@ index a158ec1630a..a01e2ad02ed 100644
  static struct key_funcs key_funcs =
  {
      key_set_property,
-@@ -148,13 +154,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 )
@@ -553,7 +553,7 @@ index a158ec1630a..a01e2ad02ed 100644
  
      if (reason == DLL_PROCESS_ATTACH)
      {
-@@ -162,7 +170,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) \
@@ -564,10 +564,10 @@ index a158ec1630a..a01e2ad02ed 100644
  
          RESOLVE_FUNC(set_property)
          RESOLVE_FUNC(symmetric_init)
-@@ -182,6 +192,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

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/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/dsound-EAX/0022-dsound-Enable-EAX-by-default.patch

@@ -0,0 +1,25 @@
+From 25450e6cf073bde4f26fec40c59224087017f332 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 1 Jan 2021 13:32:48 +1100
+Subject: [PATCH] dsound: Enable EAX by default
+
+---
+ dlls/dsound/dsound_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
+index e12c2208199..bda9a446a08 100644
+--- a/dlls/dsound/dsound_main.c
++++ b/dlls/dsound/dsound_main.c
+@@ -93,7 +93,7 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
+ /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
+ int ds_hel_buflen = 32768 * 2;
+ int ds_hq_buffers_max = 4;
+-BOOL ds_eax_enabled = FALSE;
++BOOL ds_eax_enabled = TRUE;
+ static HINSTANCE instance;
+ 
+ #define IS_OPTION_TRUE(ch) \
+-- 
+2.29.2
+

patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch

@@ -0,0 +1,48 @@
+From f8f6f53f2bb3d138717ac7a82c78010bce874d4a Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Mon, 25 Jan 2021 19:14:32 +1100
+Subject: [PATCH] dsound: Fake success for EAX Set Buffer/ListenerProperties
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50551
+---
+ dlls/dsound/buffer.c | 3 ++-
+ dlls/dsound/eax.c    | 8 ++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
+index 6393656c9fa..24ff1a6198c 100644
+--- a/dlls/dsound/buffer.c
++++ b/dlls/dsound/buffer.c
+@@ -1299,7 +1299,8 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
+ 
+     TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
+ 
+-    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet))
++    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet) ||
++        IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet))
+         return EAX_Set(This, guidPropSet, dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
+ 
+     return E_PROP_ID_UNSUPPORTED;
+diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
+index 6a6d22bc031..b3f48cdb5bd 100644
+--- a/dlls/dsound/eax.c
++++ b/dlls/dsound/eax.c
+@@ -1082,11 +1082,11 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+ 
+         return S_OK;
+     } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
+-        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
+-        return E_PROP_ID_UNSUPPORTED;
++        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d - Faking Success\n", dwPropID);
++        return S_OK;
+     } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) {
+-        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID);
+-        return E_PROP_ID_UNSUPPORTED;
++        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d - Faking Success\n", dwPropID);
++        return S_OK;
+     }
+ 
+     FIXME("(%p,%s,%d,%p,%d,%p,%d)\n",
+-- 
+2.29.2
+

patches/dsound-EAX/definition

@@ -1,2 +1,3 @@
 Fixes: Software support for Environmental Audio Extensions (EAX)
+Fixes: [42886] Mushroom Wars - Has no sounds.
 Depends: dsound-Fast_Mixer

patches/dwrite-FontFallback/0002-dwrite-Test-GetMetrics-with-custom-fontcollection.patch

@@ -1,4 +1,4 @@
-From 6242434571910c686887b51cbbee8f6cb9b83389 Mon Sep 17 00:00:00 2001
+From 73b91ff2ff705bf35d9603a6446b424af90fb199 Mon Sep 17 00:00:00 2001
 From: Lucian Poston <lucianposton@pm.me>
 Date: Wed, 23 May 2018 00:01:42 -0700
 Subject: [PATCH] dwrite: Test GetMetrics with custom fontcollection
@@ -9,10 +9,10 @@ Signed-off-by: Lucian Poston <lucianposton@pm.me>
  1 file changed, 279 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index d89ccc9d995..bf003376f86 100644
+index 4cba57764fd..26f4693e862 100644
 --- a/dlls/dwrite/tests/layout.c
 +++ b/dlls/dwrite/tests/layout.c
-@@ -3297,7 +3297,7 @@ todo_wine
+@@ -3339,7 +3339,7 @@ todo_wine
          DWRITE_FONT_STRETCH_NORMAL, 10.0, L"en-us", &format);
      ok(hr == S_OK, "got 0x%08x\n", hr);
  
@@ -21,7 +21,7 @@ index d89ccc9d995..bf003376f86 100644
      ok(hr == S_OK, "got 0x%08x\n", hr);
  
      count = 0;
-@@ -4480,6 +4480,7 @@ static void test_SetWordWrapping(void)
+@@ -4522,6 +4522,7 @@ static void test_SetWordWrapping(void)
  /* Collection dedicated to fallback testing */
  
  static const WCHAR g_blahfontW[] = {'B','l','a','h',0};
@@ -29,7 +29,7 @@ index d89ccc9d995..bf003376f86 100644
  static HRESULT WINAPI fontcollection_QI(IDWriteFontCollection *iface, REFIID riid, void **obj)
  {
      if (IsEqualIID(riid, &IID_IDWriteFontCollection) || IsEqualIID(riid, &IID_IUnknown)) {
-@@ -4541,6 +4542,9 @@ static HRESULT WINAPI fontcollection_FindFamilyName(IDWriteFontCollection *iface
+@@ -4583,6 +4584,9 @@ static HRESULT WINAPI fontcollection_FindFamilyName(IDWriteFontCollection *iface
          *index = 123456;
          *exists = TRUE;
          return S_OK;
@@ -39,8 +39,8 @@ index d89ccc9d995..bf003376f86 100644
      }
      ok(0, "unexpected call, name %s\n", wine_dbgstr_w(name));
      return E_NOTIMPL;
-@@ -5781,6 +5785,279 @@ todo_wine {
-     IDWriteFactory_Release(factory);
+@@ -5992,6 +5996,279 @@ if (SUCCEEDED(hr))
+     IDWriteFactory6_Release(factory);
  }
  
 +static void test_GetMetrics_with_custom_fontcollection(void)
@@ -319,7 +319,7 @@ index d89ccc9d995..bf003376f86 100644
  START_TEST(layout)
  {
      IDWriteFactory *factory;
-@@ -5814,6 +6091,7 @@ START_TEST(layout)
+@@ -6025,6 +6302,7 @@ START_TEST(layout)
      test_SetFontStretch();
      test_SetStrikethrough();
      test_GetMetrics();
@@ -328,5 +328,5 @@ index d89ccc9d995..bf003376f86 100644
      test_SetDrawingEffect();
      test_GetLineMetrics();
 -- 
-2.17.1
+2.29.2
 

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
+

patches/dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch

@@ -0,0 +1,138 @@
+From 26163e8bd3dccff151f336e81e620b5898316af7 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:44:22 -0500
+Subject: [PATCH] dsdmoprp: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac                  |  1 +
+ dlls/dsdmoprp/Makefile.in     |  8 +++++++
+ dlls/dsdmoprp/dsdmoprp.spec   |  4 ++++
+ dlls/dsdmoprp/dsdmoprp_main.c | 42 +++++++++++++++++++++++++++++++++++
+ dlls/dsdmoprp/version.rc      | 26 ++++++++++++++++++++++
+ 5 files changed, 81 insertions(+)
+ create mode 100644 dlls/dsdmoprp/Makefile.in
+ create mode 100644 dlls/dsdmoprp/dsdmoprp.spec
+ create mode 100644 dlls/dsdmoprp/dsdmoprp_main.c
+ create mode 100644 dlls/dsdmoprp/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index e8505848dc3..5305312d2aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3212,6 +3212,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpwsockx)
+ WINE_CONFIG_MAKEFILE(dlls/drmclien)
+ WINE_CONFIG_MAKEFILE(dlls/dsdmo)
+ WINE_CONFIG_MAKEFILE(dlls/dsdmo/tests)
++WINE_CONFIG_MAKEFILE(dlls/dsdmoprp)
+ WINE_CONFIG_MAKEFILE(dlls/dsound)
+ WINE_CONFIG_MAKEFILE(dlls/dsound/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dsquery)
+diff --git a/dlls/dsdmoprp/Makefile.in b/dlls/dsdmoprp/Makefile.in
+new file mode 100644
+index 00000000000..ca31aa0d359
+--- /dev/null
++++ b/dlls/dsdmoprp/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dsdmoprp.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	dsdmoprp_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dsdmoprp/dsdmoprp.spec b/dlls/dsdmoprp/dsdmoprp.spec
+new file mode 100644
+index 00000000000..a043605127d
+--- /dev/null
++++ b/dlls/dsdmoprp/dsdmoprp.spec
+@@ -0,0 +1,4 @@
++@ stub DllCanUnloadNow
++@ stub DllGetClassObject
++@ stub DllRegisterServer
++@ stub DllUnregisterServer
+\ No newline at end of file
+diff --git a/dlls/dsdmoprp/dsdmoprp_main.c b/dlls/dsdmoprp/dsdmoprp_main.c
+new file mode 100644
+index 00000000000..7a547e5d499
+--- /dev/null
++++ b/dlls/dsdmoprp/dsdmoprp_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(dsdmoprp);
++
++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/dsdmoprp/version.rc b/dlls/dsdmoprp/version.rc
+new file mode 100644
+index 00000000000..9a2ca3e1c54
+--- /dev/null
++++ b/dlls/dsdmoprp/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 dsdmoprp"
++#define WINE_FILENAME_STR "dsdmoprp.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/0009-dsound3d-add-stub-dll.patch

@@ -0,0 +1,135 @@
+From 0a577ac59e4c1a8dad7ac90374ecf32aabf51057 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:42:03 -0500
+Subject: [PATCH] dsound3d: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac                  |  1 +
+ dlls/dsound3d/Makefile.in     |  8 +++++++
+ dlls/dsound3d/dsound3d.spec   |  1 +
+ dlls/dsound3d/dsound3d_main.c | 42 +++++++++++++++++++++++++++++++++++
+ dlls/dsound3d/version.rc      | 26 ++++++++++++++++++++++
+ 5 files changed, 78 insertions(+)
+ create mode 100644 dlls/dsound3d/Makefile.in
+ create mode 100644 dlls/dsound3d/dsound3d.spec
+ create mode 100644 dlls/dsound3d/dsound3d_main.c
+ create mode 100644 dlls/dsound3d/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index 5305312d2aa..00bb6bdf015 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3215,6 +3215,7 @@ WINE_CONFIG_MAKEFILE(dlls/dsdmo/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dsdmoprp)
+ WINE_CONFIG_MAKEFILE(dlls/dsound)
+ WINE_CONFIG_MAKEFILE(dlls/dsound/tests)
++WINE_CONFIG_MAKEFILE(dlls/dsound3d)
+ WINE_CONFIG_MAKEFILE(dlls/dsquery)
+ WINE_CONFIG_MAKEFILE(dlls/dssenh)
+ WINE_CONFIG_MAKEFILE(dlls/dssenh/tests)
+diff --git a/dlls/dsound3d/Makefile.in b/dlls/dsound3d/Makefile.in
+new file mode 100644
+index 00000000000..780faeb9f68
+--- /dev/null
++++ b/dlls/dsound3d/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dsound3d.dll
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	dsound3d_main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dsound3d/dsound3d.spec b/dlls/dsound3d/dsound3d.spec
+new file mode 100644
+index 00000000000..9859c231f25
+--- /dev/null
++++ b/dlls/dsound3d/dsound3d.spec
+@@ -0,0 +1 @@
++@ stub CafBiquadCoeffs
+\ No newline at end of file
+diff --git a/dlls/dsound3d/dsound3d_main.c b/dlls/dsound3d/dsound3d_main.c
+new file mode 100644
+index 00000000000..0bd7ecdfdf2
+--- /dev/null
++++ b/dlls/dsound3d/dsound3d_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(dsound3d);
++
++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/dsound3d/version.rc b/dlls/dsound3d/version.rc
+new file mode 100644
+index 00000000000..77dea7a2f70
+--- /dev/null
++++ b/dlls/dsound3d/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 dsound3d"
++#define WINE_FILENAME_STR "dsound3d.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/0010-dxapi.sys-add-stub-dll.patch

@@ -0,0 +1,161 @@
+From 79a82bb0fba6786ef42d832b6c35c9a74ff4f71e Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 13 Oct 2020 04:42:03 -0500
+Subject: [PATCH] dxapi.sys: add stub dll
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ configure.ac                  |  1 +
+ dlls/dxapi.sys/Makefile.in    |  8 +++++++
+ dlls/dxapi.sys/dxapi.sys.spec |  7 ++++++
+ dlls/dxapi.sys/main.c         | 42 +++++++++++++++++++++++++++++++++++
+ dlls/dxapi.sys/version.rc     | 26 ++++++++++++++++++++++
+ loader/wine.inf.in            |  2 ++
+ 6 files changed, 86 insertions(+)
+ create mode 100644 dlls/dxapi.sys/Makefile.in
+ create mode 100644 dlls/dxapi.sys/dxapi.sys.spec
+ create mode 100644 dlls/dxapi.sys/main.c
+ create mode 100644 dlls/dxapi.sys/version.rc
+
+diff --git a/configure.ac b/configure.ac
+index 11c7eb88a00..794e3207517 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3247,6 +3247,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi)
+ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dwrite)
+ WINE_CONFIG_MAKEFILE(dlls/dwrite/tests)
++WINE_CONFIG_MAKEFILE(dlls/dxapi.sys)
+ WINE_CONFIG_MAKEFILE(dlls/dx8vb)
+ WINE_CONFIG_MAKEFILE(dlls/dxdiagn)
+ WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests)
+diff --git a/dlls/dxapi.sys/Makefile.in b/dlls/dxapi.sys/Makefile.in
+new file mode 100644
+index 00000000000..53df0e25040
+--- /dev/null
++++ b/dlls/dxapi.sys/Makefile.in
+@@ -0,0 +1,8 @@
++MODULE    = dxapi.sys
++
++EXTRADLLFLAGS = -mno-cygwin
++
++C_SRCS = \
++	main.c
++
++RC_SRCS = version.rc
+diff --git a/dlls/dxapi.sys/dxapi.sys.spec b/dlls/dxapi.sys/dxapi.sys.spec
+new file mode 100644
+index 00000000000..05748b5fe59
+--- /dev/null
++++ b/dlls/dxapi.sys/dxapi.sys.spec
+@@ -0,0 +1,7 @@
++@ stub _DxApi@20
++@ stub _DxApiGetVersion@0
++@ stub _DxApiInitialize@32
++@ stub _DxAutoflipUpdate@20
++@ stub _DxEnableIRQ@8
++@ stub _DxLoseObject@8
++@ stub _DxUpdateCapture@12
+diff --git a/dlls/dxapi.sys/main.c b/dlls/dxapi.sys/main.c
+new file mode 100644
+index 00000000000..be1e04ec188
+--- /dev/null
++++ b/dlls/dxapi.sys/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(dxapi);
++
++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/dxapi.sys/version.rc b/dlls/dxapi.sys/version.rc
+new file mode 100644
+index 00000000000..7ecd1565052
+--- /dev/null
++++ b/dlls/dxapi.sys/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 dxapi.sys"
++#define WINE_FILENAME_STR "dxapi.sys"
++#define WINE_FILEVERSION 5,0,2180,1
++#define WINE_FILEVERSION_STR "5.0.2180.1"
++#define WINE_PRODUCTVERSION 5,0,2180,1
++#define WINE_PRODUCTVERSION_STR "5.0.2180.1"
++
++#include "wine/wine_common_ver.rc"
+diff --git a/loader/wine.inf.in b/loader/wine.inf.in
+index 20d5243aa4b..b4052b146b4 100644
+--- a/loader/wine.inf.in
++++ b/loader/wine.inf.in
+@@ -2632,6 +2632,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+ 10,syswow64,stdole2.tlb
+ 11,,iexplore.exe
+ 11,,winetest.exe,-
++12,,dxapi.sys,-
+ 12,,dxgkrnl.sys,-
+ 12,,dxgmms1.sys,-
+ 12,,fltmgr.sys,-
+@@ -2689,6 +2690,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+ 11,,iexplore.exe
+ 11,,notepad.exe
+ 11,,winetest.exe,-
++12,,dxapi.sys,-
+ 12,,dxgkrnl.sys
+ 12,,dxgmms1.sys
+ 12,,fltmgr.sys
+-- 
+2.29.2
+