Release v6.7

Fixed upstream by <50903a1504>.

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

@@ -1,4 +1,4 @@
-From 0cf6433af95363c5fbba2af482b2ba50b863dfb7 Mon Sep 17 00:00:00 2001
+From a4d9189613ecacb289595663302c1db8676c8d9d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  1 file changed, 15 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 20bc3f977d1..c2187a19397 100644
+index 7a714a5aa6d..e5325ec31ff 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,15 +20,15 @@ index 20bc3f977d1..c2187a19397 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3456,6 +3457,7 @@ static void process_breakpoint(void)
-     __ENDTRY
+@@ -3235,6 +3236,7 @@ void WINAPI LdrShutdownProcess(void)
+     process_detach();
  }
  
 +extern const char * CDECL wine_get_version(void);
  
  /******************************************************************
-  *		LdrInitializeThunk (NTDLL.@)
-@@ -3465,6 +3467,9 @@ static void process_breakpoint(void)
+  *		RtlExitUserProcess (NTDLL.@)
+@@ -3597,6 +3599,9 @@ static void init_wow64(void)
   */
  void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
  {
@@ -38,7 +38,7 @@ index 20bc3f977d1..c2187a19397 100644
      static int attach_done;
      int i;
      NTSTATUS status;
-@@ -3483,6 +3488,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+@@ -3614,6 +3619,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
      entry = (void **)&context->u.s.X0;
  #endif
  
@@ -56,5 +56,5 @@ index 20bc3f977d1..c2187a19397 100644
  
      RtlEnterCriticalSection( &loader_section );
 -- 
-2.28.0
+2.30.2
 

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

@@ -1,4 +1,4 @@
-From 3478a4e41c07a66e7e913c54bcf5ad52e16a8fee Mon Sep 17 00:00:00 2001
+From 6d925cb20409888ada3e469a2a09b1bfc726fa79 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.
@@ -14,7 +14,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  create mode 100644 dlls/bcrypt/unixlib.c
 
 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
-index 24803fb2d7cb..46a20d473dd7 100644
+index 24803fb2d7c..46a20d473dd 100644
 --- a/dlls/bcrypt/Makefile.in
 +++ b/dlls/bcrypt/Makefile.in
 @@ -11,6 +11,7 @@ C_SRCS = \
@@ -27,7 +27,7 @@ index 24803fb2d7cb..46a20d473dd7 100644
  
  RC_SRCS = version.rc
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index eb1361115093..3c7110d05f84 100644
+index eb136111509..3c7110d05f8 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
 @@ -218,4 +218,7 @@ struct key_funcs
@@ -39,10 +39,10 @@ index eb1361115093..3c7110d05f84 100644
 +
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index c065ac31fba3..9490ea8612a8 100644
+index 2f0c62bc6da..4a9dcf9de8a 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -371,9 +371,12 @@ fail:
+@@ -372,9 +372,12 @@ fail:
  
  static void gnutls_uninitialize(void)
  {
@@ -58,7 +58,7 @@ index c065ac31fba3..9490ea8612a8 100644
  }
  
  struct buffer
-@@ -1949,19 +1952,28 @@ static const struct key_funcs key_funcs =
+@@ -1899,19 +1902,28 @@ static const struct key_funcs key_funcs =
      key_import_rsa
  };
  
@@ -74,7 +74,7 @@ index c065ac31fba3..9490ea8612a8 100644
 +        if (!gnutls_initialize()) return NULL;
 +        return &key_funcs;
      case DLL_PROCESS_DETACH:
-         gnutls_uninitialize();
+         if (libgnutls_handle) gnutls_uninitialize();
 -        break;
      }
 -    return STATUS_SUCCESS;
@@ -95,7 +95,7 @@ index c065ac31fba3..9490ea8612a8 100644
 +}
 +#endif
 diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 44906519cef0..2a88aec8362c 100644
+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 =
@@ -126,7 +126,7 @@ index 44906519cef0..2a88aec8362c 100644
  #endif
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
 new file mode 100644
-index 000000000000..9cbb25f5740c
+index 00000000000..9cbb25f5740
 --- /dev/null
 +++ b/dlls/bcrypt/unixlib.c
 @@ -0,0 +1,211 @@
@@ -342,5 +342,5 @@ index 000000000000..9cbb25f5740c
 +
 +#endif
 -- 
-2.29.2
+2.30.2
 

patches/bcrypt-ECDHSecretAgreement/definition

@@ -2,4 +2,3 @@ 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).
-#Disabled: true

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

@@ -1,4 +1,4 @@
-From 881e39d338d1b8faed36440376460d498262c532 Mon Sep 17 00:00:00 2001
+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.
@@ -13,10 +13,10 @@ Subject: [PATCH] wined3d: Add wined3d_resource_map_info function.
  6 files changed, 70 insertions(+)
 
 diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
-index 89dab8ebfdd..5ef9a48eeb7 100644
+index ea21f85bc9e..d030a1cecd6 100644
 --- a/dlls/wined3d/buffer.c
 +++ b/dlls/wined3d/buffer.c
-@@ -1121,6 +1121,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
+@@ -949,6 +949,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
      return WINED3D_OK;
  }
  
@@ -41,7 +41,7 @@ index 89dab8ebfdd..5ef9a48eeb7 100644
  static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
  {
      struct wined3d_buffer *buffer = buffer_from_resource(resource);
-@@ -1279,6 +1297,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
+@@ -1085,6 +1103,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
      buffer_resource_preload,
      buffer_resource_unload,
      buffer_resource_sub_resource_map,
@@ -50,11 +50,11 @@ index 89dab8ebfdd..5ef9a48eeb7 100644
  };
  
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index bba940f42cb..ff31c004b06 100644
+index 6e34605f547..b3a46950f4e 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -383,6 +383,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
-     return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags);
+@@ -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,
@@ -69,10 +69,10 @@ index bba940f42cb..ff31c004b06 100644
  {
      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 7c9c8298519..73e79ff25b5 100644
+index 333002ebfd5..ad34329af1d 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -3155,6 +3155,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
+@@ -3509,6 +3509,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
      return WINED3D_OK;
  }
  
@@ -109,7 +109,7 @@ index 7c9c8298519..73e79ff25b5 100644
  static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
  {
      struct wined3d_texture_sub_resource *sub_resource;
-@@ -3207,6 +3237,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
+@@ -3561,6 +3591,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
      texture_resource_preload,
      texture_resource_unload,
      texture_resource_sub_resource_map,
@@ -118,10 +118,10 @@ index 7c9c8298519..73e79ff25b5 100644
  };
  
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index e03c57055b7..f68f8199f7e 100644
+index 7c81eff1593..63e7b82abda 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
-@@ -218,6 +218,7 @@
+@@ -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)
@@ -130,10 +130,10 @@ index e03c57055b7..f68f8199f7e 100644
  @ 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 8f9ad1ce856..c7f75d1983c 100644
+index 4d5f4765f57..385d0511d56 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -3368,6 +3368,8 @@ struct wined3d_resource_ops
+@@ -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);
@@ -143,10 +143,10 @@ index 8f9ad1ce856..c7f75d1983c 100644
  };
  
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index bafab04d3d3..ea50fb7c8d4 100644
+index 2c4b93ce805..760bb709c2b 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -1851,6 +1851,13 @@ struct wined3d_map_desc
+@@ -1861,6 +1861,13 @@ struct wined3d_map_desc
      void *data;
  };
  
@@ -160,7 +160,7 @@ index bafab04d3d3..ea50fb7c8d4 100644
  struct wined3d_sub_resource_data
  {
      const void *data;
-@@ -2663,6 +2670,8 @@ void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resour
+@@ -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);
@@ -170,5 +170,5 @@ index bafab04d3d3..ea50fb7c8d4 100644
  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.24.0
+2.30.2
 

patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch

@@ -1,4 +1,4 @@
-From 504969929eb7932fe22880768461f2172080f0eb Mon Sep 17 00:00:00 2001
+From 4527c01f3e96ad841fb26002c1e73a2b4d9ac55e 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:56:56 +0100
 Subject: [PATCH] d3d11: Initial implementation for deferred contexts.
@@ -8,7 +8,7 @@ Subject: [PATCH] d3d11: Initial implementation for deferred contexts.
  1 file changed, 1041 insertions(+), 31 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 454003128dc..4beb7cea4fa 100644
+index 47f43a796e3..ca21e9be6ea 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
 @@ -16,6 +16,7 @@
@@ -18,8 +18,8 @@ index 454003128dc..4beb7cea4fa 100644
 +#include "wine/list.h"
  
  #define NONAMELESSUNION
- #include "d3d11_private.h"
-@@ -48,6 +49,174 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S
+ #define WINE_NO_NAMELESS_EXTENSION
+@@ -49,6 +50,174 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S
      return TRUE;
  }
  
@@ -194,7 +194,7 @@ index 454003128dc..4beb7cea4fa 100644
  /* ID3D11DeviceContext - deferred context */
  struct d3d11_deferred_context
  {
-@@ -55,9 +224,532 @@ struct d3d11_deferred_context
+@@ -56,9 +225,532 @@ struct d3d11_deferred_context
      ID3D11Device *device;
      LONG refcount;
  
@@ -727,7 +727,7 @@ index 454003128dc..4beb7cea4fa 100644
  static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
  
  static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
-@@ -1415,7 +2107,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
+@@ -1428,7 +2120,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
  static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext1 *iface,
          ID3D11CommandList *command_list, BOOL restore_state)
  {
@@ -749,7 +749,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext1 *iface,
-@@ -3169,6 +3874,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
+@@ -3167,6 +3872,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
  
      if (!refcount)
      {
@@ -757,7 +757,7 @@ index 454003128dc..4beb7cea4fa 100644
          wined3d_private_store_cleanup(&context->private_store);
          ID3D11Device_Release(context->device);
          HeapFree(GetProcessHeap(), 0, context);
-@@ -3220,43 +3926,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
+@@ -3218,43 +3924,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -850,7 +850,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface,
-@@ -3269,53 +4018,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
+@@ -3267,53 +4016,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource,
          UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource)
  {
@@ -1029,7 +1029,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface,
-@@ -3344,7 +4209,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
+@@ -3342,7 +4207,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
  static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface,
          D3D11_PRIMITIVE_TOPOLOGY topology)
  {
@@ -1047,7 +1047,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3404,8 +4278,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
+@@ -3402,8 +4276,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
          UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views,
          ID3D11DepthStencilView *depth_stencil_view)
  {
@@ -1077,7 +1077,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorderedAccessViews(
-@@ -3425,15 +4319,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
+@@ -3423,15 +4317,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetBlendState(ID3D11DeviceContext *iface,
          ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask)
  {
@@ -1124,7 +1124,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count,
-@@ -3475,13 +4398,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
+@@ -3473,13 +4396,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetState(ID3D11DeviceContext *iface,
          ID3D11RasterizerState *rasterizer_state)
  {
@@ -1161,7 +1161,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetScissorRects(ID3D11DeviceContext *iface,
-@@ -3596,8 +4540,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
+@@ -3594,8 +4538,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceContext *iface,
          ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
  {
@@ -1181,7 +1181,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface,
-@@ -3610,36 +4564,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
+@@ -3608,36 +4562,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -1249,7 +1249,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3940,7 +4920,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
+@@ -3938,7 +4918,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_ClearState(ID3D11DeviceContext *iface)
  {
@@ -1266,7 +1266,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Flush(ID3D11DeviceContext *iface)
-@@ -3965,9 +4953,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
+@@ -3963,9 +4951,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_FinishCommandList(ID3D11DeviceContext *iface,
          BOOL restore, ID3D11CommandList **command_list)
  {
@@ -1298,7 +1298,7 @@ index 454003128dc..4beb7cea4fa 100644
  }
  
  static const struct ID3D11DeviceContextVtbl d3d11_deferred_context_vtbl =
-@@ -4582,6 +5590,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
+@@ -4580,6 +5588,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
      object->device = (ID3D11Device *)iface;
      object->refcount = 1;
  
@@ -1308,5 +1308,5 @@ index 454003128dc..4beb7cea4fa 100644
      wined3d_private_store_init(&object->private_store);
  
 -- 
-2.30.0
+2.30.2
 

patches/d3d11-Deferred_Context/0039-d3d11-Implement-d3d11_deferred_context_UpdateSubreso.patch

@@ -1,20 +1,20 @@
-From 2aca1492440a076d00c910b6479b76fe69c1b2ee Mon Sep 17 00:00:00 2001
+From 8fe0dad5a51a6ddd712dfc87949e4b3d453c9e0f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 31 Aug 2017 05:04:15 +0200
 Subject: [PATCH] d3d11: Implement d3d11_deferred_context_UpdateSubresource.
 
 ---
- dlls/d3d11/device.c       | 75 +++++++++++++++++++++++++++++++++++++-
- dlls/wined3d/resource.c   | 93 +++++++++++++++++++++++++++++++++++++++++++++++
+ dlls/d3d11/device.c       | 75 ++++++++++++++++++++++++++++++-
+ dlls/wined3d/resource.c   | 93 +++++++++++++++++++++++++++++++++++++++
  dlls/wined3d/wined3d.spec |  1 +
  include/wine/wined3d.h    |  2 +
  4 files changed, 170 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index c83d6a0..4f3700d 100644
+index 21da04547a6..70eecdd5a9e 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
-@@ -45,6 +45,7 @@ enum deferred_cmd
+@@ -69,6 +69,7 @@ enum deferred_cmd
      DEFERRED_COPYRESOURCE,              /* copy_resource_info */
      DEFERRED_SETRESOURCEMINLOD,         /* set_resource_min_lod_info */
      DEFERRED_COPYSUBRESOURCEREGION,     /* copy_subresource_region_info */
@@ -22,10 +22,11 @@ index c83d6a0..4f3700d 100644
      DEFERRED_RESOLVESUBRESOURCE,        /* resolve_subresource_info */
      DEFERRED_COPYSTRUCTURECOUNT,        /* copy_structure_count_info */
  
-@@ -185,6 +186,15 @@ struct deferred_call
+@@ -208,6 +209,15 @@ struct deferred_call
+             D3D11_BOX *src_box;
          } copy_subresource_region_info;
          struct
-         {
++        {
 +            ID3D11Resource *resource;
 +            UINT subresource_idx;
 +            D3D11_BOX *box;
@@ -34,11 +35,10 @@ index c83d6a0..4f3700d 100644
 +            UINT depth_pitch;
 +        } update_subresource_info;
 +        struct
-+        {
+         {
              ID3D11Resource *dst_resource;
              UINT dst_subresource_idx;
-             ID3D11Resource *src_resource;
-@@ -568,6 +578,12 @@ static void free_deferred_calls(struct list *commands)
+@@ -592,6 +602,12 @@ static void free_deferred_calls(struct list *commands)
                      ID3D11Resource_Release(call->copy_subresource_region_info.src_resource);
                  break;
              }
@@ -51,7 +51,7 @@ index c83d6a0..4f3700d 100644
              case DEFERRED_RESOLVESUBRESOURCE:
              {
                  if (call->resolve_subresource_info.dst_resource)
-@@ -899,6 +915,17 @@ static void exec_deferred_calls(ID3D11DeviceContext1 *iface, struct list *comman
+@@ -923,6 +939,17 @@ static void exec_deferred_calls(ID3D11DeviceContext1 *iface, struct list *comman
                          call->copy_structure_count_info.src_view);
                  break;
              }
@@ -69,7 +69,7 @@ index c83d6a0..4f3700d 100644
              case DEFERRED_CSSETSHADER:
              {
                  ID3D11DeviceContext1_CSSetShader(iface, call->cs_info.shader, NULL, 0);
-@@ -5054,8 +5081,54 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_UpdateSubresource(ID3D11Dev
+@@ -5281,8 +5308,54 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_UpdateSubresource(ID3D11Dev
          ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box,
          const void *data, UINT row_pitch, UINT depth_pitch)
  {
@@ -126,11 +126,11 @@ index c83d6a0..4f3700d 100644
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_CopyStructureCount(ID3D11DeviceContext *iface,
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index 28581a1..c2a9933 100644
+index b3a46950f4e..fae2cae4398 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -373,6 +373,99 @@ HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned
-     return wined3d_cs_unmap(resource->device->cs, resource, sub_resource_idx);
+@@ -338,6 +338,99 @@ HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned
+     return wined3d_device_context_unmap(&resource->device->cs->c, resource, sub_resource_idx);
  }
  
 +UINT CDECL wined3d_resource_update_info(struct wined3d_resource *resource, unsigned int sub_resource_idx,
@@ -230,10 +230,10 @@ index 28581a1..c2a9933 100644
  {
      wined3d_cs_emit_preload_resource(resource->device->cs, resource);
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index 58dc0a9..fe6e0af 100644
+index 63e7b82abda..9879f394699 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
-@@ -234,6 +234,7 @@
+@@ -235,6 +235,7 @@
  @ cdecl wined3d_resource_set_parent(ptr ptr)
  @ cdecl wined3d_resource_set_priority(ptr long)
  @ cdecl wined3d_resource_unmap(ptr long)
@@ -242,10 +242,10 @@ index 58dc0a9..fe6e0af 100644
  @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr)
  @ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr)
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index fa929e5..0adb891 100644
+index 760bb709c2b..7cd6682d494 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -2597,6 +2597,8 @@ void __cdecl wined3d_resource_preload(struct wined3d_resource *resource);
+@@ -2762,6 +2762,8 @@ 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);
  HRESULT __cdecl wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx);
@@ -255,5 +255,5 @@ index fa929e5..0adb891 100644
  HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_view_desc *desc,
          struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,
 -- 
-1.9.1
+2.30.2
 

patches/d3d11-Deferred_Context/0040-d3d11-Implement-restoring-of-state-after-executing-a.patch

@@ -1,18 +1,18 @@
-From d6805cde0e8f01e672f17fb03af947e7d2f83dde Mon Sep 17 00:00:00 2001
+From cf45f6b66c0babf760c2a27ff7aa6842696fb22f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 1 Oct 2017 04:43:22 +0200
 Subject: [PATCH] d3d11: Implement restoring of state after executing a command
  list.
 
 ---
- dlls/d3d11/device.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ dlls/d3d11/device.c | 233 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 229 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 4f3700d..e214202 100644
+index 639727e4af4..c2c63d97351 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
-@@ -367,6 +367,62 @@ struct deferred_call
+@@ -391,6 +391,62 @@ struct deferred_call
      };
  };
  
@@ -75,7 +75,7 @@ index 4f3700d..e214202 100644
  /* ID3D11CommandList - command list */
  struct d3d11_command_list
  {
-@@ -2513,22 +2569,191 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
+@@ -2730,22 +2786,191 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
      wined3d_mutex_unlock();
  }
  
@@ -130,7 +130,7 @@ index 4f3700d..e214202 100644
 +    ID3D11DeviceContext1_SOGetTargets(context, D3D11_SO_BUFFER_SLOT_COUNT, stateblock->so_buffers);
 +    /* For some reason the d3d11 get function is missing the offset parameter */
 +    for (i = 0; i < D3D11_SO_BUFFER_SLOT_COUNT; i++)
-+        wined3d_device_get_stream_output(device->wined3d_device, i, &stateblock->so_offsets[i]);
++        wined3d_device_context_get_stream_output(device->immediate_context.wined3d_context, i, &stateblock->so_offsets[i]);
 +
 +    ID3D11DeviceContext1_GetPredication(context, &stateblock->predicate, &stateblock->predicate_value);
 +
@@ -272,5 +272,5 @@ index 4f3700d..e214202 100644
  }
  
 -- 
-1.9.1
+2.30.2
 

patches/ddraw-IDirect3DTexture2_Load/0001-ddraw-Allow-size-and-format-conversions-in-IDirect3D.patch

@@ -1,18 +1,18 @@
-From a6a89266f71551cd6ee6b80dc758825957087a37 Mon Sep 17 00:00:00 2001
+From 7e0e8ea02fa2670a29e1c312f88205b870521a9e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 30 May 2015 02:55:03 +0200
 Subject: [PATCH] ddraw: Allow size and format conversions in
  IDirect3DTexture2::Load.
 
 ---
- dlls/ddraw/surface.c | 152 +++++++++++++++++++++++--------------------
- 1 file changed, 81 insertions(+), 71 deletions(-)
+ dlls/ddraw/surface.c | 153 +++++++++++++++++++++++--------------------
+ 1 file changed, 82 insertions(+), 71 deletions(-)
 
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index 19a1ae3d2d2..ed46ff0534a 100644
+index f5c3528cfa4..a8b919c05c2 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
-@@ -5310,6 +5310,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
+@@ -5316,6 +5316,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
      return impl_from_IDirectDrawSurface7(next_level);
  }
  
@@ -59,7 +59,7 @@ index 19a1ae3d2d2..ed46ff0534a 100644
  /*****************************************************************************
   * IDirect3DTexture2::Load
   *
-@@ -5331,7 +5371,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5337,7 +5377,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  {
      struct ddraw_surface *dst_surface = impl_from_IDirect3DTexture2(iface);
      struct ddraw_surface *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture);
@@ -68,7 +68,7 @@ index 19a1ae3d2d2..ed46ff0534a 100644
      HRESULT hr;
  
      TRACE("iface %p, src_texture %p.\n", iface, src_texture);
-@@ -5344,90 +5384,61 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5350,90 +5390,62 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  
      wined3d_mutex_lock();
  
@@ -184,7 +184,8 @@ index 19a1ae3d2d2..ed46ff0534a 100644
  
 -            wined3d_resource_unmap(dst_resource, dst_surface->sub_resource_idx);
 -            wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx);
-+        hr = wined3d_texture_blt(ddraw_surface_get_default_texture(dst_surface, DDRAW_SURFACE_WRITE),
++        hr = wined3d_device_context_blt(dst_surface->ddraw->immediate_context,
++                ddraw_surface_get_default_texture(dst_surface, DDRAW_SURFACE_WRITE),
 +                dst_surface->sub_resource_idx, &dst_rect,
 +                ddraw_surface_get_default_texture(src_surface, DDRAW_SURFACE_READ),
 +                src_surface->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_LINEAR);
@@ -196,7 +197,7 @@ index 19a1ae3d2d2..ed46ff0534a 100644
          }
  
          if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
-@@ -5440,12 +5451,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5446,12 +5458,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
          else
              dst_surface = NULL;
  
@@ -213,5 +214,5 @@ index 19a1ae3d2d2..ed46ff0534a 100644
  
      wined3d_mutex_unlock();
 -- 
-2.20.1
+2.30.2
 

patches/eventfd_synchronization/0018-server-Create-eventfd-file-descriptors-for-thread-ob.patch

@@ -1,4 +1,4 @@
-From 5bfa95c3058d8c869e7555514b05dc877a842e42 Mon Sep 17 00:00:00 2001
+From f72b878cf5dcf8f20d485f7b3e75d86e303393e7 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 8 Jun 2018 22:04:29 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for thread objects.
@@ -9,7 +9,7 @@ Subject: [PATCH] server: Create eventfd file descriptors for thread objects.
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/server/thread.c b/server/thread.c
-index 8432d0aa8ed..d4b88be3897 100644
+index e7795c21136..ef5b3fbf313 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -186,6 +186,7 @@ struct type_descr thread_type =
@@ -37,8 +37,8 @@ index 8432d0aa8ed..d4b88be3897 100644
      thread->system_regs     = 0;
      thread->queue           = NULL;
      thread->wait            = NULL;
-@@ -374,6 +376,9 @@ struct thread *create_thread( int fd, struct process *process, const struct secu
-         return NULL;
+@@ -385,6 +387,9 @@ struct thread *create_thread( int fd, struct process *process, const struct secu
+         }
      }
  
 +    if (do_esync())
@@ -47,7 +47,7 @@ index 8432d0aa8ed..d4b88be3897 100644
      set_fd_events( thread->request_fd, POLLIN );  /* start listening to events */
      add_process_thread( thread->process, thread );
      return thread;
-@@ -453,6 +458,9 @@ static void destroy_thread( struct object *obj )
+@@ -464,6 +469,9 @@ static void destroy_thread( struct object *obj )
      if (thread->exit_poll) remove_timeout_user( thread->exit_poll );
      if (thread->id) free_ptid( thread->id );
      if (thread->token) release_object( thread->token );
@@ -57,7 +57,7 @@ index 8432d0aa8ed..d4b88be3897 100644
  }
  
  /* dump a thread on stdout for debugging purposes */
-@@ -471,6 +479,13 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry )
+@@ -482,6 +490,13 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry )
      return mythread->state == TERMINATED && !mythread->exit_poll;
  }
  
@@ -84,5 +84,5 @@ index 077ab0929ba..99904557d44 100644
      struct msg_queue      *queue;         /* message queue */
      struct thread_wait    *wait;          /* current wait condition if sleeping */
 -- 
-2.20.1
+2.30.2
 

patches/eventfd_synchronization/0020-server-Create-eventfd-file-descriptors-for-message-q.patch

@@ -1,4 +1,4 @@
-From 1aac9111b536d35eec696e20141b6c5d6d92579b Mon Sep 17 00:00:00 2001
+From 2da453ad472ce69926e158bd4e933facd985d1cd Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:01:56 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for message queues.
@@ -8,7 +8,7 @@ Subject: [PATCH] server: Create eventfd file descriptors for message queues.
  1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/server/queue.c b/server/queue.c
-index 263bb46ea00..4d416a88d88 100644
+index 1f1392387df..d34bc284d08 100644
 --- a/server/queue.c
 +++ b/server/queue.c
 @@ -43,6 +43,7 @@
@@ -19,15 +19,15 @@ index 263bb46ea00..4d416a88d88 100644
  
  #define WM_NCMOUSEFIRST WM_NCMOUSEMOVE
  #define WM_NCMOUSELAST  (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST))
-@@ -141,6 +142,7 @@ struct msg_queue
-     struct hook_table     *hooks;           /* hook table */
+@@ -144,6 +145,7 @@ struct msg_queue
      timeout_t              last_get_msg;    /* time of last get message call */
+     int                    keystate_lock;   /* owns an input keystate lock */
      unsigned int           ignore_post_msg; /* ignore post messages newer than this unique id */
 +    int                    esync_fd;        /* esync file descriptor (signalled on message) */
  };
  
  struct hotkey
-@@ -157,6 +159,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
+@@ -160,6 +162,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
  static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry );
  static void msg_queue_remove_queue( struct object *obj, struct wait_queue_entry *entry );
  static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry );
@@ -35,7 +35,7 @@ index 263bb46ea00..4d416a88d88 100644
  static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry );
  static void msg_queue_destroy( struct object *obj );
  static void msg_queue_poll_event( struct fd *fd, int event );
-@@ -172,7 +175,7 @@ static const struct object_ops msg_queue_ops =
+@@ -175,7 +178,7 @@ static const struct object_ops msg_queue_ops =
      msg_queue_add_queue,       /* add_queue */
      msg_queue_remove_queue,    /* remove_queue */
      msg_queue_signaled,        /* signaled */
@@ -44,9 +44,9 @@ index 263bb46ea00..4d416a88d88 100644
      msg_queue_satisfied,       /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -309,12 +312,16 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
-         queue->hooks           = NULL;
+@@ -315,12 +318,16 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          queue->last_get_msg    = current_time;
+         queue->keystate_lock   = 0;
          queue->ignore_post_msg = 0;
 +        queue->esync_fd        = -1;
          list_init( &queue->send_result );
@@ -61,17 +61,17 @@ index 263bb46ea00..4d416a88d88 100644
          thread->queue = queue;
      }
      if (new_input) release_object( new_input );
-@@ -491,6 +498,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
- {
-     queue->wake_bits &= ~bits;
-     queue->changed_bits &= ~bits;
+@@ -534,6 +541,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
+         if (queue->keystate_lock) unlock_input_keystate( queue->input );
+         queue->keystate_lock = 0;
+     }
 +
 +    if (do_esync() && !is_signaled( queue ))
 +        esync_clear( queue->esync_fd );
  }
  
  /* check whether msg is a keyboard message */
-@@ -1004,6 +1014,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
+@@ -1047,6 +1057,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
      return ret || is_signaled( queue );
  }
  
@@ -85,7 +85,7 @@ index 263bb46ea00..4d416a88d88 100644
  static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry )
  {
      struct msg_queue *queue = (struct msg_queue *)obj;
-@@ -2381,6 +2398,9 @@ DECL_HANDLER(get_queue_status)
+@@ -2425,6 +2442,9 @@ DECL_HANDLER(get_queue_status)
          reply->wake_bits    = queue->wake_bits;
          reply->changed_bits = queue->changed_bits;
          queue->changed_bits &= ~req->clear_bits;
@@ -96,5 +96,5 @@ index 263bb46ea00..4d416a88d88 100644
      else reply->wake_bits = reply->changed_bits = 0;
  }
 -- 
-2.28.0
+2.30.2
 

patches/eventfd_synchronization/0021-server-ntdll-Implement-message-waits.patch

@@ -1,4 +1,4 @@
-From df50f6973c1fa60db18b408001ac50c03fb2fa07 Mon Sep 17 00:00:00 2001
+From e0a89702e35941e75ce06f795966c92b3f195ed8 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:11:23 -0500
 Subject: [PATCH] server, ntdll: Implement message waits.
@@ -105,10 +105,10 @@ index fcbe563bb5a..88490e08ef9 100644
  {
      struct stat st;
 diff --git a/server/protocol.def b/server/protocol.def
-index 9062a5020c2..789bc56e7f1 100644
+index cf00ab99c63..ecbb78cc9bb 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3697,3 +3697,8 @@ enum esync_type
+@@ -3734,3 +3734,8 @@ enum esync_type
      int          type;
      unsigned int shm_idx;
  @END
@@ -118,26 +118,26 @@ index 9062a5020c2..789bc56e7f1 100644
 +    int          in_msgwait;    /* are we in a message wait? */
 +@END
 diff --git a/server/queue.c b/server/queue.c
-index 4d416a88d88..efaf8a0f7e7 100644
+index d34bc284d08..f4edb299dc3 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -143,6 +143,7 @@ struct msg_queue
-     timeout_t              last_get_msg;    /* time of last get message call */
+@@ -146,6 +146,7 @@ struct msg_queue
+     int                    keystate_lock;   /* owns an input keystate lock */
      unsigned int           ignore_post_msg; /* ignore post messages newer than this unique id */
      int                    esync_fd;        /* esync file descriptor (signalled on message) */
 +    int                    esync_in_msgwait; /* our thread is currently waiting on us */
  };
  
  struct hotkey
-@@ -313,6 +314,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
-         queue->last_get_msg    = current_time;
+@@ -319,6 +320,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+         queue->keystate_lock   = 0;
          queue->ignore_post_msg = 0;
          queue->esync_fd        = -1;
 +        queue->esync_in_msgwait = 0;
          list_init( &queue->send_result );
          list_init( &queue->callback_result );
          list_init( &queue->pending_timers );
-@@ -959,6 +961,10 @@ static int is_queue_hung( struct msg_queue *queue )
+@@ -1002,6 +1004,10 @@ static int is_queue_hung( struct msg_queue *queue )
          if (get_wait_queue_thread(entry)->queue == queue)
              return 0;  /* thread is waiting on queue -> not hung */
      }
@@ -148,7 +148,7 @@ index 4d416a88d88..efaf8a0f7e7 100644
      return 1;
  }
  
-@@ -3385,3 +3391,18 @@ DECL_HANDLER(get_rawinput_devices)
+@@ -3416,3 +3422,18 @@ DECL_HANDLER(get_rawinput_devices)
              devices[i++] = e->device;
      }
  }
@@ -168,5 +168,5 @@ index 4d416a88d88..efaf8a0f7e7 100644
 +        set_fd_events( queue->fd, req->in_msgwait ? POLLIN : 0 );
 +}
 -- 
-2.28.0
+2.30.2
 

patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch

@@ -1,8 +1,8 @@
-From ac9e5c8733b503db651b358c78aef60294a70aff Mon Sep 17 00:00:00 2001
+From b332f5a5dd03b7d71515a2fddefa787da3fb7b5e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 9 Jan 2016 16:57:49 +0100
-Subject: explorer: Create CurrentControlSet\Control\Video registry key as
- non-volatile.
+Subject: [PATCH] explorer: Create CurrentControlSet\Control\Video registry key
+ as non-volatile.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Signed-off-by: Michael Müller <michael@fds-team.de>
  2 files changed, 16 insertions(+)
 
 diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index d1fe3f05f..011c2fcea 100644
+index dfadd13ea8c..b3e5888da92 100644
 --- a/dlls/advapi32/tests/registry.c
 +++ b/dlls/advapi32/tests/registry.c
-@@ -1345,6 +1345,13 @@ static void test_reg_create_key(void)
+@@ -1318,6 +1318,13 @@ static void test_reg_create_key(void)
      RegDeleteKeyA(hkey1, "");
      RegCloseKey(hkey1);
  
@@ -32,10 +32,10 @@ index d1fe3f05f..011c2fcea 100644
      hkey1 = NULL;
      ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL);
 diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
-index 2857fcfca..bfe3bec18 100644
+index 94d178880a8..95f06e50b7d 100644
 --- a/programs/explorer/desktop.c
 +++ b/programs/explorer/desktop.c
-@@ -754,6 +754,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
+@@ -792,6 +792,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
  
  static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
  {
@@ -47,9 +47,9 @@ index 2857fcfca..bfe3bec18 100644
      static const WCHAR device_keyW[] = {
          'S','y','s','t','e','m','\\',
          'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
-@@ -817,6 +822,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
-         TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) );
-     }
+@@ -859,6 +864,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
+ 
+     TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) );
  
 +    /* create video key first without REG_OPTION_VOLATILE attribute */
 +    if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, NULL ))
@@ -59,5 +59,5 @@ index 2857fcfca..bfe3bec18 100644
                guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
                guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
 -- 
-2.21.0
+2.30.2
 

patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch

@@ -1,146 +0,0 @@
-From 2ce47e07be60a3306855c625f4ffc75d039085ec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 4 Feb 2017 16:20:37 +0100
-Subject: [PATCH] kernel32: Implement some processor group functions.
-
----
- ...pi-ms-win-core-kernel32-legacy-l1-1-0.spec |  2 +-
- ...pi-ms-win-core-kernel32-legacy-l1-1-1.spec |  2 +-
- dlls/kernel32/kernel32.spec                   |  2 +-
- dlls/kernel32/process.c                       | 26 ++++++++++++++++---
- dlls/kernel32/tests/process.c                 | 21 +++++++++++++++
- 5 files changed, 46 insertions(+), 7 deletions(-)
-
-diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
-index e653ac6d212..b6af37ab0aa 100644
---- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
-@@ -21,7 +21,7 @@
- @ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW
- @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow
- @ stub GetDurationFormatEx
--@ stub GetMaximumProcessorGroupCount
-+@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount
- @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
- @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
- @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA
-diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
-index 4998af04d9b..5ce8e24713b 100644
---- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
-+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
-@@ -26,7 +26,7 @@
- @ stub GetDurationFormatEx
- @ stub GetFileAttributesTransactedW
- @ stub GetFirmwareType
--@ stub GetMaximumProcessorGroupCount
-+@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount
- @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
- @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
- @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx
-diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index d14bf010383..d7eb984c0cd 100644
---- a/dlls/kernel32/kernel32.spec
-+++ b/dlls/kernel32/kernel32.spec
-@@ -719,7 +719,7 @@
- @ stdcall -import GetLongPathNameW(wstr ptr long)
- @ stdcall GetMailslotInfo(long ptr ptr ptr ptr)
- @ stdcall GetMaximumProcessorCount(long)
--# @ stub GetMaximumProcessorGroupCount
-+@ stdcall GetMaximumProcessorGroupCount()
- @ stdcall -import GetModuleFileNameA(long ptr long)
- @ stdcall -import GetModuleFileNameW(long ptr long)
- @ stdcall -import GetModuleHandleA(str)
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 41a5b34af19..dc136365f50 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -609,7 +609,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
-  */
- WORD WINAPI GetActiveProcessorGroupCount(void)
- {
--    FIXME("semi-stub, always returning 1\n");
-+    TRACE("()\n");
-+
-+    /* systems with less than 64 logical processors only have group 0 */
-     return 1;
- }
- 
-@@ -618,10 +620,14 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
-  */
- DWORD WINAPI GetActiveProcessorCount(WORD group)
- {
--    DWORD cpus = system_info.NumberOfProcessors;
-+    TRACE("(%u)\n", group);
- 
--    FIXME("semi-stub, returning %u\n", cpus);
--    return cpus;
-+    if (group && group != ALL_PROCESSOR_GROUPS)
-+    {
-+        SetLastError(ERROR_INVALID_PARAMETER);
-+        return 0;
-+    }
-+    return system_info.NumberOfProcessors;
- }
- 
- /***********************************************************************
-@@ -635,6 +641,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
-     return cpus;
- }
- 
-+/***********************************************************************
-+ *           GetMaximumProcessorGroupCount (KERNEL32.@)
-+ */
-+WORD WINAPI GetMaximumProcessorGroupCount(void)
-+{
-+    TRACE("()\n");
-+
-+    /* systems with less than 64 logical processors only have group 0 */
-+    return 1;
-+}
-+
-+
- /***********************************************************************
-  *           GetFirmwareEnvironmentVariableA     (KERNEL32.@)
-  */
-diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index 762e114a988..4bf68401268 100644
---- a/dlls/kernel32/tests/process.c
-+++ b/dlls/kernel32/tests/process.c
-@@ -4327,6 +4327,26 @@ static void test_dead_process(void)
-     CloseHandle(pi.hThread);
- }
- 
-+static void test_GetActiveProcessorCount(void)
-+{
-+    DWORD count;
-+
-+    if (!pGetActiveProcessorCount)
-+    {
-+        win_skip("GetActiveProcessorCount not available, skipping test\n");
-+        return;
-+    }
-+
-+    count = pGetActiveProcessorCount(0);
-+    ok(count, "GetActiveProcessorCount failed, error %u\n", GetLastError());
-+
-+    /* Test would fail on systems with more than 6400 processors */
-+    SetLastError(0xdeadbeef);
-+    count = pGetActiveProcessorCount(101);
-+    ok(count == 0, "Expeced GetActiveProcessorCount to fail\n");
-+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
-+}
-+
- START_TEST(process)
- {
-     HANDLE job, hproc, h, h2;
-@@ -4443,6 +4463,7 @@ START_TEST(process)
-     test_GetNumaProcessorNode();
-     test_session_info();
-     test_GetLogicalProcessorInformationEx();
-+    test_GetActiveProcessorCount();
-     test_largepages();
-     test_ProcThreadAttributeList();
-     test_SuspendProcessState();
--- 
-2.30.1
-

patches/kernel32-Processor_Group/definition

@@ -1,2 +1 @@
 Fixes: Implement some processor group functions and SetThreadIdealProcessorEx
-Depends: api-ms-win-Stub_DLLs

patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

@@ -1,4 +1,4 @@
-From 27332457e843bbef5d08dd45249956ade1258476 Mon Sep 17 00:00:00 2001
+From dd0c922c02e793aba906cfad855c2474a3c2fe3b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 9 Jul 2019 14:13:28 +1000
 Subject: [PATCH] user32: Improve GetKeyboardLayoutList
@@ -55,11 +55,11 @@ index 7ac77141696..56009667b00 100644
      if (baselayout != 0)
      {
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index ce272ed73f4..9ac14b607cf 100644
+index 2397b4104e4..a5c8521c0e9 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -3979,6 +3979,40 @@ static void test_UnregisterDeviceNotification(void)
-     ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret);
+@@ -4322,6 +4322,40 @@ static void test_SendInput(void)
+     DestroyWindow( hwnd );
  }
  
 +static void test_GetKeyboardLayoutList(void)
@@ -99,7 +99,7 @@ index ce272ed73f4..9ac14b607cf 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4020,6 +4054,7 @@ START_TEST(input)
+@@ -4364,6 +4398,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
@@ -108,5 +108,5 @@ index ce272ed73f4..9ac14b607cf 100644
      if(pGetMouseMovePointsEx)
          test_GetMouseMovePointsEx(argv[0]);
 -- 
-2.28.0
+2.30.2
 

patches/mfplat-streaming-support/0019-winegstreamer-Set-MF_MT_ALL_SAMPLES_INDEPENDENT-attr.patch

@@ -1,26 +0,0 @@
-From fbf25644246c31e0116b319a1876c89697c07bc5 Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Wed, 25 Nov 2020 12:29:50 -0500
-Subject: [PATCH] winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT attribute on
- raw video media types.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/mfplat.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 1b19c43d991..f4a0c5b00f0 100644
---- a/dlls/winegstreamer/mfplat.c
-+++ b/dlls/winegstreamer/mfplat.c
-@@ -604,6 +604,7 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)
-             unsigned int i;
- 
-             IMFMediaType_SetUINT32(media_type, &MF_MT_COMPRESSED, FALSE);
-+            IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE);
- 
-             /* First try FOURCC */
-             if ((fourcc_subtype.Data1 = gst_video_format_to_fourcc(video_info.finfo->format)))
--- 
-2.29.2
-

patches/msxml3-FreeThreadedXMLHTTP60/definition

@@ -1 +1 @@
-Fixes: [49740] msxml3: Implement FreeThreadedXMLHTTP60.
+Fixes: [50900] msxml3: Implement FreeThreadedXMLHTTP60.

patches/ntdll-Activation_Context/0001-ntdll-Fix-return-value-for-missing-ACTIVATION_CONTEX.patch

@@ -1,116 +0,0 @@
-From caf668bdbcf74b6f00d6d70ae6030007852a082d Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 16 Mar 2015 03:46:36 +0100
-Subject: [PATCH] ntdll: Fix return value for missing
- ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION key.
-
----
- dlls/kernel32/tests/actctx.c | 36 ++++++++++++++++--------------------
- dlls/ntdll/actctx.c          |  3 +++
- 2 files changed, 19 insertions(+), 20 deletions(-)
-
-diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
-index 4b7096276e8..8effbdbc9bc 100644
---- a/dlls/kernel32/tests/actctx.c
-+++ b/dlls/kernel32/tests/actctx.c
-@@ -2365,7 +2365,7 @@ static HANDLE create_manifest(const char *filename, const char *data, int line)
-     return handle;
- }
- 
--static void kernel32_find(ULONG section, const char *string_to_find, BOOL should_find, BOOL todo, int line)
-+static void kernel32_find(ULONG section, const char *string_to_find, BOOL should_find, int line)
- {
-     UNICODE_STRING string_to_findW;
-     ACTCTX_SECTION_KEYED_DATA data;
-@@ -2382,7 +2382,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
-     err = GetLastError();
-     ok_(__FILE__, line)(ret == should_find,
-         "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret);
--    todo_wine_if(todo)
-     ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
-         "FindActCtxSectionStringA: unexpected error %u\n", err);
- 
-@@ -2394,7 +2393,6 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
-     err = GetLastError();
-     ok_(__FILE__, line)(ret == should_find,
-         "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret);
--    todo_wine_if(todo)
-     ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
-         "FindActCtxSectionStringW: unexpected error %u\n", err);
- 
-@@ -2417,7 +2415,7 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
-     pRtlFreeUnicodeString(&string_to_findW);
- }
- 
--static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_find, BOOL todo, int line)
-+static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_find, int line)
- {
-     UNICODE_STRING string_to_findW;
-     ACTCTX_SECTION_KEYED_DATA data;
-@@ -2429,12 +2427,10 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi
-     data.cbSize = sizeof(data);
- 
-     ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data);
--    todo_wine_if(todo)
-     ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
-         "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
- 
-     ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL);
--    todo_wine_if(todo)
-     ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
-         "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
- 
-@@ -2452,22 +2448,22 @@ static void test_findsectionstring(void)
-     ok(ret, "ActivateActCtx failed: %u\n", GetLastError());
- 
-     /* first we show the parameter validation from kernel32 */
--    kernel32_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, TRUE, __LINE__);
--    kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, FALSE, __LINE__);
--    kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, FALSE, __LINE__);
--    kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, FALSE, __LINE__);
--    kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, FALSE, __LINE__);
--    kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, FALSE, __LINE__);
--    kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, FALSE, __LINE__);
-+    kernel32_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, __LINE__);
-+    kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, __LINE__);
-+    kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, __LINE__);
-+    kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, __LINE__);
-+    kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, __LINE__);
-+    kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, __LINE__);
-+    kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, __LINE__);
- 
-     /* then we show that ntdll plays by different rules */
--    ntdll_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, TRUE, __LINE__);
--    ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, FALSE, __LINE__);
--    ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, FALSE, __LINE__);
--    ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, FALSE, __LINE__);
--    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, FALSE, __LINE__);
--    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, FALSE, __LINE__);
--    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, FALSE, __LINE__);
-+    ntdll_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, __LINE__);
-+    ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, __LINE__);
-+    ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, __LINE__);
-+    ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, __LINE__);
-+    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, __LINE__);
-+    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, __LINE__);
-+    ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, __LINE__);
- 
-     ret = DeactivateActCtx(0, cookie);
-     ok(ret, "DeactivateActCtx failed: %u\n", GetLastError());
-diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
-index 59e9671f9a8..c50d1a42fcf 100644
---- a/dlls/ntdll/actctx.c
-+++ b/dlls/ntdll/actctx.c
-@@ -4842,6 +4842,9 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind,
- 
-     switch (section_kind)
-     {
-+    case ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION:
-+        FIXME("Unsupported yet section_kind %x\n", section_kind);
-+        return STATUS_SXS_KEY_NOT_FOUND;
-     case ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION:
-         status = find_dll_redirection(actctx, section_name, data);
-         break;
--- 
-2.17.1
-

patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch

@@ -1,4 +1,4 @@
-From 658a24832ee3e9a04a311600fd00b91b6d5cfb5f Mon Sep 17 00:00:00 2001
+From 5b1520dd617c454ac8e482260b6b437f6f98d185 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 01:06:26 +0200
 Subject: [PATCH] ntdll: Add dummy apiset to PEB.
@@ -12,27 +12,27 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
  create mode 100644 include/apiset.h
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index c7da728964c..addc5e0adfc 100644
+index 7a714a5aa6d..62d1b38f4c0 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -169,6 +169,7 @@ static RTL_CRITICAL_SECTION peb_lock = { &peb_critsect_debug, -1, 0, 0, 0, 0 };
- static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE };
+@@ -164,6 +164,7 @@ static PEB_LDR_DATA ldr =
+ 
  static RTL_BITMAP tls_bitmap;
  static RTL_BITMAP tls_expansion_bitmap;
 +static API_SET_NAMESPACE_ARRAY apiset_map;
  
  static WINE_MODREF *cached_modref;
  static WINE_MODREF *current_modref;
-@@ -4025,6 +4026,7 @@ static NTSTATUS process_init(void)
+@@ -3626,6 +3627,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
  
-     peb->LdrData            = &ldr;
-     peb->FastPebLock        = &peb_lock;
-+    peb->ApiSetMap          = &apiset_map;
-     peb->TlsBitmap          = &tls_bitmap;
-     peb->TlsExpansionBitmap = &tls_expansion_bitmap;
-     peb->LoaderLock         = &loader_section;
+         peb->LdrData            = &ldr;
+         peb->FastPebLock        = &peb_lock;
++        peb->ApiSetMap          = &apiset_map;
+         peb->TlsBitmap          = &tls_bitmap;
+         peb->TlsExpansionBitmap = &tls_expansion_bitmap;
+         peb->LoaderLock         = &loader_section;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 87cc175739b..ff9f0f692d9 100644
+index 9133e5c6315..f56a60fae5e 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
 @@ -15,6 +15,7 @@ SOURCES = \
@@ -87,7 +87,7 @@ index 00000000000..6801cd5f509
 +
 +#endif
 diff --git a/include/winternl.h b/include/winternl.h
-index cff261b6d7c..ca7a85d9578 100644
+index 298ebbc2d36..163b7737e00 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
 @@ -23,6 +23,7 @@
@@ -98,7 +98,7 @@ index cff261b6d7c..ca7a85d9578 100644
  
  #ifdef __cplusplus
  extern "C" {
-@@ -316,7 +317,7 @@ typedef struct _PEB
+@@ -321,7 +322,7 @@ typedef struct _PEB
      PVOID                        KernelCallbackTable;               /* 02c/058 */
      ULONG                        Reserved;                          /* 030/060 */
      ULONG                        AtlThunkSListPtr32;                /* 034/064 */
@@ -108,5 +108,5 @@ index cff261b6d7c..ca7a85d9578 100644
      PRTL_BITMAP                  TlsBitmap;                         /* 040/078 */
      ULONG                        TlsBitmapBits[2];                  /* 044/080 */
 -- 
-2.28.0
+2.30.2
 

patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch

@@ -1,4 +1,4 @@
-From 5d866aebeeb7760eed0f35a206d43ef32bafbffe Mon Sep 17 00:00:00 2001
+From dd8ab6d50d5a84d8b40fd8541184c4cc462e7bd0 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Aug 2017 03:38:38 +0200
 Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
  1 file changed, 34 insertions(+)
 
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index b8f9dc28e63..444feb5d152 100644
+index 1e00dcda2ec..631876c9862 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
 @@ -26,6 +26,7 @@
@@ -20,7 +20,7 @@ index b8f9dc28e63..444feb5d152 100644
  #include "wine/asm.h"
  
  #define DECLARE_CRITICAL_SECTION(cs) \
-@@ -88,6 +89,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
+@@ -85,6 +86,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
  extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN;
  extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN;
  
@@ -57,9 +57,9 @@ index b8f9dc28e63..444feb5d152 100644
 +    }
 +}
 +
- /* load order */
- 
- #ifndef _WIN64
+ struct dllredirect_data
+ {
+     ULONG size;
 -- 
-2.30.1
+2.30.2