Release v8.5

Fixes a crash on some videos.

.github/workflows/macOS.yml

@@ -33,12 +33,13 @@ jobs:
           mkdir $GITHUB_WORKSPACE/wine
           cd wine
           git init
-          git fetch git://source.winehq.org/git/wine.git $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit) --depth=1
-          git checkout $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit)
+          git fetch git://source.winehq.org/git/wine.git $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit) --depth=1
+          git checkout $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit)
 
-      - name: Run patchinstall.sh --all
+      - name: Run patchinstall.py --all
         run: |
-          $GITHUB_WORKSPACE/patches/patchinstall.sh DESTDIR=$GITHUB_WORKSPACE/wine --all
+          cd wine
+          $GITHUB_WORKSPACE/staging/patchinstall.py DESTDIR=. --all
 
       - name: Configure wine64
         env:

.gitignore

@@ -1,3 +1,2 @@
 staging/wine
 *.pyc
-.patchupdate.cache

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

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/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/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From 8c78d1203c965927d0a0e6fcde31dd651cc704db Mon Sep 17 00:00:00 2001
+From f78fc333748a6c4f664bb10ee2115c86690b3b16 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -22,7 +22,7 @@ index 22be2612eeb..2e11bb2b62d 100644
  
  C_SRCS = \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index 404c7c11dbb..e0779e4e3a7 100644
+index 3c1e225e195..4468f7fa4ed 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
 @@ -1445,6 +1445,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
@@ -30,9 +30,9 @@ index 404c7c11dbb..e0779e4e3a7 100644
  
          ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
 +            || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf)
-             || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf);
+             || search_dll_path(pcs, filename, IMAGE_FILE_MACHINE_UNKNOWN, elf_load_file_cb, &load_elf);
      }
  
 -- 
-2.34.1
+2.39.1
 

patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch

@@ -1,73 +0,0 @@
-From 98a9b8337d40c1f6df21227dff3d993f270aef46 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 24 May 2019 16:16:13 +1000
-Subject: [PATCH] dinput: Allow mapping of controls based of Genre type.
-
----
- dlls/dinput/device.c | 41 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 40 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index e826cc89c1e..a4815f24958 100644
---- a/dlls/dinput/device.c
-+++ b/dlls/dinput/device.c
-@@ -1741,8 +1741,15 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
- 
-     /* Count the actions */
-     for (i = 0; i < format->dwNumActions; i++)
--        if (IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance ))
-+    {
-+        if (IsEqualGUID(&impl->guid, &format->rgoAction[i].guidInstance) ||
-+                (IsEqualGUID(&IID_NULL, &format->rgoAction[i].guidInstance) &&
-+                  ((format->rgoAction[i].dwSemantic & format->dwGenre) == format->dwGenre ||
-+                   (format->rgoAction[i].dwSemantic & 0xff000000) == 0xff000000 /* Any Axis */) ))
-+        {
-             num_actions++;
-+        }
-+    }
- 
-     /* Should return DI_NOEFFECT if we dont have any actions and actionformat has not changed */
-     if (num_actions == 0 && format->dwCRC == new_crc && !(flags & DIDSAM_FORCESAVE)) return DI_NOEFFECT;
-@@ -1779,7 +1786,39 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
- 
-             action++;
-         }
-+        else if ((format->rgoAction[i].dwSemantic & format->dwGenre) == format->dwGenre ||
-+                 (format->rgoAction[i].dwSemantic & 0xff000000) == 0xff000000 /* Any Axis */)
-+        {
-+            DWORD obj_id = semantic_to_obj_id(impl, format->rgoAction[i].dwSemantic);
-+            DWORD type = DIDFT_GETTYPE(obj_id);
-+            DWORD inst = DIDFT_GETINSTANCE(obj_id);
-+            LPDIOBJECTDATAFORMAT obj;
-+
-+            if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON;
-+            else if (type == DIDFT_RELAXIS) type = DIDFT_AXIS;
-+
-+            obj = dataformat_to_odf_by_type(df, inst, type);
-+            TRACE("obj %p, inst 0x%08lx, type 0x%08lx\n", obj, inst, type);
-+            if(obj)
-+            {
-+                memcpy(&obj_df[action], obj, df->dwObjSize);
-+
-+                impl->action_map[action].uAppData = format->rgoAction[i].uAppData;
-+                impl->action_map[action].offset = offset;
-+                obj_df[action].dwOfs = offset;
-+                offset += (type & DIDFT_BUTTON) ? 1 : 4;
-+
-+                action++;
-+            }
-+        }
-+    }
-+
-+    if (action == 0)
-+    {
-+        free( obj_df );
-+        return DI_NOEFFECT;
-     }
-+    data_format.dwNumObjs = action;
- 
-     IDirectInputDevice8_SetDataFormat( iface, &data_format );
- 
--- 
-2.33.0
-

patches/dinput-joy-mappings/definition

@@ -1,3 +1,5 @@
 Fixes: [34108] dinput: Improve support for user Joystick configuration.
 Fixes: [47326] dinput: Allow mapping of controls based of genre type.
 Fixes: [35815] dinput: Allow remapping of joystick buttons.
+# Seeing active work...
+Disabled: true

patches/dmime-load-wave/0001-dmime-Store-WAVE-data-when-Loading.patch

@@ -0,0 +1,100 @@
+From 4b20338821a19304650d1acc1229b0e8615896bc Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 3 Aug 2022 16:25:11 +1000
+Subject: [PATCH] dmime: Store WAVE data when Loading.
+
+---
+ dlls/dmime/segment.c | 56 ++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 52 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
+index bf44c5e73b3..6bf9f3abf0c 100644
+--- a/dlls/dmime/segment.c
++++ b/dlls/dmime/segment.c
+@@ -33,6 +33,10 @@ typedef struct IDirectMusicSegment8Impl {
+     DMUS_IO_SEGMENT_HEADER header;
+     IDirectMusicGraph *pGraph;
+     struct list Tracks;
++
++    PCMWAVEFORMAT wave_format;
++    void *wave_data;
++    int data_size;
+ } IDirectMusicSegment8Impl;
+ 
+ IDirectMusicSegment8Impl *create_segment(void);
+@@ -86,6 +90,9 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface
+     TRACE("(%p) ref=%ld\n", This, ref);
+ 
+     if (!ref) {
++        if (This->wave_data)
++            free(This->wave_data);
++
+         HeapFree(GetProcessHeap(), 0, This);
+         DMIME_UnlockModule();
+     }
+@@ -818,6 +825,49 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream
+     return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface);
+ }
+ 
++static HRESULT parse_wave_form(IDirectMusicSegment8Impl *This, IStream *stream, const struct chunk_entry *riff)
++{
++    HRESULT hr;
++    struct chunk_entry chunk = {.parent = riff};
++
++    TRACE("Parsing segment wave in %p: %s\n", stream, debugstr_chunk(riff));
++
++     while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) {
++        switch (chunk.id) {
++            case mmioFOURCC('f','m','t',' '): {
++                if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &This->wave_format, chunk.size)))
++                    return hr;
++                TRACE("Wave Format tag %d\n", This->wave_format.wf.wFormatTag);
++                break;
++            }
++            case mmioFOURCC('d','a','t','a'): {
++                TRACE("Wave Data size %lu\n", chunk.size);
++                This->wave_data = malloc(chunk.size);
++                This->data_size = chunk.size;
++                if (!This->wave_data)
++                    return E_OUTOFMEMORY;
++                if (FAILED(hr = stream_chunk_get_data(stream, &chunk, This->wave_data, chunk.size)))
++                    return hr;
++                break;
++            }
++            case FOURCC_LIST: {
++                FIXME("Skipping LIST tag\n");
++                break;
++            }
++            case mmioFOURCC('I','S','F','T'): {
++                FIXME("Skipping ISFT tag\n");
++                break;
++            }
++            case mmioFOURCC('f','a','c','t'): {
++                FIXME("Skipping fact tag\n");
++                break;
++            }
++        }
++    }
++
++    return S_OK;
++}
++
+ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *stream)
+ {
+     IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface);
+@@ -847,10 +897,8 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st
+ 
+     if (riff.type == DMUS_FOURCC_SEGMENT_FORM)
+         hr = parse_segment_form(This, stream, &riff);
+-    else {
+-        FIXME("WAVE form loading not implemented\n");
+-        hr = S_OK;
+-    }
++    else
++        hr = parse_wave_form(This, stream, &riff);
+ 
+     return hr;
+ }
+-- 
+2.39.1
+

patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch

@@ -0,0 +1,157 @@
+From f58dbcdfedf4d5d78d586d54f507c647e58379c8 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 2 Dec 2022 14:41:30 +1100
+Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download
+
+---
+ dlls/dmime/dmime_private.h |  2 +
+ dlls/dmime/performance.c   |  7 +++
+ dlls/dmime/segment.c       | 87 ++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
+index 4159abffa99..030aab50094 100644
+--- a/dlls/dmime/dmime_private.h
++++ b/dlls/dmime/dmime_private.h
+@@ -71,6 +71,8 @@ extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerfor
+ extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN;
+ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN;
+ 
++extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN;
++
+ /*****************************************************************************
+  * Auxiliary definitions
+  */
+diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
+index d69a27540d6..5578c3e523b 100644
+--- a/dlls/dmime/performance.c
++++ b/dlls/dmime/performance.c
+@@ -252,6 +252,13 @@ static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(I
+     return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface);
+ }
+ 
++IDirectSound *get_dsound_interface(IDirectMusicPerformance8* iface)
++{
++    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
++    return This->dsound;
++}
++
++
+ /* IDirectMusicPerformance8 IUnknown part: */
+ static HRESULT WINAPI IDirectMusicPerformance8Impl_QueryInterface(IDirectMusicPerformance8 *iface,
+         REFIID riid, void **ppv)
+diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
+index 6bf9f3abf0c..0ea0c15c5e0 100644
+--- a/dlls/dmime/segment.c
++++ b/dlls/dmime/segment.c
+@@ -37,6 +37,7 @@ typedef struct IDirectMusicSegment8Impl {
+     PCMWAVEFORMAT wave_format;
+     void *wave_data;
+     int data_size;
++    IDirectSoundBuffer *buffer;
+ } IDirectMusicSegment8Impl;
+ 
+ IDirectMusicSegment8Impl *create_segment(void);
+@@ -90,6 +91,8 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface
+     TRACE("(%p) ref=%ld\n", This, ref);
+ 
+     if (!ref) {
++        if (This->buffer)
++            IDirectSoundBuffer_Release(This->buffer);
+         if (This->wave_data)
+             free(This->wave_data);
+ 
+@@ -559,9 +562,87 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Compose(IDirectMusicSegment8 *ifa
+ static HRESULT WINAPI IDirectMusicSegment8Impl_Download(IDirectMusicSegment8 *iface,
+         IUnknown *pAudioPath)
+ {
+-        IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
+-	FIXME("(%p, %p): stub\n", This, pAudioPath);
+-	return S_OK;
++    IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
++    IDirectMusicPerformance8 *perf;
++    IDirectMusicAudioPath *audio;
++    IDirectSound *dsound;
++    HRESULT hr;
++    DSBUFFERDESC dsbd = {.dwSize = sizeof(dsbd)};
++    void *data;
++    DWORD size;
++    DWORD buffer = 0;
++
++    TRACE("(%p, %p)\n", This, pAudioPath);
++
++    if (!pAudioPath)
++        return E_INVALIDARG;
++
++    if (This->buffer)
++    {
++        TRACE("Using Cached buffer\n");
++        return S_OK;
++    }
++
++    /* pAudioPath can either be IDirectMusicAudioPath or IDirectMusicPerformance */
++    hr = IUnknown_QueryInterface(pAudioPath, &IID_IDirectMusicPerformance8, (void**)&perf);
++    if (FAILED(hr))
++    {
++        TRACE("Checking for IDirectMusicAudioPath interface\n");
++        hr = IUnknown_QueryInterface(pAudioPath, &IID_IDirectMusicAudioPath, (void**)&audio);
++        if (FAILED(hr))
++        {
++            WARN("Cannot query for IDirectMusicAudioPath\n");
++            return E_INVALIDARG;
++        }
++
++        IDirectMusicAudioPath_GetObjectInPath(audio, DMUS_PCHANNEL_ALL, DMUS_PATH_PERFORMANCE, buffer, &GUID_NULL,
++                0, &IID_IDirectMusicPerformance, (void**)&perf);
++        IDirectMusicAudioPath_Release(audio);
++    }
++
++    if (!perf)
++    {
++        ERR("Failed to get IDirectMusicPerformance interface\n");
++        return E_INVALIDARG;
++    }
++
++    dsound = get_dsound_interface(perf);
++    if (!dsound)
++    {
++        ERR("Failed get_dsound_interface\n");
++        return E_INVALIDARG;
++    }
++
++    if (This->data_size == 0)
++    {
++        FIXME("No wave data skipping\n");
++        return S_OK;
++    }
++
++    dsbd.dwBufferBytes = This->data_size;
++    dsbd.lpwfxFormat = (WAVEFORMATEX*)&This->wave_format;
++
++    hr = IDirectSound_CreateSoundBuffer(dsound, &dsbd, &This->buffer, NULL);
++    if (FAILED(hr))
++    {
++        ERR("IDirectSound_CreateSoundBuffer failed 0x%08lx\n", hr);
++        return E_INVALIDARG;
++    }
++
++    TRACE("CreateSoundBuffer successful\n");
++
++    hr = IDirectSoundBuffer_Lock(This->buffer, 0, This->data_size, &data, &size, NULL, 0, 0);
++    TRACE("IDirectSoundBuffer_Lock hr 0x%08lx\n", hr);
++
++    memcpy(data, This->wave_data, This->data_size);
++
++    hr = IDirectSoundBuffer_Unlock(This->buffer, data, This->data_size, NULL, 0);
++    TRACE("IDirectSoundBuffer_Unlock hr 0x%08lx\n", hr);
++
++    /*hr = IDirectSoundBuffer_Play(This->buffer, 0, 0, 0);
++    TRACE("IDirectSoundBuffer_Play hr 0x%08lx\n", hr);*/
++
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI IDirectMusicSegment8Impl_Unload(IDirectMusicSegment8 *iface,
+-- 
+2.39.1
+

patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch

@@ -0,0 +1,81 @@
+From 8ef2197cd4c77bf562ab5b83f2a137ae565bc22d Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Mon, 12 Dec 2022 15:20:10 +1100
+Subject: [PATCH 3/3] dmime: Play a sound in IDirectMusicPerformance8
+ PlaySegmentEx
+
+---
+ dlls/dmime/dmime_private.h |  1 +
+ dlls/dmime/performance.c   | 25 +++++++++++++++++++------
+ dlls/dmime/segment.c       |  6 ++++++
+ 3 files changed, 26 insertions(+), 6 deletions(-)
+
+diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
+index 030aab50094..d09aba02a5c 100644
+--- a/dlls/dmime/dmime_private.h
++++ b/dlls/dmime/dmime_private.h
+@@ -72,6 +72,7 @@ extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffe
+ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN;
+ 
+ extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN;
++extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface) DECLSPEC_HIDDEN;
+ 
+ /*****************************************************************************
+  * Auxiliary definitions
+diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
+index 5578c3e523b..03e59e95af3 100644
+--- a/dlls/dmime/performance.c
++++ b/dlls/dmime/performance.c
+@@ -1043,13 +1043,26 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer
+         __int64 i64StartTime, IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom,
+         IUnknown *pAudioPath)
+ {
+-        IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
++    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
++    IDirectMusicSegment8 *segment;
++    IDirectSoundBuffer *buffer;
++    HRESULT hr;
+ 
+-	FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName,
+-	    pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath);
+-	if (ppSegmentState)
+-          return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState);
+-	return S_OK;
++    FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): semi-stub\n", This, pSource, pwzSegmentName,
++        pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath);
++
++    hr = IUnknown_QueryInterface(pSource, &IID_IDirectMusicSegment8, (void**)&segment);
++    if (FAILED(hr))
++        return hr;
++
++    buffer = get_segment_buffer(segment);
++
++    if (segment)
++        hr = IDirectSoundBuffer_Play(buffer, 0, 0, 0);
++
++    if (ppSegmentState)
++      return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState);
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformance8 *iface,
+diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
+index dbf2f8203d8..9213fbf4a4c 100644
+--- a/dlls/dmime/segment.c
++++ b/dlls/dmime/segment.c
+@@ -45,6 +45,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu
+   return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface);
+ }
+ 
++IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface)
++{
++    IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
++    return This->buffer;
++}
++
+ static HRESULT WINAPI IDirectMusicSegment8Impl_QueryInterface(IDirectMusicSegment8 *iface,
+         REFIID riid, void **ret_iface)
+ {
+-- 
+2.38.1
+

patches/dmime-load-wave/definition

@@ -0,0 +1,13 @@
+Fixes: [48220] dmime: Handle basic loading of Wave files and playing them.
+Fixes: [61322] dmine: No Sound in Black Rockman Shooter.
+Fixes: [34751] dmime: Aura: Fate of the Ages: sounds aren't played, but music works fine
+Fixes: [9027]  dmime: No sound for rise of nations - all versions.
+
+# Also
+# - Cloning Clyde demo
+
+# Doesnt fix
+#  The following are known not to work, at the moment.
+# [31586] : Myst sounds (Voices)
+# [30969] : Tron 2.0 Background music
+# [32896] : Serious Sam: The Random Encounter

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

@@ -1,30 +1,29 @@
-From da59fcb896bc204ea0ea1d866eeddef0c9b962c4 Mon Sep 17 00:00:00 2001
+From d09ac9a348309f956a2f3985a1b465b51b6e174c 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.
 
 Based on a patch by Mark Harmstone.
 ---
- dlls/dsound/dsound.c         |   2 +
+ dlls/dsound/dsound.c         |   1 +
  dlls/dsound/dsound_private.h |   4 +-
- dlls/dsound/mixer.c          | 109 ++++++++++++++++++++++++-----------
- 3 files changed, 80 insertions(+), 35 deletions(-)
+ dlls/dsound/mixer.c          | 112 ++++++++++++++++++++++++-----------
+ 3 files changed, 81 insertions(+), 36 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 346cc4ceca3..e869c4dd251 100644
+index 0b8edaaaf06..bdf3a824511 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
-@@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
+@@ -234,6 +234,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
          if(device->mmdevice)
              IMMDevice_Release(device->mmdevice);
          CloseHandle(device->sleepev);
-+
-+        HeapFree(GetProcessHeap(), 0, device->dsp_buffer);
-         HeapFree(GetProcessHeap(), 0, device->tmp_buffer);
-         HeapFree(GetProcessHeap(), 0, device->cp_buffer);
-         HeapFree(GetProcessHeap(), 0, device->buffer);
++        free(device->dsp_buffer);
+         free(device->tmp_buffer);
+         free(device->cp_buffer);
+         free(device->buffer);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index f89588de4d9..d4e74ed0e82 100644
+index 124a4311b4c..fe39ca221fa 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -89,8 +89,8 @@ struct DirectSoundDevice
@@ -39,7 +38,7 @@ index f89588de4d9..d4e74ed0e82 100644
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 50816b1a582..ddab45893ac 100644
+index c26b19ea8c1..68a45c46d1e 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -283,10 +283,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -150,7 +149,7 @@ index 50816b1a582..ddab45893ac 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,34 +511,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -497,31 +511,61 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -165,21 +164,20 @@ index 50816b1a582..ddab45893ac 100644
 -	if (dsb->device->tmp_buffer_len < size_bytes || !dsb->device->tmp_buffer)
 -	{
 -		dsb->device->tmp_buffer_len = size_bytes;
+-		dsb->device->tmp_buffer = realloc(dsb->device->tmp_buffer, size_bytes);
+-	}
+-	if(dsb->put_aux == putieee32_sum)
+-		memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len);
 +    put = dsb->put;
 +    ostride = dsb->device->pwfx->nChannels * sizeof(float);
 +    size_bytes = frames * ostride;
-+
-+    if (dsb->device->tmp_buffer_len < size_bytes || !dsb->device->tmp_buffer) {
- 		if (dsb->device->tmp_buffer)
- 			dsb->device->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->tmp_buffer, size_bytes);
- 		else
- 			dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, size_bytes);
-+        dsb->device->tmp_buffer_len = size_bytes;
- 	}
--	if(dsb->put_aux == putieee32_sum)
--		memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len);
--
+ 
 -	cp_fields(dsb, frames, &dsb->freqAccNum);
++    if (dsb->device->tmp_buffer_len < size_bytes || !dsb->device->tmp_buffer)
++    {
++        dsb->device->tmp_buffer_len = size_bytes;
++        dsb->device->tmp_buffer = realloc(dsb->device->tmp_buffer, size_bytes);
++    }
 +    if(dsb->put_aux == putieee32_sum)
 +        memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len);
 +
@@ -234,5 +232,5 @@ index 50816b1a582..ddab45893ac 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.35.1
+2.39.2
 

patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch

@@ -1,4 +1,4 @@
-From 5d29a2de174042ce7bdd52d92337591933e0f761 Mon Sep 17 00:00:00 2001
+From 42c58e406220e9351337b079ae44364fbc39365d Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:58:37 +0000
 Subject: [PATCH] dsound: Add EAX init and free stubs.
@@ -10,10 +10,10 @@ Subject: [PATCH] dsound: Add EAX init and free stubs.
  3 files changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index e8b3fb4a832..28f2e95994e 100644
+index 22b23c9f877..72e96765883 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1153,6 +1153,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
+@@ -1152,6 +1152,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
  		DSOUND_RecalcVolPan(&(dsb->volpan));
  
          InitializeSRWLock(&dsb->lock);
@@ -22,17 +22,17 @@ index e8b3fb4a832..28f2e95994e 100644
  
          /* register buffer */
          err = DirectSoundDevice_AddBuffer(device, dsb);
-@@ -1194,6 +1196,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
-         HeapFree(GetProcessHeap(), 0, This->filters);
+@@ -1193,6 +1195,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
+         free(This->filters);
      }
  
 +    free_eax_buffer(This);
 +
      TRACE("(%p) released\n", This);
  
-     HeapFree(GetProcessHeap(), 0, This);
+     free(This);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 267b2c044bc..c906eb2adb1 100644
+index 09566b28a12..703b5da8225 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -240,6 +240,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
@@ -97,5 +97,5 @@ index 03b6e0a9813..91438efc335 100644
  
  HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
 -- 
-2.35.1
+2.39.2
 

patches/dsound-EAX/0018-dsound-Various-improvements-to-EAX-support.patch

@@ -1,4 +1,4 @@
-From 3760db8daceee555842425400af01de2075b4568 Mon Sep 17 00:00:00 2001
+From 673e9f32e39fce78a02f6519a435051ffec3664d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 4 Apr 2015 21:09:18 +0200
 Subject: [PATCH] dsound: Various improvements to EAX support.
@@ -24,19 +24,19 @@ the buffers).
  5 files changed, 37 insertions(+), 39 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 6b7414d34ff..b1efa0d3012 100644
+index 72e96765883..bdb93657017 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1213,7 +1213,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+@@ -1223,7 +1223,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
      VOID *committedbuff;
      TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb);
  
--    dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb));
-+    dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb));
+-    dsb = malloc(sizeof(*dsb));
++    dsb = calloc(1, sizeof(*dsb));
      if (dsb == NULL) {
          WARN("out of memory\n");
          *ppdsb = NULL;
-@@ -1261,6 +1261,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+@@ -1271,6 +1271,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
  
      InitializeSRWLock(&dsb->lock);
  
@@ -46,7 +46,7 @@ index 6b7414d34ff..b1efa0d3012 100644
      hres = DirectSoundDevice_AddBuffer(device, dsb);
      if (hres != DS_OK) {
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 91fa94b943e..a0931325ebc 100644
+index bdf3a824511..4df26e93c6e 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
 @@ -182,6 +182,8 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
@@ -71,10 +71,10 @@ index a650108f570..a555a75e458 100644
  
      float *SampleBuffer;
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 43e62626161..065fe820055 100644
+index 9131fa8792e..f2b2c353643 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -239,6 +239,7 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -240,6 +240,7 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
  HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData) DECLSPEC_HIDDEN;
@@ -83,7 +83,7 @@ index 43e62626161..065fe820055 100644
  void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
  void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index a05b00e1c02..ef802b95a7d 100644
+index 5f2b8ef07e2..2244565897b 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -114,6 +114,8 @@ static const float LATE_LINE_MULTIPLIER = 4.0f;
@@ -244,5 +244,5 @@ index a05b00e1c02..ef802b95a7d 100644
          switch (dwPropID) {
              case DSPROPERTY_EAXBUFFER_ALL:
 -- 
-2.33.0
+2.39.2
 

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

@@ -1,4 +1,4 @@
-From 3069c254173b551cde229830af857fc5e3abd911 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,10 +12,10 @@ 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 f4e454ae217..de28e5228e9 100644
+index 3be31e40cf6..0a2cdc0dfcd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -464,6 +464,7 @@ AC_CHECK_HEADERS(\
+@@ -453,6 +453,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -23,7 +23,7 @@ index f4e454ae217..de28e5228e9 100644
  	sys/extattr.h \
  	sys/filio.h \
  	sys/ipc.h \
-@@ -2044,6 +2045,7 @@ AC_CHECK_FUNCS(\
+@@ -2024,6 +2025,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
@@ -31,7 +31,7 @@ index f4e454ae217..de28e5228e9 100644
  	prctl \
  	proc_pidinfo \
  	sched_yield \
-@@ -2085,6 +2087,12 @@ case $host_os in
+@@ -2049,6 +2051,12 @@ case $host_os in
      ;;
  esac
  
@@ -45,10 +45,10 @@ index f4e454ae217..de28e5228e9 100644
                  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 509dd2869bf..d6b19f96a9c 100644
+index fe2fc36a914..8e8c57d711c 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -335,6 +335,9 @@
+@@ -309,6 +309,9 @@
  /* Define to 1 if you have the `posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -58,17 +58,17 @@ index 509dd2869bf..d6b19f96a9c 100644
  /* Define to 1 if you have the `prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -404,6 +407,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
  
-@@ -553,6 +559,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 509dd2869bf..d6b19f96a9c 100644
  #undef HAVE_SYS_EVENT_H
  
 -- 
-2.38.1
+2.39.0
 

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

@@ -1,4 +1,4 @@
-From b332f5a5dd03b7d71515a2fddefa787da3fb7b5e Mon Sep 17 00:00:00 2001
+From 9e4371e8d0aaf8b4c5578c41adf8e1dd4436b1f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 9 Jan 2016 16:57:49 +0100
 Subject: [PATCH] explorer: Create CurrentControlSet\Control\Video registry key
@@ -14,7 +14,7 @@ Signed-off-by: Michael Müller <michael@fds-team.de>
  2 files changed, 16 insertions(+)
 
 diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index dfadd13ea8c..b3e5888da92 100644
+index 480e96ef6ee..49aacc905b1 100644
 --- a/dlls/advapi32/tests/registry.c
 +++ b/dlls/advapi32/tests/registry.c
 @@ -1318,6 +1318,13 @@ static void test_reg_create_key(void)
@@ -32,12 +32,12 @@ index dfadd13ea8c..b3e5888da92 100644
      hkey1 = NULL;
      ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL);
 diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
-index 94d178880a8..95f06e50b7d 100644
+index 81eb0d1d01b..f742cd6d30b 100644
 --- a/programs/explorer/desktop.c
 +++ b/programs/explorer/desktop.c
-@@ -792,6 +792,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
+@@ -878,6 +878,11 @@ static BOOL get_default_enable_shell( const WCHAR *name )
  
- static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
+ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
  {
 +    static const WCHAR video_keyW[] = {
 +        'S','y','s','t','e','m','\\',
@@ -47,7 +47,7 @@ index 94d178880a8..95f06e50b7d 100644
      static const WCHAR device_keyW[] = {
          'S','y','s','t','e','m','\\',
          'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
-@@ -859,6 +864,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid )
+@@ -947,6 +952,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
  
      TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) );
  
@@ -59,5 +59,5 @@ index 94d178880a8..95f06e50b7d 100644
                guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
                guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
 -- 
-2.30.2
+2.39.2
 

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

@@ -1,4 +1,4 @@
-From 8b6a7baacf0a26c7de7524c5f6da37bf4f4c1120 Mon Sep 17 00:00:00 2001
+From bc1d0962b58a45949c91367e84e6f71beb9f698b 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
@@ -23,7 +23,7 @@ index ab1db85adbb..9c89e44e70a 100644
  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 de61ed64fa4..a0cdbf0878a 100644
+index 18f2920759d..569007d435e 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.c
 @@ -32,6 +32,7 @@
@@ -34,7 +34,7 @@ index de61ed64fa4..a0cdbf0878a 100644
  
  #include "driver.h"
  
-@@ -2338,6 +2339,69 @@ static void test_default_modules(void)
+@@ -2374,6 +2375,69 @@ static void test_default_modules(void)
      ok(dxgmms1, "Failed to find dxgmms1.sys\n");
  }
  
@@ -104,14 +104,14 @@ index de61ed64fa4..a0cdbf0878a 100644
  static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
  {
      void *buffer = irp->AssociatedIrp.SystemBuffer;
-@@ -2382,6 +2446,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
-     test_dpc();
+@@ -2419,6 +2483,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.35.1
+2.39.2
 

patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch

@@ -1,4 +1,4 @@
-From f2347ae7216626d248cfaf9445862561b2b5eef7 Mon Sep 17 00:00:00 2001
+From d1d83243555801226876f651b6f3304d3e595ae4 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 1 Jul 2019 09:58:55 +1000
 Subject: [PATCH] loader: Add Keyboard Layouts registry enteries.
@@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  1 file changed, 209 insertions(+)
 
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index ff601e41b26..6ffb8c56d87 100644
+index d5f943861a8..b07843ff237 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
 @@ -63,6 +63,7 @@ AddReg=\
@@ -20,7 +20,7 @@ index ff601e41b26..6ffb8c56d87 100644
      MCI,\
      Misc,\
      OLE,\
-@@ -87,6 +88,7 @@ AddReg=\
+@@ -86,6 +87,7 @@ AddReg=\
      Debugger,\
      DirectX,\
      Fonts,\
@@ -28,7 +28,7 @@ index ff601e41b26..6ffb8c56d87 100644
      MCI,\
      Misc,\
      OLE,\
-@@ -113,6 +115,7 @@ AddReg=\
+@@ -111,6 +113,7 @@ AddReg=\
      Debugger,\
      DirectX,\
      Fonts,\
@@ -36,15 +36,15 @@ index ff601e41b26..6ffb8c56d87 100644
      MCI,\
      Misc,\
      OLE,\
-@@ -160,6 +163,7 @@ AddReg=\
-     CurrentVersionWow64,\
+@@ -156,6 +159,7 @@ AddReg=\
+     CurrentVersionWow64.ntx86,\
      Debugger,\
      DirectX,\
 +    KeyboardLayouts,\
      MCI,\
      Misc,\
      Tapi,\
-@@ -597,6 +601,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
+@@ -628,6 +632,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
  HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http"
  HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https"
  
@@ -257,5 +257,5 @@ index ff601e41b26..6ffb8c56d87 100644
  HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y"
  HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"
 -- 
-2.35.1
+2.39.2
 

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

@@ -1,4 +1,4 @@
-From f57e7a06cffc47773c647a10ed4d298b58fbd408 Mon Sep 17 00:00:00 2001
+From 2a1229098b39f923ff6e9a13bde05e161c797b0a 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,22 +13,22 @@ 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 c5387cf9212..2507a86e3b6 100644
+index 8f3cd8acae7..072f1fab23a 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
+@@ -499,7 +499,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
      return FALSE;
  }
  
 -
- /***********************************************************************
-  *		EnableMouseInPointer (USER32.@)
-  */
+ static DWORD CALLBACK devnotify_window_callbackW(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 bf913b8e6a6..8ac46bedc71 100644
+index 8f3d5750c2f..3bdfd042e85 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -4837,6 +4837,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
+@@ -5091,6 +5091,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
      CloseHandle( info.hProcess );
  }
  
@@ -69,7 +69,7 @@ index bf913b8e6a6..8ac46bedc71 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4887,6 +4921,7 @@ START_TEST(input)
+@@ -5142,6 +5176,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
@@ -78,10 +78,10 @@ index bf913b8e6a6..8ac46bedc71 100644
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index fd16d03f733..fb452843803 100644
+index 11bb129134c..9864d80ceff 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -934,11 +934,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -1250,11 +1250,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index fd16d03f733..fb452843803 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -952,33 +948,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -1268,33 +1264,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
@@ -111,10 +111,10 @@ index fd16d03f733..fb452843803 100644
 -            tmp = wcstoul( key_info->Name, NULL, 16 );
 -            if (query_reg_ascii_value( subkey, "Layout Id", value_info, sizeof(buffer) ) &&
 -                value_info->Type == REG_SZ)
--                tmp = MAKELONG( LOWORD( tmp ),
--                                0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff) );
+-                tmp = 0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff);
 -            NtClose( subkey );
 -
+-            tmp = MAKELONG( LOWORD( layout ), LOWORD( tmp ) );
 -            if (layout == UlongToHandle( tmp )) continue;
 -
 -            count++;
@@ -129,5 +129,5 @@ index fd16d03f733..fb452843803 100644
  
      return count;
 -- 
-2.39.0
+2.39.2