Release v6.17

Fix by Matteo Bruni <mbruni@codeweavers.com>.

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+
+patreon: winestaging

.github/workflows/macOS.yml

@@ -2,10 +2,7 @@ name: MacOS
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
-
   workflow_dispatch:
 
 jobs:
@@ -17,11 +14,13 @@ jobs:
 
       - name: Install dependencies
         run: |
+          brew update
           brew install --cask xquartz
           brew install  bison \
                         faudio \
                         gphoto2 \
                         gst-plugins-base \
+                        jxrlib \
                         little-cms2 \
                         mingw-w64 \
                         molten-vk \
@@ -77,11 +76,13 @@ jobs:
 
       - name: Install dependencies
         run: |
+          brew update
           brew install --cask xquartz
           brew install  bison \
                         faudio \
                         gphoto2 \
                         gst-plugins-base \
+                        jxrlib \
                         little-cms2 \
                         mingw-w64 \
                         molten-vk \

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 7784b62bd2b64aabd6bfef9ef39ac4f3e8c55c77 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 37a80bdc062..64825f5b99b 100644
+--- a/dlls/bcrypt/gnutls.c
++++ b/dlls/bcrypt/gnutls.c
+@@ -25,9 +25,10 @@
+ #include "config.h"
+ #include "wine/port.h"
+ 
++#include <stdarg.h>
++
+ #ifdef HAVE_GNUTLS_CIPHER_INIT
+ 
+-#include <stdarg.h>
+ #include <assert.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/crypto.h>
+-- 
+2.30.2
+

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

@@ -0,0 +1,61 @@
+From 990050ed436283fb820d4fe64b08dda3ac7ea9e2 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 2/2] 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 86ef50aac01..060fb69ce3e 100644
+--- a/dlls/d3d10/effect.c
++++ b/dlls/d3d10/effect.c
+@@ -126,7 +126,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);
+ }
+ 
+ struct d3d10_effect_state_property_info
+@@ -4665,7 +4665,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)
+@@ -5001,7 +5001,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)
+@@ -5488,7 +5488,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)
+@@ -5995,7 +5995,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.30.2
+

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 916189d1cdf149f16867870121171e20f129da9f 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 3339596944a..1d435f88755 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)
+@@ -3373,6 +3374,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)
+@@ -3783,6 +3785,9 @@ static void init_wow64( CONTEXT *context )
   */
  void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
  {
@@ -38,9 +38,9 @@ index ee453700e51..c2d4b3c2f86 100644
      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 );
+@@ -3869,6 +3874,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,7 +51,6 @@ 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 );

patches/advapi32-LsaLookupPrivilegeName/0002-advapi32-Use-TRACE-for-LsaOpenPolicy-LsaClose.patch

@@ -1,34 +0,0 @@
-From 1941137bff72a2297812bbd05fb6f6a1578426b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sun, 5 Mar 2017 23:05:54 +0100
-Subject: advapi32: Use TRACE for LsaOpenPolicy/LsaClose.
-
----
- dlls/advapi32/lsa.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index e5e3b1649c0..0f2167d19ab 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -136,7 +136,7 @@ NTSTATUS WINAPI LsaAddAccountRights(
-  */
- NTSTATUS WINAPI LsaClose(IN LSA_HANDLE ObjectHandle)
- {
--    FIXME("(%p) stub\n", ObjectHandle);
-+    TRACE("(%p) semi-stub\n", ObjectHandle);
-     return STATUS_SUCCESS;
- }
- 
-@@ -687,7 +687,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
-     IN ACCESS_MASK DesiredAccess,
-     IN OUT PLSA_HANDLE PolicyHandle)
- {
--    FIXME("(%s,%p,0x%08x,%p) stub\n",
-+    TRACE("(%s,%p,0x%08x,%p) semi-stub\n",
-           SystemName?debugstr_w(SystemName->Buffer):"(null)",
-           ObjectAttributes, DesiredAccess, PolicyHandle);
- 
--- 
-2.11.0
-

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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1 @@
+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 89c22c9894fd170b0b3a99309540c88059c64824 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.
@@ -7,10 +7,10 @@ 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/gnutls.c          |  34 ++++--
  dlls/bcrypt/macos.c           |  18 ++-
  dlls/bcrypt/unixlib.c         | 211 ++++++++++++++++++++++++++++++++++
- 5 files changed, 252 insertions(+), 15 deletions(-)
+ 5 files changed, 253 insertions(+), 16 deletions(-)
  create mode 100644 dlls/bcrypt/unixlib.c
 
 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
@@ -27,10 +27,10 @@ index 24803fb2d7c..46a20d473dd 100644
  
  RC_SRCS = version.rc
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 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,7 +39,7 @@ 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 9c1e7b5ab06..9b716c6f536 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
 @@ -372,9 +372,12 @@ fail:
@@ -58,7 +58,16 @@ index 2f0c62bc6da..4a9dcf9de8a 100644
  }
  
  struct buffer
-@@ -1899,19 +1902,28 @@ static const struct key_funcs key_funcs =
+@@ -1869,7 +1872,7 @@ static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULO
+     return status;
+ }
+ 
+-static const struct key_funcs key_funcs =
++static struct key_funcs key_funcs =
+ {
+     key_set_property,
+     key_symmetric_init,
+@@ -1893,19 +1896,28 @@ static const struct key_funcs key_funcs =
      key_import_rsa
  };
  
@@ -95,7 +104,7 @@ index 2f0c62bc6da..4a9dcf9de8a 100644
 +}
 +#endif
 diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 44906519cef..2a88aec8362 100644
+index 20e1a61e3fb..1e364ac05a3 100644
 --- a/dlls/bcrypt/macos.c
 +++ b/dlls/bcrypt/macos.c
 @@ -302,11 +302,21 @@ static const struct key_funcs key_funcs =
@@ -126,7 +135,7 @@ index 44906519cef..2a88aec8362 100644
  #endif
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
 new file mode 100644
-index 00000000000..9cbb25f5740
+index 00000000000..6c3aff80373
 --- /dev/null
 +++ b/dlls/bcrypt/unixlib.c
 @@ -0,0 +1,211 @@
@@ -262,7 +271,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_len )
 +{
 +    FIXME( "not implemented\n" );
 +    return STATUS_NOT_IMPLEMENTED;

patches/d3d11-Deferred_Context/0002-wined3d-Add-wined3d_resource_map_info-function.patch

@@ -1,174 +0,0 @@
-From 1d756dd5a98e84afa53a487cd6b7ecbf0a576422 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 19 Jan 2017 16:54:42 +0100
-Subject: [PATCH] wined3d: Add wined3d_resource_map_info function.
-
----
- dlls/wined3d/buffer.c          | 19 +++++++++++++++++++
- dlls/wined3d/resource.c        |  8 ++++++++
- dlls/wined3d/texture.c         | 31 +++++++++++++++++++++++++++++++
- dlls/wined3d/wined3d.spec      |  1 +
- dlls/wined3d/wined3d_private.h |  2 ++
- include/wine/wined3d.h         |  9 +++++++++
- 6 files changed, 70 insertions(+)
-
-diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
-index ea21f85bc9e..d030a1cecd6 100644
---- a/dlls/wined3d/buffer.c
-+++ b/dlls/wined3d/buffer.c
-@@ -949,6 +949,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
-     return WINED3D_OK;
- }
- 
-+static HRESULT buffer_resource_sub_resource_map_info(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-+        struct wined3d_map_info *info, DWORD flags)
-+{
-+    struct wined3d_buffer *buffer = buffer_from_resource(resource);
-+
-+    if (sub_resource_idx)
-+    {
-+        WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx);
-+        return E_INVALIDARG;
-+    }
-+
-+    info->row_pitch   = resource->size;
-+    info->slice_pitch = resource->size;
-+    info->size        = buffer->resource.size;
-+
-+    return WINED3D_OK;
-+}
-+
- static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
- {
-     struct wined3d_buffer *buffer = buffer_from_resource(resource);
-@@ -1085,6 +1103,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
-     buffer_resource_preload,
-     buffer_resource_unload,
-     buffer_resource_sub_resource_map,
-+    buffer_resource_sub_resource_map_info,
-     buffer_resource_sub_resource_unmap,
- };
- 
-diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index 6e34605f547..b3a46950f4e 100644
---- a/dlls/wined3d/resource.c
-+++ b/dlls/wined3d/resource.c
-@@ -323,6 +323,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
-     return wined3d_device_context_map(&resource->device->cs->c, resource, sub_resource_idx, map_desc, box, flags);
- }
- 
-+HRESULT CDECL wined3d_resource_map_info(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-+        struct wined3d_map_info *info, DWORD flags)
-+{
-+    TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
-+
-+    return resource->resource_ops->resource_map_info(resource, sub_resource_idx, info, flags);
-+}
-+
- HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
- {
-     TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
-diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index 333002ebfd5..ad34329af1d 100644
---- a/dlls/wined3d/texture.c
-+++ b/dlls/wined3d/texture.c
-@@ -3509,6 +3509,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
-     return WINED3D_OK;
- }
- 
-+static HRESULT texture_resource_sub_resource_map_info(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-+        struct wined3d_map_info *info, DWORD flags)
-+{
-+    const struct wined3d_format *format = resource->format;
-+    struct wined3d_texture_sub_resource *sub_resource;
-+    unsigned int fmt_flags = resource->format_flags;
-+    struct wined3d_texture *texture;
-+    unsigned int texture_level;
-+
-+    texture = texture_from_resource(resource);
-+    if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx)))
-+        return E_INVALIDARG;
-+
-+    texture_level = sub_resource_idx % texture->level_count;
-+
-+    if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH)
-+    {
-+        info->row_pitch = wined3d_texture_get_level_width(texture, texture_level) * format->byte_count;
-+        info->slice_pitch = wined3d_texture_get_level_height(texture, texture_level) * info->row_pitch;
-+    }
-+    else
-+    {
-+        wined3d_texture_get_pitch(texture, texture_level, &info->row_pitch, &info->slice_pitch);
-+    }
-+
-+    info->size = info->slice_pitch * wined3d_texture_get_level_depth(texture, texture_level);
-+
-+    return WINED3D_OK;
-+}
-+
- static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
- {
-     struct wined3d_texture_sub_resource *sub_resource;
-@@ -3561,6 +3591,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
-     texture_resource_preload,
-     texture_resource_unload,
-     texture_resource_sub_resource_map,
-+    texture_resource_sub_resource_map_info,
-     texture_resource_sub_resource_unmap,
- };
- 
-diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index 7c81eff1593..63e7b82abda 100644
---- a/dlls/wined3d/wined3d.spec
-+++ b/dlls/wined3d/wined3d.spec
-@@ -230,6 +230,7 @@
- @ cdecl wined3d_resource_get_parent(ptr)
- @ cdecl wined3d_resource_get_priority(ptr)
- @ cdecl wined3d_resource_map(ptr long ptr ptr long)
-+@ cdecl wined3d_resource_map_info(ptr long ptr long)
- @ cdecl wined3d_resource_preload(ptr)
- @ cdecl wined3d_resource_set_parent(ptr ptr)
- @ cdecl wined3d_resource_set_priority(ptr long)
-diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 4d5f4765f57..385d0511d56 100644
---- a/dlls/wined3d/wined3d_private.h
-+++ b/dlls/wined3d/wined3d_private.h
-@@ -4046,6 +4046,8 @@ struct wined3d_resource_ops
-     void (*resource_unload)(struct wined3d_resource *resource);
-     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_map_info)(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-+            struct wined3d_map_info *info, DWORD flags);
-     HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx);
- };
- 
-diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index 2c4b93ce805..760bb709c2b 100644
---- a/include/wine/wined3d.h
-+++ b/include/wine/wined3d.h
-@@ -1861,6 +1861,13 @@ struct wined3d_map_desc
-     void *data;
- };
- 
-+struct wined3d_map_info
-+{
-+    UINT row_pitch;
-+    UINT slice_pitch;
-+    UINT size;
-+};
-+
- struct wined3d_sub_resource_data
- {
-     const void *data;
-@@ -2749,6 +2756,8 @@ void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resour
- DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource);
- HRESULT __cdecl wined3d_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 __cdecl wined3d_resource_map_info(struct wined3d_resource *resource, unsigned int sub_resource_idx,
-+        struct wined3d_map_info *info, DWORD flags);
- void __cdecl wined3d_resource_preload(struct wined3d_resource *resource);
- void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent);
- DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority);
--- 
-2.30.2
-

patches/d3d11-Deferred_Context/0004-d3d11-Implement-CSSetShader-for-deferred-contexts.patch

@@ -1,81 +0,0 @@
-From fc3937794343611ef4bedefc4829ed06ceee8f64 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 24 Jan 2017 04:10:12 +0100
-Subject: [PATCH] d3d11: Implement CSSetShader for deferred contexts.
-
----
- dlls/d3d11/device.c | 29 ++++++++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 2f13e85..e54ccaf 100644
---- a/dlls/d3d11/device.c
-+++ b/dlls/d3d11/device.c
-@@ -40,6 +40,7 @@ enum deferred_cmd
-     DEFERRED_OMSETBLENDSTATE,           /* blend_state_info */
-     DEFERRED_OMSETRENDERTARGETS,        /* render_target_info */
- 
-+    DEFERRED_CSSETSHADER,               /* cs_info */
-     DEFERRED_DSSETSHADER,               /* ds_info */
-     DEFERRED_HSSETSHADER,               /* hs_info */
-     DEFERRED_PSSETSHADER,               /* ps_info */
-@@ -120,6 +121,11 @@ struct deferred_call
-         } render_target_info;
-         struct
-         {
-+            ID3D11ComputeShader *shader;
-+            /* FIXME: add class instances */
-+        } cs_info;
-+        struct
-+        {
-             ID3D11DomainShader *shader;
-             /* FIXME: add class instances */
-         } ds_info;
-@@ -349,6 +355,12 @@ static void free_deferred_calls(struct list *commands)
-                     ID3D11DepthStencilView_Release(call->render_target_info.depth_stencil);
-                 break;
-             }
-+            case DEFERRED_CSSETSHADER:
-+            {
-+                if (call->cs_info.shader)
-+                    ID3D11ComputeShader_Release(call->cs_info.shader);
-+                break;
-+            }
-             case DEFERRED_DSSETSHADER:
-             {
-                 if (call->ds_info.shader)
-@@ -491,6 +503,11 @@ static void exec_deferred_calls(ID3D11DeviceContext1 *iface, struct list *comman
-                         call->render_target_info.render_targets, call->render_target_info.depth_stencil);
-                 break;
-             }
-+            case DEFERRED_CSSETSHADER:
-+            {
-+                ID3D11DeviceContext1_CSSetShader(iface, call->cs_info.shader, NULL, 0);
-+                break;
-+            }
-             case DEFERRED_DSSETSHADER:
-             {
-                 ID3D11DeviceContext1_DSSetShader(iface, call->ds_info.shader, NULL, 0);
-@@ -4410,8 +4427,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetUnorderedAccessViews(I
- static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShader(ID3D11DeviceContext *iface,
-         ID3D11ComputeShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
- {
--    FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n",
-+    struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
-+    struct deferred_call *call;
-+
-+    TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n",
-             iface, shader, class_instances, class_instance_count);
-+
-+    if (!(call = add_deferred_call(context, 0)))
-+        return;
-+
-+    call->cmd = DEFERRED_CSSETSHADER;
-+    if (shader) ID3D11ComputeShader_AddRef(shader);
-+    call->cs_info.shader = shader;
- }
- 
- static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetSamplers(ID3D11DeviceContext *iface,
--- 
-1.9.1
-