Release v6.0rc1

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

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

@@ -1,4 +1,4 @@
-From 7529755fcc41fda650aac6b27f34438354435d34 Mon Sep 17 00:00:00 2001
+From b51fdc7e211f676d169c937209bf689e57252c5d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
 Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
@@ -9,10 +9,10 @@ Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index 9280b5d32..2f0974a4c 100644
+index aa51c744297..7cad015480f 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -1887,7 +1887,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -2130,7 +2130,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -21,7 +21,7 @@ index 9280b5d32..2f0974a4c 100644
  }
  
  struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1895,7 +1895,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -2138,7 +2138,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -31,10 +31,10 @@ index 9280b5d32..2f0974a4c 100644
  
  static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index b9321157a..76ea23ba6 100644
+index 1f6201a6a93..35791d5c22e 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5895,7 +5895,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
+@@ -5886,7 +5886,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
@@ -42,7 +42,7 @@ index b9321157a..76ea23ba6 100644
 +        CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
  }
  
- HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
+ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight,
 -- 
-2.24.0
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 700513f28e4844cbfc40b3ebf1b77cf121b71e71 Mon Sep 17 00:00:00 2001
+From 0cf6433af95363c5fbba2af482b2ba50b863dfb7 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  1 file changed, 15 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 587c87bbfc0..05b40326d82 100644
+index 20bc3f977d1..c2187a19397 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index 587c87bbfc0..05b40326d82 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3487,6 +3488,7 @@ static void process_breakpoint(void)
+@@ -3456,6 +3457,7 @@ static void process_breakpoint(void)
      __ENDTRY
  }
  
@@ -28,17 +28,17 @@ index 587c87bbfc0..05b40326d82 100644
  
  /******************************************************************
   *		LdrInitializeThunk (NTDLL.@)
-@@ -3497,6 +3499,9 @@ static void process_breakpoint(void)
+@@ -3465,6 +3467,9 @@ static void process_breakpoint(void)
+  */
  void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
  {
-     static const unsigned int fls_slot_count = 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits);
 +    OBJECT_ATTRIBUTES staging_event_attr;
 +    UNICODE_STRING staging_event_string;
 +    HANDLE staging_event;
      static int attach_done;
      int i;
      NTSTATUS status;
-@@ -3515,6 +3520,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+@@ -3483,6 +3488,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
      entry = (void **)&context->u.s.X0;
  #endif
  

patches/Staging/definition

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

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

@@ -0,0 +1,329 @@
+From eaab7eaeb7533445473bc19d947c34bdc360566e Mon Sep 17 00:00:00 2001
+From: Derek Lesho <dlesho@codeweavers.com>
+Date: Fri, 2 Oct 2020 11:29:24 -0500
+Subject: [PATCH] bcrypt: Allow multiple backends to coexist.
+
+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(-)
+ create mode 100644 dlls/bcrypt/unixlib.c
+
+diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
+index 24803fb2d7c..46a20d473dd 100644
+--- a/dlls/bcrypt/Makefile.in
++++ b/dlls/bcrypt/Makefile.in
+@@ -11,6 +11,7 @@ C_SRCS = \
+ 	macos.c \
+ 	md2.c \
+ 	sha256.c \
+-	sha512.c
++	sha512.c \
++	unixlib.c
+ 
+ RC_SRCS = version.rc
+diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
+index e1777ed130b..86b1e3d28c3 100644
+--- a/dlls/bcrypt/bcrypt_internal.h
++++ b/dlls/bcrypt/bcrypt_internal.h
+@@ -217,4 +217,7 @@ struct key_funcs
+     NTSTATUS (CDECL *key_import_rsa)( struct key *, UCHAR *, ULONG );
+ };
+ 
++struct key_funcs *gnutls_lib_init(DWORD reason);
++struct key_funcs *macos_lib_init(DWORD reason);
++
+ #endif /* __BCRYPT_INTERNAL_H */
+diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
+index 162ac9ea732..a7fd8428dec 100644
+--- a/dlls/bcrypt/gnutls.c
++++ b/dlls/bcrypt/gnutls.c
+@@ -358,9 +358,12 @@ fail:
+ 
+ static void gnutls_uninitialize(void)
+ {
+-    pgnutls_global_deinit();
+-    dlclose( libgnutls_handle );
+-    libgnutls_handle = NULL;
++    if (libgnutls_handle)
++    {
++        pgnutls_global_deinit();
++        dlclose( libgnutls_handle );
++        libgnutls_handle = NULL;
++    }
+ }
+ 
+ struct buffer
+@@ -1906,19 +1909,28 @@ static const struct key_funcs key_funcs =
+     key_import_rsa
+ };
+ 
+-NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
++struct key_funcs * gnutls_lib_init( DWORD reason )
+ {
+     switch (reason)
+     {
+     case DLL_PROCESS_ATTACH:
+-        if (!gnutls_initialize()) return STATUS_DLL_NOT_FOUND;
+-        *(const struct key_funcs **)ptr_out = &key_funcs;
+-        break;
++        if (!gnutls_initialize()) return NULL;
++        return &key_funcs;
+     case DLL_PROCESS_DETACH:
+         gnutls_uninitialize();
+-        break;
+     }
+-    return STATUS_SUCCESS;
++    return NULL;
+ }
+ 
+-#endif /* HAVE_GNUTLS_CIPHER_INIT */
++#else /* HAVE_GNUTLS_CIPHER_INIT */
++#include "ntstatus.h"
++#define WIN32_NO_STATUS
++#include "windef.h"
++#include "winbase.h"
++#include "winternl.h"
++
++struct key_funcs * gnutls_lib_init( DWORD reason )
++{
++    return NULL;
++}
++#endif
+diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
+index 57edc3e262b..55dca5dde34 100644
+--- a/dlls/bcrypt/macos.c
++++ b/dlls/bcrypt/macos.c
+@@ -294,11 +294,21 @@ static const struct key_funcs key_funcs =
+     key_import_rsa
+ };
+ 
+-NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
++struct key_funcs * macos_lib_init( DWORD reason )
+ {
+-    if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS;
+-    *(const struct key_funcs **)ptr_out = &key_funcs;
+-    return STATUS_SUCCESS;
++    if (reason != DLL_PROCESS_ATTACH) return NULL;
++    return &key_funcs;
+ }
+ 
++#else
++#include "ntstatus.h"
++#define WIN32_NO_STATUS
++#include "windef.h"
++#include "winbase.h"
++#include "winternl.h"
++
++struct key_funcs * macos_lib_init( DWORD reason )
++{
++    return NULL;
++}
+ #endif
+diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
+new file mode 100644
+index 00000000000..a158ec1630a
+--- /dev/null
++++ b/dlls/bcrypt/unixlib.c
+@@ -0,0 +1,194 @@
++#if 0
++#pragma makedep unix
++#endif
++
++#include "config.h"
++#include "wine/port.h"
++
++#include <stdarg.h>
++
++#include "ntstatus.h"
++#define WIN32_NO_STATUS
++#include "windef.h"
++#include "winbase.h"
++#include "ntsecapi.h"
++#include "bcrypt.h"
++
++#include "bcrypt_internal.h"
++
++#include "wine/debug.h"
++#include "wine/unicode.h"
++
++#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 || defined(HAVE_GNUTLS_CIPHER_INIT)
++WINE_DEFAULT_DEBUG_CHANNEL(bcrypt);
++
++static NTSTATUS CDECL key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_symmetric_init( struct key *key )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static void CDECL key_symmetric_vector_reset( struct key *key )
++{
++    FIXME( "not implemented\n" );
++}
++
++static NTSTATUS CDECL key_symmetric_set_auth_data( struct key *key, UCHAR *auth_data, ULONG len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_symmetric_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len  )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_symmetric_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static void CDECL key_symmetric_destroy( struct key *key )
++{
++    FIXME( "not implemented\n" );
++}
++
++static NTSTATUS CDECL key_asymmetric_init( struct key *key )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output,
++                                           ULONG output_len, ULONG *ret_len, ULONG flags )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len,
++                                             UCHAR *signature, ULONG signature_len, DWORD flags )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_export_ecc( struct key *key, UCHAR *output, ULONG len, ULONG *ret_len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_import_ecc( struct key *key, UCHAR *input, ULONG len )
++{
++    FIXME( "not implemented\n" );
++    return STATUS_NOT_IMPLEMENTED;
++}
++
++static NTSTATUS CDECL key_asymmetric_generate( struct key *key )
++{
++    FIXME( "not implemented\n" );
++    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 struct key_funcs key_funcs =
++{
++    key_set_property,
++    key_symmetric_init,
++    key_symmetric_vector_reset,
++    key_symmetric_set_auth_data,
++    key_symmetric_encrypt,
++    key_symmetric_decrypt,
++    key_symmetric_get_tag,
++    key_symmetric_destroy,
++    key_asymmetric_init,
++    key_asymmetric_generate,
++    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
++};
++
++NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
++{
++    struct key_funcs *gnutls_funcs = gnutls_lib_init(reason);
++    struct key_funcs *macos_funcs = macos_lib_init(reason);
++
++    if (reason == DLL_PROCESS_ATTACH)
++    {
++#define RESOLVE_FUNC(name) \
++        if (macos_funcs && macos_funcs->key_##name) \
++            key_funcs.key_##name = macos_funcs->key_##name; \
++        if (gnutls_funcs && gnutls_funcs->key_##name) \
++            key_funcs.key_##name = gnutls_funcs->key_##name;
++
++        RESOLVE_FUNC(set_property)
++        RESOLVE_FUNC(symmetric_init)
++        RESOLVE_FUNC(symmetric_vector_reset)
++        RESOLVE_FUNC(symmetric_set_auth_data)
++        RESOLVE_FUNC(symmetric_encrypt)
++        RESOLVE_FUNC(symmetric_decrypt)
++        RESOLVE_FUNC(symmetric_get_tag)
++        RESOLVE_FUNC(symmetric_destroy)
++        RESOLVE_FUNC(asymmetric_init)
++        RESOLVE_FUNC(asymmetric_generate)
++        RESOLVE_FUNC(asymmetric_duplicate)
++        RESOLVE_FUNC(asymmetric_sign)
++        RESOLVE_FUNC(asymmetric_verify)
++        RESOLVE_FUNC(asymmetric_destroy)
++        RESOLVE_FUNC(export_dsa_capi)
++        RESOLVE_FUNC(export_ecc)
++        RESOLVE_FUNC(import_dsa_capi)
++        RESOLVE_FUNC(import_ecc)
++
++#undef RESOLVE_FUNC
++
++        *(struct key_funcs **)ptr_out = &key_funcs;
++    }
++
++    return STATUS_SUCCESS;
++}
++
++#endif
+-- 
+2.29.2
+

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

@@ -1,4 +1,4 @@
-From d232882c571a14f4da8a134071a2125805ebd41f Mon Sep 17 00:00:00 2001
+From 01530fae68970b0c0af8811c5f6c5ea85c14372c 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.
@@ -7,21 +7,21 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47699
 Signed-off-by: Derek Lesho <dlesho at codeweavers.com>
 ---
  dlls/bcrypt/bcrypt_main.c  | 108 ++++++++++++++++++++++++++++++++++++-
- dlls/bcrypt/tests/bcrypt.c |   2 +-
- 2 files changed, 108 insertions(+), 2 deletions(-)
+ dlls/bcrypt/tests/bcrypt.c |   3 +-
+ 2 files changed, 108 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 65c28ca63e2..6e7b52e93b0 100644
+index 8dae41a2e2e..67be417aa61 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1891,7 +1891,113 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
+@@ -1837,7 +1837,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;
  
--    if (!(strcmpW( kdf, BCRYPT_KDF_RAW_SECRET )))
+-    if (!(lstrcmpW( kdf, BCRYPT_KDF_RAW_SECRET )))
 +    if (flags) FIXME("flags ignored: %08x\n", flags);
 +
-+    if (!(strcmpW( kdf, BCRYPT_KDF_HASH )))
++    if (!(lstrcmpW( kdf, BCRYPT_KDF_HASH )))
 +    {
 +        unsigned int i;
 +        BCryptBuffer *hash_algorithm = NULL;
@@ -67,7 +67,7 @@ index 65c28ca63e2..6e7b52e93b0 100644
 +        {
 +            for (i = 0; i < ARRAY_SIZE( builtin_algorithms ); i++)
 +            {
-+                if (!strcmpW( hash_algorithm->pvBuffer, builtin_algorithms[i].name))
++                if (!lstrcmpW( hash_algorithm->pvBuffer, builtin_algorithms[i].name))
 +                {
 +                    hash_alg_id = i;
 +                    break;
@@ -125,15 +125,15 @@ index 65c28ca63e2..6e7b52e93b0 100644
 +
 +        return STATUS_SUCCESS;
 +    }
-+    else if (!(strcmpW( kdf, BCRYPT_KDF_RAW_SECRET )))
++    else if (!(lstrcmpW( kdf, BCRYPT_KDF_RAW_SECRET )))
      {
          ULONG n;
          ULONG secret_length = secret->len;
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index a351aacf1f5..5333b879817 100644
+index 5701a0a30ce..d4ffb3fe69c 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -2085,7 +2085,7 @@ static void test_ECDH(void)
+@@ -2132,7 +2132,7 @@ static void test_ECDH(void)
      raw_secret_end:
  
      status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0);
@@ -142,6 +142,14 @@ index a351aacf1f5..5333b879817 100644
  
      if (status != STATUS_SUCCESS)
      {
+@@ -2666,7 +2666,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);
+-    todo_wine
+     ok(status == STATUS_SUCCESS, "got %08x\n", status);
+ 
+     status = pBCryptDestroyHash(secret);
 -- 
-2.27.0
+2.28.0
 

patches/bcrypt-ECDHSecretAgreement/definition

@@ -1,2 +1,5 @@
 Fixes: [47699] Multiple games fail to connect to online services (missing BCryptSecretAgreement / BCryptDeriveKey implementation)
-
+# Needs to be moved to the unix lib, but that's a nontrivial amount of work, and
+# using gcrypt is the wrong way forward (we should expose the missing APIs from
+# gnutls instead).
+#Disabled: true

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-wine.inf-Add-sRGB-color-profile.patch

@@ -1,229 +0,0 @@
-From 01cf21eb49307de6b0eb5445b9befdf8f585e3f7 Mon Sep 17 00:00:00 2001
-From: Alex Henrie <alexhenrie24@gmail.com>
-Date: Sat, 12 Sep 2020 01:45:02 -0600
-Subject: [PATCH] wine.inf: 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>
----
- Makefile.in                        |   1 +
- color/Makefile.in                  |   2 ++
- color/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes
- configure.ac                       |   2 ++
- loader/wine.inf.in                 |  14 +++++++++-----
- tools/makedep.c                    |  12 ++++++++++++
- 6 files changed, 26 insertions(+), 5 deletions(-)
- create mode 100644 color/Makefile.in
- create mode 100644 color/sRGB_Color_Space_Profile.icm
-
-diff --git a/Makefile.in b/Makefile.in
-index 307a95b3b1..367bc3fe77 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -27,6 +27,7 @@ datarootdir     = @datarootdir@
- datadir         = @datadir@
- mandir          = @mandir@
- includedir      = @includedir@
-+colordir        = ${datadir}/wine/color
- fontdir         = ${datadir}/wine/fonts
- nlsdir          = ${datadir}/wine/nls
- dlldir          = ${libdir}/wine
-diff --git a/color/Makefile.in b/color/Makefile.in
-new file mode 100644
-index 0000000000..f9f6f62a3b
---- /dev/null
-+++ b/color/Makefile.in
-@@ -0,0 +1,2 @@
-+SOURCES = \
-+	sRGB_Color_Space_Profile.icm
-diff --git a/color/sRGB_Color_Space_Profile.icm b/color/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/configure.ac b/configure.ac
-index 20ae7577fa..c615f1bfe0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2810,6 +2810,7 @@ dummy:
- WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
- WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"])
- 
-+WINE_CONFIG_MAKEFILE(color)
- WINE_CONFIG_MAKEFILE(dlls/acledit)
- WINE_CONFIG_MAKEFILE(dlls/aclui)
- WINE_CONFIG_MAKEFILE(dlls/activeds.tlb)
-@@ -4146,6 +4147,7 @@ clean::
- else
-     TOP_INSTALL_DEV="$TOP_INSTALL_DEV include"
-     TOP_INSTALL_LIB="$TOP_INSTALL_LIB \
-+color \
- fonts \
- loader/wine.inf \
- loader/winebus.inf \
-diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index cd0e7bd16f..f84567c13e 100644
---- a/loader/wine.inf.in
-+++ b/loader/wine.inf.in
-@@ -30,7 +30,7 @@ signature="$CHICAGO$"
- RegisterDlls=RegisterDllsSection
- WineFakeDlls=FakeDllsWin32,FakeDlls
- UpdateInis=SystemIni
--CopyFiles=InfFiles,NlsFiles,SortFiles
-+CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
- AddReg=\
-     Classes,\
-     ContentIndex,\
-@@ -54,7 +54,7 @@ AddReg=\
- RegisterDlls=RegisterDllsSection
- WineFakeDlls=FakeDllsWin32,FakeDlls
- UpdateInis=SystemIni
--CopyFiles=InfFiles,NlsFiles,SortFiles
-+CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
- AddReg=\
-     Classes,\
-     ContentIndex,\
-@@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection
- WineFakeDlls=FakeDllsWin64,FakeDlls
- WinePreInstall=Wow64
- UpdateInis=SystemIni
--CopyFiles=InfFiles,NlsFiles,SortFiles
-+CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
- AddReg=\
-     Classes,\
-     ContentIndex,\
-@@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection
- WineFakeDlls=FakeDllsWin64,FakeDlls
- WinePreInstall=Wow64
- UpdateInis=SystemIni
--CopyFiles=InfFiles,NlsFiles,SortFiles
-+CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles
- AddReg=\
-     Classes,\
-     ContentIndex,\
-@@ -2670,7 +2670,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
- 11,catroot,
- 11,mui,
- 11,tasks,
--11,spool\drivers\color,
- 11,spool\printers,
- 10,,explorer.exe
- 10,,hh.exe
-@@ -3886,6 +3885,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x
- HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001
- HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001
- 
-+[ColorFiles]
-+"sRGB Color Space Profile.icm",sRGB_Color_Space_Profile.icm
-+
- [InfFiles]
- winebus.inf
- winehid.inf
-@@ -3968,10 +3970,12 @@ normnfkd.nls
- sortdefault.nls
- 
- [WineSourceDirs]
-+ColorFiles = color
- NlsFiles  = nls
- SortFiles = nls
- 
- [DestinationDirs]
-+ColorFiles = 11,spool\drivers\color
- InfFiles  = 17
- NlsFiles  = 11
- SortFiles = 10,globalization\sorting
-diff --git a/tools/makedep.c b/tools/makedep.c
-index 7fe2c4daf5..aa188d6fe5 100644
---- a/tools/makedep.c
-+++ b/tools/makedep.c
-@@ -2955,6 +2955,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source,
- }
- 
- 
-+/*******************************************************************
-+ *         output_source_icm
-+ */
-+static void output_source_icm( struct makefile *make, struct incl_file *source, const char *obj )
-+{
-+    add_install_rule( make, source->name, source->name,
-+                      strmake( "D$(colordir)/%s", source->name ));
-+    output_srcdir_symlink( make, strmake( "%s.icm", obj ));
-+}
-+
-+
- /*******************************************************************
-  *         output_source_nls
-  */
-@@ -3171,6 +3182,7 @@ static const struct
-     { "tlb", output_source_tlb },
-     { "sfd", output_source_sfd },
-     { "svg", output_source_svg },
-+    { "icm", output_source_icm },
-     { "nls", output_source_nls },
-     { "desktop", output_source_desktop },
-     { "po", output_source_po },
--- 
-2.28.0
-

patches/color-sRGB-profile/definition

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

patches/d3dx9_36-Optimize_Inplace/0001-d3dx9_36-No-need-to-fail-if-we-don-t-support-vertice.patch

@@ -1,33 +0,0 @@
-From d037faddfa629e54b5ba13d57f2e4c185de2a555 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Tue, 4 Nov 2014 22:25:58 +0100
-Subject: d3dx9_36: No need to fail if we don't support vertices reordering in
- D3DXMESHOPT_ATTRSORT
-
-A non optimized mesh does not prevent rendering as long as we return valid data to the application.
-In our case we provided an identity remapping array when no vertices reordering is done.
-
-Avencast demo works perfectly well (using native effects functions).
----
- dlls/d3dx9_36/mesh.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 6f268f2..b15e033 100644
---- a/dlls/d3dx9_36/mesh.c
-+++ b/dlls/d3dx9_36/mesh.c
-@@ -1700,11 +1700,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags,
-         if (FAILED(hr)) goto cleanup;
-     } else if (flags & D3DXMESHOPT_ATTRSORT) {
-         if (!(flags & D3DXMESHOPT_IGNOREVERTS))
--        {
-             FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n");
--            hr = E_NOTIMPL;
--            goto cleanup;
--        }
- 
-         hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer);
-         if (FAILED(hr)) goto cleanup;
--- 
-2.1.3
-

patches/d3dx9_36-Optimize_Inplace/definition

@@ -1 +0,0 @@
-Fixes: [48529] Avencast fails to launch

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

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

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

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

patches/dwmapi-DwmGetTransportAttributes/definition

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

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

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

patches/dxdiagn-Enumerate_DirectSound/definition

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

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

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

patches/dxdiagn-GetChildContainer_Leaf_Nodes/definition

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

patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch

@@ -1,4 +1,4 @@
-From e0719eabba7a7c187767441b361acedd50766234 Mon Sep 17 00:00:00 2001
+From 723ccff12d0b9516490e34519e244a6486d11b8b Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 10:44:49 -0500
 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -7,14 +7,16 @@ We use ppoll() instead of poll() for the better time granularity.
 
 Although perhaps we shouldn't since the server doesn't do this.
 ---
- configure.ac | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ configure           | 68 +++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac        | 12 ++++++++
+ include/config.h.in |  9 ++++++
+ 3 files changed, 89 insertions(+)
 
-diff --git a/configure.ac b/configure.ac
-index da5f24aba5f..6c2653c4c82 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -509,6 +509,7 @@ AC_CHECK_HEADERS(\
+diff --git a/configure b/configure
+index 5672688a0d7..24ae489c3a9 100755
+--- a/configure
++++ b/configure
+@@ -7467,6 +7467,7 @@ for ac_header in \
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -22,7 +24,7 @@ index da5f24aba5f..6c2653c4c82 100644
  	sys/filio.h \
  	sys/ioctl.h \
  	sys/ipc.h \
-@@ -2191,6 +2192,7 @@ AC_CHECK_FUNCS(\
+@@ -17815,6 +17816,7 @@ for ac_func in \
  	pipe2 \
  	poll \
  	port_create \
@@ -30,7 +32,100 @@ index da5f24aba5f..6c2653c4c82 100644
  	prctl \
  	pread \
  	proc_pidinfo \
-@@ -2265,6 +2267,16 @@ case $host_os in
+@@ -18224,6 +18226,72 @@ fi
+     ;;
+ esac
+ 
++if test "$ac_cv_header_sys_mman_h" = "yes" -a "x$RT_LIBS" = "x"
++then
++    ac_save_LIBS=$LIBS
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
++$as_echo_n "checking for library containing shm_open... " >&6; }
++if ${ac_cv_search_shm_open+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shm_open ();
++int
++main ()
++{
++return shm_open ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' rt; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_shm_open=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_shm_open+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_shm_open+:} false; then :
++
++else
++  ac_cv_search_shm_open=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5
++$as_echo "$ac_cv_search_shm_open" >&6; }
++ac_res=$ac_cv_search_shm_open
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
++
++                    test "$ac_res" = "none required" || RT_LIBS="$ac_res"
++
++fi
++
++fi
++LIBS=$ac_save_LIBS
++
+ if test "x$with_ldap" != "xno"
+ then
+         if ${LDAP_CFLAGS:+false} :; then :
+diff --git a/configure.ac b/configure.ac
+index 7a03cbc1cab..bfa64a8d68a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\
+ 	sys/cdio.h \
+ 	sys/epoll.h \
+ 	sys/event.h \
++	sys/eventfd.h \
+ 	sys/filio.h \
+ 	sys/ioctl.h \
+ 	sys/ipc.h \
+@@ -2207,6 +2208,7 @@ AC_CHECK_FUNCS(\
+ 	pipe2 \
+ 	poll \
+ 	port_create \
++	ppoll \
+ 	prctl \
+ 	pread \
+ 	proc_pidinfo \
+@@ -2271,6 +2273,16 @@ case $host_os in
      ;;
  esac
  
@@ -47,6 +142,40 @@ index da5f24aba5f..6c2653c4c82 100644
  dnl **** Check for OpenLDAP ***
  if test "x$with_ldap" != "xno"
  then
+diff --git a/include/config.h.in b/include/config.h.in
+index 4adb6325e14..6f1323311d9 100644
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -687,6 +687,9 @@
+ /* Define to 1 if you have the <port.h> header file. */
+ #undef HAVE_PORT_H
+ 
++/* Define to 1 if you have the `ppoll' function. */
++#undef HAVE_PPOLL
++
+ /* Define to 1 if you have the `prctl' function. */
+ #undef HAVE_PRCTL
+ 
+@@ -804,6 +807,9 @@
+ /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
+ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
+ 
++/* Define to 1 if you have the `shm_open' function. */
++#undef HAVE_SHM_OPEN
++
+ /* Define if sigaddset is supported */
+ #undef HAVE_SIGADDSET
+ 
+@@ -1004,6 +1010,9 @@
+ /* Define to 1 if you have the <sys/epoll.h> header file. */
+ #undef HAVE_SYS_EPOLL_H
+ 
++/* Define to 1 if you have the <sys/eventfd.h> header file. */
++#undef HAVE_SYS_EVENTFD_H
++
+ /* Define to 1 if you have the <sys/event.h> header file. */
+ #undef HAVE_SYS_EVENT_H
+ 
 -- 
-2.25.1
+2.28.0