Release v9.8

Correct rebase.

Fixes: https://bugs.winehq.org/show_bug.cgi?id=56529

.github/workflows/macOS.yml

@@ -7,17 +7,20 @@ on:
 
 jobs:
   wine-staging:
-    runs-on:  macos-latest
+    # https://github.com/actions/runner-images/issues/9741
+    runs-on:  macos-13
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
           brew install --cask xquartz
-          brew install  bison \
+          brew install  autoconf \
+                        bison \
                         gphoto2 \
-                        gst-plugins-base \
+                        gstreamer \
+                        gcenx/wine/libinotify-kqueue \
                         mingw-w64 \
                         molten-vk \
                         sdl2
@@ -52,7 +55,6 @@ jobs:
                         --without-alsa \
                         --without-capi \
                         --without-dbus \
-                        --without-inotify \
                         --without-oss \
                         --without-pulse \
                         --without-udev \

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

@@ -1,4 +1,4 @@
-From 683fab1d88342c11a52ac3b919964837e6f36823 Mon Sep 17 00:00:00 2001
+From ef7171d2eb01b4b8aaf8c4c608ceebd698d96e3c 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.
@@ -66,15 +66,15 @@ index 75cd72b5b9f..314123373b7 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
 diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
-index dced9847390..e86e1945bdd 100644
+index c0ac5ba9a44..e171c1c6bd8 100644
 --- a/dlls/d2d1/d2d1_private.h
 +++ b/dlls/d2d1/d2d1_private.h
 @@ -697,7 +697,7 @@ struct d2d_factory
  
  static inline struct d2d_factory *unsafe_impl_from_ID2D1Factory(ID2D1Factory *iface)
  {
--    return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory3_iface);
-+    return CONTAINING_RECORD((ID2D1Factory3*)iface, struct d2d_factory, ID2D1Factory3_iface);
+-    return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory7_iface);
++    return CONTAINING_RECORD((ID2D1Factory7*)iface, struct d2d_factory, ID2D1Factory7_iface);
  }
  
  void d2d_effects_init_builtins(struct d2d_factory *factory);

patches/Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch

@@ -1,41 +0,0 @@
-From 32ae090ad4a99862a420cfe44847d8e2905cdde7 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 21 Dec 2013 23:57:02 +0100
-Subject: winex11: Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command
-
----
- dlls/winex11.drv/init.c   |    3 +++
- dlls/winex11.drv/x11drv.h |    3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
-index 5a7d316..68d3f96 100644
---- a/dlls/winex11.drv/init.c
-+++ b/dlls/winex11.drv/init.c
-@@ -440,6 +440,9 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
-                     return TRUE;
-                 }
-                 break;
-+            case X11DRV_FLUSH_GDI_DISPLAY:
-+                XFlush( gdi_display );
-+                return TRUE;
-             default:
-                 break;
-             }
-diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 9008db6..85dd2a5 100644
---- a/dlls/winex11.drv/x11drv.h
-+++ b/dlls/winex11.drv/x11drv.h
-@@ -277,7 +277,8 @@ enum x11drv_escape_codes
-     X11DRV_GET_DRAWABLE,     /* get current drawable for a DC */
-     X11DRV_START_EXPOSURES,  /* start graphics exposures */
-     X11DRV_END_EXPOSURES,    /* end graphics exposures */
--    X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */
-+    X11DRV_FLUSH_GL_DRAWABLE, /* flush changes made to the gl drawable */
-+    X11DRV_FLUSH_GDI_DISPLAY /* flush the gdi display */
- };
- 
- struct x11drv_escape_set_drawable
--- 
-1.7.9.5
-

patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch

@@ -1,25 +0,0 @@
-From ebe00ceb4f2d24f2611dbec87486d6597a3466a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 2 May 2014 20:46:19 +0200
-Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
-
----
- dlls/win32u/message.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
-index d2909339983..337d4a2cc1d 100644
---- a/dlls/win32u/message.c
-+++ b/dlls/win32u/message.c
-@@ -3975,7 +3975,7 @@ UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC
- 
-     if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE );
- 
--    timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM );
-+    timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM );
- 
-     SERVER_START_REQ( set_win_timer )
-     {
--- 
-2.42.0
-

patches/Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch

@@ -1,46 +0,0 @@
-From a9cf27a493697c97249ce526483d25c871c053c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sun, 1 Jun 2014 22:51:32 +0200
-Subject: [PATCH] winex11.drv: Indicate direct rendering through OpenGL
- extension
-
----
- dlls/winex11.drv/opengl.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
-index 92555841f71..71e7ecbcf7c 100644
---- a/dlls/winex11.drv/opengl.c
-+++ b/dlls/winex11.drv/opengl.c
-@@ -410,6 +410,7 @@ static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
- static BOOL X11DRV_WineGL_InitOpenglInfo(void)
- {
-     static const char legacy_extensions[] = " WGL_EXT_extensions_string WGL_EXT_swap_control";
-+    static const char direct_extension[] = " WINE_EXT_direct_rendering";
- 
-     int screen = DefaultScreen(gdi_display);
-     Window win = 0, root = 0;
-@@ -465,16 +466,18 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
-     }
-     gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER);
-     gl_version  = (const char *)opengl_funcs.gl.p_glGetString(GL_VERSION);
-+    glx_direct = pglXIsDirect(gdi_display, ctx);
-     str = (const char *) opengl_funcs.gl.p_glGetString(GL_EXTENSIONS);
--    glExtensions = malloc( strlen(str) + sizeof(legacy_extensions) );
-+    glExtensions = malloc( strlen(str)+sizeof(legacy_extensions)+sizeof(direct_extension) );
-     strcpy(glExtensions, str);
-     strcat(glExtensions, legacy_extensions);
-+    if (glx_direct)
-+        strcat(glExtensions, direct_extension);
- 
-     /* Get the common GLX version supported by GLX client and server ( major/minor) */
-     pglXQueryVersion(gdi_display, &glxVersion[0], &glxVersion[1]);
- 
-     glxExtensions = pglXQueryExtensionsString(gdi_display, screen);
--    glx_direct = pglXIsDirect(gdi_display, ctx);
- 
-     TRACE("GL version             : %s.\n", gl_version);
-     TRACE("GL renderer            : %s.\n", gl_renderer);
--- 
-2.35.1
-

patches/Pipelight/definition

@@ -1,2 +0,0 @@
-Fixes: Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
-Fixes: Other Pipelight-specific enhancements

patches/d3dx9_SetRawValue/0001-d3dx9-Implement-d3dx_effect_SetRawValue.patch

@@ -0,0 +1,182 @@
+From ae80ae124a784078a9838a8aca4b3af308d645dd Mon Sep 17 00:00:00 2001
+From: Patrick Hibbs <hibbsncc1701@gmail.com>
+Date: Fri, 30 Sep 2022 17:58:15 -0400
+Subject: [PATCH] d3dx9: Implement d3dx_effect_SetRawValue
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46012
+
+Signed-off-by: Patrick Hibbs <hibbsncc1701@gmail.com>
+---
+ dlls/d3dx9_36/effect.c | 154 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 152 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
+index ea965ce789b..625af4af36b 100644
+--- a/dlls/d3dx9_36/effect.c
++++ b/dlls/d3dx9_36/effect.c
+@@ -4445,10 +4445,160 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic
+ static HRESULT WINAPI d3dx_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data,
+         UINT byte_offset, UINT bytes)
+ {
+-    FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n",
++    struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
++    struct d3dx_parameter *param = (parameter == INVALID_HANDLE_VALUE) ? NULL : get_valid_parameter(effect, parameter);
++    const unsigned int single_size = sizeof(DWORD);
++    unsigned int x, index_offset, remaining_byte_offset, remaining_bytes;
++    void *raw;
++
++    TRACE("iface %p, parameter %p, data %p, byte_offset %u, bytes %u.\n",
+             iface, parameter, data, byte_offset, bytes);
+ 
+-    return E_NOTIMPL;
++    /* pendentic */
++    index_offset = 0;
++    remaining_byte_offset = 0;
++
++    /* BOOLs and Matries with a single value copy require sanitization of the
++        byte_offset.
++
++        Specificly, matries with a single value copy only allow byte shifts that
++        are not multiples of the value (DWORD) size. For multiples, we increment
++        the index of the promoted data type, then add any remainder as a byte
++        offset.
++
++        For BOOLs, due to their value sanitization, we only care about the
++        index of their promoted data type. Unless it's a non value size matrix.
++        In that case we do care about the byte offset.
++    */
++    if (byte_offset > 0 && (param->type == D3DXPT_BOOL ||
++            (param->class == D3DXPC_MATRIX_COLUMNS ||
++            param->class == D3DXPC_MATRIX_ROWS)))
++    {
++        remaining_byte_offset = byte_offset % single_size;
++        if (remaining_byte_offset != 0)
++            index_offset = byte_offset / single_size;
++        else
++            index_offset = byte_offset;
++        if (param->type != D3DXPT_BOOL || (bytes != single_size &&
++                (param->class == D3DXPC_MATRIX_COLUMNS ||
++                param->class == D3DXPC_MATRIX_ROWS)))
++        {
++            index_offset = index_offset * single_size;
++            if (param->type != D3DXPT_BOOL)
++                index_offset = index_offset * single_size;
++        }
++    }
++
++    /* If parameter is bad, we are expected to throw C0000005. */
++    switch (param->class)
++    {
++        case D3DXPC_STRUCT:
++            break;
++        case D3DXPC_OBJECT:
++            raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
++            if (data && bytes)
++            {
++                if (((char*)raw)[0] != '\0')
++                {
++                    memset(raw, '\0', param->bytes);
++                    return S_OK; /* This returns a false success. */
++                }
++                else
++                {
++                    return D3DERR_INVALIDCALL;
++                }
++            }
++            break;
++        case D3DXPC_SCALAR:
++            raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
++            if (param->type == D3DXPT_BOOL)
++                *(BOOL*)raw = *(BOOL*)data ? TRUE : FALSE;
++            else
++                memcpy((unsigned char*)raw + byte_offset, data, bytes);
++            return S_OK;
++            break;
++        case D3DXPC_VECTOR:
++            raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
++            if (param->type == D3DXPT_BOOL)
++            {
++                raw = (unsigned char*)raw + index_offset;
++                *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE;
++                memset((unsigned char*)raw + single_size, \
++                        '\0', param->bytes - index_offset - single_size);
++            }
++            else
++            {
++                raw = (unsigned char*)raw + byte_offset;
++                for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++)
++                {
++                    memcpy((unsigned char*)raw + (x * single_size), \
++                            (unsigned char*)data + (x * single_size), \
++                            single_size);
++                }
++            }
++            return S_OK;
++            break;
++        case D3DXPC_MATRIX_COLUMNS:
++        case D3DXPC_MATRIX_ROWS:
++            raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
++            if (param->type == D3DXPT_BOOL)
++            {
++                if (bytes == single_size)
++                {
++                    raw = (unsigned char*)raw + index_offset;
++                    for (x = 0; (x * single_size) < param->bytes - index_offset; x++)
++                    {
++                        remaining_bytes = param->bytes - index_offset - \
++                                (x * single_size) - single_size;
++                        *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE;
++                        memset((unsigned char*)raw + single_size, \
++                                '\0', (remaining_bytes > (single_size * 4) ? \
++                                single_size * 4 : remaining_bytes));
++                        raw = (unsigned char*)raw + (remaining_bytes > (single_size * 4) ? \
++                                single_size * 4 : remaining_bytes);
++                    }
++                }
++                else
++                {
++                    raw = (unsigned char*)raw + index_offset;
++                    for (x = 0; (x * single_size) < param->bytes - index_offset; x++)
++                    {
++                        ((DWORD*)raw)[x] = ((DWORD*)data)[x] ? TRUE : FALSE;
++                    }
++                }
++            }
++            else
++            {
++                if (bytes == single_size)
++                {
++                    raw = (unsigned char*)raw + index_offset + remaining_byte_offset;
++                    for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++)
++                    {
++                        memcpy((unsigned char*)raw + (x * single_size), \
++                                (unsigned char*)data + (x * single_size), \
++                                single_size);
++                    }
++                }
++                else
++                {
++                    raw = (unsigned char*)raw + byte_offset;
++                    for (x = 0; byte_offset + (x * single_size) < param->bytes &&
++                            (x * single_size) < bytes; x++)
++                    {
++                        memcpy((unsigned char*)raw + (x * single_size), \
++                                (unsigned char*)data + (x * single_size), \
++                                single_size);
++                    }
++                }
++            }
++            return S_OK;
++            break;
++        default:
++            FIXME("Unhandled param class %s.\n", debug_d3dxparameter_class(param->class));
++            break;
++    };
++
++    return D3DERR_INVALIDCALL;
+ }
+ #endif
+ 
+-- 
+2.43.0
+

patches/d3dx9_SetRawValue/definition

@@ -0,0 +1,3 @@
+Fixes: [46012] d3d9: Implement ID3DXEffect::SetRawValue
+
+# https://gitlab.winehq.org/wine/wine/-/merge_requests/979

patches/ddraw-GetPickRecords/0001-ddraw-Implement-Pick-and-GetPickRecords.patch

@@ -1,4 +1,4 @@
-From 0a5214d0fe032778fa3ca4ee60c3d2ba64f8f4c0 Mon Sep 17 00:00:00 2001
+From 274e40a7f25d8041f5b93d132f01e0a66fefe481 Mon Sep 17 00:00:00 2001
 From: Matthew Wong <itsmattkc@gmail.com>
 Date: Fri, 18 Sep 2020 00:47:13 +0000
 Subject: [PATCH] ddraw: Implement Pick() and GetPickRecords().
@@ -37,10 +37,10 @@ Signed-off-by: Myah Caron <qsniyg@protonmail.com>
  4 files changed, 373 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
-index 6fc93b91860..c90b894ea61 100644
+index 1f0c94a9c6e..157384e3579 100644
 --- a/dlls/ddraw/ddraw_private.h
 +++ b/dlls/ddraw/ddraw_private.h
-@@ -338,6 +338,11 @@ struct d3d_device
+@@ -337,6 +337,11 @@ struct d3d_device
      struct d3d_viewport *current_viewport;
      D3DVIEWPORT7 active_viewport;
  
@@ -52,7 +52,7 @@ index 6fc93b91860..c90b894ea61 100644
      /* Required to keep track which of two available texture blending modes in d3ddevice3 is used */
      BOOL legacyTextureBlending;
      D3DTEXTUREBLEND texture_map_blend;
-@@ -571,7 +576,7 @@ struct d3d_execute_buffer *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExec
+@@ -573,7 +578,7 @@ struct d3d_execute_buffer *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExec
  
  /* The execute function */
  HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *execute_buffer,
@@ -62,11 +62,11 @@ index 6fc93b91860..c90b894ea61 100644
  /*****************************************************************************
   * IDirect3DVertexBuffer
 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index bc1d91ee00b..82a813f9064 100644
+index f64db3aa633..60c43c250b1 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
-@@ -349,6 +349,9 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
-             IDirect3DDevice3_DeleteViewport(&This->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
+@@ -333,6 +333,9 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
+             This->ddraw = NULL;
          }
  
 +        if (This->pick_record_size > 0)
@@ -75,7 +75,7 @@ index bc1d91ee00b..82a813f9064 100644
          TRACE("Releasing render target %p.\n", This->rt_iface);
          rt_iface = This->rt_iface;
          This->rt_iface = NULL;
-@@ -758,7 +761,7 @@ static HRESULT WINAPI d3d_device1_Execute(IDirect3DDevice *iface,
+@@ -739,7 +742,7 @@ static HRESULT WINAPI d3d_device1_Execute(IDirect3DDevice *iface,
  
      /* Execute... */
      wined3d_mutex_lock();
@@ -84,7 +84,7 @@ index bc1d91ee00b..82a813f9064 100644
      wined3d_mutex_unlock();
  
      return hr;
-@@ -1025,16 +1028,44 @@ static HRESULT WINAPI d3d_device1_NextViewport(IDirect3DDevice *iface,
+@@ -1006,16 +1009,44 @@ static HRESULT WINAPI d3d_device1_NextViewport(IDirect3DDevice *iface,
   *        x2 and y2 are ignored.
   *
   * Returns:
@@ -133,7 +133,7 @@ index bc1d91ee00b..82a813f9064 100644
  }
  
  /*****************************************************************************
-@@ -1050,13 +1081,35 @@ static HRESULT WINAPI d3d_device1_Pick(IDirect3DDevice *iface, IDirect3DExecuteB
+@@ -1031,13 +1062,35 @@ static HRESULT WINAPI d3d_device1_Pick(IDirect3DDevice *iface, IDirect3DExecuteB
   *  D3DPickRec: Address to store the resulting D3DPICKRECORD array.
   *
   * Returns:
@@ -172,7 +172,7 @@ index bc1d91ee00b..82a813f9064 100644
      return D3D_OK;
  }
 diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
-index 320ce6649d4..84366dafd7d 100644
+index 0cf0bf121f3..89915fb7145 100644
 --- a/dlls/ddraw/executebuffer.c
 +++ b/dlls/ddraw/executebuffer.c
 @@ -45,15 +45,106 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
@@ -378,7 +378,7 @@ index 320ce6649d4..84366dafd7d 100644
                              /* Drop through. */
                          case 2:
                              indices[(i * primitive_size) + 1] = ci->v2;
-@@ -426,6 +597,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
+@@ -424,6 +595,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
  end_of_buffer:
      return D3D_OK;
  }
@@ -387,10 +387,10 @@ index 320ce6649d4..84366dafd7d 100644
  static inline struct d3d_execute_buffer *impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface)
  {
 diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
-index d8fcb188c40..bacd9049d6e 100644
+index 96047744635..2364c92eb96 100644
 --- a/dlls/ddraw/tests/ddraw1.c
 +++ b/dlls/ddraw/tests/ddraw1.c
-@@ -15467,6 +15467,137 @@ static void test_enum_devices(void)
+@@ -15507,6 +15507,137 @@ static void test_enum_devices(void)
      ok(!refcount, "Device has %lu references left.\n", refcount);
  }
  
@@ -528,7 +528,7 @@ index d8fcb188c40..bacd9049d6e 100644
  /* Emperor: Rise of the Middle Kingdom locks a sysmem surface and then accesses
   * the pointer after unlocking it. This test roughly replicates the calls that
   * it makes. */
-@@ -15527,6 +15658,7 @@ static void test_pinned_sysmem(void)
+@@ -15567,6 +15698,7 @@ static void test_pinned_sysmem(void)
      IDirectDrawSurface_Release(surface);
      refcount = IDirectDraw_Release(ddraw);
      ok(!refcount, "Device has %lu references left.\n", refcount);
@@ -536,7 +536,7 @@ index d8fcb188c40..bacd9049d6e 100644
      DestroyWindow(window);
  }
  
-@@ -15646,6 +15778,7 @@ START_TEST(ddraw1)
+@@ -15789,6 +15921,7 @@ START_TEST(ddraw1)
      test_vtbl_protection();
      test_window_position();
      test_get_display_mode();

patches/ddraw-version-check/0001-ddraw-Return-correct-devices-based-off-requested-Dir.patch

@@ -1,15 +1,15 @@
-From e4688a88901a1c13b2df67a0444c34e3ee02bbab Mon Sep 17 00:00:00 2001
+From 9c7acdba85edafc52bc0cc2719ac556894a59351 Mon Sep 17 00:00:00 2001
 From: Andrew D'Addesio <andrew@fatbag.net>
 Date: Fri, 8 Feb 2019 18:48:33 -1000
 Subject: [PATCH] ddraw: Return correct devices based off requested DirectX
  version.
 
 ---
- dlls/ddraw/ddraw.c | 232 +++++++++++++++++++++++++--------------------
- 1 file changed, 129 insertions(+), 103 deletions(-)
+ dlls/ddraw/ddraw.c | 240 +++++++++++++++++++++++++--------------------
+ 1 file changed, 131 insertions(+), 109 deletions(-)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 5887854556b..5ac95dc3043 100644
+index 8f2fd9f3b4b..0ef400b7a26 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
 @@ -44,37 +44,80 @@ static const DDDEVICEIDENTIFIER2 deviceidentifier =
@@ -122,7 +122,7 @@ index 5887854556b..5ac95dc3043 100644
      /* Fill the missing members, and do some fixup */
      caps->dpcLineCaps.dwSize = sizeof(caps->dpcLineCaps);
      caps->dpcLineCaps.dwTextureBlendCaps = D3DPTBLENDCAPS_ADD
-@@ -3746,8 +3780,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur
+@@ -3770,8 +3804,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur
  /*****************************************************************************
   * IDirect3D7::EnumDevices
   *
@@ -132,7 +132,7 @@ index 5887854556b..5ac95dc3043 100644
   *
   * Params:
   *  callback: Function to call for each enumerated device
-@@ -3779,13 +3812,16 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+@@ -3803,13 +3836,16 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
      }
      dev_caps = device_desc7.dwDevCaps;
  
@@ -153,7 +153,7 @@ index 5887854556b..5ac95dc3043 100644
          if (ret != DDENUMRET_OK)
          {
              TRACE("Application cancelled the enumeration.\n");
-@@ -3801,11 +3837,21 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+@@ -3825,11 +3861,21 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
      return D3D_OK;
  }
  
@@ -177,7 +177,7 @@ index 5887854556b..5ac95dc3043 100644
   *
   * Versions 1, 2 and 3
   *
-@@ -3820,18 +3866,18 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+@@ -3844,18 +3890,18 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
   *****************************************************************************/
  static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBACK callback, void *context)
  {
@@ -205,7 +205,7 @@ index 5887854556b..5ac95dc3043 100644
  
      TRACE("iface %p, callback %p, context %p.\n", iface, callback, context);
  
-@@ -3840,55 +3886,60 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
+@@ -3864,58 +3910,59 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
  
      wined3d_mutex_lock();
  
@@ -221,7 +221,6 @@ index 5887854556b..5ac95dc3043 100644
          wined3d_mutex_unlock();
          return hr;
      }
-+
      ddraw_d3dcaps1_from_7(&device_desc1, &device_desc7);
 +    device_desc1.dwSize = desc_size;
  
@@ -245,15 +244,12 @@ index 5887854556b..5ac95dc3043 100644
 -     * flag set. This way it refuses the emulation device, and HAL devices
 -     * never have POW2 unset in d3d7 on windows. */
 -    if (ddraw->d3dversion != 1)
-+    clear_device_desc(&empty_desc1);
-+    empty_desc1.dwSize = desc_size;
-+
-+    for (i = 0; i < ARRAY_SIZE(device_list); i++)
-     {
--        static CHAR reference_description[] = "RGB Direct3D emulation";
-+        if (!(device_list[i].version_mask & D3D_VERSION(ddraw->d3dversion)))
-+            continue;
- 
+-    {
+-        /* Tomb Raider 3 overwrites the reference device description buffer
+-         * with its own custom string. Reserve some extra space in the array
+-         * to avoid a buffer overrun. */
+-        static CHAR reference_description[64] = "RGB Direct3D emulation";
+-
 -        TRACE("Enumerating WineD3D D3DDevice interface.\n");
 -        hal_desc = device_desc1;
 -        hel_desc = device_desc1;
@@ -269,13 +265,22 @@ index 5887854556b..5ac95dc3043 100644
 -        /* RGB, REF, RAMP and MMX devices don't report hardware transform and lighting capability */
 -        hal_desc.dwDevCaps &= ~(D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWRASTERIZATION);
 -        hel_desc.dwDevCaps &= ~(D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWRASTERIZATION);
-+        if (IsEqualGUID(&IID_IDirect3DHALDevice, device_list[i].device_guid))
-+        {
-+            hal_desc = device_desc1;
- 
+-
 -        hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description,
 -                device_name, &hal_desc, &hel_desc, context);
 -        if (hr != D3DENUMRET_OK)
++    clear_device_desc(&empty_desc1);
++    empty_desc1.dwSize = desc_size;
++
++    for (i = 0; i < ARRAY_SIZE(device_list); i++)
++    {
++        if (!(device_list[i].version_mask & D3D_VERSION(ddraw->d3dversion)))
++            continue;
++
++        if (IsEqualGUID(&IID_IDirect3DHALDevice, device_list[i].device_guid))
++        {
++            hal_desc = device_desc1;
++
 +            /* The HAL device's hel_desc is almost empty -- but not completely */
 +            hel_desc = empty_desc1;
 +            hel_desc.dwFlags = D3DDD_COLORMODEL | D3DDD_DEVCAPS | D3DDD_TRANSFORMCAPS
@@ -305,7 +310,7 @@ index 5887854556b..5ac95dc3043 100644
          {
              TRACE("Application cancelled the enumeration.\n");
              wined3d_mutex_unlock();
-@@ -3896,31 +3947,6 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
+@@ -3923,31 +3970,6 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
          }
      }
  

patches/dsound-EAX/0001-dsound-Apply-filters-before-sound-is-multiplied-to-s.patch

@@ -1,4 +1,4 @@
-From d09ac9a348309f956a2f3985a1b465b51b6e174c Mon Sep 17 00:00:00 2001
+From 6ef73a30a9f0c7c6775786d4cdba169f95056393 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 28 Mar 2015 08:18:10 +0100
 Subject: [PATCH] dsound: Apply filters before sound is multiplied to speakers.
@@ -11,10 +11,10 @@ Based on a patch by Mark Harmstone.
  3 files changed, 81 insertions(+), 36 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 0b8edaaaf06..bdf3a824511 100644
+index 7629810db50..4c1c022acb7 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
-@@ -234,6 +234,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
+@@ -236,6 +236,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
          if(device->mmdevice)
              IMMDevice_Release(device->mmdevice);
          CloseHandle(device->sleepev);
@@ -23,10 +23,10 @@ index 0b8edaaaf06..bdf3a824511 100644
          free(device->cp_buffer);
          free(device->buffer);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 124a4311b4c..fe39ca221fa 100644
+index 61323be99d8..c2656ab82f1 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -89,8 +89,8 @@ struct DirectSoundDevice
+@@ -90,8 +90,8 @@ struct DirectSoundDevice
      int                         speaker_num[DS_MAX_CHANNELS];
      int                         num_speakers;
      int                         lfe_channel;
@@ -34,14 +34,14 @@ index 124a4311b4c..fe39ca221fa 100644
 -    DWORD                       tmp_buffer_len, cp_buffer_len;
 +    float *tmp_buffer, *cp_buffer, *dsp_buffer;
 +    DWORD                       tmp_buffer_len, cp_buffer_len, dsp_buffer_len;
+     CO_MTA_USAGE_COOKIE         mta_cookie;
  
      DSVOLUMEPAN                 volpan;
- 
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index c26b19ea8c1..68a45c46d1e 100644
+index 042b9499727..f261588454a 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
-@@ -283,10 +283,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
+@@ -286,10 +286,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
      return dsb->get(dsb, buffer + (mixpos % buflen), channel);
  }
  
@@ -53,7 +53,7 @@ index c26b19ea8c1..68a45c46d1e 100644
      UINT committed_samples = 0;
      DWORD channel, i;
  
-@@ -305,17 +304,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
+@@ -308,17 +307,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
  
      for (; i < count; i++)
          for (channel = 0; channel < dsb->mix_channels; channel++)
@@ -74,7 +74,7 @@ index c26b19ea8c1..68a45c46d1e 100644
      UINT channels = dsb->mix_channels;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -343,7 +341,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -346,7 +344,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
              float s1 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx, channel);
              float s2 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx + istride, channel);
              float result = s1 * cur_freqAcc2 + s2 * cur_freqAcc;
@@ -83,7 +83,7 @@ index c26b19ea8c1..68a45c46d1e 100644
          }
      }
  
-@@ -351,11 +349,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -354,11 +352,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -97,7 +97,7 @@ index c26b19ea8c1..68a45c46d1e 100644
      UINT committed_samples = 0;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -430,23 +428,24 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -433,23 +431,24 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
              float* cache = &intermediate[channel * required_input + ipos];
              for (j = 0; j < fir_used; j++)
                  sum += fir_copy[j] * cache[j];
@@ -127,7 +127,7 @@ index c26b19ea8c1..68a45c46d1e 100644
  
      ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign;
      if (ipos >= dsb->buflen) {
-@@ -482,6 +481,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -485,6 +484,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
  		return buflen + ptr1 - ptr2;
  	}
  }
@@ -149,7 +149,7 @@ index c26b19ea8c1..68a45c46d1e 100644
  /**
   * Mix at most the given amount of data into the allocated temporary buffer
   * of the given secondary buffer, starting from the dsb's first currently
-@@ -497,31 +511,61 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -500,31 +514,61 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -180,12 +180,22 @@ index c26b19ea8c1..68a45c46d1e 100644
 +    }
 +    if(dsb->put_aux == putieee32_sum)
 +        memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len);
-+
+ 
+-	if (size_bytes > 0) {
+-		for (i = 0; i < dsb->num_filters; i++) {
+-			if (dsb->filters[i].inplace) {
+-				hr = IMediaObjectInPlace_Process(dsb->filters[i].inplace, size_bytes, (BYTE*)dsb->device->tmp_buffer, 0, DMO_INPLACE_NORMAL);
 +    if (using_filters) {
 +        put = putieee32_dsp;
 +        ostride = dsb->mix_channels * sizeof(float);
 +        size_bytes = frames * ostride;
-+
+ 
+-				if (FAILED(hr))
+-					WARN("IMediaObjectInPlace_Process failed for filter %u\n", i);
+-			} else
+-				WARN("filter %u has no inplace object - unsupported\n", i);
+-		}
+-	}
 +        if (dsb->device->dsp_buffer_len < size_bytes || !dsb->device->dsp_buffer) {
 +            if (dsb->device->dsp_buffer)
 +                dsb->device->dsp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->dsp_buffer, size_bytes);
@@ -194,11 +204,7 @@ index c26b19ea8c1..68a45c46d1e 100644
 +            dsb->device->dsp_buffer_len = size_bytes;
 +        }
 +    }
- 
--	if (size_bytes > 0) {
--		for (i = 0; i < dsb->num_filters; i++) {
--			if (dsb->filters[i].inplace) {
--				hr = IMediaObjectInPlace_Process(dsb->filters[i].inplace, size_bytes, (BYTE*)dsb->device->tmp_buffer, 0, DMO_INPLACE_NORMAL);
++
 +    cp_fields(dsb, put, ostride, frames, &dsb->freqAccNum);
 +
 +    if (using_filters) {
@@ -213,13 +219,7 @@ index c26b19ea8c1..68a45c46d1e 100644
 +                    WARN("filter %lu has no inplace object - unsupported\n", i);
 +            }
 +        }
- 
--				if (FAILED(hr))
--					WARN("IMediaObjectInPlace_Process failed for filter %u\n", i);
--			} else
--				WARN("filter %u has no inplace object - unsupported\n", i);
--		}
--	}
++
 +        istride = ostride;
 +        ostride = dsb->device->pwfx->nChannels * sizeof(float);
 +        for (i = 0; i < frames; i++) {
@@ -232,5 +232,5 @@ index c26b19ea8c1..68a45c46d1e 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.39.2
+2.43.0
 

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0001-fltmgr.sys-Implement-FltBuildDefaultSecurityDescript.patch

@@ -1,153 +0,0 @@
-From 8caf8262a8ae8b5f0275172a62d807240d86968d Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sun, 29 Aug 2021 13:26:53 +1000
-Subject: [PATCH 1/3] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/fltmgr.sys/Makefile.in     |  1 +
- dlls/fltmgr.sys/fltmgr.sys.spec |  4 +-
- dlls/fltmgr.sys/main.c          | 75 ++++++++++++++++++++++++++++++++-
- include/ddk/fltkernel.h         |  3 +-
- 4 files changed, 79 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in
-index 6ebd48d9412..ae0e812cb22 100644
---- a/dlls/fltmgr.sys/Makefile.in
-+++ b/dlls/fltmgr.sys/Makefile.in
-@@ -1,5 +1,6 @@
- MODULE    = fltmgr.sys
- EXTRADLLFLAGS = -Wl,--subsystem,native
-+IMPORTS = ntoskrnl
- 
- SOURCES = \
- 	fltmgr.sys.spec \
-diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
-index 39ce6798178..8943b9f85cf 100644
---- a/dlls/fltmgr.sys/fltmgr.sys.spec
-+++ b/dlls/fltmgr.sys/fltmgr.sys.spec
-@@ -10,7 +10,7 @@
- @ stub FltAllocatePoolAlignedWithTag
- @ stub FltAttachVolume
- @ stub FltAttachVolumeAtAltitude
--@ stub FltBuildDefaultSecurityDescriptor
-+@ stdcall FltBuildDefaultSecurityDescriptor(ptr long)
- @ stub FltCancelFileOpen
- @ stub FltCancelIo
- @ stub FltCbdqDisable
-@@ -60,7 +60,7 @@
- @ stub FltFreeFileLock
- @ stub FltFreeGenericWorkItem
- @ stub FltFreePoolAlignedWithTag
--@ stub FltFreeSecurityDescriptor
-+@ stdcall FltFreeSecurityDescriptor(ptr)
- @ stub FltFsControlFile
- @ stub FltGetBottomInstance
- @ stub FltGetContexts
-diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index e1016a4989c..9a85f4b6c82 100644
---- a/dlls/fltmgr.sys/main.c
-+++ b/dlls/fltmgr.sys/main.c
-@@ -23,7 +23,6 @@
- #include "ntstatus.h"
- #define WIN32_NO_STATUS
- #include "windef.h"
--#include "winbase.h"
- #include "winternl.h"
- #include "ddk/fltkernel.h"
- 
-@@ -93,3 +92,77 @@ void* WINAPI FltGetRoutineAddress(LPCSTR name)
- 
-     return func;
- }
-+
-+NTSTATUS WINAPI FltBuildDefaultSecurityDescriptor(PSECURITY_DESCRIPTOR *descriptor, ACCESS_MASK access)
-+{
-+    PACL dacl;
-+    NTSTATUS ret = STATUS_INSUFFICIENT_RESOURCES;
-+    DWORD sid_len;
-+    SID *sid;
-+    SID *sid_system = NULL;
-+    PSECURITY_DESCRIPTOR sec_desc = NULL;
-+    SID_IDENTIFIER_AUTHORITY auth = { SECURITY_NULL_SID_AUTHORITY };
-+
-+    *descriptor = NULL;
-+
-+    sid_len = RtlLengthRequiredSid(2);
-+    sid = ExAllocatePool(PagedPool, sid_len);
-+    if (!sid)
-+        goto done;
-+    RtlInitializeSid(sid, &auth, 2);
-+    sid->SubAuthority[1] = DOMAIN_GROUP_RID_ADMINS;
-+    sid->SubAuthority[0] = SECURITY_BUILTIN_DOMAIN_RID;
-+
-+    sid_len = RtlLengthRequiredSid(1);
-+    sid_system = ExAllocatePool(PagedPool, sid_len);
-+    if (!sid_system)
-+        goto done;
-+    RtlInitializeSid(sid_system, &auth, 1);
-+    sid_system->SubAuthority[0] = SECURITY_LOCAL_SYSTEM_RID;
-+
-+    sid_len = SECURITY_DESCRIPTOR_MIN_LENGTH + sizeof(ACL) +
-+            sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(sid) +
-+            sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(sid_system);
-+
-+    sec_desc = ExAllocatePool(PagedPool, sid_len);
-+    if (!sec_desc)
-+    {
-+        ret = STATUS_NO_MEMORY;
-+        goto done;
-+    }
-+
-+    ret = RtlCreateSecurityDescriptor(sec_desc, SECURITY_DESCRIPTOR_REVISION);
-+    if (ret != STATUS_SUCCESS)
-+        goto done;
-+
-+    dacl = (PACL)((char*)sec_desc + SECURITY_DESCRIPTOR_MIN_LENGTH);
-+    ret = RtlCreateAcl(dacl, sid_len - SECURITY_DESCRIPTOR_MIN_LENGTH, ACL_REVISION);
-+    if (ret != STATUS_SUCCESS)
-+        goto done;
-+
-+    ret = RtlAddAccessAllowedAce(dacl, ACL_REVISION, access, sid);
-+    if (ret != STATUS_SUCCESS)
-+        goto done;
-+
-+    ret = RtlAddAccessAllowedAce(dacl, ACL_REVISION, access, sid_system);
-+    if (ret != STATUS_SUCCESS)
-+        goto done;
-+
-+    ret = RtlSetDaclSecurityDescriptor(sec_desc, 1, dacl, 0);
-+    if (ret == STATUS_SUCCESS)
-+        *descriptor = sec_desc;
-+
-+done:
-+    if (ret != STATUS_SUCCESS)
-+        ExFreePool(sec_desc);
-+
-+    ExFreePool(sid);
-+    ExFreePool(sid_system);
-+
-+    return ret;
-+}
-+
-+void WINAPI FltFreeSecurityDescriptor(PSECURITY_DESCRIPTOR descriptor)
-+{
-+    ExFreePool(descriptor);
-+}
-diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h
-index 49c9d55dbaa..e5483d5a3fa 100644
---- a/include/ddk/fltkernel.h
-+++ b/include/ddk/fltkernel.h
-@@ -653,7 +653,8 @@ typedef struct _FLT_REGISTRATION
-     PFLT_SECTION_CONFLICT_NOTIFICATION_CALLBACK SectionNotificationCallback;
- } FLT_REGISTRATION, *PFLT_REGISTRATION;
- 
--
-+NTSTATUS WINAPI FltBuildDefaultSecurityDescriptor(PSECURITY_DESCRIPTOR *, ACCESS_MASK);
-+void     WINAPI FltFreeSecurityDescriptor(PSECURITY_DESCRIPTOR);
- void*    WINAPI FltGetRoutineAddress(LPCSTR name);
- NTSTATUS WINAPI FltRegisterFilter(PDRIVER_OBJECT, const FLT_REGISTRATION *, PFLT_FILTER *);
- NTSTATUS WINAPI FltStartFiltering(PFLT_FILTER);
--- 
-2.42.0
-

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0002-fltmgr.sys-Create-import-library.patch

@@ -1,23 +0,0 @@
-From c1af142bac149b296b2dea06cd99c13e0f8814c9 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 30 Aug 2021 15:15:35 +1000
-Subject: [PATCH 2/3] fltmgr.sys: Create import library
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/fltmgr.sys/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in
-index ae0e812cb22..ae02da9b5d6 100644
---- a/dlls/fltmgr.sys/Makefile.in
-+++ b/dlls/fltmgr.sys/Makefile.in
-@@ -1,4 +1,5 @@
- MODULE    = fltmgr.sys
-+IMPORTLIB = fltmgr
- EXTRADLLFLAGS = -Wl,--subsystem,native
- IMPORTS = ntoskrnl
- 
--- 
-2.42.0
-

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch

@@ -1,133 +0,0 @@
-From c69247afcbd83af223f471342c67bc06deeffda0 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 30 Aug 2021 15:16:06 +1000
-Subject: [PATCH] ntoskrnl.exe: Add FltBuildDefaultSecurityDescriptor test
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/ntoskrnl.exe/tests/Makefile.in |  2 +-
- dlls/ntoskrnl.exe/tests/driver.c    | 81 +++++++++++++++++++++++++++++
- 2 files changed, 82 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in
-index f610df6a947..97dee8b25cf 100644
---- a/dlls/ntoskrnl.exe/tests/Makefile.in
-+++ b/dlls/ntoskrnl.exe/tests/Makefile.in
-@@ -1,7 +1,7 @@
- TESTDLL   = ntoskrnl.exe
- IMPORTS   = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid
- 
--driver_IMPORTS = winecrt0 ntoskrnl hal
-+driver_IMPORTS = winecrt0 ntoskrnl hal fltmgr
- driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
- driver2_IMPORTS = winecrt0 ntoskrnl hal
- driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
-diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
-index ea4bd03ee44..844a181472c 100644
---- a/dlls/ntoskrnl.exe/tests/driver.c
-+++ b/dlls/ntoskrnl.exe/tests/driver.c
-@@ -36,6 +36,7 @@
- #include "ddk/ntddk.h"
- #include "ddk/ntifs.h"
- #include "ddk/wdm.h"
-+#include "ddk/fltkernel.h"
- 
- #include "driver.h"
- 
-@@ -2393,6 +2394,85 @@ static void test_default_modules(void)
-     ok(dxgmms1, "Failed to find dxgmms1.sys\n");
- }
- 
-+static void test_default_security(void)
-+{
-+    PSECURITY_DESCRIPTOR sd = NULL;
-+    NTSTATUS status;
-+    PSID group = NULL, owner = NULL;
-+    BOOLEAN isdefault, present;
-+    PACL acl = NULL;
-+    PACCESS_ALLOWED_ACE ace;
-+    SID_IDENTIFIER_AUTHORITY auth = { SECURITY_NULL_SID_AUTHORITY };
-+    SID_IDENTIFIER_AUTHORITY authwine7 = { SECURITY_NT_AUTHORITY };
-+    PSID sid1, sid2, sidwin7;
-+    BOOL ret;
-+
-+    status = FltBuildDefaultSecurityDescriptor(&sd, STANDARD_RIGHTS_ALL);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+    if (status != STATUS_SUCCESS)
-+    {
-+        win_skip("Skipping FltBuildDefaultSecurityDescriptor tests\n");
-+        return;
-+    }
-+    ok(sd != NULL, "Failed to return descriptor\n");
-+
-+    status = RtlGetGroupSecurityDescriptor(sd, &group, &isdefault);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+    ok(group == NULL, "group isn't NULL\n");
-+
-+    status = RtlGetOwnerSecurityDescriptor(sd, &owner, &isdefault);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+    ok(owner == NULL, "owner isn't NULL\n");
-+
-+    status = RtlGetDaclSecurityDescriptor(sd, &present, &acl, &isdefault);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+    ok(acl != NULL, "acl is NULL\n");
-+    ok(acl->AceCount == 2, "got %d\n", acl->AceCount);
-+
-+    sid1 = ExAllocatePool(NonPagedPool, RtlLengthRequiredSid(2));
-+    status = RtlInitializeSid(sid1, &auth, 2);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+    *RtlSubAuthoritySid(sid1, 0)  = SECURITY_BUILTIN_DOMAIN_RID;
-+    *RtlSubAuthoritySid(sid1, 1) = DOMAIN_GROUP_RID_ADMINS;
-+
-+    sidwin7 = ExAllocatePool(NonPagedPool, RtlLengthRequiredSid(2));
-+    status = RtlInitializeSid(sidwin7, &authwine7, 2);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+    *RtlSubAuthoritySid(sidwin7, 0)  = SECURITY_BUILTIN_DOMAIN_RID;
-+    *RtlSubAuthoritySid(sidwin7, 1) = DOMAIN_ALIAS_RID_ADMINS;
-+
-+    sid2 = ExAllocatePool(NonPagedPool, RtlLengthRequiredSid(1));
-+    RtlInitializeSid(sid2, &auth, 1);
-+    *RtlSubAuthoritySid(sid2, 0)  = SECURITY_LOCAL_SYSTEM_RID;
-+
-+    /* SECURITY_BUILTIN_DOMAIN_RID */
-+    status = RtlGetAce(acl, 0, (void**)&ace);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+
-+    ok(ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "got %#x\n", ace->Header.AceType);
-+    ok(ace->Header.AceFlags == 0, "got %#x\n", ace->Header.AceFlags);
-+    ok(ace->Mask == STANDARD_RIGHTS_ALL, "got %#lx\n", ace->Mask);
-+
-+    ret = RtlEqualSid(sid1, (PSID)&ace->SidStart) || RtlEqualSid(sidwin7, (PSID)&ace->SidStart);
-+    ok(ret, "SID not equal\n");
-+
-+    /* SECURITY_LOCAL_SYSTEM_RID */
-+    status = RtlGetAce(acl, 1, (void**)&ace);
-+    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
-+
-+    ok(ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "got %#x\n", ace->Header.AceType);
-+    ok(ace->Header.AceFlags == 0, "got %#x\n", ace->Header.AceFlags);
-+    ok(ace->Mask == STANDARD_RIGHTS_ALL, "got %#lx\n", ace->Mask);
-+
-+    ret = RtlEqualSid(sid2, (PSID)&ace->SidStart) || RtlEqualSid(sidwin7, (PSID)&ace->SidStart);
-+    ok(ret, "SID not equal\n");
-+
-+    ExFreePool(sid1);
-+    ExFreePool(sid2);
-+
-+    FltFreeSecurityDescriptor(sd);
-+}
-+
- static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
- {
-     void *buffer = irp->AssociatedIrp.SystemBuffer;
-@@ -2438,6 +2518,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
-     test_process_memory(test_input);
-     test_permanence();
-     test_driver_object_extension();
-+    test_default_security();
- 
-     IoMarkIrpPending(irp);
-     IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp);
--- 
-2.42.0
-

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/definition

@@ -1,2 +0,0 @@
-Fixes: [49089] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
-Depends: winedevice-Default_Drivers

patches/kernel32-CopyFileEx/0001-kernel32-Add-support-for-progress-callback-in-CopyFi.patch

@@ -174,7 +174,7 @@ index 7806ad2ec1f..e5adc0d4e2c 100644
 +    basic_info.LastAccessTime = info.LastAccessTime;
 +    basic_info.LastWriteTime = info.LastWriteTime;
 +    basic_info.ChangeTime = info.ChangeTime;
-+    basic_info.FileAttributes &= FILE_ATTRIBUTE_READONLY;
++    basic_info.FileAttributes = info.FileAttributes & FILE_ATTRIBUTE_READONLY;
 +    NtSetInformationFile( h2, &io, &basic_info, sizeof(basic_info), FileBasicInformation );
      HeapFree( GetProcessHeap(), 0, buffer );
      CloseHandle( h1 );

patches/kernel32-Job_Tests/0001-kernel32-tests-Add-tests-for-job-object-accounting.patch

@@ -1,223 +0,0 @@
-From dd46b005cfcc8aa02bf25c031326e28bd75e0ff2 Mon Sep 17 00:00:00 2001
-From: Mark Jansen <mark.jansen@reactos.org>
-Date: Sun, 24 Sep 2017 22:45:22 +0200
-Subject: [PATCH] kernel32/tests: Add tests for job object accounting
-
-Signed-off-by: Mark Jansen <mark.jansen@reactos.org>
----
- dlls/kernel32/tests/process.c | 95 +++++++++++++++++++++++++++++++++++
- 1 file changed, 95 insertions(+)
-
-diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index e9e8555c32e..e5a9914ca7b 100644
---- a/dlls/kernel32/tests/process.c
-+++ b/dlls/kernel32/tests/process.c
-@@ -2541,6 +2541,69 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION
-     ok_(__FILE__, line)(ret, "CreateProcess error %lu\n", GetLastError());
- }
- 
-+#define test_assigned_proc(job, ...) _test_assigned_proc(__LINE__, job, __VA_ARGS__)
-+static void _test_assigned_proc(int line, HANDLE job, int expected_count, ...)
-+{
-+    char buf[sizeof(JOBOBJECT_BASIC_PROCESS_ID_LIST) + sizeof(ULONG_PTR) * 20];
-+    PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf;
-+    DWORD ret_len, pid;
-+    va_list valist;
-+    int n;
-+    BOOL ret;
-+
-+    memset(buf, 0, sizeof(buf));
-+    ret = pQueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, sizeof(buf), &ret_len);
-+    ok_(__FILE__, line)(ret, "QueryInformationJobObject error %lu\n", GetLastError());
-+    if (ret)
-+    {
-+        todo_wine_if(expected_count)
-+        ok_(__FILE__, line)(expected_count == pid_list->NumberOfAssignedProcesses,
-+                            "Expected NumberOfAssignedProcesses to be %d (expected_count) is %ld\n",
-+                            expected_count, pid_list->NumberOfAssignedProcesses);
-+        todo_wine_if(expected_count)
-+        ok_(__FILE__, line)(expected_count == pid_list->NumberOfProcessIdsInList,
-+                            "Expected NumberOfProcessIdsInList to be %d (expected_count) is %ld\n",
-+                            expected_count, pid_list->NumberOfProcessIdsInList);
-+
-+        va_start(valist, expected_count);
-+        for (n = 0; n < min(expected_count, pid_list->NumberOfProcessIdsInList); ++n)
-+        {
-+            pid = va_arg(valist, DWORD);
-+            ok_(__FILE__, line)(pid == pid_list->ProcessIdList[n],
-+                                "Expected pid_list->ProcessIdList[%d] to be %lx is %Ix\n",
-+                                n, pid, pid_list->ProcessIdList[n]);
-+        }
-+        va_end(valist);
-+    }
-+}
-+
-+#define test_accounting(job, total_proc, active_proc, terminated_proc) _test_accounting(__LINE__, job, total_proc, active_proc, terminated_proc)
-+static void _test_accounting(int line, HANDLE job, int total_proc, int active_proc, int terminated_proc)
-+{
-+    JOBOBJECT_BASIC_ACCOUNTING_INFORMATION basic_accounting;
-+    DWORD ret_len;
-+    BOOL ret;
-+
-+    memset(&basic_accounting, 0, sizeof(basic_accounting));
-+    ret = pQueryInformationJobObject(job, JobObjectBasicAccountingInformation, &basic_accounting, sizeof(basic_accounting), &ret_len);
-+    ok_(__FILE__, line)(ret, "QueryInformationJobObject error %lu\n", GetLastError());
-+    if (ret)
-+    {
-+        /* Not going to check process times or page faults */
-+
-+        todo_wine_if(total_proc)
-+        ok_(__FILE__, line)(total_proc == basic_accounting.TotalProcesses,
-+                            "Expected basic_accounting.TotalProcesses to be %d (total_proc) is %ld\n",
-+                            total_proc, basic_accounting.TotalProcesses);
-+        todo_wine_if(active_proc)
-+        ok_(__FILE__, line)(active_proc == basic_accounting.ActiveProcesses,
-+                            "Expected basic_accounting.ActiveProcesses to be %d (active_proc) is %ld\n",
-+                            active_proc, basic_accounting.ActiveProcesses);
-+        ok_(__FILE__, line)(terminated_proc == basic_accounting.TotalTerminatedProcesses,
-+                            "Expected basic_accounting.TotalTerminatedProcesses to be %d (terminated_proc) is %ld\n",
-+                            terminated_proc, basic_accounting.TotalTerminatedProcesses);
-+    }
-+}
- 
- static void test_IsProcessInJob(void)
- {
-@@ -2566,11 +2629,15 @@ static void test_IsProcessInJob(void)
-     ret = pIsProcessInJob(pi.hProcess, job, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(!out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job, 0);
-+    test_accounting(job, 0, 0, 0);
- 
-     out = TRUE;
-     ret = pIsProcessInJob(pi.hProcess, job2, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(!out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job2, 0);
-+    test_accounting(job2, 0, 0, 0);
- 
-     ret = pAssignProcessToJobObject(job, pi.hProcess);
-     ok(ret, "AssignProcessToJobObject error %lu\n", GetLastError());
-@@ -2579,11 +2646,15 @@ static void test_IsProcessInJob(void)
-     ret = pIsProcessInJob(pi.hProcess, job, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job, 1, pi.dwProcessId);
-+    test_accounting(job, 1, 1, 0);
- 
-     out = TRUE;
-     ret = pIsProcessInJob(pi.hProcess, job2, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(!out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job2, 0);
-+    test_accounting(job2, 0, 0, 0);
- 
-     out = FALSE;
-     ret = pIsProcessInJob(pi.hProcess, NULL, &out);
-@@ -2597,6 +2668,8 @@ static void test_IsProcessInJob(void)
-     ret = pIsProcessInJob(pi.hProcess, job, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job, 0);
-+    test_accounting(job, 1, 0, 0);
- 
-     CloseHandle(pi.hProcess);
-     CloseHandle(pi.hThread);
-@@ -2613,11 +2686,15 @@ static void test_TerminateJobObject(void)
- 
-     job = pCreateJobObjectW(NULL, NULL);
-     ok(job != NULL, "CreateJobObject error %lu\n", GetLastError());
-+    test_assigned_proc(job, 0);
-+    test_accounting(job, 0, 0, 0);
- 
-     create_process("wait", &pi);
- 
-     ret = pAssignProcessToJobObject(job, pi.hProcess);
-     ok(ret, "AssignProcessToJobObject error %lu\n", GetLastError());
-+    test_assigned_proc(job, 1, pi.dwProcessId);
-+    test_accounting(job, 1, 1, 0);
- 
-     ret = pTerminateJobObject(job, 123);
-     ok(ret, "TerminateJobObject error %lu\n", GetLastError());
-@@ -2626,6 +2703,8 @@ static void test_TerminateJobObject(void)
-     dwret = WaitForSingleObject(pi.hProcess, 1000);
-     ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", dwret);
-     if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0);
-+    test_assigned_proc(job, 0);
-+    test_accounting(job, 1, 0, 0);
- 
-     ret = GetExitCodeProcess(pi.hProcess, &dwret);
-     ok(ret, "GetExitCodeProcess error %lu\n", GetLastError());
-@@ -2643,6 +2722,8 @@ static void test_TerminateJobObject(void)
-     ret = pAssignProcessToJobObject(job, pi.hProcess);
-     ok(!ret, "AssignProcessToJobObject unexpectedly succeeded\n");
-     expect_eq_d(ERROR_ACCESS_DENIED, GetLastError());
-+    test_assigned_proc(job, 0);
-+    test_accounting(job, 1, 0, 0);
- 
-     CloseHandle(pi.hProcess);
-     CloseHandle(pi.hThread);
-@@ -2841,11 +2922,15 @@ static void test_KillOnJobClose(void)
-         return;
-     }
-     ok(ret, "SetInformationJobObject error %lu\n", GetLastError());
-+    test_assigned_proc(job, 0);
-+    test_accounting(job, 0, 0, 0);
- 
-     create_process("wait", &pi);
- 
-     ret = pAssignProcessToJobObject(job, pi.hProcess);
-     ok(ret, "AssignProcessToJobObject error %lu\n", GetLastError());
-+    test_assigned_proc(job, 1, pi.dwProcessId);
-+    test_accounting(job, 1, 1, 0);
- 
-     CloseHandle(job);
- 
-@@ -2955,6 +3040,8 @@ static HANDLE test_AddSelfToJob(void)
- 
-     ret = pAssignProcessToJobObject(job, GetCurrentProcess());
-     ok(ret, "AssignProcessToJobObject error %lu\n", GetLastError());
-+    test_assigned_proc(job, 1, GetCurrentProcessId());
-+    test_accounting(job, 1, 1, 0);
- 
-     return job;
- }
-@@ -2976,6 +3063,8 @@ static void test_jobInheritance(HANDLE job)
-     ret = pIsProcessInJob(pi.hProcess, job, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job, 2, GetCurrentProcessId(), pi.dwProcessId);
-+    test_accounting(job, 2, 2, 0);
- 
-     wait_and_close_child_process(&pi);
- }
-@@ -3009,6 +3098,8 @@ static void test_BreakawayOk(HANDLE parent_job)
-     ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi);
-     ok(!ret, "CreateProcessA expected failure\n");
-     expect_eq_d(ERROR_ACCESS_DENIED, GetLastError());
-+    test_assigned_proc(job, 1, GetCurrentProcessId());
-+    test_accounting(job, 2, 1, 0);
- 
-     if (ret)
-     {
-@@ -3048,6 +3139,8 @@ static void test_BreakawayOk(HANDLE parent_job)
-     ret = pIsProcessInJob(pi.hProcess, job, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(!out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job, 1, GetCurrentProcessId());
-+    test_accounting(job, 2, 1, 0);
- 
-     ret = pIsProcessInJob(pi.hProcess, parent_job, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-@@ -3065,6 +3158,8 @@ static void test_BreakawayOk(HANDLE parent_job)
-     ret = pIsProcessInJob(pi.hProcess, job, &out);
-     ok(ret, "IsProcessInJob error %lu\n", GetLastError());
-     ok(!out, "IsProcessInJob returned out=%u\n", out);
-+    test_assigned_proc(job, 1, GetCurrentProcessId());
-+    test_accounting(job, 2, 1, 0);
- 
-     wait_and_close_child_process(&pi);
- 
--- 
-2.35.1
-

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

@@ -1,4 +1,4 @@
-From d4f9fa0c33b6a414fe3b6c604f3039e98d416263 Mon Sep 17 00:00:00 2001
+From a808aeb6fbb9c7cace366a262715607379ca1b58 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,10 +13,10 @@ 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 1fff29c7f87..9bf65573d87 100644
+index 00337aa72b7..375ca3abee3 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -486,7 +486,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
+@@ -497,7 +497,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
      return FALSE;
  }
  
@@ -25,11 +25,11 @@ index 1fff29c7f87..9bf65573d87 100644
  {
      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 350baff600d..27066fc46f4 100644
+index b92e59396ac..364afc08b26 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -5542,6 +5542,40 @@ static void test_keyboard_ll_hook_blocking(void)
-     ok_ret( 1, DestroyWindow( hwnd ) );
+@@ -5637,6 +5637,40 @@ static void test_LoadKeyboardLayoutEx(void)
+     ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" );
  }
  
 +static void test_GetKeyboardLayoutList(void)
@@ -69,7 +69,7 @@ index 350baff600d..27066fc46f4 100644
  /* run the tests in a separate desktop to avoid interaction with other
   * tests, current desktop state, or user actions. */
  static void test_input_desktop( char **argv )
-@@ -5633,6 +5667,7 @@ START_TEST(input)
+@@ -5730,6 +5764,7 @@ START_TEST(input)
      test_GetKeyState();
      test_OemKeyScan();
      test_rawinput(argv[0]);
@@ -78,10 +78,10 @@ index 350baff600d..27066fc46f4 100644
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index ef8d564c264..9a7c58f359d 100644
+index 1886ff979d7..1834ae40441 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -1267,11 +1267,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -1266,11 +1266,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index ef8d564c264..9a7c58f359d 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -1285,33 +1281,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -1284,33 +1280,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;

patches/mfplat-streaming-support/0055-winegstreamer-Add-MFVideoFormat_ARGB32-output-for-th.patch

@@ -1,37 +0,0 @@
-From af54761b8536f81831f2813ef0ff9b627dcc5ca4 Mon Sep 17 00:00:00 2001
-From: Nikolay Sivov <nsivov@codeweavers.com>
-Date: Wed, 12 Jan 2022 22:48:35 +0300
-Subject: [PATCH] winegstreamer: Add MFVideoFormat_ARGB32 output for the
- source.
-
-(cherry picked from commit 9812591f0003c5c611faa59ab9b3cb73a85be637)
-
-CW-Bug-Id: #19975
----
- dlls/winegstreamer/media_source.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 00c40dc2f47..7a0f65b4247 100644
---- a/dlls/winegstreamer/media_source.c
-+++ b/dlls/winegstreamer/media_source.c
-@@ -856,7 +856,7 @@ static HRESULT new_media_stream(struct media_source *source,
- static HRESULT media_stream_init_desc(struct media_stream *stream)
- {
-     IMFMediaTypeHandler *type_handler = NULL;
--    IMFMediaType *stream_types[6];
-+    IMFMediaType *stream_types[7];
-     struct wg_format format;
-     DWORD type_count = 0;
-     unsigned int i;
-@@ -875,6 +875,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
-             WG_VIDEO_FORMAT_YV12,
-             WG_VIDEO_FORMAT_YUY2,
-             WG_VIDEO_FORMAT_I420,
-+            WG_VIDEO_FORMAT_BGRA,
-         };
- 
-         IMFMediaType *base_type = mf_media_type_from_wg_format(&format);
--- 
-2.40.0
-