Release v8.1

We don't have a WineHQ bug report, and it may be difficult to make one, but let's at least write down what this is for.

.github/workflows/macOS.yml

@@ -14,7 +14,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew update
           brew install --cask xquartz
           brew install  bison \
                         gphoto2 \

README.md

@@ -33,11 +33,11 @@ of information about that is collected in the
 [WineHQ Wiki](http://wiki.winehq.org/BuildingWine).
 
 In order to apply all Wine Staging patches it is recommended to use the
-`patchinstall.sh` utility which takes care of applying all patches in the
+`patchinstall.py` utility which takes care of applying all patches in the
 correct order. For reference, the possible commandline arguments are:
 
 ```
-Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]
+Usage: ./staging/patchinstall.py [DESTDIR=path] [-W patchset] [patchset ...]
 
 Autogenerated script to apply all Wine Staging patches on your Wine
 source tree.
@@ -55,17 +55,14 @@ Configuration:
 
 Backends:
   --backend=patch      Use regular 'patch' utility to apply patches (default)
-  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
-  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
   --backend=git-am     Use 'git am' to apply patches
   --backend=git-apply  Use 'git apply' to apply patches
-  --backend=stg        Import the patches using stacked git
 ```
 
 If you want to apply *all* patches with the `patch` utility, the commandline
 should look similar to this:
 ```
-./patches/patchinstall.sh DESTDIR="/path/to/wine" --all
+./staging/patchinstall.py DESTDIR="/path/to/wine" --all
 ```
 
 Before you proceed with the compilation, please make sure that you installed all
@@ -94,17 +91,17 @@ proper implementation. In the event that this happens, we add the patches to
 wine-staging instead, and keep them updated and maintained as well as attempt to
 clean them up to be upstreamed. We also both write and verify patches which fix
 various bugs that may not have patches, and in turn allow them run better using
-WINE. This includes testing on various hardware, games, and applications.
+WINE. This includes testing on various hardware, games and applications.
 
 Any expenses for applications, games, or hardware which we do not own comes out
 of pocket. In order to alleviate these expenses, we are now accepting donations.
 This in turn allows us to continue to perform testing, provide fixes, and get
 them upstreamed, ultimately aiming to provide a better experience for all WINE
 users. All of our work is provided publicly for free and can be found at
-<https://github.com/wine-staging/wine-staging>. We do not expect to be paid for
+<https://gitlab.winehq.org/wine/wine-staging>. We do not expect to be paid for
 any of the work provided, nor will donators receive any special benefits or
 compensation.
 
 Donations are recieved through Patreon. Anyone interested may donate here:
 
-https://www.patreon.com/winestaging
+https://www.patreon.com/winestaging

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

@@ -1,4 +1,4 @@
-From 92914d4648be5dd7ee62b35d3ca2fc7376d0dbd0 Mon Sep 17 00:00:00 2001
+From 4edf58f26172ec7f931eab57d14aca564d8b58e3 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:54:26 +0100
 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
@@ -13,10 +13,10 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
  6 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
-index 971e3c7ff6b..fcd96eb6374 100644
+index 1cba26f5ca4..df88fb70469 100644
 --- a/dlls/d2d1/bitmap.c
 +++ b/dlls/d2d1/bitmap.c
-@@ -646,5 +646,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
+@@ -762,5 +762,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl);
@@ -24,7 +24,7 @@ index 971e3c7ff6b..fcd96eb6374 100644
 +    return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
  }
 diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
-index b9a673fe54c..c5a52db6b01 100644
+index 98aa889aa5f..52fc0a9854a 100644
 --- a/dlls/d2d1/brush.c
 +++ b/dlls/d2d1/brush.c
 @@ -259,7 +259,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
@@ -64,7 +64,7 @@ index b9a673fe54c..c5a52db6b01 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
 diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
-index e7e0fa57ed7..1166ae204c2 100644
+index 30eafe361d1..0a38aa8613a 100644
 --- a/dlls/d2d1/dc_render_target.c
 +++ b/dlls/d2d1/dc_render_target.c
 @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -77,10 +77,10 @@ index e7e0fa57ed7..1166ae204c2 100644
  
  static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
-index e97bae0b54a..661387b570b 100644
+index d6ee91de005..781e9aa8511 100644
 --- a/dlls/d2d1/geometry.c
 +++ b/dlls/d2d1/geometry.c
-@@ -3356,7 +3356,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
+@@ -3360,7 +3360,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
  
  static inline struct d2d_geometry *impl_from_ID2D1PathGeometry1(ID2D1PathGeometry1 *iface)
  {
@@ -89,7 +89,7 @@ index e97bae0b54a..661387b570b 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry1 *iface, REFIID iid, void **out)
-@@ -4229,7 +4229,7 @@ fail:
+@@ -4233,7 +4233,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
  {
@@ -98,7 +98,7 @@ index e97bae0b54a..661387b570b 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
-@@ -4941,7 +4941,7 @@ fail:
+@@ -4945,7 +4945,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
  {
@@ -107,7 +107,7 @@ index e97bae0b54a..661387b570b 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
-@@ -5225,7 +5225,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *
+@@ -5229,7 +5229,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *
  
  static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface)
  {
@@ -117,7 +117,7 @@ index e97bae0b54a..661387b570b 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface,
 diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
-index 4ce220bf433..32eeaf02c9f 100644
+index 4d3fe43a1b3..ccb7067fabf 100644
 --- a/dlls/d2d1/hwnd_render_target.c
 +++ b/dlls/d2d1/hwnd_render_target.c
 @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -130,16 +130,16 @@ index 4ce220bf433..32eeaf02c9f 100644
  
  static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown)
 diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
-index 114a3efd883..4f662be4549 100644
+index 770c165fd90..a3b48095436 100644
 --- a/dlls/d2d1/state_block.c
 +++ b/dlls/d2d1/state_block.c
-@@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
-     if (!iface)
+@@ -191,5 +191,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
+         WARN("Unexpected state block vtbl %p.\n", iface->lpVtbl);
          return NULL;
-     assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl);
+     }
 -    return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
 +    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
  }
 -- 
-2.35.1
+2.38.1
 

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

@@ -1,25 +0,0 @@
-From e35d665256d08ebccee30361867ba57f790d519f Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 23:01:32 +0100
-Subject: rpcrt4: Avoid implicit cast of interface pointer.
-
----
- dlls/rpcrt4/cstub.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c
-index 838ed03..992c235 100644
---- a/dlls/rpcrt4/cstub.c
-+++ b/dlls/rpcrt4/cstub.c
-@@ -59,7 +59,7 @@ typedef struct
- 
- static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface )
- {
--    return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer);
-+    return CONTAINING_RECORD((void *)iface, cstdstubbuffer_delegating_t, stub_buffer);
- }
- 
- HRESULT CStdStubBuffer_Construct(REFIID riid,
--- 
-2.7.1
-

patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch

@@ -67,7 +67,7 @@ index cacb7ea7751..19a807c1624 100644
 -           Note: Launching internal wine processes cannot specify a full path to exe */
 -        status = CreateProcessW(thisDir,
 -                                command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe);
--        heap_free(st.lpReserved2);
+-        free(st.lpReserved2);
 -        if ((opt_c || opt_k) && !opt_s && !status
 -            && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
 -          /* strip first and last quote WCHARacters and try again */
@@ -143,7 +143,7 @@ index cacb7ea7751..19a807c1624 100644
 +      WINE_TRACE("Launching via CreateProcess\n");
 +      status = CreateProcessW(thisDir,
 +                              command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe);
-+      heap_free(st.lpReserved2);
++      free(st.lpReserved2);
 +      if ((opt_c || opt_k) && !opt_s && !status
 +          && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
 +        /* strip first and last quote WCHARacters and try again */

patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch

@@ -1,4 +1,4 @@
-From c88a1acf9ac625cb2a7cbfc90ac3bb2d426889a0 Mon Sep 17 00:00:00 2001
+From 7362e037e8160046fffcf062a663ea8e7ac45290 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 12 Nov 2019 18:13:20 +0800
 Subject: [PATCH] comctl32: Bump version to 6.0.
@@ -14,10 +14,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
-index 66b341ae5ad..1af9baea7ee 100644
+index 7dfdf089eb1..17ec7eeab40 100644
 --- a/dlls/comctl32/comctl32.h
 +++ b/dlls/comctl32/comctl32.h
-@@ -193,7 +193,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
+@@ -194,7 +194,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
  BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
  BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN;
  
@@ -40,12 +40,12 @@ index c9aa1ba6253..be6e2425193 100644
  #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
  
 diff --git a/include/commctrl.h b/include/commctrl.h
-index dfd2f4a37d2..0784478ce14 100644
+index a54de13d8b2..e0b0e22d4dc 100644
 --- a/include/commctrl.h
 +++ b/include/commctrl.h
-@@ -51,7 +51,7 @@ enum _LI_METRIC
- HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
- HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
+@@ -59,7 +59,7 @@ enum _LI_METRIC
+ WINCOMMCTRLAPI HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
+ WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
  
 -#define COMCTL32_VERSION                5  /* dll version */
 +#define COMCTL32_VERSION                6  /* dll version */
@@ -53,5 +53,5 @@ index dfd2f4a37d2..0784478ce14 100644
  #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
  #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
 -- 
-2.25.1
+2.35.1
 

patches/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch

@@ -1,4 +1,4 @@
-From 6c3aa646aff81104eb7783138a71d4bb8cf192a7 Mon Sep 17 00:00:00 2001
+From 0ba05ea85f8f2de3c802083340eb3a9ee8df209e Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 13 Feb 2016 15:29:37 +0100
 Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
@@ -6,11 +6,11 @@ Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
 Changes in v2 (by Christian Costa):
   * More generic code for D3DXDisassembleShader.
 ---
- dlls/d3dx9_36/shader.c | 332 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 327 insertions(+), 5 deletions(-)
+ dlls/d3dx9_36/shader.c | 335 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 329 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index fe0f99180ac..54d0b158568 100644
+index 1aa75d64dc5..d98345e2288 100644
 --- a/dlls/d3dx9_36/shader.c
 +++ b/dlls/d3dx9_36/shader.c
 @@ -1,6 +1,7 @@
@@ -21,22 +21,27 @@ index fe0f99180ac..54d0b158568 100644
   * Copyright 2011 Travis Athougies
   *
   * This library is free software; you can redistribute it and/or
-@@ -18,7 +19,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+@@ -19,6 +20,7 @@
   */
  
--
+ #include <assert.h>
 +#include <stdio.h>
+ 
  #include "d3dx9_private.h"
  #include "d3dcommon.h"
- #include "d3dcompiler.h"
-@@ -2336,13 +2337,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
+@@ -2347,13 +2349,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
      return D3D_OK;
  }
  
+-HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments,
+-        ID3DXBuffer **buffer)
+-{
+-    TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer);
 +static const char *decl_usage[] = { "position", "blendweight", "blendindices", "normal", "psize", "texcoord",
 +                                    "tangent", "binormal", "tessfactor", "positiont", "color" };
-+
+ 
+-    return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0,
+-            comments, (ID3DBlob **)buffer);
 +static const char *tex_type[] = { "", "1d", "2d", "cube", "volume" };
 +
 +static int add_modifier(char *buffer, DWORD param)
@@ -298,11 +303,9 @@ index fe0f99180ac..54d0b158568 100644
 +    { D3DSIO_COMMENT,      "",              0, instr_comment, 0x0100, 0xFFFF }
 +};
 +
- HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments,
--        ID3DXBuffer **buffer)
++HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments,
 +        ID3DXBuffer **disassembly)
- {
--    TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer);
++{
 +    DWORD *ptr = (DWORD *)shader;
 +    char *buffer, *buf;
 +    UINT capacity = 4096;
@@ -314,9 +317,7 @@ index fe0f99180ac..54d0b158568 100644
 +
 +    if (!shader || !disassembly)
 +        return D3DERR_INVALIDCALL;
- 
--    return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0,
--            comments, (ID3DBlob **)buffer);
++
 +    buf = buffer = HeapAlloc(GetProcessHeap(), 0, capacity);
 +    if (!buffer)
 +        return E_OUTOFMEMORY;
@@ -370,5 +371,5 @@ index fe0f99180ac..54d0b158568 100644
  
  struct d3dx9_texture_shader
 -- 
-2.32.0
+2.39.0
 

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

@@ -1,16 +1,16 @@
-From 33e4e3219056f09ed8b406d154b87bafedb1ebe0 Mon Sep 17 00:00:00 2001
+From 7ba5e4a89be15deeb704078ad8321c7cc5aa02eb Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Mon, 22 Jul 2013 21:51:20 +0200
-Subject: d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
+Subject: [PATCH] d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
 
 This patch fixes last problem of bug 32572.
 ---
- dlls/d3dx9_36/skin.c       | 86 ++++++++++++++++++++++++++++++++++++++++++++--
- dlls/d3dx9_36/tests/mesh.c | 83 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/skin.c       | 86 ++++++++++++++++++++++++++++++++++++--
+ dlls/d3dx9_36/tests/mesh.c | 83 ++++++++++++++++++++++++++++++++++++
  2 files changed, 166 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
-index aa5acf2..bd7e581 100644
+index b81fb6863d3..75ee6d44a95 100644
 --- a/dlls/d3dx9_36/skin.c
 +++ b/dlls/d3dx9_36/skin.c
 @@ -2,6 +2,7 @@
@@ -21,7 +21,7 @@ index aa5acf2..bd7e581 100644
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
-@@ -375,10 +376,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface,
+@@ -399,10 +400,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface,
  static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms,
          const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices)
  {
@@ -115,11 +115,11 @@ index aa5acf2..bd7e581 100644
  
  static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in,
 diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index 17c5d9c..e255eac 100644
+index 1daec158a5f..64b02276843 100644
 --- a/dlls/d3dx9_36/tests/mesh.c
 +++ b/dlls/d3dx9_36/tests/mesh.c
-@@ -5152,6 +5152,88 @@ static void test_create_skin_info(void)
-     ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
+@@ -5241,6 +5241,88 @@ static void test_create_skin_info(void)
+     ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#lx\n", hr);
  }
  
 +static void test_update_skinned_mesh(void)
@@ -207,7 +207,7 @@ index 17c5d9c..e255eac 100644
  static void test_convert_adjacency_to_point_reps(void)
  {
      HRESULT hr;
-@@ -10468,6 +10550,7 @@ START_TEST(mesh)
+@@ -11484,6 +11566,7 @@ START_TEST(mesh)
      D3DXGenerateAdjacencyTest();
      test_update_semantics();
      test_create_skin_info();
@@ -216,5 +216,5 @@ index 17c5d9c..e255eac 100644
      test_convert_point_reps_to_adjacency();
      test_weld_vertices();
 -- 
-2.1.2
+2.38.1
 

patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch

@@ -1,4 +1,4 @@
-From f2401390227b40c68bb97983fc028d5060a70e8c Mon Sep 17 00:00:00 2001
+From d3262875b2ce7d2a6746f2139ca00e3d0f13fb33 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 10:44:49 -0500
 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -12,18 +12,18 @@ Although perhaps we shouldn't since the server doesn't do this.
  2 files changed, 17 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 9683798b57b..b4465a98794 100644
+index 3be31e40cf6..0a2cdc0dfcd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -478,6 +478,7 @@ AC_CHECK_HEADERS(\
+@@ -453,6 +453,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
 +	sys/eventfd.h \
+ 	sys/extattr.h \
  	sys/filio.h \
  	sys/ipc.h \
- 	sys/link.h \
-@@ -1991,6 +1992,7 @@ AC_CHECK_FUNCS(\
+@@ -2024,6 +2025,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
@@ -31,7 +31,7 @@ index 9683798b57b..b4465a98794 100644
  	prctl \
  	proc_pidinfo \
  	sched_yield \
-@@ -2033,6 +2035,12 @@ case $host_os in
+@@ -2049,6 +2051,12 @@ case $host_os in
      ;;
  esac
  
@@ -41,14 +41,14 @@ index 9683798b57b..b4465a98794 100644
 +                test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
 +LIBS=$ac_save_LIBS
 +
- dnl **** Check for OpenLDAP ***
- if test "x$with_ldap" != "xno"
- then
+ AC_CACHE_CHECK([for sched_setaffinity],wine_cv_have_sched_setaffinity,
+                 AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ [[#include <sched.h>]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no]))
 diff --git a/include/config.h.in b/include/config.h.in
-index 197c3b97f09..13f822cb36c 100644
+index fe2fc36a914..8e8c57d711c 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -362,6 +362,9 @@
+@@ -309,6 +309,9 @@
  /* Define to 1 if you have the `posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -58,17 +58,17 @@ index 197c3b97f09..13f822cb36c 100644
  /* Define to 1 if you have the `prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -434,6 +437,9 @@
+@@ -375,6 +378,9 @@
  /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
 +/* Define to 1 if you have the `shm_open' function. */
 +#undef HAVE_SHM_OPEN
 +
- /* Define if sigaddset is supported */
- #undef HAVE_SIGADDSET
+ /* Define to 1 if `si_fd' is a member of `siginfo_t'. */
+ #undef HAVE_SIGINFO_T_SI_FD
  
-@@ -574,6 +580,9 @@
+@@ -510,6 +516,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  
@@ -79,5 +79,5 @@ index 197c3b97f09..13f822cb36c 100644
  #undef HAVE_SYS_EVENT_H
  
 -- 
-2.33.0
+2.39.0
 

patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch

@@ -1,4 +1,4 @@
-From 846f2603e9d2a3a3b5a56b0e1140bb49a95053a6 Mon Sep 17 00:00:00 2001
+From ec18233558b62aa736b5ecf20d2f7487e2823286 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Thu, 7 Jun 2018 20:09:59 -0500
 Subject: [PATCH] server: Create server objects for eventfd-based
@@ -15,7 +15,7 @@ Subject: [PATCH] server: Create server objects for eventfd-based
  create mode 100644 server/esync.h
 
 diff --git a/server/Makefile.in b/server/Makefile.in
-index c81a2112632..da20dff9f56 100644
+index 3b9446fe224..776faec63e4 100644
 --- a/server/Makefile.in
 +++ b/server/Makefile.in
 @@ -11,6 +11,7 @@ C_SRCS = \
@@ -28,7 +28,7 @@ index c81a2112632..da20dff9f56 100644
  	file.c \
 diff --git a/server/esync.c b/server/esync.c
 new file mode 100644
-index 00000000000..b9dbfa322bc
+index 00000000000..35b4833fd4c
 --- /dev/null
 +++ b/server/esync.c
 @@ -0,0 +1,318 @@
@@ -158,7 +158,7 @@ index 00000000000..b9dbfa322bc
 +    NULL,                      /* satisfied */
 +    no_signal,                 /* signal */
 +    no_get_fd,                 /* get_fd */
-+    no_map_access,             /* map_access */
++    default_map_access,        /* map_access */
 +    default_get_sd,            /* get_sd */
 +    default_set_sd,            /* set_sd */
 +    default_get_full_name,     /* get_full_name */
@@ -403,10 +403,10 @@ index a134d811d82..3436b0871b4 100644
      set_current_time();
      init_scheduler();
 diff --git a/server/protocol.def b/server/protocol.def
-index 6bfcda213a4..6b0e0e6f6e4 100644
+index 99df502e398..9e15ada5bd0 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3738,7 +3738,6 @@ struct handle_info
+@@ -3777,7 +3777,6 @@ struct handle_info
      obj_handle_t handle;       /* process handle */
  @END
  
@@ -414,7 +414,7 @@ index 6bfcda213a4..6b0e0e6f6e4 100644
  /* Iterate thread list for process */
  @REQ(get_next_thread)
      obj_handle_t process;      /* process handle */
-@@ -3749,3 +3748,27 @@ struct handle_info
+@@ -3788,3 +3787,27 @@ struct handle_info
  @REPLY
      obj_handle_t handle;       /* next thread handle */
  @END
@@ -443,5 +443,5 @@ index 6bfcda213a4..6b0e0e6f6e4 100644
 +    unsigned int shm_idx;
 +@END
 -- 
-2.35.1
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From c204c9ed2a8504868c3cbf487e7a29c4e7254d3f Mon Sep 17 00:00:00 2001
+From 271f43a1fafb19e1404b05ec597b504ecad74784 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:09:22 -0500
 Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
@@ -16,10 +16,10 @@ Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
  create mode 100644 dlls/ntdll/unix/esync.h
 
 diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index 185bc563e68..d7c757cab32 100644
+index 07688a5fcf6..4e490c475a2 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
-@@ -46,6 +46,7 @@ C_SRCS = \
+@@ -47,6 +47,7 @@ C_SRCS = \
  	unix/cdrom.c \
  	unix/debug.c \
  	unix/env.c \
@@ -346,7 +346,7 @@ index 00000000000..a50a755149a
 +
 +extern int receive_fd( obj_handle_t *handle ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 10884a7a673..28cc48e04bf 100644
+index 35f2e5f986f..4d95c29ab24 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
 @@ -89,6 +89,7 @@
@@ -357,8 +357,8 @@ index 10884a7a673..28cc48e04bf 100644
  #include "wine/list.h"
  #include "wine/debug.h"
  
-@@ -2082,6 +2083,7 @@ static void start_main_thread(void)
-     signal_init_thread( teb );
+@@ -2188,6 +2189,7 @@ static void start_main_thread(void)
+     signal_alloc_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();
 +    esync_init();
@@ -366,7 +366,7 @@ index 10884a7a673..28cc48e04bf 100644
      init_cpu_info();
      init_files();
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index 6a3224d8385..de65f936a59 100644
+index b7d8733f2bc..8cd5f0474e6 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
 @@ -106,7 +106,7 @@ sigset_t server_block_set;  /* signals to block during server calls */
@@ -378,7 +378,7 @@ index 6a3224d8385..de65f936a59 100644
  
  /* atomically exchange a 64-bit value */
  static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
-@@ -803,7 +803,7 @@ void wine_server_send_fd( int fd )
+@@ -834,7 +834,7 @@ void wine_server_send_fd( int fd )
   *
   * Receive a file descriptor passed from the server.
   */
@@ -388,7 +388,7 @@ index 6a3224d8385..de65f936a59 100644
      struct iovec vec;
      struct msghdr msghdr;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 442243d8bcf..72cbf92f93c 100644
+index 9112572c67d..c5f30428f79 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
 @@ -64,6 +64,7 @@
@@ -399,7 +399,7 @@ index 442243d8bcf..72cbf92f93c 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(sync);
  
-@@ -262,6 +263,9 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
+@@ -273,6 +274,9 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
      if (max <= 0 || initial < 0 || initial > max) return STATUS_INVALID_PARAMETER;
      if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;
  
@@ -422,5 +422,5 @@ index b9dbfa322bc..99e57eca44c 100644
  int do_esync(void)
  {
 -- 
-2.34.1
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 4c255f91363e09892de43bf5f3b991ef5ccce3b2 Mon Sep 17 00:00:00 2001
+From 06faa163af3dd5fa6e4794bf244c662533a88b69 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:16:34 -0500
 Subject: [PATCH] ntdll: Implement NtReleaseSemaphore().
@@ -90,12 +90,12 @@ index a50a755149a..09838e95535 100644
  
  /* We have to synchronize on the fd cache mutex so that our calls to receive_fd
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 72cbf92f93c..db992f3a9ad 100644
+index fff4970549b..fbd28292524 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -348,6 +348,9 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous
+@@ -359,6 +359,9 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous
  {
-     NTSTATUS ret;
+     unsigned int ret;
  
 +    if (do_esync())
 +        return esync_release_semaphore( handle, count, previous );
@@ -104,5 +104,5 @@ index 72cbf92f93c..db992f3a9ad 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.33.0
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From bb4f401e45ff4017600e8037ceb69456c2c0171d Mon Sep 17 00:00:00 2001
+From ff044319027197bb9a1f20a19f01d8c299835818 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 14:46:24 -0500
 Subject: [PATCH] ntdll: Implement NtSetEvent().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtSetEvent().
  3 files changed, 20 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index e440e9baa4a..b8fb27edf38 100644
+index 059d7fd9ca6..410cfd3c2ce 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -316,6 +316,21 @@ NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
+@@ -314,6 +314,21 @@ NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
      return create_esync( type, handle, access, attr, initial, 0 );
  }
  
@@ -48,15 +48,15 @@ index d9c7df967f8..b585af047ee 100644
  extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
                                      BOOLEAN alertable, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index f3ced2d63b6..686255d4d99 100644
+index 7be736927b2..8e793941711 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -429,8 +429,12 @@ NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT
+@@ -440,8 +440,12 @@ NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT
   */
  NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state )
  {
 +    /* This comment is a dummy to make sure this patch applies in the right place. */
-     NTSTATUS ret;
+     unsigned int ret;
  
 +    if (do_esync())
 +        return esync_set_event( handle );
@@ -65,5 +65,5 @@ index f3ced2d63b6..686255d4d99 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.29.2
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 68e3e5a72ce9776371df909163ac40cb2a2aa887 Mon Sep 17 00:00:00 2001
+From c1c004fcfb9d38086fd682e64aca7fd6aaad4cc9 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 14:51:21 -0500
 Subject: [PATCH] ntdll: Implement NtResetEvent().
@@ -6,14 +6,14 @@ Subject: [PATCH] ntdll: Implement NtResetEvent().
 ---
  dlls/ntdll/unix/esync.c | 15 +++++++++++++++
  dlls/ntdll/unix/esync.h |  1 +
- dlls/ntdll/unix/sync.c  |  4 ++++
- 3 files changed, 20 insertions(+)
+ dlls/ntdll/unix/sync.c  |  5 +++++
+ 3 files changed, 21 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index b8fb27edf38..97d468b2449 100644
+index 410cfd3c2ce..80eb3773ee4 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -331,6 +331,21 @@ NTSTATUS esync_set_event( HANDLE handle )
+@@ -329,6 +329,21 @@ NTSTATUS esync_set_event( HANDLE handle )
      return STATUS_SUCCESS;
  }
  
@@ -48,22 +48,23 @@ index b585af047ee..8480a213b2a 100644
  
  extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index bb36254acdc..b0f53d4677b 100644
+index 8e793941711..f57a825872b 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -507,8 +507,12 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state )
+@@ -463,8 +463,13 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state )
   */
  NTSTATUS WINAPI NtResetEvent( HANDLE handle, LONG *prev_state )
  {
 +    /* This comment is a dummy to make sure this patch applies in the right place. */
-     NTSTATUS ret;
+     unsigned int ret;
  
 +    if (do_esync())
 +        return esync_reset_event( handle );
++
 +
      SERVER_START_REQ( event_op )
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.29.2
+2.38.1
 

patches/eventfd_synchronization/0024-ntdll-Implement-NtReleaseMutant.patch

@@ -1,4 +1,4 @@
-From 5b4a4557f47415d9a78185a3be8b0a9d7d6bdc33 Mon Sep 17 00:00:00 2001
+From 24a1dd64bee6e9140d6f05241c03f572bb464436 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:37:49 -0500
 Subject: [PATCH] ntdll: Implement NtReleaseMutant().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtReleaseMutant().
  3 files changed, 38 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index df9eb2696a1..48482a31ea2 100644
+index 350b1ffb756..ded71e631f7 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -431,6 +431,40 @@ NTSTATUS esync_create_mutex( HANDLE *handle, ACCESS_MASK access,
+@@ -424,6 +424,40 @@ NTSTATUS esync_create_mutex( HANDLE *handle, ACCESS_MASK access,
      return create_esync( ESYNC_MUTEX, handle, access, attr, initial ? 0 : 1, 0 );
  }
  
@@ -67,12 +67,12 @@ index 38ebefc9eed..e69c46ca462 100644
  extern NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
                                      BOOLEAN alertable, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 56292db271a..1a19bb78a9c 100644
+index 2640320587e..620d013751f 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -648,6 +648,9 @@ NTSTATUS WINAPI NtReleaseMutant( HANDLE handle, LONG *prev_count )
+@@ -609,6 +609,9 @@ NTSTATUS WINAPI NtReleaseMutant( HANDLE handle, LONG *prev_count )
  {
-     NTSTATUS ret;
+     unsigned int ret;
  
 +    if (do_esync())
 +        return esync_release_mutex( handle, prev_count );
@@ -81,5 +81,5 @@ index 56292db271a..1a19bb78a9c 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.28.0
+2.38.1
 

patches/eventfd_synchronization/0029-ntdll-Implement-NtOpenSemaphore.patch

@@ -1,4 +1,4 @@
-From 7f04be3dd881287f1a74b7fe5829fa5917afa054 Mon Sep 17 00:00:00 2001
+From fd251549dc6a59073937ba74b195f9dc7a892616 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:56:09 -0500
 Subject: [PATCH] ntdll: Implement NtOpenSemaphore().
@@ -12,10 +12,10 @@ Subject: [PATCH] ntdll: Implement NtOpenSemaphore().
  5 files changed, 96 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 6d8653cd107..8e7e50ce777 100644
+index cdf5f602695..583afebb17c 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -336,6 +336,45 @@ static NTSTATUS create_esync( enum esync_type type, HANDLE *handle, ACCESS_MASK
+@@ -329,6 +329,45 @@ static NTSTATUS create_esync( enum esync_type type, HANDLE *handle, ACCESS_MASK
      return ret;
  }
  
@@ -61,7 +61,7 @@ index 6d8653cd107..8e7e50ce777 100644
  extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
      const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max)
  {
-@@ -345,6 +384,14 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
+@@ -338,6 +377,14 @@ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
      return create_esync( ESYNC_SEMAPHORE, handle, access, attr, initial, max );
  }
  
@@ -90,11 +90,11 @@ index bee08ff857f..2738e8b7f87 100644
  
  extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index a51462abeac..36322f6afb6 100644
+index ce3061a7f31..dd8ed16f868 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -353,6 +353,10 @@ NTSTATUS WINAPI NtOpenSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJEC
-     NTSTATUS ret;
+@@ -301,6 +301,10 @@ NTSTATUS WINAPI NtOpenSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJEC
+     unsigned int ret;
  
      *handle = 0;
 +
@@ -105,10 +105,10 @@ index a51462abeac..36322f6afb6 100644
  
      SERVER_START_REQ( open_semaphore )
 diff --git a/server/esync.c b/server/esync.c
-index 913104e3dd4..da97c6c140b 100644
+index 3f1c61bc1f0..eca9b6aa67d 100644
 --- a/server/esync.c
 +++ b/server/esync.c
-@@ -412,6 +412,37 @@ DECL_HANDLER(create_esync)
+@@ -410,6 +410,37 @@ DECL_HANDLER(create_esync)
      if (root) release_object( root );
  }
  
@@ -147,10 +147,10 @@ index 913104e3dd4..da97c6c140b 100644
   * server. The client should only read from (i.e. wait on) this object. */
  DECL_HANDLER(get_esync_fd)
 diff --git a/server/protocol.def b/server/protocol.def
-index 776d3d72dc2..575cf291bb0 100644
+index 40bdd8a70b4..acd90615cf7 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3750,6 +3750,18 @@ enum esync_type
+@@ -3812,6 +3812,18 @@ enum esync_type
      unsigned int shm_idx;
  @END
  
@@ -170,5 +170,5 @@ index 776d3d72dc2..575cf291bb0 100644
  @REQ(get_esync_fd)
      obj_handle_t handle;        /* handle to the object */
 -- 
-2.30.2
+2.38.1
 

patches/eventfd_synchronization/0032-server-Implement-esync_map_access.patch

@@ -1,4 +1,4 @@
-From 161ae4c64b5e3bd33771671f518c482a6a66700b Mon Sep 17 00:00:00 2001
+From 614c13aed3d20a772c3ccd26547fa93a56fcc40b Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Sun, 10 Jun 2018 19:08:18 -0500
 Subject: [PATCH] server: Implement esync_map_access().
@@ -8,10 +8,10 @@ Subject: [PATCH] server: Implement esync_map_access().
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/server/esync.c b/server/esync.c
-index 1703608263f..20f149cdad3 100644
+index eca9b6aa67d..3a334b3b330 100644
 --- a/server/esync.c
 +++ b/server/esync.c
-@@ -114,6 +114,7 @@ struct esync
+@@ -112,6 +112,7 @@ struct esync
  };
  
  static void esync_dump( struct object *obj, int verbose );
@@ -19,16 +19,16 @@ index 1703608263f..20f149cdad3 100644
  static void esync_destroy( struct object *obj );
  
  const struct object_ops esync_ops =
-@@ -128,7 +129,7 @@ const struct object_ops esync_ops =
+@@ -126,7 +127,7 @@ const struct object_ops esync_ops =
      NULL,                      /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
--    no_map_access,             /* map_access */
+-    default_map_access,        /* map_access */
 +    esync_map_access,          /* map_access */
      default_get_sd,            /* get_sd */
      default_set_sd,            /* set_sd */
      default_get_full_name,     /* get_full_name */
-@@ -148,6 +149,16 @@ static void esync_dump( struct object *obj, int verbose )
+@@ -146,6 +147,16 @@ static void esync_dump( struct object *obj, int verbose )
      fprintf( stderr, "esync fd=%d\n", esync->fd );
  }
  
@@ -46,5 +46,5 @@ index 1703608263f..20f149cdad3 100644
  {
      struct esync *esync = (struct esync *)obj;
 -- 
-2.28.0
+2.38.1
 

patches/eventfd_synchronization/0052-ntdll-Implement-NtPulseEvent.patch

@@ -1,4 +1,4 @@
-From bb81fa475b3aa206fe1e8ff914d41de292aa9807 Mon Sep 17 00:00:00 2001
+From 1d7cb4fe562903aa56abe64c97d0d84357b67f49 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 17:56:40 -0500
 Subject: [PATCH] ntdll: Implement NtPulseEvent().
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement NtPulseEvent().
  3 files changed, 29 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index 91a85253a83..d7511f39601 100644
+index ff0210f3cd4..3a47b5aa39e 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -607,6 +607,31 @@ NTSTATUS esync_reset_event( HANDLE handle )
+@@ -600,6 +600,31 @@ NTSTATUS esync_reset_event( HANDLE handle )
      return STATUS_SUCCESS;
  }
  
@@ -58,12 +58,12 @@ index 18788fa273b..188304f3be7 100644
  extern NTSTATUS esync_reset_event( HANDLE handle ) DECLSPEC_HIDDEN;
  extern NTSTATUS esync_set_event( HANDLE handle ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index acec96c0a3c..051c672bd12 100644
+index 4c745b3b72e..4025a7a3a2f 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -549,6 +549,9 @@ NTSTATUS WINAPI NtPulseEvent( HANDLE handle, LONG *prev_state )
+@@ -509,6 +509,9 @@ NTSTATUS WINAPI NtPulseEvent( HANDLE handle, LONG *prev_state )
  {
-     NTSTATUS ret;
+     unsigned int ret;
  
 +    if (do_esync())
 +        return esync_pulse_event( handle );
@@ -72,5 +72,5 @@ index acec96c0a3c..051c672bd12 100644
      {
          req->handle = wine_server_obj_handle( handle );
 -- 
-2.28.0
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From c4a4d47fb07faee6ef6d20b967e21eafe6a60ea4 Mon Sep 17 00:00:00 2001
+From c1ecb277d4b77d59bd113a530bea556c356f81cc 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: Do not enumerate the registry in
@@ -13,7 +13,7 @@ not the complete list from the registry.
  3 files changed, 36 insertions(+), 33 deletions(-)
 
 diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index bb7477ed482..55ab8d246e7 100644
+index 3b0a13842c8..2027ce10358 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
 @@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
@@ -21,15 +21,15 @@ index bb7477ed482..55ab8d246e7 100644
  }
  
 -
- /***********************************************************************
-  *		EnableMouseInPointer (USER32.@)
-  */
+ static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header)
+ {
+     SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL);
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index 8477645fad5..e92548c7402 100644
+index f8b40099091..6551367788c 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -4566,6 +4566,40 @@ static void test_SendInput(void)
-     DestroyWindow( hwnd );
+@@ -4875,6 +4875,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
+     CloseHandle( info.hProcess );
  }
  
 +static void test_GetKeyboardLayoutList(void)
@@ -69,7 +69,7 @@ index 8477645fad5..e92548c7402 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4608,6 +4642,7 @@ START_TEST(input)
+@@ -4925,6 +4959,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
@@ -78,7 +78,7 @@ index 8477645fad5..e92548c7402 100644
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index f3b724e7010..a971e1ee776 100644
+index 36f7404b296..bdbd24b5695 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
 @@ -934,11 +934,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
@@ -129,5 +129,5 @@ index f3b724e7010..a971e1ee776 100644
  
      return count;
 -- 
-2.37.2
+2.39.1
 

patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch

@@ -1,7 +1,7 @@
-From 6e5861b34f4359129d0ebec199e2106db4b7be43 Mon Sep 17 00:00:00 2001
+From eba9e414d60a33dfde7e7b978fcdddbaf9bfe5b6 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 21 Oct 2020 16:03:21 -0500
-Subject: [PATCH 08/88] winegstreamer: Allow videoconvert to parallelize.
+Subject: [PATCH] winegstreamer: Allow videoconvert to parallelize.
 
 Not sure if this should be called a hack. It's not the *best* solution to the problem, but it's not a wrong one either.
 
@@ -11,10 +11,10 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index 0a6cf927187..5f3b4375b4c 100644
+index 0573c99858b..5df08dc5fd7 100644
 --- a/dlls/winegstreamer/wg_parser.c
 +++ b/dlls/winegstreamer/wg_parser.c
-@@ -1189,6 +1189,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
+@@ -760,6 +760,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
          if (!(vconv = create_element("videoconvert", "base")))
              goto out;
  
@@ -25,5 +25,5 @@ index 0a6cf927187..5f3b4375b4c 100644
          if (!(flip = create_element("videoflip", "good")))
              goto out;
 -- 
-2.34.1
+2.37.2