Release v8.10

This fixes a crash in TeamTalk 5.

.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-sprite-state/0001-d3dx9-Improve-handling-of-Sprite-render-states.patch

@@ -0,0 +1,127 @@
+From cf47173eec41f4427248796a781e3aa4463a79db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mu=C5=BCy=C5=82o?= <galtgendo@o2.pl>
+Date: Wed, 7 Jun 2023 08:17:59 +1000
+Subject: [PATCH] d3dx9: Improve handling of Sprite render states
+
+---
+ dlls/d3dx9_36/sprite.c | 76 +++++++++++++++++++++++-------------------
+ 1 file changed, 41 insertions(+), 35 deletions(-)
+
+diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c
+index 1a072e52cda..0ce2ab977f3 100644
+--- a/dlls/d3dx9_36/sprite.c
++++ b/dlls/d3dx9_36/sprite.c
+@@ -193,7 +193,7 @@ static HRESULT WINAPI d3dx9_sprite_SetWorldViewLH(ID3DXSprite *iface,
+ }
+ 
+ /* Helper function */
+-static void set_states(struct d3dx9_sprite *object)
++static void set_states(struct d3dx9_sprite *object, DWORD flags)
+ {
+     D3DXMATRIX mat;
+     D3DVIEWPORT9 vp;
+@@ -204,32 +204,35 @@ static void set_states(struct d3dx9_sprite *object)
+     IDirect3DDevice9_SetNPatchMode(object->device, 0.0f);
+ 
+     /* Render states */
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHABLENDENABLE, TRUE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHAFUNC, D3DCMP_GREATER);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHAREF, 0x00);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHATESTENABLE, object->alphacmp_caps);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_BLENDOP, D3DBLENDOP_ADD);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_CLIPPING, TRUE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_CLIPPLANEENABLE, 0);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE |
+-                                    D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_CULLMODE, D3DCULL_NONE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_ENABLEADAPTIVETESSELLATION, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_FILLMODE, D3DFILL_SOLID);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_FOGENABLE, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_LIGHTING, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_RANGEFOGENABLE, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_SEPARATEALPHABLENDENABLE, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_SHADEMODE, D3DSHADE_GOURAUD);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_SPECULARENABLE, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_SRGBWRITEENABLE, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_STENCILENABLE, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_VERTEXBLEND, FALSE);
+-    IDirect3DDevice9_SetRenderState(object->device, D3DRS_WRAP0, 0);
++    if (!(flags & D3DXSPRITE_DONOTMODIFY_RENDERSTATE))
++    {
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHABLENDENABLE, TRUE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHAFUNC, D3DCMP_GREATER);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHAREF, 0x00);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHATESTENABLE, object->alphacmp_caps);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_BLENDOP, D3DBLENDOP_ADD);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_CLIPPING, TRUE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_CLIPPLANEENABLE, 0);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE |
++                                      D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_CULLMODE, D3DCULL_NONE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_ENABLEADAPTIVETESSELLATION, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_FILLMODE, D3DFILL_SOLID);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_FOGENABLE, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_LIGHTING, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_RANGEFOGENABLE, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_SEPARATEALPHABLENDENABLE, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_SHADEMODE, D3DSHADE_GOURAUD);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_SPECULARENABLE, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_SRGBWRITEENABLE, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_STENCILENABLE, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_VERTEXBLEND, FALSE);
++      IDirect3DDevice9_SetRenderState(object->device, D3DRS_WRAP0, 0);
++    }
+ 
+     /* Texture stage states */
+     IDirect3DDevice9_SetTextureStageState(object->device, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+@@ -266,12 +269,15 @@ static void set_states(struct d3dx9_sprite *object)
+     IDirect3DDevice9_SetSamplerState(object->device, 0, D3DSAMP_SRGBTEXTURE, 0);
+ 
+     /* Matrices */
+-    D3DXMatrixIdentity(&mat);
+-    IDirect3DDevice9_SetTransform(object->device, D3DTS_WORLD, &mat);
+-    IDirect3DDevice9_SetTransform(object->device, D3DTS_VIEW, &object->view);
+-    IDirect3DDevice9_GetViewport(object->device, &vp);
+-    D3DXMatrixOrthoOffCenterLH(&mat, vp.X+0.5f, (float)vp.Width+vp.X+0.5f, (float)vp.Height+vp.Y+0.5f, vp.Y+0.5f, vp.MinZ, vp.MaxZ);
+-    IDirect3DDevice9_SetTransform(object->device, D3DTS_PROJECTION, &mat);
++    if (!(flags & D3DXSPRITE_OBJECTSPACE))
++    {
++      D3DXMatrixIdentity(&mat);
++      IDirect3DDevice9_SetTransform(object->device, D3DTS_WORLD, &mat);
++      IDirect3DDevice9_SetTransform(object->device, D3DTS_VIEW, &object->view);
++      IDirect3DDevice9_GetViewport(object->device, &vp);
++      D3DXMatrixOrthoOffCenterLH(&mat, vp.X+0.5f, (float)vp.Width+vp.X+0.5f, (float)vp.Height+vp.Y+0.5f, vp.Y+0.5f, vp.MinZ, vp.MaxZ);
++      IDirect3DDevice9_SetTransform(object->device, D3DTS_PROJECTION, &mat);
++    }
+ }
+ 
+ static HRESULT WINAPI d3dx9_sprite_Begin(ID3DXSprite *iface, DWORD flags)
+@@ -317,7 +323,7 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often)
+             hr=IDirect3DDevice9_BeginStateBlock(This->device);
+             if(hr!=D3D_OK) return hr;
+ 
+-            set_states(This);
++            set_states(This, flags);
+ 
+             IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl);
+             IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(struct sprite_vertex));
+@@ -330,7 +336,7 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often)
+     }
+ 
+     /* Apply device state */
+-    set_states(This);
++    set_states(This, flags);
+ 
+     This->flags=flags;
+     This->ready=TRUE;
+-- 
+2.40.1
+

patches/d3dx9-sprite-state/definition

@@ -0,0 +1 @@
+Fixes: [54034] d3dx9: Improve sprite rendering state handling.

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 e9f5c886b6b40ca77eb1dd7f0d21bbdc483b7a95 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.
@@ -9,12 +9,12 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 22be2612eeb..2e11bb2b62d 100644
+index 74647820126..9f0aad2fc4f 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
  IMPORTLIB = dbghelp
- IMPORTS   = $(ZLIB_PE_LIBS)
+ IMPORTS   = kernelbase $(ZLIB_PE_LIBS)
  EXTRAINCL = $(ZLIB_PE_CFLAGS)
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
@@ -22,17 +22,17 @@ 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 a2a60752a68..a2bca11048f 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,
+@@ -1457,6 +1457,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
          load_elf.elf_info    = elf_info;
  
          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.40.1
 

patches/ddraw-Silence_FIXMEs/0001-ddraw-Silence-noisy-FIXME-about-unimplemented-D3DPRO.patch

@@ -1,29 +0,0 @@
-From ff117878cb3a0c74a50355ca64ac36c5fe6cee67 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Fri, 10 Mar 2017 22:07:37 +0100
-Subject: ddraw: Silence noisy FIXME about unimplemented
- D3DPROCESSVERTICES_UPDATEEXTENTS.
-
----
- dlls/ddraw/executebuffer.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
-index 393c52c1e2..9b64c687d3 100644
---- a/dlls/ddraw/executebuffer.c
-+++ b/dlls/ddraw/executebuffer.c
-@@ -302,7 +302,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
-                             ci->wStart, ci->wDest, ci->dwCount, ci->dwFlags);
- 
-                     if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
--                        FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n");
-+                    {
-+                        static int once;
-+                        if (!once++) FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n");
-+                    }
-                     if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
-                         FIXME("D3DPROCESSVERTICES_NOCOLOR not implemented.\n");
- 
--- 
-2.11.0
-

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/dnsapi_dns_records/0001-dnsapi-tests-Add-some-tests-for-DNS_TYPE_SRV-message.patch

@@ -0,0 +1,96 @@
+From fcf816014b4f7ce60b544f5a50a5a88ade3b055b Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Thu, 1 Jun 2023 14:30:10 +0300
+Subject: [PATCH] dnsapi/tests: Add some tests for DNS_TYPE_SRV messages.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/dnsapi/tests/record.c | 65 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+
+diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
+index 20738de3618..8abcdadaacc 100644
+--- a/dlls/dnsapi/tests/record.c
++++ b/dlls/dnsapi/tests/record.c
+@@ -193,6 +193,28 @@ static BYTE msg_types[] =  /* various record types */
+ /* KEY */   0xc0, 0x0c, 0x00, 0x19, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x00, 0x06, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
+ /* TXT */   0x01, 't', 0x01, 'x', 0x00, 0x00, 0x10, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x00, 0x09, 0x02, 'z', 'y', 0x00, 0x04, 'X', 'Y', 0xc3, 0xa9
+ };
++static BYTE msg_question_srv[] =  /* SRV question only */
++{
++    0x12, 0x34, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00,0x00,0x00,0x21,0x00
++};
++static BYTE msg_answer_srv[] =  /* SRV answer only */
++{
++    0x12, 0x34, 0x81, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
++    5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00,
++    0x00,0x21,0x00,0x01,0x04,0x05,0x06,0x07,
++    0x00,0x15,0x00,0x00,0x00,0x00,0x01,0x85,
++    2,'d','c',6,'w','i','n','e','h','q',3,'o','r','g',0x00
++};
++static BYTE msg_full_srv[] =  /* SRV question + answer */
++{
++    0x12, 0x34, 0x81, 0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
++    5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00,
++    0x00,0x21,0x00,0x01,
++    0xc0,0x0c,0x00,0x21,0x00,0x01,0x04,0x05,0x06,0x07,
++    0x00,0x15,0x00,0x00,0x00,0x00,0x01,0x85,
++    2,'d','c',6,'w','i','n','e','h','q',3,'o','r','g',0x00
++};
+ 
+ static void test_DnsExtractRecordsFromMessage(void)
+ {
+@@ -200,6 +222,49 @@ static void test_DnsExtractRecordsFromMessage(void)
+     DNS_RECORDA *rec, *r;
+     DNS_RECORDW *recW, *rW;
+ 
++    rec = NULL;
++    ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_full_srv, sizeof(msg_full_srv), &rec );
++    todo_wine
++    ok( !ret, "failed %ld\n", ret );
++    todo_wine
++    ok( rec != NULL, "record not set\n" );
++    if (!rec) goto next;
++    ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
++    ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
++    ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
++    ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
++    todo_wine
++    ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
++    ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
++    ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
++    ok( !rec->pNext, "next record %p\n", rec->pNext );
++    DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
++
++next:
++    rec = (void *)0xdeadbeef;
++    ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_question_srv, sizeof(msg_question_srv), &rec );
++    ok( !ret, "failed %ld\n", ret );
++    ok( !rec, "record %p\n", rec );
++
++    rec = NULL;
++    ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_answer_srv, sizeof(msg_answer_srv), &rec );
++    todo_wine
++    ok( !ret, "failed %ld\n", ret );
++    todo_wine
++    ok( rec != NULL, "record not set\n" );
++    if (!rec) goto next2;
++    ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
++    ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
++    ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
++    ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
++    todo_wine
++    ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
++    ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
++    ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
++    ok( !rec->pNext, "next record %p\n", rec->pNext );
++    DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
++
++next2:
+     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty) - 1, &rec );
+     ok( ret == ERROR_INVALID_PARAMETER || broken(ret == DNS_ERROR_BAD_PACKET) /* win7 */,
+         "failed %ld\n", ret );
+-- 
+2.40.1
+

patches/dnsapi_dns_records/0002-dnsapi-Accept-name-records-of-exact-size-at-the-end-.patch

@@ -0,0 +1,72 @@
+From 3c5ac02e18d5898d68c01f6a58996dc47e5582db Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Thu, 1 Jun 2023 14:32:55 +0300
+Subject: [PATCH] dnsapi: Accept name records of exact size at the end of the
+ packet.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/dnsapi/record.c       | 2 +-
+ dlls/dnsapi/tests/record.c | 8 --------
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
+index 01786842b73..cfd55a44852 100644
+--- a/dlls/dnsapi/record.c
++++ b/dlls/dnsapi/record.c
+@@ -199,7 +199,7 @@ static const BYTE *get_name( const BYTE *base, const BYTE *end, const BYTE *ptr,
+             return NULL;
+         }
+     }
+-    if (ptr >= end) return NULL;
++    if (ptr > end) return NULL;
+     if (out == name) *out++ = '.';
+     *out = 0;
+     return next ? next : ptr;
+diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
+index 8abcdadaacc..340d10f6024 100644
+--- a/dlls/dnsapi/tests/record.c
++++ b/dlls/dnsapi/tests/record.c
+@@ -224,11 +224,8 @@ static void test_DnsExtractRecordsFromMessage(void)
+ 
+     rec = NULL;
+     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_full_srv, sizeof(msg_full_srv), &rec );
+-    todo_wine
+     ok( !ret, "failed %ld\n", ret );
+-    todo_wine
+     ok( rec != NULL, "record not set\n" );
+-    if (!rec) goto next;
+     ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
+     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
+     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
+@@ -240,7 +237,6 @@ static void test_DnsExtractRecordsFromMessage(void)
+     ok( !rec->pNext, "next record %p\n", rec->pNext );
+     DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
+ 
+-next:
+     rec = (void *)0xdeadbeef;
+     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_question_srv, sizeof(msg_question_srv), &rec );
+     ok( !ret, "failed %ld\n", ret );
+@@ -248,11 +244,8 @@ next:
+ 
+     rec = NULL;
+     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_answer_srv, sizeof(msg_answer_srv), &rec );
+-    todo_wine
+     ok( !ret, "failed %ld\n", ret );
+-    todo_wine
+     ok( rec != NULL, "record not set\n" );
+-    if (!rec) goto next2;
+     ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
+     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
+     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
+@@ -264,7 +257,6 @@ next:
+     ok( !rec->pNext, "next record %p\n", rec->pNext );
+     DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
+ 
+-next2:
+     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty) - 1, &rec );
+     ok( ret == ERROR_INVALID_PARAMETER || broken(ret == DNS_ERROR_BAD_PACKET) /* win7 */,
+         "failed %ld\n", ret );
+-- 
+2.40.1
+

patches/dnsapi_dns_records/0003-dnsapi-Set-correct-wDataLength-for-DNS_TYPE_SRV-reco.patch

@@ -0,0 +1,49 @@
+From 623038324e863d3438243f75f5726291e5ee3ac2 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Thu, 1 Jun 2023 14:48:23 +0300
+Subject: [PATCH] dnsapi: Set correct wDataLength for DNS_TYPE_SRV records.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/dnsapi/record.c       | 4 ++++
+ dlls/dnsapi/tests/record.c | 2 --
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
+index cfd55a44852..1b4cbfeac0f 100644
+--- a/dlls/dnsapi/record.c
++++ b/dlls/dnsapi/record.c
+@@ -1046,6 +1046,10 @@ static DNS_STATUS extract_rdata( const BYTE *base, const BYTE *end, const BYTE *
+         if (!get_name( base, end, pos, name )) return DNS_ERROR_BAD_PACKET;
+         if (!(r->Data.SRV.pNameTarget = strdupX( name, in, out ))) return ERROR_NOT_ENOUGH_MEMORY;
+         r->wDataLength = sizeof(DNS_SRV_DATAA);
++        if (out == DnsCharSetUnicode)
++            r->wDataLength += (wcslen( (const WCHAR *)r->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR);
++        else
++            r->wDataLength += strlen( r->Data.SRV.pNameTarget ) + 1;
+         break;
+ 
+     case DNS_TYPE_HINFO:
+diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
+index 340d10f6024..d340c064554 100644
+--- a/dlls/dnsapi/tests/record.c
++++ b/dlls/dnsapi/tests/record.c
+@@ -230,7 +230,6 @@ static void test_DnsExtractRecordsFromMessage(void)
+     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
+     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
+     ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
+-    todo_wine
+     ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
+     ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
+     ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
+@@ -250,7 +249,6 @@ static void test_DnsExtractRecordsFromMessage(void)
+     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
+     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
+     ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
+-    todo_wine
+     ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
+     ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
+     ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
+-- 
+2.40.1
+

patches/dnsapi_dns_records/definition

@@ -0,0 +1 @@
+Fixes: [54998] - DnsQuery(DNS_TYPE_SRV) fails to parse some of the server answers

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