Release v9.0-rc3

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/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
-+
-+SOURCES = \
-+	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("%s, %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/dsound-EAX/0004-dsound-Add-EAX-propset-stubs.patch

@@ -1,4 +1,4 @@
-From c3f44de2b3a1dbcc91b1ed1a864e6995ce1eb87b Mon Sep 17 00:00:00 2001
+From d7a094dd68e005ed2271d9874ba3ee03c7dc12b2 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 22 Mar 2015 13:58:53 +0000
 Subject: [PATCH] dsound: Add EAX propset stubs.
@@ -12,10 +12,10 @@ Subject: [PATCH] dsound: Add EAX propset stubs.
  create mode 100644 dlls/dsound/eax.c
 
 diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
-index 6cb653fdfa0..1c04bf34162 100644
+index 13cb6e8b615..ee097767ecd 100644
 --- a/dlls/dsound/Makefile.in
 +++ b/dlls/dsound/Makefile.in
-@@ -9,6 +9,7 @@ C_SRCS = \
+@@ -10,6 +10,7 @@ SOURCES = \
  	dsound_convert.c \
  	dsound_main.c \
  	duplex.c \
@@ -48,7 +48,7 @@ index 447b41bffbb..5c8c495bfe4 100644
  }
  
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index b5546c7d9db..185b8efd014 100644
+index 1113d07fa21..911d60dec61 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -230,6 +230,14 @@ LONG capped_refcount_dec(LONG *ref);
@@ -58,10 +58,10 @@ index b5546c7d9db..185b8efd014 100644
 +/* eax.c */
 +HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
 +        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
-+        ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
++        ULONG cbPropData, ULONG *pcbReturned);
 +HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
 +        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
-+        ULONG cbPropData) DECLSPEC_HIDDEN;
++        ULONG cbPropData);
 +
  /* mixer.c */
  void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
@@ -127,5 +127,5 @@ index 00000000000..c1264f977b6
 +    return E_PROP_ID_UNSUPPORTED;
 +}
 -- 
-2.40.1
+2.42.0
 

patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch

@@ -1,4 +1,4 @@
-From 3a08f97fcd9ffd224c917cc52298702b6feaea9e Mon Sep 17 00:00:00 2001
+From 5401bf0e1d666f14efae1a81383502d3c6231e57 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:58:37 +0000
 Subject: [PATCH] dsound: Add EAX init and free stubs.
@@ -32,15 +32,15 @@ index ede6d9f1ba1..309d632397a 100644
  
      free(This);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index c2dcda9da67..12203876623 100644
+index a89f635739c..e58a45cfb7d 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -241,6 +241,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
  HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
-         ULONG cbPropData) DECLSPEC_HIDDEN;
-+void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
-+void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
+         ULONG cbPropData);
++void free_eax_buffer(IDirectSoundBufferImpl *dsb);
++void init_eax_buffer(IDirectSoundBufferImpl *dsb);
  
  /* mixer.c */
  void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
@@ -97,5 +97,5 @@ index 03b6e0a9813..91438efc335 100644
  
  HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
 -- 
-2.40.1
+2.42.0
 

patches/dsound-EAX/0009-dsound-Feed-data-through-EAX-function.patch

@@ -1,4 +1,4 @@
-From a0ff76bc868a22624a06989f675c5d574125aa5c Mon Sep 17 00:00:00 2001
+From 035915e64ffbd674e38bb46c4ac10834bfc25961 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:59:57 +0000
 Subject: [PATCH] dsound: Feed data through EAX function.
@@ -10,14 +10,14 @@ Subject: [PATCH] dsound: Feed data through EAX function.
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 12203876623..11cfa641d77 100644
+index e58a45cfb7d..b9b608be7c0 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -243,6 +243,7 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
-         ULONG cbPropData) DECLSPEC_HIDDEN;
- void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
- void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
-+void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
+         ULONG cbPropData);
+ void free_eax_buffer(IDirectSoundBufferImpl *dsb);
+ void init_eax_buffer(IDirectSoundBufferImpl *dsb);
++void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count);
  
  /* mixer.c */
  void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
@@ -61,5 +61,5 @@ index f261588454a..33dcd8a953c 100644
          ostride = dsb->device->pwfx->nChannels * sizeof(float);
          for (i = 0; i < frames; i++) {
 -- 
-2.40.1
+2.42.0
 

patches/dsound-EAX/0018-dsound-Various-improvements-to-EAX-support.patch

@@ -1,4 +1,4 @@
-From 673e9f32e39fce78a02f6519a435051ffec3664d Mon Sep 17 00:00:00 2001
+From b6f55f023339b8a254680e833c9ed6e03ad2a106 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 4 Apr 2015 21:09:18 +0200
 Subject: [PATCH] dsound: Various improvements to EAX support.
@@ -24,10 +24,10 @@ the buffers).
  5 files changed, 37 insertions(+), 39 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 72e96765883..bdb93657017 100644
+index 309d632397a..aa7bbe13cc5 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1223,7 +1223,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+@@ -1216,7 +1216,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
      VOID *committedbuff;
      TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb);
  
@@ -36,7 +36,7 @@ index 72e96765883..bdb93657017 100644
      if (dsb == NULL) {
          WARN("out of memory\n");
          *ppdsb = NULL;
-@@ -1271,6 +1271,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+@@ -1264,6 +1264,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
  
      InitializeSRWLock(&dsb->lock);
  
@@ -46,7 +46,7 @@ index 72e96765883..bdb93657017 100644
      hres = DirectSoundDevice_AddBuffer(device, dsb);
      if (hres != DS_OK) {
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index bdf3a824511..4df26e93c6e 100644
+index 482dc5c109d..b382b51000e 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
 @@ -182,6 +182,8 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
@@ -71,17 +71,17 @@ index a650108f570..a555a75e458 100644
  
      float *SampleBuffer;
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 9131fa8792e..f2b2c353643 100644
+index b9b608be7c0..4afddbff72f 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -240,6 +240,7 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -241,6 +241,7 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
  HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
-         ULONG cbPropData) DECLSPEC_HIDDEN;
-+void init_eax_device(DirectSoundDevice *dev) DECLSPEC_HIDDEN;
- void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
- void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
- void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
+         ULONG cbPropData);
++void init_eax_device(DirectSoundDevice *dev);
+ void free_eax_buffer(IDirectSoundBufferImpl *dsb);
+ void init_eax_buffer(IDirectSoundBufferImpl *dsb);
+ void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count);
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 index 5f2b8ef07e2..2244565897b 100644
 --- a/dlls/dsound/eax.c
@@ -244,5 +244,5 @@ index 5f2b8ef07e2..2244565897b 100644
          switch (dwPropID) {
              case DSPROPERTY_EAXBUFFER_ALL:
 -- 
-2.39.2
+2.42.0
 

patches/dsound-EAX/0019-dsound-Allow-disabling-of-EAX-support-in-the-registr.patch

@@ -1,4 +1,4 @@
-From 375f83afce055fc37c5d453b0f922c604d9ad6f8 Mon Sep 17 00:00:00 2001
+From 4e1d6e94b034635b603beb7d13eab6eaab7cb3c5 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 5 Apr 2015 19:13:18 +0200
 Subject: [PATCH] dsound: Allow disabling of EAX support in the registry.
@@ -7,9 +7,9 @@ Based on a patch by Mark Harmstone.
 ---
  dlls/dsound/buffer.c         | 16 ++++++----------
  dlls/dsound/dsound_main.c    |  8 ++++++++
- dlls/dsound/dsound_private.h | 15 ++++++++-------
+ dlls/dsound/dsound_private.h |  3 ++-
  dlls/dsound/eax.c            | 28 ++++++++++++++++++++++++++++
- 4 files changed, 50 insertions(+), 17 deletions(-)
+ 4 files changed, 44 insertions(+), 11 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
 index aa7bbe13cc5..18a16535978 100644
@@ -46,10 +46,10 @@ index aa7bbe13cc5..18a16535978 100644
  
      return E_PROP_ID_UNSUPPORTED;
 diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
-index 11983a4cb47..2c09f9c5b42 100644
+index 96e5fe2487e..d785e905527 100644
 --- a/dlls/dsound/dsound_main.c
 +++ b/dlls/dsound/dsound_main.c
-@@ -94,6 +94,10 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
+@@ -84,6 +84,10 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
  /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
  int ds_hel_buflen = 32768 * 2;
  int ds_hq_buffers_max = 4;
@@ -60,7 +60,7 @@ index 11983a4cb47..2c09f9c5b42 100644
  
  /*
   * Get a config key from either the app-specific or the default config
-@@ -148,11 +152,15 @@ void setup_dsound_options(void)
+@@ -138,11 +142,15 @@ void setup_dsound_options(void)
      if (!get_config_key( hkey, appkey, "HQBuffersMax", buffer, MAX_PATH ))
          ds_hq_buffers_max = atoi(buffer);
  
@@ -77,7 +77,7 @@ index 11983a4cb47..2c09f9c5b42 100644
  
  static const char * get_device_id(LPCGUID pGuid)
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 1c544ad2e96..43f9df866a3 100644
+index 4afddbff72f..10c6617c38b 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -35,9 +35,9 @@
@@ -91,30 +91,14 @@ index 1c544ad2e96..43f9df866a3 100644
  
  /*****************************************************************************
   * Predeclare the interface implementation structures
-@@ -235,16 +235,17 @@ LONG capped_refcount_dec(LONG *ref);
+@@ -235,6 +235,7 @@ LONG capped_refcount_dec(LONG *ref);
  HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv);
  
  /* eax.c */
 +BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSupport);
  HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
--        ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
-+        ULONG cbPropData, ULONG *pcbReturned);
- HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
-         ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
--        ULONG cbPropData) DECLSPEC_HIDDEN;
--void init_eax_device(DirectSoundDevice *dev) DECLSPEC_HIDDEN;
--void free_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
--void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
--void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
-+        ULONG cbPropData);
-+void init_eax_device(DirectSoundDevice *dev);
-+void free_eax_buffer(IDirectSoundBufferImpl *dsb);
-+void init_eax_buffer(IDirectSoundBufferImpl *dsb);
-+void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count);
- 
- /* mixer.c */
- void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len);
+         ULONG cbPropData, ULONG *pcbReturned);
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 index 2244565897b..3e15ac59480 100644
 --- a/dlls/dsound/eax.c
@@ -169,5 +153,5 @@ index 2244565897b..3e15ac59480 100644
          buf->device->eax.using_eax = TRUE;
  
 -- 
-2.40.1
+2.42.0
 

patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch

@@ -1,4 +1,4 @@
-From 05ebaac121b440567aa88de7a77d0ef19a8d9242 Mon Sep 17 00:00:00 2001
+From 955a93ac10d1328e293fbf033e28107f98c43c7f Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:09:22 -0500
 Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
@@ -305,7 +305,7 @@ index 00000000000..7be4e03fa34
 +}
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
 new file mode 100644
-index 00000000000..a50a755149a
+index 00000000000..5fec18860f8
 --- /dev/null
 +++ b/dlls/ntdll/unix/esync.h
 @@ -0,0 +1,35 @@
@@ -329,11 +329,11 @@ index 00000000000..a50a755149a
 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 + */
 +
-+extern int do_esync(void) DECLSPEC_HIDDEN;
-+extern void esync_init(void) DECLSPEC_HIDDEN;
++extern int do_esync(void);
++extern void esync_init(void);
 +
 +extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
-+    const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max) DECLSPEC_HIDDEN;
++    const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
 +
 +
 +/* We have to synchronize on the fd cache mutex so that our calls to receive_fd
@@ -343,9 +343,9 @@ index 00000000000..a50a755149a
 + * "server_fd_mutex" or something similar. */
 +extern pthread_mutex_t fd_cache_mutex;
 +
-+extern int receive_fd( obj_handle_t *handle ) DECLSPEC_HIDDEN;
++extern int receive_fd( obj_handle_t *handle );
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 42b5aa9d84e..974a3624a28 100644
+index aa120ae38ec..fdda50575d1 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
 @@ -87,6 +87,7 @@
@@ -356,7 +356,7 @@ index 42b5aa9d84e..974a3624a28 100644
  #include "wine/list.h"
  #include "ntsyscalls.h"
  #include "wine/debug.h"
-@@ -1811,6 +1812,7 @@ static void start_main_thread(void)
+@@ -1790,6 +1791,7 @@ static void start_main_thread(void)
      signal_alloc_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();

patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch

@@ -1,4 +1,4 @@
-From 06faa163af3dd5fa6e4794bf244c662533a88b69 Mon Sep 17 00:00:00 2001
+From d8135b1bdafffc23be62c216edda9ac280045753 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:16:34 -0500
 Subject: [PATCH] ntdll: Implement NtReleaseSemaphore().
@@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Implement NtReleaseSemaphore().
  3 files changed, 47 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 9e1ef7d8afd..c7320d78bd3 100644
+index 7be4e03fa34..e8da4bd311b 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
 @@ -28,6 +28,7 @@
@@ -21,7 +21,7 @@ index 9e1ef7d8afd..c7320d78bd3 100644
  #include <stdlib.h>
  #include <sys/mman.h>
  #ifdef HAVE_SYS_STAT_H
-@@ -171,6 +172,16 @@ static struct esync *add_to_list( HANDLE handle, enum esync_type type, int fd, v
+@@ -170,6 +171,16 @@ static struct esync *add_to_list( HANDLE handle, enum esync_type type, int fd, v
      return &esync_list[entry][idx];
  }
  
@@ -38,7 +38,7 @@ index 9e1ef7d8afd..c7320d78bd3 100644
  static NTSTATUS create_esync( enum esync_type type, HANDLE *handle, ACCESS_MASK access,
                                const OBJECT_ATTRIBUTES *attr, int initval, int max )
  {
-@@ -226,6 +237,38 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
+@@ -225,6 +236,38 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
      return create_esync( ESYNC_SEMAPHORE, handle, access, attr, initial, max );
  }
  
@@ -78,22 +78,22 @@ index 9e1ef7d8afd..c7320d78bd3 100644
  {
      struct stat st;
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
-index a50a755149a..09838e95535 100644
+index 5fec18860f8..cbaaed3e308 100644
 --- a/dlls/ntdll/unix/esync.h
 +++ b/dlls/ntdll/unix/esync.h
-@@ -23,6 +23,7 @@ extern void esync_init(void) DECLSPEC_HIDDEN;
+@@ -23,6 +23,7 @@ extern void esync_init(void);
  
  extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
-     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max) DECLSPEC_HIDDEN;
-+extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev ) DECLSPEC_HIDDEN;
+     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
++extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev );
  
  
  /* We have to synchronize on the fd cache mutex so that our calls to receive_fd
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index fff4970549b..fbd28292524 100644
+index f21ceb80298..c85f985b4f3 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -359,6 +359,9 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous
+@@ -358,6 +358,9 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous
  {
      unsigned int ret;
  
@@ -104,5 +104,5 @@ index fff4970549b..fbd28292524 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.38.1
+2.42.0
 

patches/eventfd_synchronization/0005-ntdll-Implement-NtClose.patch

@@ -1,4 +1,4 @@
-From 7e750cacff9e1db07141e02f3763d2b24720a00b Mon Sep 17 00:00:00 2001
+From e57a0ae8ff11195fa4a29aa1c1ccc250c0036073 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:20:44 -0500
 Subject: [PATCH] ntdll: Implement NtClose().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtClose().
  3 files changed, 23 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 8f28a36d93f..02b07bf36be 100644
+index e8da4bd311b..e031e9cb94f 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -184,6 +184,24 @@ static struct esync *get_cached_object( HANDLE handle )
+@@ -181,6 +181,24 @@ static struct esync *get_cached_object( HANDLE handle )
      return &esync_list[entry][idx];
  }
  
@@ -39,22 +39,22 @@ index 8f28a36d93f..02b07bf36be 100644
                                const OBJECT_ATTRIBUTES *attr, int initval, int max )
  {
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
-index 09838e95535..14e52416764 100644
+index cbaaed3e308..c63491dcaad 100644
 --- a/dlls/ntdll/unix/esync.h
 +++ b/dlls/ntdll/unix/esync.h
 @@ -20,6 +20,7 @@
  
- extern int do_esync(void) DECLSPEC_HIDDEN;
- extern void esync_init(void) DECLSPEC_HIDDEN;
-+extern NTSTATUS esync_close( HANDLE handle ) DECLSPEC_HIDDEN;
+ extern int do_esync(void);
+ extern void esync_init(void);
++extern NTSTATUS esync_close( HANDLE handle );
  
  extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
-     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max) DECLSPEC_HIDDEN;
+     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index 2f1d106a8da..af67e57176a 100644
+index cd8dbbdcc10..00d665d9e62 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
-@@ -88,6 +88,7 @@
+@@ -79,6 +79,7 @@
  #include "wine/server.h"
  #include "wine/debug.h"
  #include "unix_private.h"
@@ -62,7 +62,7 @@ index 2f1d106a8da..af67e57176a 100644
  #include "ddk/wdm.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(server);
-@@ -1762,6 +1763,9 @@ NTSTATUS WINAPI NtClose( HANDLE handle )
+@@ -1839,6 +1840,9 @@ NTSTATUS WINAPI NtClose( HANDLE handle )
       * retrieve it again */
      fd = remove_fd_from_cache( handle );
  
@@ -73,5 +73,5 @@ index 2f1d106a8da..af67e57176a 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.30.2
+2.42.0
 

patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch

@@ -1,4 +1,4 @@
-From e6666b78dbd54b0017de39c85f06900503780110 Mon Sep 17 00:00:00 2001
+From cdced5d4d89a932fa456191551899e1919a1881e Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:34:42 -0500
 Subject: [PATCH] ntdll: Implement NtWaitForMultipleObjects().
@@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Implement NtWaitForMultipleObjects().
  3 files changed, 180 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index f111342688e..dac49af3083 100644
+index e031e9cb94f..75ceb95bc66 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
 @@ -22,6 +22,8 @@
@@ -35,7 +35,7 @@ index f111342688e..dac49af3083 100644
  #include <sys/types.h>
  #include <unistd.h>
  
-@@ -287,6 +295,168 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
+@@ -286,6 +294,168 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
      return STATUS_SUCCESS;
  }
  
@@ -205,24 +205,24 @@ index f111342688e..dac49af3083 100644
  {
      struct stat st;
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
-index 14e52416764..87516e7597a 100644
+index c63491dcaad..92b609ebd27 100644
 --- a/dlls/ntdll/unix/esync.h
 +++ b/dlls/ntdll/unix/esync.h
 @@ -26,6 +26,9 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
-     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max) DECLSPEC_HIDDEN;
- extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev ) DECLSPEC_HIDDEN;
+     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
+ extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev );
  
 +extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
-+                                    BOOLEAN alertable, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
++                                    BOOLEAN alertable, const LARGE_INTEGER *timeout );
 +
  
  /* We have to synchronize on the fd cache mutex so that our calls to receive_fd
   * don't race with theirs. It looks weird, I know.
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index db992f3a9ad..bc643558a28 100644
+index c85f985b4f3..79141999e33 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -1410,6 +1410,13 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO
+@@ -1479,6 +1479,13 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO
  
      if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1;
  
@@ -237,5 +237,5 @@ index db992f3a9ad..bc643558a28 100644
      select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL;
      for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] );
 -- 
-2.33.0
+2.42.0
 

patches/eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch

@@ -1,4 +1,4 @@
-From 4af235c5bc5797cae39578991b302b47052afcbb Mon Sep 17 00:00:00 2001
+From 9c2870d27349ce3548c84ff1f7b5825b5c398296 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 14:40:43 -0500
 Subject: [PATCH] ntdll, server: Implement NtCreateEvent().
@@ -11,10 +11,10 @@ Subject: [PATCH] ntdll, server: Implement NtCreateEvent().
  4 files changed, 49 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 1b71105491c..e440e9baa4a 100644
+index 75ceb95bc66..06842f0c8f5 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -91,6 +91,13 @@ struct semaphore
+@@ -88,6 +88,13 @@ struct semaphore
  };
  C_ASSERT(sizeof(struct semaphore) == 8);
  
@@ -28,7 +28,7 @@ index 1b71105491c..e440e9baa4a 100644
  static char shm_name[29];
  static int shm_fd;
  static void **shm_addrs;
-@@ -297,6 +304,18 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
+@@ -294,6 +301,18 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
      return STATUS_SUCCESS;
  }
  
@@ -47,7 +47,7 @@ index 1b71105491c..e440e9baa4a 100644
  #define TICKSPERSEC        10000000
  #define TICKSPERMSEC       10000
  
-@@ -342,6 +361,14 @@ static void update_grabbed_object( struct esync *obj )
+@@ -339,6 +358,14 @@ static void update_grabbed_object( struct esync *obj )
           * etc. */
          InterlockedExchangeAdd( &semaphore->count, -1 );
      }
@@ -63,24 +63,24 @@ index 1b71105491c..e440e9baa4a 100644
  
  /* A value of STATUS_NOT_IMPLEMENTED returned from this function means that we
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
-index 87516e7597a..d9c7df967f8 100644
+index 92b609ebd27..7bb963faf51 100644
 --- a/dlls/ntdll/unix/esync.h
 +++ b/dlls/ntdll/unix/esync.h
 @@ -26,6 +26,9 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
-     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max) DECLSPEC_HIDDEN;
- extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev ) DECLSPEC_HIDDEN;
+     const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
+ extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev );
  
 +extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
-+    const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial ) DECLSPEC_HIDDEN;
++    const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial );
 +
  extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
-                                     BOOLEAN alertable, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
+                                     BOOLEAN alertable, const LARGE_INTEGER *timeout );
  
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index f5be91e09d4..b54874b5d3d 100644
+index 79141999e33..161c170f59c 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -440,6 +440,10 @@ NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_
+@@ -387,6 +387,10 @@ NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_
  
      *handle = 0;
      if (type != NotificationEvent && type != SynchronizationEvent) return STATUS_INVALID_PARAMETER;
@@ -92,10 +92,10 @@ index f5be91e09d4..b54874b5d3d 100644
  
      SERVER_START_REQ( create_event )
 diff --git a/server/esync.c b/server/esync.c
-index e41bbbf9349..f89f29150ea 100644
+index 75ef586df30..6a63c0dd5e9 100644
 --- a/server/esync.c
 +++ b/server/esync.c
-@@ -203,6 +203,13 @@ struct semaphore
+@@ -201,6 +201,13 @@ struct semaphore
  };
  C_ASSERT(sizeof(struct semaphore) == 8);
  
@@ -109,7 +109,7 @@ index e41bbbf9349..f89f29150ea 100644
  struct esync *create_esync( struct object *root, const struct unicode_str *name,
                              unsigned int attr, int initval, int max, enum esync_type type,
                              const struct security_descriptor *sd )
-@@ -258,6 +265,14 @@ struct esync *create_esync( struct object *root, const struct unicode_str *name,
+@@ -256,6 +263,14 @@ struct esync *create_esync( struct object *root, const struct unicode_str *name,
                  semaphore->count = initval;
                  break;
              }
@@ -125,5 +125,5 @@ index e41bbbf9349..f89f29150ea 100644
                  assert( 0 );
              }
 -- 
-2.30.2
+2.42.0
 

patches/eventfd_synchronization/0008-ntdll-Implement-NtSetEvent.patch

@@ -1,4 +1,4 @@
-From ff044319027197bb9a1f20a19f01d8c299835818 Mon Sep 17 00:00:00 2001
+From e2ab736b2e8b98268bdf840a460ee54b8388328e Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 14:46:24 -0500
 Subject: [PATCH] ntdll: Implement NtSetEvent().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtSetEvent().
  3 files changed, 20 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 059d7fd9ca6..410cfd3c2ce 100644
+index 06842f0c8f5..3bb7f2daf8f 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -314,6 +314,21 @@ NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
+@@ -313,6 +313,21 @@ NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
      return create_esync( type, handle, access, attr, initial, 0 );
  }
  
@@ -36,22 +36,22 @@ index 059d7fd9ca6..410cfd3c2ce 100644
  #define TICKSPERMSEC       10000
  
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
-index d9c7df967f8..b585af047ee 100644
+index 7bb963faf51..d92165214d6 100644
 --- a/dlls/ntdll/unix/esync.h
 +++ b/dlls/ntdll/unix/esync.h
 @@ -28,6 +28,7 @@ extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev
  
  extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
-     const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial ) DECLSPEC_HIDDEN;
-+extern NTSTATUS esync_set_event( HANDLE handle ) DECLSPEC_HIDDEN;
+     const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial );
++extern NTSTATUS esync_set_event( HANDLE handle );
  
  extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
-                                     BOOLEAN alertable, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
+                                     BOOLEAN alertable, const LARGE_INTEGER *timeout );
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 7be736927b2..8e793941711 100644
+index 161c170f59c..706d381d7c7 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -440,8 +440,12 @@ NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT
+@@ -439,8 +439,12 @@ NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT
   */
  NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state )
  {
@@ -65,5 +65,5 @@ index 7be736927b2..8e793941711 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.38.1
+2.42.0
 

patches/eventfd_synchronization/0009-ntdll-Implement-NtResetEvent.patch

@@ -1,4 +1,4 @@
-From c1c004fcfb9d38086fd682e64aca7fd6aaad4cc9 Mon Sep 17 00:00:00 2001
+From 98024ae21fbeb4f86c89000bd7953cf192c833ef Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 14:51:21 -0500
 Subject: [PATCH] ntdll: Implement NtResetEvent().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtResetEvent().
  3 files changed, 21 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 410cfd3c2ce..80eb3773ee4 100644
+index 3bb7f2daf8f..8ee0c99c5d9 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -329,6 +329,21 @@ NTSTATUS esync_set_event( HANDLE handle )
+@@ -328,6 +328,21 @@ NTSTATUS esync_set_event( HANDLE handle )
      return STATUS_SUCCESS;
  }
  
@@ -36,22 +36,22 @@ index 410cfd3c2ce..80eb3773ee4 100644
  #define TICKSPERMSEC       10000
  
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
-index b585af047ee..8480a213b2a 100644
+index d92165214d6..6e5d6233a2e 100644
 --- a/dlls/ntdll/unix/esync.h
 +++ b/dlls/ntdll/unix/esync.h
 @@ -28,6 +28,7 @@ extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev
  
  extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
-     const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial ) DECLSPEC_HIDDEN;
-+extern NTSTATUS esync_reset_event( HANDLE handle ) DECLSPEC_HIDDEN;
- extern NTSTATUS esync_set_event( HANDLE handle ) DECLSPEC_HIDDEN;
+     const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial );
++extern NTSTATUS esync_reset_event( HANDLE handle );
+ extern NTSTATUS esync_set_event( HANDLE handle );
  
  extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 8e793941711..f57a825872b 100644
+index 706d381d7c7..fdf4215039b 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -463,8 +463,13 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state )
+@@ -462,8 +462,13 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state )
   */
  NTSTATUS WINAPI NtResetEvent( HANDLE handle, LONG *prev_state )
  {
@@ -66,5 +66,5 @@ index 8e793941711..f57a825872b 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.38.1
+2.42.0
 

patches/eventfd_synchronization/0023-ntdll-server-Implement-NtCreateMutant.patch

@@ -1,4 +1,4 @@
-From 1496c3a96452deeb4ca687bc61e2125bc82fff71 Mon Sep 17 00:00:00 2001
+From a4145f3d6ea7973ce83c7eef109613482c6adf11 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:34:56 -0500
 Subject: [PATCH] ntdll, server: Implement NtCreateMutant().
@@ -11,10 +11,10 @@ Subject: [PATCH] ntdll, server: Implement NtCreateMutant().
  4 files changed, 37 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 88490e08ef9..df9eb2696a1 100644
+index 06d7d8babc6..e979a5b81ae 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -91,6 +91,13 @@ struct semaphore
+@@ -83,6 +83,13 @@ struct semaphore
  };
  C_ASSERT(sizeof(struct semaphore) == 8);
  
@@ -28,7 +28,7 @@ index 88490e08ef9..df9eb2696a1 100644
  struct event
  {
      int signaled;
-@@ -415,6 +422,15 @@ NTSTATUS esync_reset_event( HANDLE handle )
+@@ -407,6 +414,15 @@ NTSTATUS esync_reset_event( HANDLE handle )
      return STATUS_SUCCESS;
  }
  
@@ -45,24 +45,24 @@ index 88490e08ef9..df9eb2696a1 100644
  #define TICKSPERMSEC       10000
  
 diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
-index 8480a213b2a..38ebefc9eed 100644
+index 6e5d6233a2e..9b2f88670d1 100644
 --- a/dlls/ntdll/unix/esync.h
 +++ b/dlls/ntdll/unix/esync.h
 @@ -31,6 +31,9 @@ extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
- extern NTSTATUS esync_reset_event( HANDLE handle ) DECLSPEC_HIDDEN;
- extern NTSTATUS esync_set_event( HANDLE handle ) DECLSPEC_HIDDEN;
+ extern NTSTATUS esync_reset_event( HANDLE handle );
+ extern NTSTATUS esync_set_event( HANDLE handle );
  
 +extern NTSTATUS esync_create_mutex( HANDLE *handle, ACCESS_MASK access,
-+    const OBJECT_ATTRIBUTES *attr, BOOLEAN initial ) DECLSPEC_HIDDEN;
++    const OBJECT_ATTRIBUTES *attr, BOOLEAN initial );
 +
  extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
-                                     BOOLEAN alertable, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
+                                     BOOLEAN alertable, const LARGE_INTEGER *timeout );
  
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 47ab533d5c7..7e492320cee 100644
+index fdf4215039b..1bf4a381a8f 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -608,6 +608,10 @@ NTSTATUS WINAPI NtCreateMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT
+@@ -555,6 +555,10 @@ NTSTATUS WINAPI NtCreateMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT
      struct object_attributes *objattr;
  
      *handle = 0;
@@ -74,10 +74,10 @@ index 47ab533d5c7..7e492320cee 100644
  
      SERVER_START_REQ( create_mutex )
 diff --git a/server/esync.c b/server/esync.c
-index ac59779a454..913104e3dd4 100644
+index 669afbc70d7..3f1c61bc1f0 100644
 --- a/server/esync.c
 +++ b/server/esync.c
-@@ -204,6 +204,13 @@ struct semaphore
+@@ -202,6 +202,13 @@ struct semaphore
  };
  C_ASSERT(sizeof(struct semaphore) == 8);
  
@@ -91,7 +91,7 @@ index ac59779a454..913104e3dd4 100644
  struct event
  {
      int signaled;
-@@ -274,6 +281,13 @@ struct esync *create_esync( struct object *root, const struct unicode_str *name,
+@@ -272,6 +279,13 @@ struct esync *create_esync( struct object *root, const struct unicode_str *name,
                  event->locked = 0;
                  break;
              }
@@ -106,5 +106,5 @@ index ac59779a454..913104e3dd4 100644
                  assert( 0 );
              }
 -- 
-2.30.2
+2.42.0