Release v9.0-rc4

Fixed header path for list/rbtree/.h

patches/Compiler_Warnings/0024-d3d9-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,4 +1,4 @@
-From 3dd0480317fe0ed3951daf1cf5757204d11a1ae5 Mon Sep 17 00:00:00 2001
+From bd5dfbb4768404c53ad623a2c0b3c3b9d635b562 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:55:12 +0100
 Subject: [PATCH] d3d9: Avoid implicit cast of interface pointer.
@@ -8,10 +8,10 @@ Subject: [PATCH] d3d9: Avoid implicit cast of interface pointer.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
-index d3662f8..ebc3413 100644
+index 4de7d2eb99e..9a4ab3601e3 100644
 --- a/dlls/d3d9/texture.c
 +++ b/dlls/d3d9/texture.c
-@@ -25,17 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
+@@ -77,17 +77,17 @@ static void d3d9_texture_preload(struct d3d9_texture *texture)
  
  static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface)
  {
@@ -31,7 +31,7 @@ index d3662f8..ebc3413 100644
 +    return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
  }
  
- static void STDMETHODCALLTYPE srv_wined3d_object_destroyed(void *parent)
+ /* wined3d critical section must be taken by the caller. */
 -- 
-1.9.1
+2.42.0
 

patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch

@@ -1,38 +1,17 @@
-From 81a36b530261731d6020e09770237ae5bf58166d Mon Sep 17 00:00:00 2001
+From ebe00ceb4f2d24f2611dbec87486d6597a3466a9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 2 May 2014 20:46:19 +0200
 Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
 
 ---
- dlls/user32/tests/msg.c | 2 ++
- dlls/win32u/message.c   | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ dlls/win32u/message.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index 4519da6962d..304a3b87f46 100644
---- a/dlls/user32/tests/msg.c
-+++ b/dlls/user32/tests/msg.c
-@@ -10709,6 +10709,7 @@ static void test_timers(void)
-     start = GetTickCount();
-     while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
-         DispatchMessageA(&msg);
-+todo_wine
-     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
-        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
-@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void)
-     start = GetTickCount();
-     while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
-         DispatchMessageA(&msg);
-+todo_wine
-     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
-        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
 diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
-index d00178e6aa4..513150a3d61 100644
+index d2909339983..337d4a2cc1d 100644
 --- a/dlls/win32u/message.c
 +++ b/dlls/win32u/message.c
-@@ -170,7 +170,7 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME
+@@ -3975,7 +3975,7 @@ UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC
  
      if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE );
  
@@ -42,5 +21,5 @@ index d00178e6aa4..513150a3d61 100644
      SERVER_START_REQ( set_win_timer )
      {
 -- 
-2.35.1
+2.42.0
 

patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch

@@ -1,4 +1,4 @@
-From 36b4dbb687232d783cc3203da1dee4a797606ba7 Mon Sep 17 00:00:00 2001
+From e6354103c243e13c177f6a534a9e786cfdcf7c92 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,10 +9,10 @@ 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 255d5afef79..00add6728cc 100644
+index 1a87f4d1f5e..31c0a3bae94 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
+@@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
  WINE_DECLARE_DEBUG_CHANNEL(snoop);
  WINE_DECLARE_DEBUG_CHANNEL(loaddll);
  WINE_DECLARE_DEBUG_CHANNEL(imports);
@@ -20,7 +20,7 @@ index 255d5afef79..00add6728cc 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3536,6 +3537,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3749,6 +3750,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,9 +28,9 @@ index 255d5afef79..00add6728cc 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -3955,6 +3957,9 @@ static void release_address_space(void)
+@@ -4195,6 +4197,9 @@ static void release_address_space(void)
   */
- void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
+ void loader_init( CONTEXT *context, void **entry )
  {
 +    OBJECT_ATTRIBUTES staging_event_attr;
 +    UNICODE_STRING staging_event_string;
@@ -38,7 +38,7 @@ index 255d5afef79..00add6728cc 100644
      static int attach_done;
      NTSTATUS status;
      ULONG_PTR cookie;
-@@ -4041,6 +4046,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+@@ -4274,6 +4279,16 @@ void loader_init( CONTEXT *context, void **entry )
      if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
  #endif
  
@@ -56,5 +56,5 @@ index 255d5afef79..00add6728cc 100644
      InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks );
      RtlReleasePebLock();
 -- 
-2.33.0
+2.42.0
 

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

@@ -1,312 +0,0 @@
-From 1768ecfc4a7181600df254069f02655fe4e5fa0b 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/unixlib.c         | 208 ++++++++++++++++++++++++++++++++++
- 4 files changed, 235 insertions(+), 11 deletions(-)
- create mode 100644 dlls/bcrypt/unixlib.c
-
-diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
-index 63a731fa9d9..6dd3066d4a5 100644
---- a/dlls/bcrypt/Makefile.in
-+++ b/dlls/bcrypt/Makefile.in
-@@ -8,6 +8,7 @@ C_SRCS = \
- 	gnutls.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 61c367cae9d..d0697ed807e 100644
---- a/dlls/bcrypt/bcrypt_internal.h
-+++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -219,4 +219,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 7b1bceda889..66845ffc8cf 100644
---- a/dlls/bcrypt/gnutls.c
-+++ b/dlls/bcrypt/gnutls.c
-@@ -373,9 +373,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
-@@ -1894,19 +1897,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:
-         if (libgnutls_handle) 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/unixlib.c b/dlls/bcrypt/unixlib.c
-new file mode 100644
-index 00000000000..1937a8172a4
---- /dev/null
-+++ b/dlls/bcrypt/unixlib.c
-@@ -0,0 +1,208 @@
-+#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 NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len,
-+        UCHAR *output, ULONG output_len, ULONG *ret)
-+{
-+    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,
-+    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_decrypt,
-+    key_asymmetric_duplicate,
-+    key_asymmetric_sign,
-+    key_asymmetric_verify,
-+    key_asymmetric_destroy,
-+    key_export_dsa_capi,
-+    key_export_ecc,
-+    key_import_dsa_capi,
-+    key_import_ecc,
-+    key_import_rsa,
-+};
-+
-+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);
-+
-+    if (reason == DLL_PROCESS_ATTACH)
-+    {
-+#define RESOLVE_FUNC(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_decrypt)
-+        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)
-+        RESOLVE_FUNC(import_rsa)
-+
-+#undef RESOLVE_FUNC
-+
-+        *(struct key_funcs **)ptr_out = &key_funcs;
-+    }
-+
-+    return STATUS_SUCCESS;
-+}
-+
-+#endif
--- 
-2.33.0
-

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

@@ -1,155 +0,0 @@
-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.
-
-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 |   3 +-
- 2 files changed, 108 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 0655c5dcfe81..70e914bd41f1 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -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;
- 
--    if (!(lstrcmpW( kdf, BCRYPT_KDF_RAW_SECRET )))
-+    if (flags) FIXME("flags ignored: %08x\n", flags);
-+
-+    if (!(lstrcmpW( kdf, BCRYPT_KDF_HASH )))
-+    {
-+        unsigned int i;
-+        BCryptBuffer *hash_algorithm = NULL;
-+        BCryptBuffer *secret_prepend = NULL;
-+        BCryptBuffer *secret_append = NULL;
-+        enum alg_id hash_alg_id;
-+        ULONG hash_length;
-+        struct hash_impl hash;
-+        NTSTATUS status;
-+
-+        if (parameter)
-+        {
-+            for (i = 0; i < parameter->cBuffers; i++)
-+            {
-+                BCryptBuffer *cur_buffer = &parameter->pBuffers[i];
-+                switch(cur_buffer->BufferType)
-+                {
-+                case KDF_HASH_ALGORITHM:
-+                    if (hash_algorithm)
-+                        FIXME("Duplicate KDF_HASH_ALGORITHM, untested\n");
-+                    hash_algorithm = cur_buffer;
-+                    break;
-+                case KDF_SECRET_PREPEND:
-+                    if (secret_prepend)
-+                        FIXME("Multiple prefixes unsupported\n");
-+                    secret_prepend = cur_buffer;
-+                    break;
-+                case KDF_SECRET_APPEND:
-+                    if (secret_append)
-+                        FIXME("Multiple suffixes unsupported\n");
-+                    secret_append = cur_buffer;
-+                    break;
-+                default:
-+                    FIXME("Unsupported BCRYPT_KDF_HASH parameter type %x\n", cur_buffer->BufferType);
-+                    break;
-+                }
-+            }
-+        }
-+
-+        if (!(hash_algorithm))
-+            hash_alg_id = ALG_ID_SHA1;
-+        else
-+        {
-+            for (i = 0; i < ARRAY_SIZE( builtin_algorithms ); i++)
-+            {
-+                if (!lstrcmpW( hash_algorithm->pvBuffer, builtin_algorithms[i].name))
-+                {
-+                    hash_alg_id = i;
-+                    break;
-+                }
-+            }
-+            if (i == ARRAY_SIZE(builtin_algorithms))
-+            {
-+                WARN("Algorithm %s not found\n", debugstr_w(hash_algorithm->pvBuffer));
-+                return STATUS_NOT_SUPPORTED;
-+            }
-+            if (builtin_algorithms[hash_alg_id].class != BCRYPT_HASH_INTERFACE)
-+            {
-+                return STATUS_NOT_SUPPORTED;
-+            }
-+        }
-+
-+        hash_length = builtin_algorithms[hash_alg_id].hash_length;
-+
-+        if (!derived)
-+        {
-+            *result = hash_length;
-+            return STATUS_SUCCESS;
-+        }
-+
-+        if ((status = hash_init(&hash, hash_alg_id)))
-+        {
-+            return status;
-+        }
-+
-+        if (secret_prepend)
-+        {
-+            hash_update(&hash, hash_alg_id, secret_prepend->pvBuffer, secret_prepend->cbBuffer);
-+        }
-+
-+        hash_update(&hash, hash_alg_id, secret->data, secret->len);
-+
-+        if (secret_append)
-+        {
-+            hash_update(&hash, hash_alg_id, secret_append->pvBuffer, secret_append->cbBuffer);
-+        }
-+
-+        if (derived_size >= hash_length)
-+        {
-+            hash_finish(&hash, hash_alg_id, derived, derived_size);
-+            *result = hash_length;
-+        }
-+        else
-+        {
-+            UCHAR *output = heap_alloc(hash_length);
-+            hash_finish(&hash, hash_alg_id, output, hash_length);
-+            memcpy(derived, output, derived_size);
-+            heap_free(output);
-+            *result = derived_size;
-+        }
-+
-+        return STATUS_SUCCESS;
-+    }
-+    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 6be406dee21f..b13432523d15 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -2180,7 +2180,7 @@ static void test_ECDH(void)
-     raw_secret_end:
- 
-     status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0);
--    todo_wine ok (status == STATUS_SUCCESS, "got %08x\n", status);
-+    ok (status == STATUS_SUCCESS, "got %08x\n", status);
- 
-     if (status != STATUS_SUCCESS)
-     {
-@@ -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);
--    todo_wine
-     ok(status == STATUS_SUCCESS, "got %08x\n", status);
- 
-     status = pBCryptDestroyHash(secret);
--- 
-2.29.2
-

patches/bcrypt-ECDHSecretAgreement/definition

@@ -1,6 +0,0 @@
-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).
-# Temporarily disabled pending a rebase from author.
-Disabled: true

patches/d3d12core-D3D12GetInterface/0001-d3d12core-Add-D3D12GetInterface-stub.patch

@@ -1,69 +0,0 @@
-From b30d3de1043cef20b57984035968fc78d5fcd2bb Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sat, 22 Jul 2023 10:22:03 +1000
-Subject: [PATCH] d3d12core: Add D3D12GetInterface stub
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55135
----
- dlls/d3d12core/Makefile.in      |  3 +++
- dlls/d3d12core/d3d12core.spec   |  2 +-
- dlls/d3d12core/d3d12core_main.c | 30 ++++++++++++++++++++++++++++++
- 3 files changed, 34 insertions(+), 1 deletion(-)
- create mode 100644 dlls/d3d12core/d3d12core_main.c
-
-diff --git a/dlls/d3d12core/Makefile.in b/dlls/d3d12core/Makefile.in
-index 8778b66138b..94d8fd4da00 100644
---- a/dlls/d3d12core/Makefile.in
-+++ b/dlls/d3d12core/Makefile.in
-@@ -1 +1,4 @@
- MODULE = d3d12core.dll
-+
-+C_SRCS = \
-+	d3d12core_main.c
-diff --git a/dlls/d3d12core/d3d12core.spec b/dlls/d3d12core/d3d12core.spec
-index c9c73bd4ee4..3f3e0a0f2e1 100644
---- a/dlls/d3d12core/d3d12core.spec
-+++ b/dlls/d3d12core/d3d12core.spec
-@@ -1,2 +1,2 @@
--@ stub D3D12GetInterface
-+@ stdcall D3D12GetInterface(ptr ptr ptr)
- @ stub D3D12SDKVersion
-diff --git a/dlls/d3d12core/d3d12core_main.c b/dlls/d3d12core/d3d12core_main.c
-new file mode 100644
-index 00000000000..75a083ad276
---- /dev/null
-+++ b/dlls/d3d12core/d3d12core_main.c
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (c) 2023 Alistair Leslie-Hughes
-+ *
-+ * 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 "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(d3d12core);
-+
-+HRESULT WINAPI D3D12GetInterface(REFCLSID rclsid, REFIID riid, void **out)
-+{
-+    FIXME("%d, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out);
-+
-+    return E_NOINTERFACE;
-+}
--- 
-2.40.1
-

patches/d3d12core-D3D12GetInterface/definition

@@ -1 +0,0 @@
-Fixes: [55135] d3d12core: Add D3D12GetInterface stub

patches/d3dx9_36-D3DXStubs/0003-d3dx9-Implement-D3DXComputeTangent.patch

@@ -210,7 +210,7 @@ index 984b2f6..a206e06 100644
 +HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx,
 +        DWORD binorm_idx, DWORD wrap, const DWORD *adjacency)
 +{
-+    TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n",
++    TRACE("mesh %p, stage_idx %ld, tangent_idx %ld, binorm_idx %ld, wrap %ld, adjacency %p.\n",
 +           mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency);
 +
 +    return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx,

patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch

@@ -174,18 +174,18 @@ index 1daec158a5f..64b02276843 100644
 +    }
 +
 +    hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +
 +    skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    for (i = 0; i < 4; i++)
 +    {
 +        ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n",

patches/d3dx9_36_controller/0001-d3dx9-D3DXLoadMeshHierarchyFromXInMemory-return-defa.patch

@@ -0,0 +1,27 @@
+From 1772b5826cbd3adef3f5c09e6c0138a8d367fc8b Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 28 Sep 2023 09:14:00 +1000
+Subject: [PATCH 1/3] d3dx9: D3DXLoadMeshHierarchyFromXInMemory return default
+ Animation Controller
+
+---
+ dlls/d3dx9_36/mesh.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
+index 8aa4ece69fb..442b56a7e19 100644
+--- a/dlls/d3dx9_36/mesh.c
++++ b/dlls/d3dx9_36/mesh.c
+@@ -4019,7 +4019,8 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo
+     if (anim_controller)
+     {
+         *anim_controller = NULL;
+-        FIXME("Animation controller creation not implemented.\n");
++        /*FIXME("Animation controller creation not implemented.\n");*/
++        D3DXCreateAnimationController(1, 1, 1, 1, anim_controller);
+     }
+ 
+ cleanup:
+-- 
+2.40.1
+

patches/d3dx9_36_controller/0003-d3dx9-HACK-D3DXIntersect-Assign-hit-to-FALSE.patch

@@ -0,0 +1,28 @@
+From 164c33e29bfe06d99c58c1ee73dfd6f31dc4c663 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 30 Sep 2023 10:18:54 +1000
+Subject: [PATCH] d3dx9: [HACK] D3DXIntersect - Assign hit to FALSE
+
+This functions needs to be implement to make "Humanity Asset" to work correctly.
+
+Added to stop the Infinite loop - Doesn't make the game playable.
+---
+ dlls/d3dx9_36/mesh.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
+index 822b2d7d410..fdc642c4e0c 100644
+--- a/dlls/d3dx9_36/mesh.c
++++ b/dlls/d3dx9_36/mesh.c
+@@ -7645,6 +7645,8 @@ HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, co
+     FIXME("mesh %p, ray_pos %p, ray_dir %p, hit %p, face_index %p, u %p, v %p, distance %p, all_hits %p, "
+             "count_of_hits %p stub!\n", mesh, ray_pos, ray_dir, hit, face_index, u, v, distance, all_hits, count_of_hits);
+ 
++    *hit = FALSE;
++
+     return E_NOTIMPL;
+ }
+ 
+-- 
+2.42.0
+

patches/d3dx9_36_controller/definition

@@ -0,0 +1,4 @@
+Fixes: [39876] d3dx9: D3DXLoadMeshHierarchyFromXInMemory return a dummy ID3DXAnimationController.
+
+# This allow Humanity Asset to get in game - Doesn't make the game playable though.
+# Requires D3DXIntersect to be implemented.

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From e9f5c886b6b40ca77eb1dd7f0d21bbdc483b7a95 Mon Sep 17 00:00:00 2001
+From 9d274e6d152c3f3961212f3cbd71dc8f14641367 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -9,7 +9,7 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 74647820126..9f0aad2fc4f 100644
+index 152ef80611a..06ebb65e2af 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
@@ -18,11 +18,11 @@ index 74647820126..9f0aad2fc4f 100644
  EXTRAINCL = $(ZLIB_PE_CFLAGS)
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
- DELAYIMPORTS = version
  
- C_SRCS = \
+ SOURCES = \
+ 	coff.c \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index a2a60752a68..a2bca11048f 100644
+index 5ada8c70c9b..a9a6303c8d7 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
 @@ -1457,6 +1457,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
@@ -34,5 +34,5 @@ index a2a60752a68..a2bca11048f 100644
      }
  
 -- 
-2.40.1
+2.42.0
 

patches/ddraw-GetPickRecords/definition

@@ -0,0 +1,2 @@
+Fixes: [10729] ddraw: Implement Pick() and GetPickRecords().
+

patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch

@@ -1,157 +0,0 @@
-From 9eccf33cb881c2e847a22a72f1c8d8b10886d531 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 2 Dec 2022 14:41:30 +1100
-Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download
-
----
- dlls/dmime/dmime_private.h |  2 +
- dlls/dmime/performance.c   |  7 +++
- dlls/dmime/segment.c       | 87 ++++++++++++++++++++++++++++++++++++--
- 3 files changed, 93 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
-index 7cdc1534866..39f6cdce790 100644
---- a/dlls/dmime/dmime_private.h
-+++ b/dlls/dmime/dmime_private.h
-@@ -71,6 +71,8 @@ extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerfor
- extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
- extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
- 
-+extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*);
-+
- /*****************************************************************************
-  * Auxiliary definitions
-  */
-diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
-index d69a27540d6..5578c3e523b 100644
---- a/dlls/dmime/performance.c
-+++ b/dlls/dmime/performance.c
-@@ -252,6 +252,13 @@ static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(I
-     return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface);
- }
- 
-+IDirectSound *get_dsound_interface(IDirectMusicPerformance8* iface)
-+{
-+    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
-+    return This->dsound;
-+}
-+
-+
- /* IDirectMusicPerformance8 IUnknown part: */
- static HRESULT WINAPI IDirectMusicPerformance8Impl_QueryInterface(IDirectMusicPerformance8 *iface,
-         REFIID riid, void **ppv)
-diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
-index 6bf9f3abf0c..0ea0c15c5e0 100644
---- a/dlls/dmime/segment.c
-+++ b/dlls/dmime/segment.c
-@@ -37,6 +37,7 @@ typedef struct IDirectMusicSegment8Impl {
-     PCMWAVEFORMAT wave_format;
-     void *wave_data;
-     int data_size;
-+    IDirectSoundBuffer *buffer;
- } IDirectMusicSegment8Impl;
- 
- IDirectMusicSegment8Impl *create_segment(void);
-@@ -90,6 +91,8 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface
-     TRACE("(%p) ref=%ld\n", This, ref);
- 
-     if (!ref) {
-+        if (This->buffer)
-+            IDirectSoundBuffer_Release(This->buffer);
-         if (This->wave_data)
-             free(This->wave_data);
- 
-@@ -559,9 +562,87 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Compose(IDirectMusicSegment8 *ifa
- static HRESULT WINAPI IDirectMusicSegment8Impl_Download(IDirectMusicSegment8 *iface,
-         IUnknown *pAudioPath)
- {
--        IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
--	FIXME("(%p, %p): stub\n", This, pAudioPath);
--	return S_OK;
-+    IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
-+    IDirectMusicPerformance8 *perf;
-+    IDirectMusicAudioPath *audio;
-+    IDirectSound *dsound;
-+    HRESULT hr;
-+    DSBUFFERDESC dsbd = {.dwSize = sizeof(dsbd)};
-+    void *data;
-+    DWORD size;
-+    DWORD buffer = 0;
-+
-+    TRACE("(%p, %p)\n", This, pAudioPath);
-+
-+    if (!pAudioPath)
-+        return E_INVALIDARG;
-+
-+    if (This->buffer)
-+    {
-+        TRACE("Using Cached buffer\n");
-+        return S_OK;
-+    }
-+
-+    /* pAudioPath can either be IDirectMusicAudioPath or IDirectMusicPerformance */
-+    hr = IUnknown_QueryInterface(pAudioPath, &IID_IDirectMusicPerformance8, (void**)&perf);
-+    if (FAILED(hr))
-+    {
-+        TRACE("Checking for IDirectMusicAudioPath interface\n");
-+        hr = IUnknown_QueryInterface(pAudioPath, &IID_IDirectMusicAudioPath, (void**)&audio);
-+        if (FAILED(hr))
-+        {
-+            WARN("Cannot query for IDirectMusicAudioPath\n");
-+            return E_INVALIDARG;
-+        }
-+
-+        IDirectMusicAudioPath_GetObjectInPath(audio, DMUS_PCHANNEL_ALL, DMUS_PATH_PERFORMANCE, buffer, &GUID_NULL,
-+                0, &IID_IDirectMusicPerformance, (void**)&perf);
-+        IDirectMusicAudioPath_Release(audio);
-+    }
-+
-+    if (!perf)
-+    {
-+        ERR("Failed to get IDirectMusicPerformance interface\n");
-+        return E_INVALIDARG;
-+    }
-+
-+    dsound = get_dsound_interface(perf);
-+    if (!dsound)
-+    {
-+        ERR("Failed get_dsound_interface\n");
-+        return E_INVALIDARG;
-+    }
-+
-+    if (This->data_size == 0)
-+    {
-+        FIXME("No wave data skipping\n");
-+        return S_OK;
-+    }
-+
-+    dsbd.dwBufferBytes = This->data_size;
-+    dsbd.lpwfxFormat = (WAVEFORMATEX*)&This->wave_format;
-+
-+    hr = IDirectSound_CreateSoundBuffer(dsound, &dsbd, &This->buffer, NULL);
-+    if (FAILED(hr))
-+    {
-+        ERR("IDirectSound_CreateSoundBuffer failed 0x%08lx\n", hr);
-+        return E_INVALIDARG;
-+    }
-+
-+    TRACE("CreateSoundBuffer successful\n");
-+
-+    hr = IDirectSoundBuffer_Lock(This->buffer, 0, This->data_size, &data, &size, NULL, 0, 0);
-+    TRACE("IDirectSoundBuffer_Lock hr 0x%08lx\n", hr);
-+
-+    memcpy(data, This->wave_data, This->data_size);
-+
-+    hr = IDirectSoundBuffer_Unlock(This->buffer, data, This->data_size, NULL, 0);
-+    TRACE("IDirectSoundBuffer_Unlock hr 0x%08lx\n", hr);
-+
-+    /*hr = IDirectSoundBuffer_Play(This->buffer, 0, 0, 0);
-+    TRACE("IDirectSoundBuffer_Play hr 0x%08lx\n", hr);*/
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI IDirectMusicSegment8Impl_Unload(IDirectMusicSegment8 *iface,
--- 
-2.40.1
-

patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch

@@ -1,80 +0,0 @@
-From 8f92585ece53fbcd940fe028dd7ee24d6b854ec3 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 12 Dec 2022 15:20:10 +1100
-Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx
-
----
- dlls/dmime/dmime_private.h |  1 +
- dlls/dmime/performance.c   | 25 +++++++++++++++++++------
- dlls/dmime/segment.c       |  6 ++++++
- 3 files changed, 26 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
-index 39f6cdce790..6cd45697e2f 100644
---- a/dlls/dmime/dmime_private.h
-+++ b/dlls/dmime/dmime_private.h
-@@ -72,6 +72,7 @@ extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffe
- extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
- 
- extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*);
-+extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface);
- 
- /*****************************************************************************
-  * Auxiliary definitions
-diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
-index 5578c3e523b..03e59e95af3 100644
---- a/dlls/dmime/performance.c
-+++ b/dlls/dmime/performance.c
-@@ -1043,13 +1043,26 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer
-         __int64 i64StartTime, IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom,
-         IUnknown *pAudioPath)
- {
--        IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
-+    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
-+    IDirectMusicSegment8 *segment;
-+    IDirectSoundBuffer *buffer;
-+    HRESULT hr;
- 
--	FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName,
--	    pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath);
--	if (ppSegmentState)
--          return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState);
--	return S_OK;
-+    FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): semi-stub\n", This, pSource, pwzSegmentName,
-+        pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath);
-+
-+    hr = IUnknown_QueryInterface(pSource, &IID_IDirectMusicSegment8, (void**)&segment);
-+    if (FAILED(hr))
-+        return hr;
-+
-+    buffer = get_segment_buffer(segment);
-+
-+    if (segment)
-+        hr = IDirectSoundBuffer_Play(buffer, 0, 0, 0);
-+
-+    if (ppSegmentState)
-+      return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState);
-+    return S_OK;
- }
- 
- static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformance8 *iface,
-diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
-index 0ea0c15c5e0..b21f93bbfc6 100644
---- a/dlls/dmime/segment.c
-+++ b/dlls/dmime/segment.c
-@@ -47,6 +47,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu
-   return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface);
- }
- 
-+IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface)
-+{
-+    IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
-+    return This->buffer;
-+}
-+
- static HRESULT WINAPI IDirectMusicSegment8Impl_QueryInterface(IDirectMusicSegment8 *iface,
-         REFIID riid, void **ret_iface)
- {
--- 
-2.40.1
-

patches/dmime-load-wave/definition

@@ -1,13 +0,0 @@
-Fixes: [48220] dmime: Handle basic loading of Wave files and playing them.
-Fixes: [61322] dmine: No Sound in Black Rockman Shooter.
-Fixes: [34751] dmime: Aura: Fate of the Ages: sounds aren't played, but music works fine
-Fixes: [9027]  dmime: No sound for rise of nations - all versions.
-
-# Also
-# - Cloning Clyde demo
-
-# Doesnt fix
-#  The following are known not to work, at the moment.
-# [31586] : Myst sounds (Voices)
-# [30969] : Tron 2.0 Background music
-# [32896] : Serious Sam: The Random Encounter