Release v7.0-rc6

Thanks Sveinar Søpler.

patches/Compiler_Warnings/0033-ntdll-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,34 @@
+From 5be4173b6c3e89b1d9267679cd392a7343088a52 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 09:10:37 +1000
+Subject: [PATCH] ntdll: Avoid implicit cast of interface pointer.
+
+---
+ dlls/ntdll/unix/virtual.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
+index 34b332a613c..111c851b43b 100644
+--- a/dlls/ntdll/unix/virtual.c
++++ b/dlls/ntdll/unix/virtual.c
+@@ -3016,7 +3016,7 @@ NTSTATUS virtual_clear_tls_index( ULONG index )
+         server_enter_uninterrupted_section( &virtual_mutex, &sigset );
+         LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry )
+         {
+-            TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch );
++            TEB *teb = CONTAINING_RECORD( (GDI_TEB_BATCH *)thread_data, TEB, GdiTebBatch );
+ #ifdef _WIN64
+             WOW_TEB *wow_teb = get_wow_teb( teb );
+             if (wow_teb) wow_teb->TlsSlots[index] = 0;
+@@ -3034,7 +3034,7 @@ NTSTATUS virtual_clear_tls_index( ULONG index )
+         server_enter_uninterrupted_section( &virtual_mutex, &sigset );
+         LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry )
+         {
+-            TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch );
++            TEB *teb = CONTAINING_RECORD( (GDI_TEB_BATCH *)thread_data, TEB, GdiTebBatch );
+ #ifdef _WIN64
+             WOW_TEB *wow_teb = get_wow_teb( teb );
+             if (wow_teb)
+-- 
+2.30.2
+

patches/Compiler_Warnings/0034-bcrypt-Stop-compile-error-when-HAVE_GNUTLS_CIPHER_IN.patch

@@ -0,0 +1,40 @@
+From eb21fcc668da85977bc86b6105f3830cb26c93e6 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 08:56:40 +1000
+Subject: [PATCH] bcrypt: Stop compile error when HAVE_GNUTLS_CIPHER_INIT not
+ defined
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In file included from dlls/bcrypt/gnutls.c:1916:
+include/windef.h:112:24: error: unknown type name ‘va_list’
+  112 | #  define __ms_va_list va_list
+      |                        ^~~~~~~
+include/winbase.h:2076:84: note: in expansion of macro ‘__ms_va_list’
+ 2076 | WINBASEAPI DWORD       WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,__ms_va_list*);
+
+Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+---
+ dlls/bcrypt/gnutls.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
+index d7b4499c692..11596d5f7ac 100644
+--- a/dlls/bcrypt/gnutls.c
++++ b/dlls/bcrypt/gnutls.c
+@@ -24,9 +24,10 @@
+ 
+ #include "config.h"
+ 
++#include <stdarg.h>
++
+ #ifdef HAVE_GNUTLS_CIPHER_INIT
+ 
+-#include <stdarg.h>
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <sys/types.h>
+-- 
+2.33.0
+

patches/Compiler_Warnings/0035-d3d10-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,61 @@
+From 34109c1adac6293a87db004d60d342faeb33fcfe Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 09:34:28 +1000
+Subject: [PATCH] d3d10: Avoid implicit cast of interface pointer.
+
+---
+ dlls/d3d10/effect.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
+index 3b4050460a0..b03ed2d6c89 100644
+--- a/dlls/d3d10/effect.c
++++ b/dlls/d3d10/effect.c
+@@ -147,7 +147,7 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1
+ 
+ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable(ID3D10EffectShaderVariable *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
++    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
+ }
+ 
+ static struct d3d10_effect_variable * d3d10_array_get_element(struct d3d10_effect_variable *v,
+@@ -4876,7 +4876,7 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab
+ 
+ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectScalarVariable(ID3D10EffectScalarVariable *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
++    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
+ }
+ 
+ static BOOL STDMETHODCALLTYPE d3d10_effect_scalar_variable_IsValid(ID3D10EffectScalarVariable *iface)
+@@ -5212,7 +5212,7 @@ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_
+ 
+ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVectorVariable(ID3D10EffectVectorVariable *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
++    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
+ }
+ 
+ static BOOL STDMETHODCALLTYPE d3d10_effect_vector_variable_IsValid(ID3D10EffectVectorVariable *iface)
+@@ -5699,7 +5699,7 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable
+ 
+ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
++    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
+ }
+ 
+ static BOOL STDMETHODCALLTYPE d3d10_effect_matrix_variable_IsValid(ID3D10EffectMatrixVariable *iface)
+@@ -6222,7 +6222,7 @@ static void set_shader_resource_variable(ID3D10ShaderResourceView **src, ID3D10S
+ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderResourceVariable(
+         ID3D10EffectShaderResourceVariable *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
++    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
+ }
+ 
+ static BOOL STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_IsValid(ID3D10EffectShaderResourceVariable *iface)
+-- 
+2.33.0
+

patches/Compiler_Warnings/0036-d2d1-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,34 @@
+From dd8e8e98edf2f16a4fd4109cd283cf7949a3cb9b Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 09:39:56 +1000
+Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
+
+---
+ dlls/d2d1/geometry.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
+index eb353669030..3e00edfd1b3 100644
+--- a/dlls/d2d1/geometry.c
++++ b/dlls/d2d1/geometry.c
+@@ -3615,7 +3615,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
+ 
+ static inline struct d2d_geometry *impl_from_ID2D1EllipseGeometry(ID2D1EllipseGeometry *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
++    return CONTAINING_RECORD((ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_ellipse_geometry_QueryInterface(ID2D1EllipseGeometry *iface,
+@@ -4237,7 +4237,7 @@ fail:
+ 
+ static inline struct d2d_geometry *impl_from_ID2D1RoundedRectangleGeometry(ID2D1RoundedRectangleGeometry *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
++    return CONTAINING_RECORD((ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_QueryInterface(ID2D1RoundedRectangleGeometry *iface,
+-- 
+2.30.2
+

patches/Compiler_Warnings/0037-dxgi-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From f8ce184f72c416a1ce249afe313b698013e961b3 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 09:46:25 +1000
+Subject: [PATCH] dxgi: Avoid implicit cast of interface pointer.
+
+---
+ dlls/dxgi/output.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
+index f341388766c..64f87202741 100644
+--- a/dlls/dxgi/output.c
++++ b/dlls/dxgi/output.c
+@@ -711,7 +711,7 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface)
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl);
+-    return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface);
++    return CONTAINING_RECORD((IDXGIOutput6*)iface, struct dxgi_output, IDXGIOutput6_iface);
+ }
+ 
+ static void dxgi_output_init(struct dxgi_output *output, unsigned int output_idx,
+-- 
+2.30.2
+

patches/Compiler_Warnings/0038-msctf-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 272753daf4f20b7fe3c646eae4fd78f1b254c9a6 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 09:57:01 +1000
+Subject: [PATCH] msctf: Avoid implicit cast of interface pointer.
+
+---
+ dlls/msctf/range.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c
+index 9690a0a15c4..e15123eeb89 100644
+--- a/dlls/msctf/range.c
++++ b/dlls/msctf/range.c
+@@ -54,7 +54,7 @@ static inline Range *impl_from_ITfRangeACP(ITfRangeACP *iface)
+ 
+ static Range *unsafe_impl_from_ITfRange(ITfRange *iface)
+ {
+-    return CONTAINING_RECORD(iface, Range, ITfRangeACP_iface);
++    return CONTAINING_RECORD((ITfRangeACP*)iface, Range, ITfRangeACP_iface);
+ }
+ 
+ static void Range_Destructor(Range *This)
+-- 
+2.30.2
+

patches/Compiler_Warnings/0039-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,39 @@
+From f34ee38467781b2f7bae7e7f8a04a4210bf7d046 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 11:22:48 +1000
+Subject: [PATCH] rpcrt4: Avoid implicit cast of interface pointer.
+
+---
+ dlls/rpcrt4/ndr_marshall.c | 2 +-
+ dlls/rpcrt4/ndr_typelib.c  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
+index 764b304a047..58ea128e8a4 100644
+--- a/dlls/rpcrt4/ndr_marshall.c
++++ b/dlls/rpcrt4/ndr_marshall.c
+@@ -6999,7 +6999,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall(
+     }
+     else
+     {
+-        NDR_SCONTEXT ctxt = CONTAINING_RECORD(pMemory, struct _NDR_SCONTEXT, userContext);
++        NDR_SCONTEXT ctxt = CONTAINING_RECORD((void * const*)pMemory, struct _NDR_SCONTEXT, userContext);
+         NDR_RUNDOWN rundown = pStubMsg->StubDesc->apfnNdrRundownRoutines[pFormat[2]];
+         NdrServerContextNewMarshall(pStubMsg, ctxt, rundown, pFormat);
+     }
+diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c
+index f1f25885b75..126e8ec8766 100644
+--- a/dlls/rpcrt4/ndr_typelib.c
++++ b/dlls/rpcrt4/ndr_typelib.c
+@@ -1452,7 +1452,7 @@ struct typelib_stub
+ 
+ static ULONG WINAPI typelib_stub_Release(IRpcStubBuffer *iface)
+ {
+-    struct typelib_stub *stub = CONTAINING_RECORD(iface, struct typelib_stub, stub.stub_buffer);
++    struct typelib_stub *stub = CONTAINING_RECORD((CStdStubBuffer *)iface, struct typelib_stub, stub.stub_buffer);
+     ULONG refcount = InterlockedDecrement(&stub->stub.stub_buffer.RefCount);
+ 
+     TRACE("(%p) decreasing refs to %d\n", stub, refcount);
+-- 
+2.30.2
+

patches/Compiler_Warnings/0040-wbemdisp-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,34 @@
+From 4801b547b70654507cb8a25dcfd1efc862dcf467 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 8 Jun 2021 11:38:46 +1000
+Subject: [PATCH] wbemdisp: Avoid implicit cast of interface pointer.
+
+---
+ dlls/wbemdisp/locator.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c
+index e0a1872d38f..5bb2a187f2c 100644
+--- a/dlls/wbemdisp/locator.c
++++ b/dlls/wbemdisp/locator.c
+@@ -1751,7 +1751,7 @@ static struct object *unsafe_object_impl_from_IDispatch(IDispatch *iface)
+         FIXME( "External implementations are not supported.\n" );
+         return NULL;
+     }
+-    return CONTAINING_RECORD(iface, struct object, ISWbemObject_iface);
++    return CONTAINING_RECORD((ISWbemObject *)iface, struct object, ISWbemObject_iface);
+ }
+ 
+ static HRESULT SWbemObject_create( struct services *services, IWbemClassObject *wbem_object,
+@@ -3587,7 +3587,7 @@ static struct namedvalueset *unsafe_valueset_impl_from_IDispatch(IDispatch *ifac
+         FIXME( "External implementations are not supported.\n" );
+         return NULL;
+     }
+-    return CONTAINING_RECORD(iface, struct namedvalueset, ISWbemNamedValueSet_iface);
++    return CONTAINING_RECORD((ISWbemNamedValueSet*)iface, struct namedvalueset, ISWbemNamedValueSet_iface);
+ }
+ 
+ HRESULT SWbemNamedValueSet_create( void **obj )
+-- 
+2.30.2
+

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

@@ -1,15 +1,15 @@
-From e51b05c3a9d03e4dd84a107a30841d95f8a519c3 Mon Sep 17 00:00:00 2001
+From 36b4dbb687232d783cc3203da1dee4a797606ba7 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
  branch name and version.
 
 ---
- dlls/ntdll/loader.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ dlls/ntdll/loader.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index ee453700e51..c2d4b3c2f86 100644
+index 255d5afef79..00add6728cc 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index ee453700e51..c2d4b3c2f86 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3307,6 +3308,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3536,6 +3537,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,7 +28,7 @@ index ee453700e51..c2d4b3c2f86 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -3673,6 +3675,9 @@ static void init_wow64(void)
+@@ -3955,6 +3957,9 @@ static void release_address_space(void)
   */
  void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
  {
@@ -36,11 +36,11 @@ index ee453700e51..c2d4b3c2f86 100644
 +    UNICODE_STRING staging_event_string;
 +    HANDLE staging_event;
      static int attach_done;
-     int i;
      NTSTATUS status;
-@@ -3753,6 +3758,17 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
-     }
-     else wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
+     ULONG_PTR cookie;
+@@ -4041,6 +4046,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+     if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
+ #endif
  
 +    RtlInitUnicodeString( &staging_event_string, L"\\__wine_staging_warn_event" );
 +    InitializeObjectAttributes( &staging_event_attr, &staging_event_string, OBJ_OPENIF, NULL, NULL );
@@ -51,11 +51,10 @@ index ee453700e51..c2d4b3c2f86 100644
 +    }
 +    else
 +        WARN_(winediag)("wine-staging %s is a testing version containing experimental patches.\n", wine_get_version());
-+
 +
      RtlAcquirePebLock();
      InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks );
      RtlReleasePebLock();
 -- 
-2.30.2
+2.33.0
 

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

@@ -1,25 +1,25 @@
-From cfcc687562d4fa68b507cbf2c29722ef523d26aa Mon Sep 17 00:00:00 2001
+From 8aa6fb73e3142d86ba354c204313b8a74a5fa43d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
- Makefile.in | 2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index b52495f741f..d5a8cad20da 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -116,7 +116,7 @@ install-manpages:: manpages
- # Rules for generated source files
- 
- dlls/ntdll/unix/version.c: dummy
--	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
-+	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
+diff --git a/configure.ac b/configure.ac
+index f86a5decb07..3d7f9cc96e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3910,7 +3910,7 @@ dnl Rules for generated source files
  
+ WINE_APPEND_RULE(
+ [dlls/ntdll/unix/version.c: dummy
+-	@version=\`(GIT_DIR=${wine_srcdir}.git git describe HEAD 2>/dev/null || echo \"wine-\$(PACKAGE_VERSION)\") | sed -n -e '\$\$s/\(.*\)/const char wine_build[[]] = \"\\1\";/p'\` && (echo \$\$version | cmp -s - \$[@]) || echo \$\$version >\$[@] || (rm -f \$[@] && exit 1)
++	@version=\`(GIT_DIR=${wine_srcdir}.git git describe HEAD 2>/dev/null || echo \"wine-\$(PACKAGE_VERSION)\") | sed -n -e '\$\$s/\(.*\)/const char wine_build[[]] = \"\\1 (Staging)\";/p'\` && (echo \$\$version | cmp -s - \$[@]) || echo \$\$version >\$[@] || (rm -f \$[@] && exit 1)
  programs/winetest/build.rc: dummy
- 	@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
+ 	@build=\"STRINGTABLE { 1 \\\"\`GIT_DIR=${wine_srcdir}.git git rev-parse HEAD 2>/dev/null\`\\\" }\" && (echo \$\$build | cmp -s - \$[@]) || echo \$\$build >\$[@] || (rm -f \$[@] && exit 1)
+ programs/winetest/build.nfo:
 -- 
-2.20.1
+2.33.0
 

patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch

@@ -1,125 +0,0 @@
-From 0e65ed108eb8bab24668f9a58c5757a3ad36104f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 12 Apr 2016 01:02:34 +0200
-Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
-
----
- dlls/uiautomationcore/Makefile.in |  1 +
- dlls/uiautomationcore/uia_main.c  | 53 +++++++++++++++++++++++++++----
- 2 files changed, 48 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index 5c4acb232a4..412f1dbbe19 100644
---- a/dlls/uiautomationcore/Makefile.in
-+++ b/dlls/uiautomationcore/Makefile.in
-@@ -1,5 +1,6 @@
- MODULE = uiautomationcore.dll
- IMPORTLIB = uiautomationcore
-+IMPORTS   = uuid
- 
- EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
- 
-diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index 42014af6035..61e165d83c0 100644
---- a/dlls/uiautomationcore/uia_main.c
-+++ b/dlls/uiautomationcore/uia_main.c
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright 2016 Michael Müller
-  * Copyright 2017 Jacek Caban for CodeWeavers
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -16,18 +17,58 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
-+#define COBJMACROS
- #include "uiautomation.h"
- 
- #include "wine/debug.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
- 
-+static HRESULT WINAPI dummy_QueryInterface(IUnknown *iface, REFIID iid, void **ppv)
-+{
-+    TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), ppv);
-+
-+    if (!ppv) return E_INVALIDARG;
-+
-+    if (!IsEqualIID(&IID_IUnknown, iid))
-+    {
-+        FIXME("Unknown interface: %s\n", debugstr_guid(iid));
-+        *ppv = NULL;
-+        return E_NOINTERFACE;
-+    }
-+
-+    *ppv = iface;
-+    IUnknown_AddRef((IUnknown *)*ppv);
-+    return S_OK;
-+}
-+
-+static ULONG WINAPI dummy_AddRef(IUnknown *iface)
-+{
-+    FIXME("(%p): stub\n", iface);
-+    return 1;
-+}
-+
-+static ULONG WINAPI dummy_Release(IUnknown *iface)
-+{
-+    FIXME("(%p): stub\n", iface);
-+    return 1;
-+}
-+
-+static const IUnknownVtbl dummy_Vtbl =
-+{
-+    dummy_QueryInterface,
-+    dummy_AddRef,
-+    dummy_Release,
-+};
-+
-+static IUnknown dummy = { &dummy_Vtbl };
-+
- /***********************************************************************
-  *          UiaClientsAreListening (uiautomationcore.@)
-  */
- BOOL WINAPI UiaClientsAreListening(void)
- {
--    FIXME("()\n");
-+    FIXME("(): stub\n");
-     return FALSE;
- }
- 
-@@ -36,8 +77,8 @@ BOOL WINAPI UiaClientsAreListening(void)
-  */
- HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
- {
--    FIXME("(%p) stub!\n", value);
--    *value = NULL;
-+    FIXME("(%p): stub!\n", value);
-+    *value = &dummy;
-     return S_OK;
- }
- 
-@@ -46,8 +87,8 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
-  */
- HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
- {
--    FIXME("(%p) stub!\n", value);
--    *value = NULL;
-+    FIXME("(%p): stub!\n", value);
-+    *value = &dummy;
-     return S_OK;
- }
- 
-@@ -66,7 +107,7 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid)
- LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam,
-         LPARAM lParam, IRawElementProviderSimple *elprov)
- {
--    FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov);
-+    FIXME("(%p, %lx, %lx, %p): stub!\n", hwnd, wParam, lParam, elprov);
-     return 0;
- }
- 
--- 
-2.20.1
-

patches/api-ms-win-core-psapi-K32GetModuleInformation/0001-api-ms-win-core-psapi-l1-1-0-Add-K32GetModuleBaseNam.patch

@@ -1,27 +0,0 @@
-From ebf3df9837ac6707fe831722c7ed24ccd80f95ce Mon Sep 17 00:00:00 2001
-From: Thomas Crider <gloriouseggroll@gmail.com>
-Date: Sat, 29 May 2021 14:39:08 -0600
-Subject: [PATCH] api-ms-win-core-psapi-l1-1-0: Add K32GetModuleBaseNameW and
- K32GetModuleInformation.
-
-Needed for Mass Effect Legendary Edition.
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51199
-Signed-off-by: Thomas Crider <gloriouseggroll@gmail.com>
----
- .../api-ms-win-core-psapi-l1-1-0.spec                           | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec
-index c54c1077843..321fc3fe928 100644
---- a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec
-@@ -14,3 +14,5 @@
- @ stdcall K32QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet
- @ stdcall K32QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx
- @ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) kernel32.QueryFullProcessImageNameW
-+@ stdcall K32GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW
-+@ stdcall K32GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation
--- 
-2.30.2
-

patches/api-ms-win-core-psapi-K32GetModuleInformation/0002-api-ms-win-core-psapi-ansi-l1-1-0-add-K32GetModuleBa.patch

@@ -1,25 +0,0 @@
-From c96b3a0632721f8849fb1d8404272b5007c1d1b4 Mon Sep 17 00:00:00 2001
-From: Thomas Crider <gloriouseggroll@gmail.com>
-Date: Sat, 29 May 2021 14:39:09 -0600
-Subject: [PATCH] api-ms-win-core-psapi-ansi-l1-1-0: add K32GetModuleBaseNameA
-
-Needed for Mass Effect Legendary Edition.
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51199
-Signed-off-by: Thomas Crider <gloriouseggroll@gmail.com>
----
- .../api-ms-win-core-psapi-ansi-l1-1-0.spec                       | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec
-index e4f758581f6..340198c6edf 100644
---- a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec
-@@ -4,3 +4,4 @@
- @ stdcall K32GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA
- @ stdcall K32GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA
- @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) kernel32.QueryFullProcessImageNameA
-+@ stdcall K32GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA
--- 
-2.30.2
-

patches/api-ms-win-core-psapi-K32GetModuleInformation/definition

@@ -1 +0,0 @@
-Fixes: [51199] Add missing api-ms-win-core-psapi forwards

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

@@ -1,4 +1,4 @@
-From 6d925cb20409888ada3e469a2a09b1bfc726fa79 Mon Sep 17 00:00:00 2001
+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.
@@ -8,17 +8,16 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  dlls/bcrypt/Makefile.in       |   3 +-
  dlls/bcrypt/bcrypt_internal.h |   3 +
  dlls/bcrypt/gnutls.c          |  32 ++++--
- dlls/bcrypt/macos.c           |  18 ++-
- dlls/bcrypt/unixlib.c         | 211 ++++++++++++++++++++++++++++++++++
- 5 files changed, 252 insertions(+), 15 deletions(-)
+ 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 24803fb2d7c..46a20d473dd 100644
+index 63a731fa9d9..6dd3066d4a5 100644
 --- a/dlls/bcrypt/Makefile.in
 +++ b/dlls/bcrypt/Makefile.in
-@@ -11,6 +11,7 @@ C_SRCS = \
- 	macos.c \
+@@ -8,6 +8,7 @@ C_SRCS = \
+ 	gnutls.c \
  	md2.c \
  	sha256.c \
 -	sha512.c
@@ -27,10 +26,10 @@ index 24803fb2d7c..46a20d473dd 100644
  
  RC_SRCS = version.rc
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index eb136111509..3c7110d05f8 100644
+index 61c367cae9d..d0697ed807e 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -218,4 +218,7 @@ struct key_funcs
+@@ -219,4 +219,7 @@ struct key_funcs
      NTSTATUS (CDECL *key_import_rsa)( struct key *, UCHAR *, ULONG );
  };
  
@@ -39,10 +38,10 @@ index eb136111509..3c7110d05f8 100644
 +
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index 2f0c62bc6da..4a9dcf9de8a 100644
+index 7b1bceda889..66845ffc8cf 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -372,9 +372,12 @@ fail:
+@@ -373,9 +373,12 @@ fail:
  
  static void gnutls_uninitialize(void)
  {
@@ -58,7 +57,7 @@ index 2f0c62bc6da..4a9dcf9de8a 100644
  }
  
  struct buffer
-@@ -1899,19 +1902,28 @@ static const struct key_funcs key_funcs =
+@@ -1894,19 +1897,28 @@ static const struct key_funcs key_funcs =
      key_import_rsa
  };
  
@@ -94,42 +93,12 @@ index 2f0c62bc6da..4a9dcf9de8a 100644
 +    return NULL;
 +}
 +#endif
-diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 44906519cef..2a88aec8362 100644
---- a/dlls/bcrypt/macos.c
-+++ b/dlls/bcrypt/macos.c
-@@ -302,11 +302,21 @@ static const struct key_funcs key_funcs =
-     key_import_rsa
- };
- 
--NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
-+struct key_funcs * macos_lib_init( DWORD reason )
- {
--    if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS;
--    *(const struct key_funcs **)ptr_out = &key_funcs;
--    return STATUS_SUCCESS;
-+    if (reason != DLL_PROCESS_ATTACH) return NULL;
-+    return &key_funcs;
- }
- 
-+#else
-+#include "ntstatus.h"
-+#define WIN32_NO_STATUS
-+#include "windef.h"
-+#include "winbase.h"
-+#include "winternl.h"
-+
-+struct key_funcs * macos_lib_init( DWORD reason )
-+{
-+    return NULL;
-+}
- #endif
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
 new file mode 100644
-index 00000000000..9cbb25f5740
+index 00000000000..1937a8172a4
 --- /dev/null
 +++ b/dlls/bcrypt/unixlib.c
-@@ -0,0 +1,211 @@
+@@ -0,0 +1,208 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -262,7 +231,7 @@ index 00000000000..9cbb25f5740
 +}
 +
 +static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len,
-+        UCHAR *output, ULONG *output_len )
++        UCHAR *output, ULONG output_len, ULONG *ret)
 +{
 +    FIXME( "not implemented\n" );
 +    return STATUS_NOT_IMPLEMENTED;
@@ -301,13 +270,10 @@ index 00000000000..9cbb25f5740
 +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
 +{
 +    struct key_funcs *gnutls_funcs = gnutls_lib_init(reason);
-+    struct key_funcs *macos_funcs = macos_lib_init(reason);
 +
 +    if (reason == DLL_PROCESS_ATTACH)
 +    {
 +#define RESOLVE_FUNC(name) \
-+        if (macos_funcs && macos_funcs->key_##name) \
-+            key_funcs.key_##name = macos_funcs->key_##name; \
 +        if (gnutls_funcs && gnutls_funcs->key_##name) \
 +            key_funcs.key_##name = gnutls_funcs->key_##name;
 +
@@ -342,5 +308,5 @@ index 00000000000..9cbb25f5740
 +
 +#endif
 -- 
-2.30.2
+2.33.0
 

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

@@ -1,4 +1,4 @@
-From e2442f39015a5982bfd15479ee06d7163d36771d Mon Sep 17 00:00:00 2001
+From 528d7188ba7d6e68622d1b4f95608e68f26e1852 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 2 Oct 2020 12:11:49 -0500
 Subject: [PATCH] bcrypt: Implement BCryptSecretAgreement with libgcrypt.
@@ -11,17 +11,16 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  dlls/bcrypt/bcrypt_main.c     |  55 ++++++-
  dlls/bcrypt/gcrypt.c          | 292 ++++++++++++++++++++++++++++++++++
  dlls/bcrypt/gnutls.c          |   3 +-
- dlls/bcrypt/macos.c           |   3 +-
  dlls/bcrypt/tests/bcrypt.c    |   2 +-
  dlls/bcrypt/unixlib.c         |  13 +-
- 9 files changed, 378 insertions(+), 9 deletions(-)
+ 8 files changed, 376 insertions(+), 8 deletions(-)
  create mode 100644 dlls/bcrypt/gcrypt.c
 
 diff --git a/configure.ac b/configure.ac
-index b6b8d49342f3..7c1c8a7ddaf4 100644
+index f2401734035..b47f8d016e0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -46,6 +46,7 @@ AC_ARG_WITH(faudio,    AS_HELP_STRING([--without-faudio],[do not use FAudio (XAu
+@@ -47,6 +47,7 @@ AC_ARG_WITH(faudio,    AS_HELP_STRING([--without-faudio],[do not use FAudio (XAu
  AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms]))
  AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]))
  AC_ARG_WITH(freetype,  AS_HELP_STRING([--without-freetype],[do not use the FreeType library]))
@@ -29,7 +28,7 @@ index b6b8d49342f3..7c1c8a7ddaf4 100644
  AC_ARG_WITH(gettext,   AS_HELP_STRING([--without-gettext],[do not use gettext]))
  AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]),
              [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi])
-@@ -1989,6 +1990,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
+@@ -1954,6 +1955,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
                   [vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.])
  test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no}
  
@@ -50,22 +49,22 @@ index b6b8d49342f3..7c1c8a7ddaf4 100644
  
  AC_SUBST(EXTRACFLAGS,"")
 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
-index 46a20d473dd7..4a3016784af3 100644
+index 6dd3066d4a5..5336c8fc66b 100644
 --- a/dlls/bcrypt/Makefile.in
 +++ b/dlls/bcrypt/Makefile.in
-@@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin
+@@ -5,6 +5,7 @@ EXTRAINCL = $(GNUTLS_CFLAGS)
  
  C_SRCS = \
  	bcrypt_main.c \
 +	gcrypt.c \
  	gnutls.c \
- 	macos.c \
  	md2.c \
+ 	sha256.c \
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 3c7110d05f84..e7991eac077a 100644
+index d0697ed807e..66898c58cd2 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -192,6 +192,8 @@ struct key
+@@ -193,6 +193,8 @@ struct key
  struct secret
  {
      struct object hdr;
@@ -74,7 +73,7 @@ index 3c7110d05f84..e7991eac077a 100644
  };
  
  struct key_funcs
-@@ -216,9 +218,11 @@ struct key_funcs
+@@ -217,9 +219,11 @@ struct key_funcs
      NTSTATUS (CDECL *key_import_dsa_capi)( struct key *, UCHAR *, ULONG );
      NTSTATUS (CDECL *key_import_ecc)( struct key *, UCHAR *, ULONG );
      NTSTATUS (CDECL *key_import_rsa)( struct key *, UCHAR *, ULONG );
@@ -87,10 +86,10 @@ index 3c7110d05f84..e7991eac077a 100644
  
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index a1423dcd8368..0655c5dcfe81 100644
+index 5eb50cd616b..570f452d78e 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1932,9 +1932,12 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
+@@ -1925,9 +1925,12 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
  {
      struct key *privkey = privatekey;
      struct key *pubkey = publickey;
@@ -104,7 +103,7 @@ index a1423dcd8368..0655c5dcfe81 100644
  
      if (!privkey || privkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
      if (!pubkey || pubkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE;
-@@ -1943,18 +1946,39 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
+@@ -1936,18 +1939,39 @@ NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_H
      if (!(secret = heap_alloc_zero( sizeof(*secret) ))) return STATUS_NO_MEMORY;
      secret->hdr.magic = MAGIC_SECRET;
  
@@ -146,7 +145,7 @@ index a1423dcd8368..0655c5dcfe81 100644
      heap_free( secret );
      return STATUS_SUCCESS;
  }
-@@ -1964,12 +1988,33 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
+@@ -1957,12 +1981,33 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCrypt
  {
      struct secret *secret = handle;
  
@@ -184,7 +183,7 @@ index a1423dcd8368..0655c5dcfe81 100644
  BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 diff --git a/dlls/bcrypt/gcrypt.c b/dlls/bcrypt/gcrypt.c
 new file mode 100644
-index 000000000000..e72c27feb519
+index 00000000000..e72c27feb51
 --- /dev/null
 +++ b/dlls/bcrypt/gcrypt.c
 @@ -0,0 +1,292 @@
@@ -481,10 +480,10 @@ index 000000000000..e72c27feb519
 +}
 +#endif
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index 9490ea8612a8..78d0f2d95966 100644
+index 66845ffc8cf..64825f5b99b 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -1949,7 +1949,8 @@ static const struct key_funcs key_funcs =
+@@ -1894,7 +1894,8 @@ static const struct key_funcs key_funcs =
      key_export_ecc,
      key_import_dsa_capi,
      key_import_ecc,
@@ -494,25 +493,11 @@ index 9490ea8612a8..78d0f2d95966 100644
  };
  
  struct key_funcs * gnutls_lib_init( DWORD reason )
-diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 2a88aec8362c..3ee3515f9de2 100644
---- a/dlls/bcrypt/macos.c
-+++ b/dlls/bcrypt/macos.c
-@@ -299,7 +299,8 @@ static const struct key_funcs key_funcs =
-     key_export_ecc,
-     key_import_dsa_capi,
-     key_import_ecc,
--    key_import_rsa
-+    key_import_rsa,
-+    NULL
- };
- 
- struct key_funcs * macos_lib_init( DWORD reason )
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 456727d04a96..6be406dee21f 100644
+index fb5ac03b039..894473d5346 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -2163,7 +2163,7 @@ static void test_ECDH(void)
+@@ -2248,7 +2248,7 @@ static void test_ECDH(void)
          goto raw_secret_end;
      }
  
@@ -522,7 +507,7 @@ index 456727d04a96..6be406dee21f 100644
      if (status != STATUS_SUCCESS)
      {
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
-index 9cbb25f5740c..6f8ff7f97887 100644
+index 1937a8172a4..e684a608eb5 100644
 --- a/dlls/bcrypt/unixlib.c
 +++ b/dlls/bcrypt/unixlib.c
 @@ -142,6 +142,12 @@ static NTSTATUS CDECL key_import_rsa( struct key *key, UCHAR *input, ULONG input
@@ -538,7 +523,7 @@ index 9cbb25f5740c..6f8ff7f97887 100644
  static struct key_funcs key_funcs =
  {
      key_set_property,
-@@ -164,12 +170,14 @@ static struct key_funcs key_funcs =
+@@ -164,17 +170,21 @@ static struct key_funcs key_funcs =
      key_import_dsa_capi,
      key_import_ecc,
      key_import_rsa,
@@ -548,14 +533,11 @@ index 9cbb25f5740c..6f8ff7f97887 100644
  NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
  {
      struct key_funcs *gnutls_funcs = gnutls_lib_init(reason);
-     struct key_funcs *macos_funcs = macos_lib_init(reason);
 +    struct key_funcs *gcrypt_funcs = gcrypt_lib_init(reason);
  
      if (reason == DLL_PROCESS_ATTACH)
      {
-@@ -177,7 +185,9 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
-         if (macos_funcs && macos_funcs->key_##name) \
-             key_funcs.key_##name = macos_funcs->key_##name; \
+ #define RESOLVE_FUNC(name) \
          if (gnutls_funcs && gnutls_funcs->key_##name) \
 -            key_funcs.key_##name = gnutls_funcs->key_##name;
 +            key_funcs.key_##name = gnutls_funcs->key_##name; \
@@ -564,7 +546,7 @@ index 9cbb25f5740c..6f8ff7f97887 100644
  
          RESOLVE_FUNC(set_property)
          RESOLVE_FUNC(symmetric_init)
-@@ -199,6 +209,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
+@@ -196,6 +206,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p
          RESOLVE_FUNC(import_dsa_capi)
          RESOLVE_FUNC(import_ecc)
          RESOLVE_FUNC(import_rsa)
@@ -573,5 +555,5 @@ index 9cbb25f5740c..6f8ff7f97887 100644
  #undef RESOLVE_FUNC
  
 -- 
-2.29.2
+2.33.0
 

patches/bcrypt-ECDHSecretAgreement/definition

@@ -2,3 +2,5 @@ Fixes: [47699] Multiple games fail to connect to online services (missing BCrypt
 # 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/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch

@@ -1,4 +1,4 @@
-From 50bd67fb1fd718eaaf9f5600fba7ab86e4b71a76 Mon Sep 17 00:00:00 2001
+From a5045503cf3310058cc64814ff9626f4877a13bb Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 5 Jul 2019 13:20:23 +0800
 Subject: [PATCH] cryptext: Implement CryptExtOpenCER.
@@ -17,10 +17,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  create mode 100644 dlls/cryptext/tests/cryptext.c
 
 diff --git a/configure b/configure
-index 2b20133cd65..f3ef3aef3a9 100755
+index db592f0868d..ba13abacc46 100755
 --- a/configure
 +++ b/configure
-@@ -20350,6 +20350,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -20291,6 +20291,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
  wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg
  wine_fn_config_makefile dlls/cryptdll enable_cryptdll
  wine_fn_config_makefile dlls/cryptext enable_cryptext
@@ -29,10 +29,10 @@ index 2b20133cd65..f3ef3aef3a9 100755
  wine_fn_config_makefile dlls/cryptnet/tests enable_tests
  wine_fn_config_makefile dlls/cryptsp enable_cryptsp
 diff --git a/configure.ac b/configure.ac
-index 24f5c8847d6..f71fb6f401d 100644
+index d449b88fb19..af75e0e80ab 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3083,6 +3083,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -3029,6 +3029,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
@@ -41,7 +41,7 @@ index 24f5c8847d6..f71fb6f401d 100644
  WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptsp)
 diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
-index 3acce60ae88..590074a806f 100644
+index 0ec2b8a2045..76accca43eb 100644
 --- a/dlls/cryptext/Makefile.in
 +++ b/dlls/cryptext/Makefile.in
 @@ -1,4 +1,5 @@
@@ -49,10 +49,10 @@ index 3acce60ae88..590074a806f 100644
 +MODULE  = cryptext.dll
 +IMPORTS = crypt32 cryptui user32
  
- EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+ EXTRADLLFLAGS = -Wb,--prefer-native
  
 diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec
-index 0dba38e3934..911ab2f4ba4 100644
+index ee3e155f457..24b4794c198 100644
 --- a/dlls/cryptext/cryptext.spec
 +++ b/dlls/cryptext/cryptext.spec
 @@ -12,8 +12,8 @@
@@ -227,5 +227,5 @@ index 00000000000..cc62a772b59
 +    test_CryptExtOpenCER();
 +}
 -- 
-2.20.1
+2.33.0
 

patches/d3d11-Deferred_Context/0013-wined3d-Implement-wined3d_deferred_context_update_su.patch

@@ -1,92 +0,0 @@
-From f0cfa1dc94330d07589e09ae5961956364adac4d Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <z.figura12@gmail.com>
-Date: Fri, 14 May 2021 15:51:55 -0500
-Subject: [PATCH] wined3d: Implement
- wined3d_deferred_context_update_sub_resource().
-
-Needed by Wolcen: Lords of Mayhem.
-
-Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
----
- dlls/wined3d/cs.c | 37 +++++++++++++++++++++++++++++++++----
- 1 file changed, 33 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
-index 50a08334dab..e6f84134795 100644
---- a/dlls/wined3d/cs.c
-+++ b/dlls/wined3d/cs.c
-@@ -490,6 +490,7 @@ struct wined3d_cs_update_sub_resource
-     unsigned int sub_resource_idx;
-     struct wined3d_box box;
-     struct wined3d_sub_resource_data data;
-+    /* If data.data is NULL, the structure is followed by the data in memory. */
- };
- 
- struct wined3d_cs_add_dirty_texture_region
-@@ -2597,6 +2598,7 @@ void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context
- static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data)
- {
-     const struct wined3d_cs_update_sub_resource *op = data;
-+    const void *src_data = op->data.data ? op->data.data : (const BYTE *)(op + 1);
-     struct wined3d_resource *resource = op->resource;
-     const struct wined3d_box *box = &op->box;
-     unsigned int width, height, depth, level;
-@@ -2617,7 +2619,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi
-             goto done;
-         }
- 
--        wined3d_buffer_upload_data(buffer, context, box, op->data.data);
-+        wined3d_buffer_upload_data(buffer, context, box, src_data);
-         wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER);
-         goto done;
-     }
-@@ -2630,7 +2632,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi
-     depth = wined3d_texture_get_level_depth(texture, level);
- 
-     addr.buffer_object = 0;
--    addr.addr = op->data.data;
-+    addr.addr = src_data;
- 
-     /* Only load the sub-resource for partial updates. */
-     if (!box->left && !box->top && !box->front
-@@ -3375,8 +3377,35 @@ static void wined3d_deferred_context_update_sub_resource(struct wined3d_device_c
-         struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box,
-         const void *data, unsigned int row_pitch, unsigned int slice_pitch)
- {
--    FIXME("context %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, slice_pitch %u, stub!\n",
--            context, resource, sub_resource_idx, debug_box(box), data, row_pitch, slice_pitch);
-+    struct wined3d_cs_update_sub_resource *op;
-+    size_t data_size;
-+
-+    if (resource->type == WINED3D_RTYPE_BUFFER)
-+    {
-+        data_size = box->right - box->left;
-+    }
-+    else
-+    {
-+        const struct wined3d_format *format = resource->format;
-+
-+        data_size = (box->back - box->front - 1) * slice_pitch
-+                + ((box->bottom - box->top - 1) / format->block_height) * row_pitch
-+                + ((box->right - box->left + format->block_width - 1) / format->block_width) * format->block_byte_count;
-+    }
-+
-+    op = wined3d_device_context_require_space(context, sizeof(*op) + data_size, WINED3D_CS_QUEUE_DEFAULT);
-+    op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE;
-+    op->resource = resource;
-+    op->sub_resource_idx = sub_resource_idx;
-+    op->box = *box;
-+    op->data.row_pitch = row_pitch;
-+    op->data.slice_pitch = slice_pitch;
-+    op->data.data = NULL;
-+    memcpy(op + 1, data, data_size);
-+
-+    wined3d_device_context_acquire_resource(context, resource);
-+
-+    wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
- }
- 
- static void wined3d_deferred_context_issue_query(struct wined3d_device_context *context,
--- 
-2.30.2
-

patches/d3d11-Deferred_Context/0014-wined3d-Implement-wined3d_deferred_context_map.patch

@@ -1,461 +0,0 @@
-From cff68ab6407f62fa76e00d28532f741aa6498ad1 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <z.figura12@gmail.com>
-Date: Wed, 19 May 2021 19:00:56 -0500
-Subject: [PATCH] wined3d: Implement wined3d_deferred_context_map().
-
-Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
----
- dlls/d3d11/tests/d3d11.c       |  15 +---
- dlls/wined3d/buffer.c          |  14 ++++
- dlls/wined3d/cs.c              | 136 ++++++++++++++++++++++++++++++---
- dlls/wined3d/resource.c        |  29 +++----
- dlls/wined3d/texture.c         |  25 ++++++
- dlls/wined3d/wined3d_private.h |   5 ++
- 6 files changed, 189 insertions(+), 35 deletions(-)
-
-diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index 408c0492cd2..a2fdc116e61 100644
---- a/dlls/d3d11/tests/d3d11.c
-+++ b/dlls/d3d11/tests/d3d11.c
-@@ -32735,21 +32735,14 @@ static void test_deferred_context_map(void)
-     ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- 
-     hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE, 0, &map_desc);
--    todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
-+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- 
-     hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map_desc);
--    todo_wine ok(hr == D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD, "Got unexpected hr %#x.\n", hr);
-+    ok(hr == D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD, "Got unexpected hr %#x.\n", hr);
- 
-     hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc);
--    todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
--    if (hr != S_OK)
--    {
--        ID3D11Buffer_Release(buffer2);
--        ID3D11Buffer_Release(buffer);
--        ID3D11DeviceContext_Release(deferred);
--        release_test_context(&test_context);
--        return;
--    }
-+    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
-+
-     map_data = map_desc.pData;
-     /* The previous contents of map_data are undefined and may in practice be
-      * uninitialized garbage. */
-diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
-index 12d038c0120..12b90cb54c2 100644
---- a/dlls/wined3d/buffer.c
-+++ b/dlls/wined3d/buffer.c
-@@ -826,6 +826,19 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe
-     return &buffer->resource;
- }
- 
-+static HRESULT buffer_resource_sub_resource_get_size(struct wined3d_resource *resource,
-+        unsigned int sub_resource_idx, unsigned int *size, unsigned int *row_pitch, unsigned int *slice_pitch)
-+{
-+    if (sub_resource_idx)
-+    {
-+        WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx);
-+        return E_INVALIDARG;
-+    }
-+
-+    *size = *row_pitch = *slice_pitch = resource->size;
-+    return S_OK;
-+}
-+
- static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-         struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags)
- {
-@@ -1084,6 +1097,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
-     buffer_resource_decref,
-     buffer_resource_preload,
-     buffer_resource_unload,
-+    buffer_resource_sub_resource_get_size,
-     buffer_resource_sub_resource_map,
-     buffer_resource_sub_resource_unmap,
- };
-diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
-index e6f84134795..1f7213232fa 100644
---- a/dlls/wined3d/cs.c
-+++ b/dlls/wined3d/cs.c
-@@ -26,6 +26,13 @@ WINE_DECLARE_DEBUG_CHANNEL(fps);
- 
- #define WINED3D_INITIAL_CS_SIZE 4096
- 
-+struct wined3d_acquired_resource
-+{
-+    struct wined3d_resource *resource;
-+    unsigned int sub_resource_idx;
-+    void *sysmem;
-+};
-+
- struct wined3d_command_list
- {
-     LONG refcount;
-@@ -36,7 +43,7 @@ struct wined3d_command_list
-     void *data;
- 
-     SIZE_T resource_count;
--    struct wined3d_resource **resources;
-+    struct wined3d_acquired_resource *resources;
- 
-     /* List of command lists queued for execution on this command list. We might
-      * be the only thing holding a pointer to another command list, so we need
-@@ -48,9 +55,13 @@ struct wined3d_command_list
- static void wined3d_command_list_destroy_object(void *object)
- {
-     struct wined3d_command_list *list = object;
-+    SIZE_T i;
- 
-     TRACE("list %p.\n", list);
- 
-+    for (i = 0; i < list->resource_count; ++i)
-+        wined3d_free_sysmem(list->resources[i].sysmem);
-+
-     heap_free(list->resources);
-     heap_free(list->data);
-     heap_free(list);
-@@ -79,7 +90,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list)
-         for (i = 0; i < list->command_list_count; ++i)
-             wined3d_command_list_decref(list->command_lists[i]);
-         for (i = 0; i < list->resource_count; ++i)
--            wined3d_resource_decref(list->resources[i]);
-+            wined3d_resource_decref(list->resources[i].resource);
- 
-         wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list);
-     }
-@@ -139,6 +150,7 @@ enum wined3d_cs_op
-     WINED3D_CS_OP_COPY_UAV_COUNTER,
-     WINED3D_CS_OP_GENERATE_MIPMAPS,
-     WINED3D_CS_OP_EXECUTE_COMMAND_LIST,
-+    WINED3D_CS_OP_UPLOAD_SUB_RESOURCE,
-     WINED3D_CS_OP_STOP,
- };
- 
-@@ -469,6 +481,15 @@ struct wined3d_cs_unmap
-     HRESULT *hr;
- };
- 
-+struct wined3d_cs_upload_sub_resource
-+{
-+    enum wined3d_cs_op opcode;
-+    struct wined3d_resource *resource;
-+    unsigned int sub_resource_idx;
-+    unsigned int size;
-+    const void *data;
-+};
-+
- struct wined3d_cs_blt_sub_resource
- {
-     enum wined3d_cs_op opcode;
-@@ -616,6 +637,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op)
-         WINED3D_TO_STR(WINED3D_CS_OP_COPY_UAV_COUNTER);
-         WINED3D_TO_STR(WINED3D_CS_OP_GENERATE_MIPMAPS);
-         WINED3D_TO_STR(WINED3D_CS_OP_EXECUTE_COMMAND_LIST);
-+        WINED3D_TO_STR(WINED3D_CS_OP_UPLOAD_SUB_RESOURCE);
-         WINED3D_TO_STR(WINED3D_CS_OP_STOP);
- #undef WINED3D_TO_STR
-     }
-@@ -2342,7 +2364,7 @@ static void wined3d_cs_execute_command_list(struct wined3d_device_context *conte
-     op->list = list;
- 
-     for (i = 0; i < list->resource_count; ++i)
--        wined3d_resource_acquire(list->resources[i]);
-+        wined3d_resource_acquire(list->resources[i].resource);
- 
-     wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
- 
-@@ -2463,6 +2485,28 @@ static HRESULT wined3d_cs_unmap(struct wined3d_device_context *context, struct w
-     return hr;
- }
- 
-+static void wined3d_cs_exec_upload_sub_resource(struct wined3d_cs *cs, const void *data)
-+{
-+    const struct wined3d_cs_upload_sub_resource *op = data;
-+    struct wined3d_resource *resource = op->resource;
-+    unsigned int sub_resource_idx = op->sub_resource_idx;
-+    struct wined3d_map_desc map_desc;
-+    HRESULT hr;
-+
-+    if (FAILED(hr = resource->resource_ops->resource_sub_resource_map(resource,
-+            sub_resource_idx, &map_desc, NULL, WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD)))
-+    {
-+        ERR("Failed to map resource, hr %#x.\n", hr);
-+        return;
-+    }
-+
-+    memcpy(map_desc.data, op->data, op->size);
-+
-+    resource->resource_ops->resource_sub_resource_unmap(resource, sub_resource_idx);
-+
-+    wined3d_resource_release(resource);
-+}
-+
- static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void *data)
- {
-     const struct wined3d_cs_blt_sub_resource *op = data;
-@@ -2870,6 +2914,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
-     /* WINED3D_CS_OP_COPY_UAV_COUNTER            */ wined3d_cs_exec_copy_uav_counter,
-     /* WINED3D_CS_OP_GENERATE_MIPMAPS            */ wined3d_cs_exec_generate_mipmaps,
-     /* WINED3D_CS_OP_EXECUTE_COMMAND_LIST        */ wined3d_cs_exec_execute_command_list,
-+    /* WINED3D_CS_OP_UPLOAD_SUB_RESOURCE         */ wined3d_cs_exec_upload_sub_resource,
- };
- 
- static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data)
-@@ -3301,7 +3346,7 @@ struct wined3d_deferred_context
-     void *data;
- 
-     SIZE_T resource_count, resources_capacity;
--    struct wined3d_resource **resources;
-+    struct wined3d_acquired_resource *resources;
- 
-     /* List of command lists queued for execution on this context. A command
-      * list can be the only thing holding a pointer to another command list, so
-@@ -3361,16 +3406,78 @@ static HRESULT wined3d_deferred_context_map(struct wined3d_device_context *conte
-         struct wined3d_resource *resource, unsigned int sub_resource_idx,
-         struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags)
- {
--    FIXME("context %p, resource %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x, stub!\n",
--            context, resource, sub_resource_idx, map_desc, box, flags);
--    return E_NOTIMPL;
-+    struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context);
-+    struct wined3d_acquired_resource *acquired_resource;
-+    unsigned int size;
-+    HRESULT hr;
-+
-+    if (box)
-+    {
-+        ERR("Unexpected box.\n");
-+        return E_INVALIDARG;
-+    }
-+
-+    if (FAILED(hr = resource->resource_ops->resource_sub_resource_get_size(resource,
-+            sub_resource_idx, &size, &map_desc->row_pitch, &map_desc->slice_pitch)))
-+        return E_INVALIDARG;
-+
-+    if (flags & WINED3D_MAP_DISCARD)
-+    {
-+        struct wined3d_cs_upload_sub_resource *op;
-+        void *sysmem;
-+
-+        if (!(sysmem = wined3d_allocate_sysmem(size)))
-+            return E_OUTOFMEMORY;
-+
-+        if (!wined3d_array_reserve((void **)&deferred->resources, &deferred->resources_capacity,
-+                deferred->resource_count + 1, sizeof(*deferred->resources)))
-+            return E_OUTOFMEMORY;
-+
-+        acquired_resource = &deferred->resources[deferred->resource_count++];
-+        acquired_resource->resource = resource;
-+        wined3d_resource_incref(resource);
-+        acquired_resource->sub_resource_idx = sub_resource_idx;
-+        acquired_resource->sysmem = sysmem;
-+
-+        op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
-+        op->opcode = WINED3D_CS_OP_UPLOAD_SUB_RESOURCE;
-+        op->resource = resource;
-+        op->sub_resource_idx = sub_resource_idx;
-+        op->size = size;
-+        op->data = sysmem;
-+
-+        map_desc->data = sysmem;
-+        return S_OK;
-+    }
-+    else if (flags & WINED3D_MAP_NOOVERWRITE)
-+    {
-+        int i = deferred->resource_count;
-+
-+        while (i--)
-+        {
-+            acquired_resource = &deferred->resources[i];
-+
-+            if (acquired_resource->resource == resource
-+                    && acquired_resource->sub_resource_idx == sub_resource_idx && acquired_resource->sysmem)
-+            {
-+                map_desc->data = acquired_resource->sysmem;
-+                return S_OK;
-+            }
-+        }
-+
-+        return D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD;
-+    }
-+    else
-+    {
-+        WARN("Invalid flags %#x, returning E_INVALIDARG.\n", flags);
-+        return E_INVALIDARG;
-+    }
- }
- 
- static HRESULT wined3d_deferred_context_unmap(struct wined3d_device_context *context,
-         struct wined3d_resource *resource, unsigned int sub_resource_idx)
- {
--    FIXME("context %p, resource %p, sub_resource_idx %u, stub!\n", context, resource, sub_resource_idx);
--    return E_NOTIMPL;
-+    return S_OK;
- }
- 
- static void wined3d_deferred_context_update_sub_resource(struct wined3d_device_context *context,
-@@ -3423,13 +3530,17 @@ static void wined3d_deferred_context_acquire_resource(struct wined3d_device_cont
-         struct wined3d_resource *resource)
- {
-     struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context);
-+    struct wined3d_acquired_resource *acquired_resource;
- 
-     if (!wined3d_array_reserve((void **)&deferred->resources, &deferred->resources_capacity,
-             deferred->resource_count + 1, sizeof(*deferred->resources)))
-         return;
- 
--    deferred->resources[deferred->resource_count++] = resource;
-+    acquired_resource = &deferred->resources[deferred->resource_count++];
-+    acquired_resource->resource = resource;
-     wined3d_resource_incref(resource);
-+    acquired_resource->sub_resource_idx = 0;
-+    acquired_resource->sysmem = NULL;
- }
- 
- static void wined3d_deferred_context_execute_command_list(struct wined3d_device_context *context,
-@@ -3504,7 +3615,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte
-     TRACE("context %p.\n", context);
- 
-     for (i = 0; i < deferred->resource_count; ++i)
--        wined3d_resource_decref(deferred->resources[i]);
-+    {
-+        wined3d_resource_decref(deferred->resources[i].resource);
-+        wined3d_free_sysmem(deferred->resources[i].sysmem);
-+    }
-     heap_free(deferred->resources);
- 
-     wined3d_state_destroy(deferred->c.state);
-diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index 58e3e5c77fd..42e45a2745c 100644
---- a/dlls/wined3d/resource.c
-+++ b/dlls/wined3d/resource.c
-@@ -334,24 +334,32 @@ void CDECL wined3d_resource_preload(struct wined3d_resource *resource)
-     wined3d_cs_emit_preload_resource(resource->device->cs, resource);
- }
- 
--static BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource)
-+void *wined3d_allocate_sysmem(SIZE_T size)
- {
-     void **p;
--    SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p);
-+    static const SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p);
-     void *mem;
- 
--    if (!(mem = heap_alloc_zero(resource->size + align)))
-+    if (!(mem = heap_alloc_zero(size + align)))
-     {
-         ERR("Failed to allocate system memory.\n");
--        return FALSE;
-+        return NULL;
-     }
- 
-     p = (void **)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)) - 1;
-     *p = mem;
- 
--    resource->heap_memory = ++p;
-+    return ++p;
-+}
- 
--    return TRUE;
-+void wined3d_free_sysmem(void *mem)
-+{
-+    void **p = mem;
-+
-+    if (!p)
-+        return;
-+
-+    heap_free(*(--p));
- }
- 
- BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource)
-@@ -359,17 +367,12 @@ BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource)
-     if (resource->heap_memory)
-         return TRUE;
- 
--    return wined3d_resource_allocate_sysmem(resource);
-+    return !!(resource->heap_memory = wined3d_allocate_sysmem(resource->size));
- }
- 
- void wined3d_resource_free_sysmem(struct wined3d_resource *resource)
- {
--    void **p = resource->heap_memory;
--
--    if (!p)
--        return;
--
--    heap_free(*(--p));
-+    wined3d_free_sysmem(resource->heap_memory);
-     resource->heap_memory = NULL;
- }
- 
-diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index c7a9b4da3e1..663503bdf39 100644
---- a/dlls/wined3d/texture.c
-+++ b/dlls/wined3d/texture.c
-@@ -3506,6 +3506,30 @@ static void texture_resource_unload(struct wined3d_resource *resource)
-     resource_unload(&texture->resource);
- }
- 
-+static HRESULT texture_resource_sub_resource_get_size(struct wined3d_resource *resource,
-+        unsigned int sub_resource_idx, unsigned int *size, unsigned int *row_pitch, unsigned int *slice_pitch)
-+{
-+    struct wined3d_texture *texture = texture_from_resource(resource);
-+    unsigned int texture_level = sub_resource_idx % texture->level_count;
-+    struct wined3d_texture_sub_resource *sub_resource;
-+
-+    if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx)))
-+        return E_INVALIDARG;
-+
-+    if (resource->format_flags & WINED3DFMT_FLAG_BROKEN_PITCH)
-+    {
-+        *row_pitch = wined3d_texture_get_level_width(texture, texture_level) * resource->format->byte_count;
-+        *slice_pitch = wined3d_texture_get_level_height(texture, texture_level) * (*row_pitch);
-+    }
-+    else
-+    {
-+        wined3d_texture_get_pitch(texture, texture_level, row_pitch, slice_pitch);
-+    }
-+
-+    *size = sub_resource->size;
-+    return S_OK;
-+}
-+
- static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-         struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags)
- {
-@@ -3692,6 +3716,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
-     texture_resource_decref,
-     texture_resource_preload,
-     texture_resource_unload,
-+    texture_resource_sub_resource_get_size,
-     texture_resource_sub_resource_map,
-     texture_resource_sub_resource_unmap,
- };
-diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 8e3efccffc2..db6e1619e8f 100644
---- a/dlls/wined3d/wined3d_private.h
-+++ b/dlls/wined3d/wined3d_private.h
-@@ -4048,6 +4048,8 @@ struct wined3d_resource_ops
-     ULONG (*resource_decref)(struct wined3d_resource *resource);
-     void (*resource_preload)(struct wined3d_resource *resource);
-     void (*resource_unload)(struct wined3d_resource *resource);
-+    HRESULT (*resource_sub_resource_get_size)(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-+            unsigned int *size, unsigned int *row_pitch, unsigned int *slice_pitch);
-     HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-             struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
-     HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx);
-@@ -4131,6 +4133,9 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC
- #define RESOURCE_ALIGNMENT 16
- #define WINED3D_CONSTANT_BUFFER_ALIGNMENT 16
- 
-+void *wined3d_allocate_sysmem(SIZE_T size) DECLSPEC_HIDDEN;
-+void wined3d_free_sysmem(void *mem) DECLSPEC_HIDDEN;
-+
- #define WINED3D_LOCATION_DISCARDED      0x00000001
- #define WINED3D_LOCATION_SYSMEM         0x00000002
- #define WINED3D_LOCATION_BUFFER         0x00000008
--- 
-2.30.2
-