Release v8.2

Deprected, replaced by staging/patchinstall.py.

Maintaining the patchinstall.sh script is an annoyance, often missed when modifying patches, which then results in fixup commits. The "new" patchinstall.py script (which has been around for multiple years now) is a complete replacement, and avoids this problem by just generating the list when applying. Precomputing the list is hardly worthwhile anyway.

.github/workflows/macOS.yml

@@ -14,7 +14,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew update
           brew install --cask xquartz
           brew install  bison \
                         gphoto2 \
@@ -34,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/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/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/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

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

patches/msxml3-FreeThreadedXMLHTTP60/0005-msxml3-Implement-IXMLHTTPRequest3-SetProperty.patch

@@ -0,0 +1,114 @@
+From b6db59b7d1a7ca08a2cb3c0fb52145fa89cd2e17 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 5 Jan 2023 14:36:31 +1100
+Subject: [PATCH 2/4] msxml3: Implement IXMLHTTPRequest3 SetProperty
+
+---
+ dlls/msxml3/httprequest.c | 77 ++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 75 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
+index 98dd23c9fbb..d8360680411 100644
+--- a/dlls/msxml3/httprequest.c
++++ b/dlls/msxml3/httprequest.c
+@@ -102,6 +102,21 @@ typedef struct
+ 
+     /* IObjectSafety */
+     DWORD safeopt;
++
++    /* Properties */
++    DWORD no_prompt;
++    DWORD no_auth;
++    DWORD timeout;
++    BOOL no_headeres;
++    BOOL redirect;
++    BOOL cache;
++    BOOL extended;
++    BOOL query_utf8;
++    BOOL ignore_errors;
++    BOOL threshold;
++    DWORD enterrprised_id;
++    DWORD max_connections;
++
+ } httprequest;
+ 
+ typedef struct
+@@ -2230,8 +2245,52 @@ static HRESULT WINAPI xml_http_request_2_SetCustomResponseStream(IXMLHTTPRequest
+ static HRESULT WINAPI xml_http_request_2_SetProperty(IXMLHTTPRequest3 *iface, XHR_PROPERTY property, ULONGLONG value)
+ {
+     struct xml_http_request_2 *This = impl_from_IXMLHTTPRequest3(iface);
+-    FIXME("(%p)->(%#x %s) stub!\n", This, property, wine_dbgstr_longlong( value ));
+-    return E_NOTIMPL;
++
++    TRACE("(%p)->(%#x %s) stub!\n", This, property, wine_dbgstr_longlong( value ));
++
++    switch (property)
++    {
++        case XHR_PROP_NO_CRED_PROMPT:
++            This->req.no_prompt = value;
++            break;
++        case XHR_PROP_NO_AUTH:
++            This->req.no_auth = value;
++            break;
++        case XHR_PROP_TIMEOUT:
++            This->req.timeout = value;
++            break;
++        case XHR_PROP_NO_DEFAULT_HEADERS:
++            This->req.no_headeres = value != 0;
++            break;
++        case XHR_PROP_REPORT_REDIRECT_STATUS:
++            This->req.redirect = value != 0;
++            break;
++        case XHR_PROP_NO_CACHE:
++            This->req.cache = value != 0;
++            break;
++        case XHR_PROP_EXTENDED_ERROR:
++            This->req.extended = value != 0;
++            break;
++        case XHR_PROP_QUERY_STRING_UTF8:
++            This->req.query_utf8 = value != 0;
++            break;
++        case XHR_PROP_IGNORE_CERT_ERRORS:
++            This->req.ignore_errors = value != 0;
++            break;
++        case XHR_PROP_ONDATA_THRESHOLD:
++            This->req.threshold = value;
++            break;
++        case XHR_PROP_SET_ENTERPRISEID:
++            This->req.enterrprised_id = value;
++            break;
++        case XHR_PROP_MAX_CONNECTIONS:
++            This->req.max_connections = value;
++            break;
++        default:
++            WARN("Invalid property %#x\n", property);
++            return E_INVALIDARG;
++    }
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI xml_http_request_2_SetRequestHeader(IXMLHTTPRequest3 *iface,
+@@ -2551,6 +2610,20 @@ static void init_httprequest(httprequest *req)
+ 
+     req->site = NULL;
+     req->safeopt = 0;
++
++    /* Properties */
++    req->no_prompt = XHR_CRED_PROMPT_ALL;
++    req->no_auth = XHR_AUTH_ALL;
++    req->timeout = 0xFFFFFFFF;
++    req->no_headeres = FALSE;
++    req->redirect = FALSE;
++    req->cache = FALSE;
++    req->extended = FALSE;
++    req->query_utf8 = FALSE;;
++    req->ignore_errors = FALSE;;
++    req->threshold = 0x100;
++    req->enterrprised_id = 0;
++    req->max_connections = 10;
+ }
+ 
+ HRESULT XMLHTTPRequest_create(void **obj)
+-- 
+2.39.0
+

patches/msxml3-FreeThreadedXMLHTTP60/0006-msxml3-Copy-body-size-to-request-object.patch

@@ -0,0 +1,91 @@
+From ca9c7d377e3e5e9689d67fbb9622ac1554442cdc Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 5 Jan 2023 14:36:08 +1100
+Subject: [PATCH 3/4] msxml3: Copy body size to request object
+
+Dont assume that the data needs to be convert
+
+NOTE: should use SetProperty value.
+---
+ dlls/msxml3/httprequest.c | 44 ++++++++++++++++++++++++++-------------
+ 1 file changed, 30 insertions(+), 14 deletions(-)
+
+diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
+index d8360680411..48ed444576e 100644
+--- a/dlls/msxml3/httprequest.c
++++ b/dlls/msxml3/httprequest.c
+@@ -117,6 +117,7 @@ typedef struct
+     DWORD enterrprised_id;
+     DWORD max_connections;
+ 
++    ULONGLONG request_body_size;
+ } httprequest;
+ 
+ typedef struct
+@@ -737,27 +738,40 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback *
+         {
+         case VT_BSTR:
+         {
+-            int len = SysStringLen(V_BSTR(body));
+-            const WCHAR *str = V_BSTR(body);
+-            UINT i, cp = CP_ACP;
++            int len = This->request_body_size ? This->request_body_size : SysStringLen(V_BSTR(body));
+ 
+-            for (i = 0; i < len; i++)
++            if(!This->request_body_size)
+             {
+-                if (str[i] > 127)
++                const WCHAR *str = V_BSTR(body);
++                UINT i, cp = CP_ACP;
++
++                for (i = 0; i < len; i++)
++                {
++                    if (str[i] > 127)
++                    {
++                        cp = CP_UTF8;
++                        break;
++                    }
++                }
++                size = WideCharToMultiByte(cp, 0, str, len, NULL, 0, NULL, NULL);
++                if (!(ptr = heap_alloc(size)))
+                 {
+-                    cp = CP_UTF8;
+-                    break;
++                    heap_free(bsc);
++                    return E_OUTOFMEMORY;
+                 }
++                WideCharToMultiByte(cp, 0, str, len, ptr, size, NULL, NULL);
++                if (cp == CP_UTF8) This->use_utf8_content = TRUE;
+             }
+-
+-            size = WideCharToMultiByte(cp, 0, str, len, NULL, 0, NULL, NULL);
+-            if (!(ptr = heap_alloc(size)))
++            else
+             {
+-                heap_free(bsc);
+-                return E_OUTOFMEMORY;
++                size = This->request_body_size;
++                if (!(ptr = heap_alloc(size)))
++                {
++                    heap_free(bsc);
++                    return E_OUTOFMEMORY;
++                }
++                memcpy(ptr, V_BSTR(body), size);
+             }
+-            WideCharToMultiByte(cp, 0, str, len, ptr, size, NULL, NULL);
+-            if (cp == CP_UTF8) This->use_utf8_content = TRUE;
+             break;
+         }
+         case VT_ARRAY|VT_UI1:
+@@ -2436,6 +2450,8 @@ static HRESULT WINAPI xml_http_request_2_IRtwqAsyncCallback_Invoke(IRtwqAsyncCal
+ 
+         ISequentialStream_Release(This->request_body);
+         This->request_body = NULL;
++
++        This->req.request_body_size = This->request_body_size;
+     }
+ 
+     hr = httprequest_send(&This->req, body_v);
+-- 
+2.39.0
+

patches/msxml3-FreeThreadedXMLHTTP60/0007-msxml3-Correct-xml_http_request_2_GetResponseHeader.patch

@@ -0,0 +1,26 @@
+From a4077e33ab9e41927433479a9a8af9ed11990c04 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 12 Jan 2023 08:21:48 +1100
+Subject: [PATCH 4/4] msxml3: Correct xml_http_request_2_GetResponseHeader
+
+---
+ dlls/msxml3/httprequest.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
+index 48ed444576e..111ac39f62f 100644
+--- a/dlls/msxml3/httprequest.c
++++ b/dlls/msxml3/httprequest.c
+@@ -2339,8 +2339,7 @@ static HRESULT WINAPI xml_http_request_2_GetResponseHeader(IXMLHTTPRequest3 *ifa
+ 
+     TRACE("(%p)->(%s %p)\n", This, debugstr_w(header), value);
+ 
+-    if (FAILED(hr = httprequest_getResponseHeader(&This->req, (BSTR)header, value)))
+-        return hr;
++    hr = httprequest_getResponseHeader(&This->req, (BSTR)header, value);
+ 
+ #define E_FILE_NOT_FOUND                                   _HRESULT_TYPEDEF_(0x80070002)
+ 
+-- 
+2.39.0
+

patches/ntdll-Builtin_Prot/0001-ntdll-Fix-holes-in-ELF-mappings.patch

@@ -1,90 +0,0 @@
-From 7acf9c0e6c7f4bf86b1946778366b529a42fa660 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 1 Jun 2017 06:04:53 +0200
-Subject: [PATCH] ntdll: Fix holes in ELF mappings. (v2)
-
-Based on a patch by Andrew Wesie.
----
- dlls/ntdll/unix/virtual.c     | 23 +++++++++++++++++++++++
- dlls/psapi/tests/psapi_main.c | 14 +++++++++++++-
- 2 files changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 0c1c91750ea..c4fcf43543f 100644
---- a/dlls/ntdll/unix/virtual.c
-+++ b/dlls/ntdll/unix/virtual.c
-@@ -1210,6 +1210,16 @@ static inline BOOL is_write_watch_range( const void *addr, size_t size )
- }
- 
- 
-+/***********************************************************************
-+ *           is_system_range
-+ */
-+static inline BOOL is_system_range( const void *addr, size_t size )
-+{
-+    struct file_view *view = find_view( addr, size );
-+    return view && (view->protect & VPROT_SYSTEM);
-+}
-+
-+
- /***********************************************************************
-  *           find_view_range
-  *
-@@ -3416,6 +3426,19 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )
-         /* ignore fault if page is writable now */
-         if (get_unix_prot( get_page_vprot( page ) ) & PROT_WRITE) ret = STATUS_SUCCESS;
-     }
-+    else if (!err && (get_unix_prot( vprot ) & PROT_READ) && is_system_range( page, page_size ))
-+    {
-+        int unix_prot = get_unix_prot( vprot );
-+        unsigned char vec;
-+
-+        mprotect_range( page, page_size, 0, 0 );
-+        if (!mincore( page, page_size, &vec ) && (vec & 1))
-+            ret = STATUS_SUCCESS;
-+        else if (anon_mmap_fixed( page, page_size, unix_prot, 0 ) == page)
-+            ret = STATUS_SUCCESS;
-+        else
-+            set_page_vprot_bits( page, page_size, 0, VPROT_READ | VPROT_EXEC );
-+    }
-     mutex_unlock( &virtual_mutex );
-     return ret;
- }
-diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
-index 519e39c3df0..c29168646e8 100644
---- a/dlls/psapi/tests/psapi_main.c
-+++ b/dlls/psapi/tests/psapi_main.c
-@@ -194,6 +194,7 @@ static void test_EnumProcessModules(void)
- static void test_GetModuleInformation(void)
- {
-     HMODULE hMod = GetModuleHandleA(NULL);
-+    DWORD *tmp, counter = 0;
-     MODULEINFO info;
-     DWORD ret;
- 
-@@ -213,10 +214,21 @@ static void test_GetModuleInformation(void)
-     GetModuleInformation(hpQV, hMod, &info, sizeof(info)-1);
-     ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %ld\n", GetLastError());
- 
--    SetLastError(0xdeadbeef);
-     ret = GetModuleInformation(hpQV, hMod, &info, sizeof(info));
-     ok(ret == 1, "failed with %ld\n", GetLastError());
-     ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod);
-+
-+    hMod = LoadLibraryA("shell32.dll");
-+    ok(hMod != NULL, "Failed to load shell32.dll, error: %lu\n", GetLastError());
-+
-+    ret = GetModuleInformation(hpQV, hMod, &info, sizeof(info));
-+    ok(ret == 1, "failed with %lu\n", GetLastError());
-+    info.SizeOfImage /= sizeof(DWORD);
-+    for (tmp = (DWORD *)hMod; info.SizeOfImage; info.SizeOfImage--)
-+        counter ^= *tmp++;
-+    trace("xor of shell32: %08lx\n", counter);
-+
-+    FreeLibrary(hMod);
- }
- 
- static BOOL check_with_margin(SIZE_T perf, SIZE_T sysperf, int margin)
--- 
-2.34.1
-

patches/ntdll-Builtin_Prot/definition

@@ -1,2 +0,0 @@
-Fixes: [44650] Fix holes in ELF mappings
-Depends: ntdll-WRITECOPY

patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch

@@ -1,4 +1,4 @@
-From 3bde485a0dfb5626b079eec3a92cedcbcafa5d40 Mon Sep 17 00:00:00 2001
+From c933925dbe192c65d00bfa9bccc26bb7b21984fa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 05:30:27 +0200
 Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
@@ -109,10 +109,10 @@ index 365f4465fc7..aca2b0f24cb 100644
      test_dll_file( "kernel32.dll" );
      test_dll_file( "advapi32.dll" );
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index b96cb862c93..aade2ab95d4 100644
+index 7661227e951..1087cf72d99 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -129,6 +129,9 @@ struct file_id
+@@ -128,6 +128,9 @@ struct file_id
      BYTE ObjectId[16];
  };
  
@@ -122,7 +122,7 @@ index b96cb862c93..aade2ab95d4 100644
  /* internal representation of loaded modules */
  typedef struct _wine_modref
  {
-@@ -498,6 +501,33 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
+@@ -497,6 +500,33 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
      }
  }
  
@@ -156,7 +156,7 @@ index b96cb862c93..aade2ab95d4 100644
  /*************************************************************************
   *		get_modref
   *
-@@ -1471,7 +1501,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
+@@ -1476,7 +1506,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
                     &wm->ldr.InLoadOrderLinks);
      InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
                     &wm->ldr.InMemoryOrderLinks);
@@ -169,7 +169,7 @@ index b96cb862c93..aade2ab95d4 100644
  
      if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT))
      {
-@@ -2149,6 +2184,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
+@@ -2154,6 +2189,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
              /* the module has only be inserted in the load & memory order lists */
              RemoveEntryList(&wm->ldr.InLoadOrderLinks);
              RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -177,7 +177,7 @@ index b96cb862c93..aade2ab95d4 100644
  
              /* FIXME: there are several more dangling references
               * left. Including dlls loaded by this dll before the
-@@ -3747,6 +3783,7 @@ static void free_modref( WINE_MODREF *wm )
+@@ -3749,6 +3785,7 @@ static void free_modref( WINE_MODREF *wm )
  
      RemoveEntryList(&wm->ldr.InLoadOrderLinks);
      RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -185,15 +185,15 @@ index b96cb862c93..aade2ab95d4 100644
      if (wm->ldr.InInitializationOrderLinks.Flink)
          RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
  
-@@ -4113,6 +4150,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
-     if (!imports_fixup_done)
-     {
-         MEMORY_BASIC_INFORMATION meminfo;
-+        int i;
-         ANSI_STRING func_name;
+@@ -4117,6 +4154,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+         ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" );
          WINE_MODREF *kernel32;
          PEB *peb = NtCurrentTeb()->Peb;
-@@ -4134,6 +4172,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
++        unsigned int i;
+ 
+         NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation,
+                               &meminfo, sizeof(meminfo), NULL );
+@@ -4135,6 +4173,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
                               sizeof(peb->TlsExpansionBitmapBits) * 8 );
          RtlSetBits( peb->TlsBitmap, 0, 1 ); /* TLS index 0 is reserved and should be initialized to NULL. */
  
@@ -205,5 +205,5 @@ index b96cb862c93..aade2ab95d4 100644
          load_global_options();
          version_init();
 -- 
-2.38.1
+2.39.0
 

patches/ntdll-Junction_Points/0005-server-Implement-FILE_OPEN_REPARSE_POINT-option.patch

@@ -1,16 +1,16 @@
-From da698613af1808ca0fe2599bc4b7898fad9dcf18 Mon Sep 17 00:00:00 2001
+From 1656f670f68ce218458fc26dc8688c78d99091cb Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 21:02:11 -0700
-Subject: server: Implement FILE_OPEN_REPARSE_POINT option.
+Subject: [PATCH] server: Implement FILE_OPEN_REPARSE_POINT option.
 
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
  dlls/kernelbase/file.c |   2 +
- server/fd.c            | 142 +++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 137 insertions(+), 7 deletions(-)
+ server/fd.c            | 144 +++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 139 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
-index 5ba7e0be419..bfb291fa925 100644
+index ac04388acde..d0da370ae88 100644
 --- a/dlls/kernelbase/file.c
 +++ b/dlls/kernelbase/file.c
 @@ -735,6 +735,8 @@ static UINT get_nt_file_options( DWORD attributes )
@@ -23,7 +23,7 @@ index 5ba7e0be419..bfb291fa925 100644
  }
  
 diff --git a/server/fd.c b/server/fd.c
-index eaebe044f37..1ed975673a6 100644
+index eaebe044f37..db645779dc6 100644
 --- a/server/fd.c
 +++ b/server/fd.c
 @@ -31,6 +31,7 @@
@@ -136,7 +136,7 @@ index eaebe044f37..1ed975673a6 100644
              }
          }
          free( fd->unix_name );
-@@ -1888,6 +1965,36 @@ void get_nt_name( struct fd *fd, struct unicode_str *name )
+@@ -1888,6 +1965,38 @@ void get_nt_name( struct fd *fd, struct unicode_str *name )
      name->len = fd->nt_namelen;
  }
  
@@ -155,8 +155,10 @@ index eaebe044f37..1ed975673a6 100644
 +{
 +    char tmp[PATH_MAX], resolved_path[PATH_MAX], *p;
 +
++#if defined(O_SYMLINK)
 +    if ((flags & O_SYMLINK) != O_SYMLINK)
 +        return realpath( path, NULL );
++#endif
 +
 +    strcpy( tmp, path );
 +    p = dirname( tmp );
@@ -173,7 +175,7 @@ index eaebe044f37..1ed975673a6 100644
  /* open() wrapper that returns a struct fd with no fd user set */
  struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_name,
                      int flags, mode_t *mode, unsigned int access,
-@@ -1948,6 +2055,15 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -1948,6 +2057,15 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
      }
      else rw_mode = O_RDONLY;
  
@@ -189,7 +191,7 @@ index eaebe044f37..1ed975673a6 100644
      if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1)
      {
          /* if we tried to open a directory for write access, retry read-only */
-@@ -1972,7 +2088,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -1972,7 +2090,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
      fd->unix_name = NULL;
      if ((path = dup_fd_name( root, name )))
      {
@@ -198,7 +200,7 @@ index eaebe044f37..1ed975673a6 100644
          free( path );
      }
  
-@@ -1983,10 +2099,11 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -1983,10 +2101,11 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
      *mode = st.st_mode;
  
      /* only bother with an inode for normal files and directories */
@@ -211,7 +213,7 @@ index eaebe044f37..1ed975673a6 100644
  
          if (!inode)
          {
-@@ -2001,13 +2118,17 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
+@@ -2001,13 +2120,17 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam
          list_add_head( &inode->open, &fd->inode_entry );
          closed_fd = NULL;
  
@@ -231,7 +233,7 @@ index eaebe044f37..1ed975673a6 100644
          {
              set_error( STATUS_FILE_IS_A_DIRECTORY );
              goto error;
-@@ -2439,6 +2560,7 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl
+@@ -2439,6 +2562,7 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl
  
  static int is_dir_empty( int fd )
  {
@@ -239,7 +241,7 @@ index eaebe044f37..1ed975673a6 100644
      DIR *dir;
      int empty;
      struct dirent *de;
-@@ -2446,8 +2568,13 @@ static int is_dir_empty( int fd )
+@@ -2446,8 +2570,13 @@ static int is_dir_empty( int fd )
      if ((fd = dup( fd )) == -1)
          return -1;
  
@@ -254,7 +256,7 @@ index eaebe044f37..1ed975673a6 100644
          close( fd );
          return -1;
      }
-@@ -2459,6 +2586,7 @@ static int is_dir_empty( int fd )
+@@ -2459,6 +2588,7 @@ static int is_dir_empty( int fd )
          empty = 0;
      }
      closedir( dir );
@@ -262,7 +264,7 @@ index eaebe044f37..1ed975673a6 100644
      return empty;
  }
  
-@@ -2497,7 +2625,7 @@ static void set_fd_disposition( struct fd *fd, int unlink )
+@@ -2497,7 +2627,7 @@ static void set_fd_disposition( struct fd *fd, int unlink )
              file_set_error();
              return;
          }
@@ -272,5 +274,5 @@ index eaebe044f37..1ed975673a6 100644
              if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
              {
 -- 
-2.17.1
+2.39.1