Release v8.16

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

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

@@ -1,4 +1,4 @@
-From 7362e037e8160046fffcf062a663ea8e7ac45290 Mon Sep 17 00:00:00 2001
+From f9f5002e4ce6417dd196d53b50c51a3b224015d3 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 12 Nov 2019 18:13:20 +0800
 Subject: [PATCH] comctl32: Bump version to 6.0.
@@ -14,12 +14,12 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
-index 7dfdf089eb1..17ec7eeab40 100644
+index 51f4337add2..3fe8905abea 100644
 --- a/dlls/comctl32/comctl32.h
 +++ b/dlls/comctl32/comctl32.h
-@@ -194,7 +194,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
- BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
- BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN;
+@@ -194,7 +194,7 @@ BOOL Str_SetPtrAtoW(LPWSTR *lppDest, LPCSTR lpSrc);
+ BOOL Str_SetPtrWtoA(LPSTR *lppDest, LPCWSTR lpSrc);
+ BOOL imagelist_has_alpha(HIMAGELIST, UINT);
  
 -#define COMCTL32_VERSION_MINOR 81
 +#define COMCTL32_VERSION_MINOR 0
@@ -53,5 +53,5 @@ index a54de13d8b2..e0b0e22d4dc 100644
  #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
  #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
 -- 
-2.35.1
+2.40.1
 

patches/d3d12core-D3D12GetInterface/0001-d3d12core-Add-D3D12GetInterface-stub.patch

@@ -0,0 +1,69 @@
+From b30d3de1043cef20b57984035968fc78d5fcd2bb Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 22 Jul 2023 10:22:03 +1000
+Subject: [PATCH] d3d12core: Add D3D12GetInterface stub
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55135
+---
+ dlls/d3d12core/Makefile.in      |  3 +++
+ dlls/d3d12core/d3d12core.spec   |  2 +-
+ dlls/d3d12core/d3d12core_main.c | 30 ++++++++++++++++++++++++++++++
+ 3 files changed, 34 insertions(+), 1 deletion(-)
+ create mode 100644 dlls/d3d12core/d3d12core_main.c
+
+diff --git a/dlls/d3d12core/Makefile.in b/dlls/d3d12core/Makefile.in
+index 8778b66138b..94d8fd4da00 100644
+--- a/dlls/d3d12core/Makefile.in
++++ b/dlls/d3d12core/Makefile.in
+@@ -1 +1,4 @@
+ MODULE = d3d12core.dll
++
++C_SRCS = \
++	d3d12core_main.c
+diff --git a/dlls/d3d12core/d3d12core.spec b/dlls/d3d12core/d3d12core.spec
+index c9c73bd4ee4..3f3e0a0f2e1 100644
+--- a/dlls/d3d12core/d3d12core.spec
++++ b/dlls/d3d12core/d3d12core.spec
+@@ -1,2 +1,2 @@
+-@ stub D3D12GetInterface
++@ stdcall D3D12GetInterface(ptr ptr ptr)
+ @ stub D3D12SDKVersion
+diff --git a/dlls/d3d12core/d3d12core_main.c b/dlls/d3d12core/d3d12core_main.c
+new file mode 100644
+index 00000000000..75a083ad276
+--- /dev/null
++++ b/dlls/d3d12core/d3d12core_main.c
+@@ -0,0 +1,30 @@
++/*
++ * Copyright (c) 2023 Alistair Leslie-Hughes
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#include <stdarg.h>
++
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(d3d12core);
++
++HRESULT WINAPI D3D12GetInterface(REFCLSID rclsid, REFIID riid, void **out)
++{
++    FIXME("%d, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out);
++
++    return E_NOINTERFACE;
++}
+-- 
+2.40.1
+

patches/d3d12core-D3D12GetInterface/definition

@@ -0,0 +1 @@
+Fixes: [55135] d3d12core: Add D3D12GetInterface stub

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch

@@ -1,7 +1,7 @@
-From ea3579b5b3d701647f5c7f16de658f1cd7fe876d Mon Sep 17 00:00:00 2001
+From 0fbce9fe4b69f27b7df82c6517c364aab57de63b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 30 Jul 2021 15:57:29 +1000
-Subject: [PATCH] d3dx11_43: Implement D3DX11GetImageInfoFromMemory
+Subject: [PATCH 1/2] d3dx11_43: Implement D3DX11GetImageInfoFromMemory
 
 Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50210
 
@@ -10,8 +10,8 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  dlls/d3dx11_42/Makefile.in |   1 +
  dlls/d3dx11_43/Makefile.in |   1 +
  dlls/d3dx11_43/main.c      |   9 --
- dlls/d3dx11_43/texture.c   | 176 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 178 insertions(+), 9 deletions(-)
+ dlls/d3dx11_43/texture.c   | 167 +++++++++++++++++++++++++++++++++++++
+ 4 files changed, 169 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in
 index 7fcce18a8e1..78ca5f707a7 100644
@@ -55,10 +55,10 @@ index 5dad027864f..00c1db35e42 100644
 -    return E_NOTIMPL;
 -}
 diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index 81ac8ee6db7..6881eec107d 100644
+index 81ac8ee6db7..bbf937cdab0 100644
 --- a/dlls/d3dx11_43/texture.c
 +++ b/dlls/d3dx11_43/texture.c
-@@ -15,14 +15,190 @@
+@@ -15,14 +15,181 @@
   * License along with this library; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
@@ -145,13 +145,11 @@ index 81ac8ee6db7..6881eec107d 100644
 +HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
 +        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
 +{
-+    IWICBitmapFrameDecode *frame = NULL;
 +    IWICImagingFactory *factory = NULL;
 +    IWICDdsDecoder *dds_decoder = NULL;
 +    IWICBitmapDecoder *decoder = NULL;
 +    WICDdsParameters dds_params;
 +    IWICStream *stream = NULL;
-+    unsigned int frame_count;
 +    GUID container_format;
 +    HRESULT hr;
 +
@@ -186,16 +184,6 @@ index 81ac8ee6db7..6881eec107d 100644
 +        goto end;
 +    }
 +
-+    hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count);
-+    if (FAILED(hr) || !frame_count)
-+        goto end;
-+    hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame);
-+    if (FAILED(hr))
-+        goto end;
-+    hr = IWICBitmapFrameDecode_GetSize(frame, &img_info->Width, &img_info->Height);
-+    if (FAILED(hr))
-+        goto end;
-+
 +    if (img_info->ImageFileFormat == D3DX11_IFF_DDS)
 +    {
 +        hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder);
@@ -204,6 +192,8 @@ index 81ac8ee6db7..6881eec107d 100644
 +        hr = IWICDdsDecoder_GetParameters(dds_decoder, &dds_params);
 +        if (FAILED(hr))
 +            goto end;
++        img_info->Width = dds_params.Width;
++        img_info->Height = dds_params.Height;
 +        img_info->ArraySize = dds_params.ArraySize;
 +        img_info->Depth = dds_params.Depth;
 +        img_info->MipLevels = dds_params.MipLevels;
@@ -218,6 +208,9 @@ index 81ac8ee6db7..6881eec107d 100644
 +    }
 +    else
 +    {
++        FIXME("Unsupported image format %d\n", img_info->ImageFileFormat);
++        img_info->Width = 1;
++        img_info->Height = 1;
 +        img_info->ArraySize = 1;
 +        img_info->Depth = 1;
 +        img_info->MipLevels = 1;
@@ -229,8 +222,6 @@ index 81ac8ee6db7..6881eec107d 100644
 +end:
 +    if (dds_decoder)
 +        IWICDdsDecoder_Release(dds_decoder);
-+    if (frame)
-+        IWICBitmapFrameDecode_Release(frame);
 +    if (decoder)
 +        IWICBitmapDecoder_Release(decoder);
 +    if (stream)
@@ -250,5 +241,5 @@ index 81ac8ee6db7..6881eec107d 100644
          SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
          ID3D11ShaderResourceView **view, HRESULT *hresult)
 -- 
-2.34.1
+2.40.1
 

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch

@@ -1,15 +1,15 @@
-From 5be34c9e347d4379179eeba742b25986152d4e4f Mon Sep 17 00:00:00 2001
+From 7285c2c90f43cd46d873a2ddb65e9c6c9d63f750 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 3 Aug 2021 11:13:18 +1000
-Subject: [PATCH] d3dx11_42: Implement D3DX11CreateTextureFromMemory
+Subject: [PATCH 2/2] d3dx11_42: Implement D3DX11CreateTextureFromMemory
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- dlls/d3dx11_43/texture.c | 347 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 342 insertions(+), 5 deletions(-)
+ dlls/d3dx11_43/texture.c | 359 ++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 354 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index 6881eec107d..b91bd8d881a 100644
+index bbf937cdab0..10dedf30c0f 100644
 --- a/dlls/d3dx11_43/texture.c
 +++ b/dlls/d3dx11_43/texture.c
 @@ -22,6 +22,7 @@
@@ -20,7 +20,7 @@ index 6881eec107d..b91bd8d881a 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
  
-@@ -43,6 +44,32 @@ file_formats[] =
+@@ -43,6 +44,33 @@ file_formats[] =
      { &GUID_ContainerFormatWmp,  D3DX11_IFF_WMP },
  };
  
@@ -42,6 +42,7 @@ index 6881eec107d..b91bd8d881a 100644
 +    { &GUID_WICPixelFormat32bppBGR,           DXGI_FORMAT_B8G8R8X8_UNORM },
 +    { &GUID_WICPixelFormat32bppBGRA,          DXGI_FORMAT_B8G8R8A8_UNORM },
 +    { &GUID_WICPixelFormat32bppRGBA,          DXGI_FORMAT_R8G8B8A8_UNORM },
++    { &GUID_WICPixelFormat32bppRGBA,          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB },
 +    { &GUID_WICPixelFormat32bppRGBA1010102,   DXGI_FORMAT_R10G10B10A2_UNORM },
 +    { &GUID_WICPixelFormat32bppRGBA1010102XR, DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM },
 +    { &GUID_WICPixelFormat64bppRGBA,          DXGI_FORMAT_R16G16B16A16_UNORM },
@@ -53,7 +54,7 @@ index 6881eec107d..b91bd8d881a 100644
  static D3DX11_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *container_format)
  {
      unsigned int i;
-@@ -95,6 +122,175 @@ static DXGI_FORMAT get_d3dx11_dds_format(DXGI_FORMAT format)
+@@ -95,6 +123,175 @@ static DXGI_FORMAT get_d3dx11_dds_format(DXGI_FORMAT format)
      return format;
  }
  
@@ -229,7 +230,7 @@ index 6881eec107d..b91bd8d881a 100644
  HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
          D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
  {
-@@ -229,14 +425,155 @@ HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *f
+@@ -220,14 +417,166 @@ HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *f
      return E_NOTIMPL;
  }
  
@@ -264,17 +265,28 @@ index 6881eec107d..b91bd8d881a 100644
 +
 +    if (!src_data || !src_data_size || !texture)
 +        return E_FAIL;
-+    if (load_info)
-+        FIXME("load_info is ignored.\n");
 +    if (pump)
 +        FIXME("Thread pump is not supported yet.\n");
 +
-+    if (FAILED(D3DX11GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL)))
-+        return E_FAIL;
-+    if (img_info.MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE)
++    if (load_info)
 +    {
-+        FIXME("Cube map is not supported.\n");
-+        return E_FAIL;
++        img_info.Width = load_info->Width;
++        img_info.Height = load_info->Height;
++        img_info.Depth  = load_info->Depth;
++        img_info.ArraySize = 1;
++        img_info.MipLevels = load_info->MipLevels;
++        img_info.MiscFlags = load_info->MiscFlags;
++        img_info.Format = load_info->Format;
++    }
++    else
++    {
++        if (FAILED(D3DX11GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL)))
++            return E_FAIL;
++        if (img_info.MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE)
++        {
++            FIXME("Cube map is not supported.\n");
++            return E_FAIL;
++        }
 +    }
 +
 +    if (FAILED(hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory)))
@@ -391,5 +403,5 @@ index 6881eec107d..b91bd8d881a 100644
  
  HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture,
 -- 
-2.34.1
+2.40.1
 

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0003-d3dx11_43-D3DX11GetImageInfoFromMemory-Only-use-fram.patch

@@ -0,0 +1,56 @@
+From 30d677139afe2af3f72c68ba11f1bbaead6f1c11 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 2 Aug 2023 08:24:11 +1000
+Subject: [PATCH] d3dx11_43: D3DX11GetImageInfoFromMemory - Only use frame for
+ non DDS images
+
+---
+ dlls/d3dx11_43/texture.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
+index 10dedf30c0f..f3f7d350131 100644
+--- a/dlls/d3dx11_43/texture.c
++++ b/dlls/d3dx11_43/texture.c
+@@ -295,6 +295,7 @@ static const GUID *dxgi_format_to_wic_guid(DXGI_FORMAT format)
+ HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
+         D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
+ {
++    IWICBitmapFrameDecode *frame = NULL;
+     IWICImagingFactory *factory = NULL;
+     IWICDdsDecoder *dds_decoder = NULL;
+     IWICBitmapDecoder *decoder = NULL;
+@@ -358,9 +359,18 @@ HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat
+     }
+     else
+     {
+-        FIXME("Unsupported image format %d\n", img_info->ImageFileFormat);
+-        img_info->Width = 1;
+-        img_info->Height = 1;
++        unsigned int frame_count;
++
++        hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count);
++        if (FAILED(hr) || !frame_count)
++            goto end;
++        hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame);
++        if (FAILED(hr))
++            goto end;
++        hr = IWICBitmapFrameDecode_GetSize(frame, &img_info->Width, &img_info->Height);
++        if (FAILED(hr))
++            goto end;
++
+         img_info->ArraySize = 1;
+         img_info->Depth = 1;
+         img_info->MipLevels = 1;
+@@ -372,6 +382,8 @@ HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat
+ end:
+     if (dds_decoder)
+         IWICDdsDecoder_Release(dds_decoder);
++    if (frame)
++        IWICBitmapFrameDecode_Release(frame);
+     if (decoder)
+         IWICBitmapDecoder_Release(decoder);
+     if (stream)
+-- 
+2.40.1
+

patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch

@@ -254,14 +254,14 @@ index f437a83cbd8..c5faae520c9 100644
 +    hr = D3DXOptimizeVertices(indices, num_faces,
 +                              num_vertices, FALSE,
 +                              vertex_remap);
-+    ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %x, expected D3D_OK.\n", hr);
++    ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %lx, expected D3D_OK.\n", hr);
 +
 +    /* vertex_remap must not be NULL */
 +    hr = D3DXOptimizeVertices(indices, num_faces,
 +                              num_vertices, FALSE,
 +                              NULL);
 +    ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap "
-+            "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr);
++            "pointer. Got %lx, expected D3DERR_INVALIDCALL.\n", hr);
 +}
 +
  static void test_optimize_faces(void)

patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch

@@ -1,4 +1,4 @@
-From f22ce02d880a9a6723d202eaf959d1eaa7a4c3df Mon Sep 17 00:00:00 2001
+From 28b0030ac5f486875dff6f5f34779844f1a031cf Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:29:30 +0100
 Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
@@ -11,23 +11,23 @@ Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
  3 files changed, 65 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 9497343f422..679b57b2626 100644
+index 5d8f5b332f8..f1f41c6e4d7 100644
 --- a/dlls/d3dx9_36/d3dx9_private.h
 +++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
-         IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN;
+@@ -127,6 +127,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
+         IDirect3DSurface9 **temp_surface, BOOL write);
  HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
-         IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN;
+         IDirect3DSurface9 *temp_surface, BOOL update);
 +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
-+    const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN;
++    const PALETTEENTRY *src_palette);
  
- unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN;
- float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN;
+ unsigned short float_32_to_16(const float in);
+ float float_16_to_32(const unsigned short in);
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index aa9ee891b54..9871d211a7c 100644
+index ca40018af24..9ff5b4901b8 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -636,6 +636,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
+@@ -650,6 +650,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
      return D3D_OK;
  }
  
@@ -97,10 +97,10 @@ index aa9ee891b54..9871d211a7c 100644
      const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
      const D3DXIMAGE_INFO *src_info)
 diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index 26d07ca9f66..b743d5cfad0 100644
+index 2ee79b51f79..7ceef158d07 100644
 --- a/dlls/d3dx9_36/texture.c
 +++ b/dlls/d3dx9_36/texture.c
-@@ -1904,10 +1904,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
+@@ -1858,10 +1858,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
      if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
  
      if (file_format == D3DXIFF_DDS)
@@ -113,5 +113,5 @@ index 26d07ca9f66..b743d5cfad0 100644
      type = IDirect3DBaseTexture9_GetType(src_texture);
      switch (type)
 -- 
-2.17.1
+2.40.1
 

patches/ddraw-Device_Caps/0002-ddraw-Set-dwZBufferBitDepth-in-ddraw7_GetCaps.patch

@@ -19,7 +19,7 @@ index 8d608656143..cc8adccf049 100644
 +{
 +    DDCAPS *caps = ctx;
 +
-+    switch (format->u1.dwZBufferBitDepth)
++    switch (format->dwZBufferBitDepth)
 +    {
 +        case 8:
 +            caps->dwZBufferBitDepths |= DDBD_8;

patches/ddraw-GetPickRecords/definition

@@ -0,0 +1,2 @@
+Fixes: [10729] ddraw: Implement Pick() and GetPickRecords().
+

patches/ddraw-IDirect3DTexture2_Load/0001-ddraw-Allow-size-and-format-conversions-in-IDirect3D.patch

@@ -1,4 +1,4 @@
-From e2505b43f26d0517aad97c2778958886568ad58b Mon Sep 17 00:00:00 2001
+From ee590f3816dd8a60014214cdbd9c34c4489a842b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 30 May 2015 02:55:03 +0200
 Subject: [PATCH] ddraw: Allow size and format conversions in
@@ -9,10 +9,10 @@ Subject: [PATCH] ddraw: Allow size and format conversions in
  1 file changed, 82 insertions(+), 71 deletions(-)
 
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index 421ce68fa1c..b2c674eba7a 100644
+index 33f38949c15..099f3e92d98 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
-@@ -5321,6 +5321,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
+@@ -5473,6 +5473,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
      return impl_from_IDirectDrawSurface7(next_level);
  }
  
@@ -27,22 +27,22 @@ index 421ce68fa1c..b2c674eba7a 100644
 +        if (!(format1->dwFlags & DDPF_ALPHA))
 +        {
 +            /* The RGB and YUV bits are stored in the same fields */
-+            if (format1->u1.dwRGBBitCount != format2->u1.dwRGBBitCount)
++            if (format1->dwRGBBitCount != format2->dwRGBBitCount)
 +                return FALSE;
 +
-+            if (format1->u2.dwRBitMask != format2->u2.dwRBitMask)
++            if (format1->dwRBitMask != format2->dwRBitMask)
 +                return FALSE;
 +
-+            if (format1->u3.dwGBitMask != format2->u3.dwGBitMask)
++            if (format1->dwGBitMask != format2->dwGBitMask)
 +                return FALSE;
 +
-+            if (format1->u4.dwBBitMask != format2->u4.dwBBitMask)
++            if (format1->dwBBitMask != format2->dwBBitMask)
 +                return FALSE;
 +        }
 +
 +        if (format1->dwFlags & (DDPF_ALPHAPIXELS | DDPF_ALPHA))
 +        {
-+            if (format1->u5.dwRGBAlphaBitMask != format2->u5.dwRGBAlphaBitMask)
++            if (format1->dwRGBAlphaBitMask != format2->dwRGBAlphaBitMask)
 +                return FALSE;
 +        }
 +    }
@@ -59,7 +59,7 @@ index 421ce68fa1c..b2c674eba7a 100644
  /*****************************************************************************
   * IDirect3DTexture2::Load
   *
-@@ -5342,7 +5382,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5494,7 +5534,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  {
      struct ddraw_surface *dst_surface = impl_from_IDirect3DTexture2(iface);
      struct ddraw_surface *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture);
@@ -68,7 +68,7 @@ index 421ce68fa1c..b2c674eba7a 100644
      HRESULT hr;
  
      TRACE("iface %p, src_texture %p.\n", iface, src_texture);
-@@ -5355,90 +5395,62 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5507,90 +5547,62 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  
      wined3d_mutex_lock();
  
@@ -77,7 +77,7 @@ index 421ce68fa1c..b2c674eba7a 100644
 -
 -    if (((src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
 -            != (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP))
--            || (src_surface->surface_desc.u2.dwMipMapCount != dst_surface->surface_desc.u2.dwMipMapCount))
+-            || (src_surface->surface_desc.dwMipMapCount != dst_surface->surface_desc.dwMipMapCount))
 -    {
 -        ERR("Trying to load surfaces with different mip-map counts.\n");
 -    }
@@ -98,8 +98,8 @@ index 421ce68fa1c..b2c674eba7a 100644
 -        src_pal = src_surface->palette;
 -
 -        if (src_pal)
-+        if (compare_format(&src_surface->surface_desc.u4.ddpfPixelFormat,
-+                           &dst_surface->surface_desc.u4.ddpfPixelFormat))
++        if (compare_format(&src_surface->surface_desc.ddpfPixelFormat,
++                           &dst_surface->surface_desc.ddpfPixelFormat))
          {
 -            PALETTEENTRY palent[256];
 +            struct ddraw_palette *dst_pal, *src_pal;
@@ -125,7 +125,7 @@ index 421ce68fa1c..b2c674eba7a 100644
  
 -        if ((src_desc->dwWidth != dst_desc->dwWidth) || (src_desc->dwHeight != dst_desc->dwHeight))
 -        {
--            /* Should also check for same pixel format, u1.lPitch, ... */
+-            /* Should also check for same pixel format, lPitch, ... */
 -            ERR("Error in surface sizes.\n");
 -            wined3d_mutex_unlock();
 -            return D3DERR_TEXTURE_LOAD_FAILED;
@@ -175,8 +175,8 @@ index 421ce68fa1c..b2c674eba7a 100644
 +        /* Suppress the ALLOCONLOAD flag */
 +        dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;
  
--            if (dst_surface->surface_desc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC)
--                memcpy(dst_map_desc.data, src_map_desc.data, src_surface->surface_desc.u1.dwLinearSize);
+-            if (dst_surface->surface_desc.ddpfPixelFormat.dwFlags & DDPF_FOURCC)
+-                memcpy(dst_map_desc.data, src_map_desc.data, src_surface->surface_desc.dwLinearSize);
 -            else
 -                memcpy(dst_map_desc.data, src_map_desc.data, src_map_desc.row_pitch * src_desc->dwHeight);
 +        SetRect(&src_rect, 0, 0, src_surface->surface_desc.dwWidth, src_surface->surface_desc.dwHeight);
@@ -197,7 +197,7 @@ index 421ce68fa1c..b2c674eba7a 100644
          }
  
          if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
-@@ -5451,12 +5463,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5603,12 +5615,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
          else
              dst_surface = NULL;
  
@@ -214,5 +214,5 @@ index 421ce68fa1c..b2c674eba7a 100644
  
      wined3d_mutex_unlock();
 -- 
-2.34.1
+2.40.1
 

patches/ddraw-IDirect3DTexture2_Load/0002-ddraw-tests-Add-more-tests-for-IDirect3DTexture2-Loa.patch

@@ -37,19 +37,19 @@ index 87d0648b699..e88bbf59767 100644
 +            ddsd.dwSize = sizeof(ddsd);
 +
 +            hr = IDirectDrawSurface_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL);
-+            ok(hr == DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr);
++            ok(hr == DD_OK, "IDirectDrawSurface_Lock returned: %lx\n", hr);
 +
 +            for (y = 0; y < ddsd.dwHeight; y++)
 +            {
-+                if (U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount == 32)
++                if (ddsd.ddpfPixelFormat.dwRGBBitCount == 32)
 +                {
-+                    DWORD *textureRow = (DWORD *)((char *)ddsd.lpSurface + y * U1(ddsd).lPitch);
++                    DWORD *textureRow = (DWORD *)((char *)ddsd.lpSurface + y * ddsd.lPitch);
 +                    for (x = 0; x < ddsd.dwWidth;  x++)
 +                        *textureRow++ = fillcolor;
 +                }
-+                else if (U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount == 16)
++                else if (ddsd.ddpfPixelFormat.dwRGBBitCount == 16)
 +                {
-+                    WORD *textureRow = (WORD *)((char *)ddsd.lpSurface + y * U1(ddsd).lPitch);
++                    WORD *textureRow = (WORD *)((char *)ddsd.lpSurface + y * ddsd.lPitch);
 +                    for (x = 0; x < ddsd.dwWidth;  x++)
 +                        *textureRow++ = fillcolor;
 +                }
@@ -61,7 +61,7 @@ index 87d0648b699..e88bbf59767 100644
 +            }
 +
 +            hr = IDirectDrawSurface_Unlock(surface, NULL);
-+            ok(hr == DD_OK, "IDirectDrawSurface_Unlock returned: %x\n", hr);
++            ok(hr == DD_OK, "IDirectDrawSurface_Unlock returned: %lx\n", hr);
 +        }
 +
 +        if (level != -1 && curlevel >= level)
@@ -101,18 +101,18 @@ index 87d0648b699..e88bbf59767 100644
 +            ddsd.dwSize = sizeof(ddsd);
 +
 +            hr = IDirectDrawSurface_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL);
-+            ok(hr == DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr);
++            ok(hr == DD_OK, "IDirectDrawSurface_Lock returned: %lx\n", hr);
 +
 +            for (y = 0; y < ddsd.dwHeight; y++)
 +            {
-+                if (U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount == 32)
++                if (ddsd.ddpfPixelFormat.dwRGBBitCount == 32)
 +                {
-+                    DWORD *textureRow = (DWORD *)((char *)ddsd.lpSurface + y * U1(ddsd).lPitch);
++                    DWORD *textureRow = (DWORD *)((char *)ddsd.lpSurface + y * ddsd.lPitch);
 +                    for (x = 0; x < ddsd.dwWidth;  x++)
 +                    {
 +                        if ((*textureRow & 0x00ffffff) != fillcolor)
 +                        {
-+                            ok(0, "Expected color %x, got %x at (%d, %d) in level %d\n",
++                            ok(0, "Expected color %lx, got %lx at (%ld, %ld) in level %d\n",
 +                               fillcolor, *textureRow, x, y, curlevel);
 +                            result = FALSE;
 +                            goto end;
@@ -120,14 +120,14 @@ index 87d0648b699..e88bbf59767 100644
 +                        textureRow++;
 +                    }
 +                }
-+                else if (U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount == 16)
++                else if (ddsd.ddpfPixelFormat.dwRGBBitCount == 16)
 +                {
-+                    WORD *textureRow = (WORD *)((char *)ddsd.lpSurface + y * U1(ddsd).lPitch);
++                    WORD *textureRow = (WORD *)((char *)ddsd.lpSurface + y * ddsd.lPitch);
 +                    for (x = 0; x < ddsd.dwWidth;  x++)
 +                    {
 +                        if (*textureRow != fillcolor)
 +                        {
-+                            ok(0, "Expected color %x, got %x at (%d, %d) in level %d\n",
++                            ok(0, "Expected color %lx, got %lx at (%ld, %ld) in level %ld\n",
 +                               fillcolor, *textureRow, x, y, curlevel);
 +                            result = FALSE;
 +                            goto end;
@@ -144,7 +144,7 @@ index 87d0648b699..e88bbf59767 100644
 +
 +        end:
 +            hr = IDirectDrawSurface_Unlock(surface, NULL);
-+            ok(hr == DD_OK, "IDirectDrawSurface_Unlock returned: %x\n", hr);
++            ok(hr == DD_OK, "IDirectDrawSurface_Unlock returned: %lx\n", hr);
 +        }
 +
 +        if (level != -1 && curlevel >= level)
@@ -322,24 +322,24 @@ index 87d0648b699..e88bbf59767 100644
 +            ddsd2.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
 +            ddsd2.ddpfPixelFormat.dwSize = sizeof(ddsd2.ddpfPixelFormat);
 +            ddsd2.ddpfPixelFormat.dwFlags = DDPF_RGB;
-+            U1(U4(ddsd2).ddpfPixelFormat).dwRGBBitCount = load_tests[i].surfaces[j].format->dwRGBBitCount;
-+            U2(U4(ddsd2).ddpfPixelFormat).dwRBitMask = load_tests[i].surfaces[j].format->dwRBitMask;
-+            U3(U4(ddsd2).ddpfPixelFormat).dwGBitMask = load_tests[i].surfaces[j].format->dwGBitMask;
-+            U4(U4(ddsd2).ddpfPixelFormat).dwBBitMask = load_tests[i].surfaces[j].format->dwBBitMask;
++            ddsd2.ddpfPixelFormat.dwRGBBitCount = load_tests[i].surfaces[j].format->dwRGBBitCount;
++            ddsd2.ddpfPixelFormat.dwRBitMask = load_tests[i].surfaces[j].format->dwRBitMask;
++            ddsd2.ddpfPixelFormat.dwGBitMask = load_tests[i].surfaces[j].format->dwGBitMask;
++            ddsd2.ddpfPixelFormat.dwBBitMask = load_tests[i].surfaces[j].format->dwBBitMask;
 +
 +            if (load_tests[i].surfaces[j].levels)
 +            {
 +                ddsd2.dwFlags |= DDSD_MIPMAPCOUNT;
 +                ddsd2.ddsCaps.dwCaps |= DDSCAPS_MIPMAP | DDSCAPS_COMPLEX;
-+                U2(ddsd2).dwMipMapCount = load_tests[i].surfaces[j].levels;
++                ddsd2.dwMipMapCount = load_tests[i].surfaces[j].levels;
 +            }
 +
 +            hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd2, &TexSurfaces[j], NULL);
-+            ok(hr == D3D_OK, "IDirectDraw_CreateSurface returned %08x for surface %d in test %d\n", hr, j, i);
++            ok(hr == D3D_OK, "IDirectDraw_CreateSurface returned %08lx for surface %d in test %d\n", hr, j, i);
 +            if (FAILED(hr)) goto next;
 +
 +            hr = IDirectDrawSurface_QueryInterface(TexSurfaces[j], &IID_IDirect3DTexture, (void *)&Textures[j]);
-+            ok(hr == D3D_OK, "IDirectDrawSurface_QueryInterface returned %08x for surface %d in test %d\n", hr, j, i);
++            ok(hr == D3D_OK, "IDirectDrawSurface_QueryInterface returned %08lx for surface %d in test %d\n", hr, j, i);
 +            if (FAILED(hr)) goto next;
 +
 +            if (load_tests[i].surfaces[j].levels)
@@ -352,19 +352,19 @@ index 87d0648b699..e88bbf59767 100644
 +        }
 +
 +        hr = IDirect3DTexture_Load(Textures[1], Textures[0]);
-+        ok(hr == load_tests[i].hres, "IDirect3DTexture_Load returned %08x, expected %08x\n", hr, load_tests[i].hres);
++        ok(hr == load_tests[i].hres, "IDirect3DTexture_Load returned %08lx, expected %08x\n", hr, load_tests[i].hres);
 +        if (hr != DD_OK) goto next;
 +
 +        memset(&ddsd2, 0, sizeof (ddsd2));
 +        ddsd2.dwSize = sizeof(ddsd2);
 +        hr = IDirectDrawSurface_GetSurfaceDesc(TexSurfaces[1], &ddsd2);
-+        ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc returned %08x\n", hr);
++        ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc returned %08lx\n", hr);
 +
 +        if (load_tests[i].surfaces[1].levels)
 +        {
-+            ok(U2(ddsd2).dwMipMapCount == load_tests[i].surfaces[1].levels,
++            ok(ddsd2.dwMipMapCount == load_tests[i].surfaces[1].levels,
 +               "Expected %d mipmap levels, got %d in run %d\n", load_tests[i].surfaces[1].levels,
-+               U2(ddsd2).dwMipMapCount, i);
++               ddsd2.dwMipMapCount, i);
 +        }
 +
 +        for (k = 0; k < load_tests[i].level_check; k++)
@@ -373,21 +373,21 @@ index 87d0648b699..e88bbf59767 100644
 +                ok(0, "Check surface failed in test %d\n", i);
 +        }
 +
-+        ok(U1(U4(ddsd2).ddpfPixelFormat).dwRGBBitCount == load_tests[i].surfaces[1].format->dwRGBBitCount,
++        ok(ddsd2.ddpfPixelFormat.dwRGBBitCount == load_tests[i].surfaces[1].format->dwRGBBitCount,
 +           "Expected %d rgb bits, got %d in run %d\n", load_tests[i].surfaces[1].format->dwRGBBitCount,
-+           U1(U4(ddsd2).ddpfPixelFormat).dwRGBBitCount, i);
++           ddsd2.ddpfPixelFormat.dwRGBBitCount, i);
 +
-+        ok(U1(U4(ddsd2).ddpfPixelFormat).dwRBitMask == load_tests[i].surfaces[1].format->dwRBitMask,
++        ok(ddsd2.ddpfPixelFormat.dwRBitMask == load_tests[i].surfaces[1].format->dwRBitMask,
 +           "Expected %08x red bits, got %08x in run %d\n", load_tests[i].surfaces[1].format->dwRBitMask,
-+           U1(U4(ddsd2).ddpfPixelFormat).dwRBitMask, i);
++           ddsd2.ddpfPixelFormat.dwRBitMask, i);
 +
-+        ok(U1(U4(ddsd2).ddpfPixelFormat).dwGBitMask == load_tests[i].surfaces[1].format->dwGBitMask,
++        ok(ddsd2.ddpfPixelFormat.dwGBitMask == load_tests[i].surfaces[1].format->dwGBitMask,
 +           "Expected %08x green bits, got %08x in run %d\n", load_tests[i].surfaces[1].format->dwGBitMask,
-+           U1(U4(ddsd2).ddpfPixelFormat).dwGBitMask, i);
++           ddsd2.ddpfPixelFormat.dwGBitMask, i);
 +
-+        ok(U1(U4(ddsd2).ddpfPixelFormat).dwBBitMask == load_tests[i].surfaces[1].format->dwBBitMask,
++        ok(ddsd2.ddpfPixelFormat.dwBBitMask == load_tests[i].surfaces[1].format->dwBBitMask,
 +           "Expected %08x blue bits, got %08x in run %d\n", load_tests[i].surfaces[1].format->dwBBitMask,
-+           U1(U4(ddsd2).ddpfPixelFormat).dwBBitMask, i);
++           ddsd2.ddpfPixelFormat.dwBBitMask, i);
 +
 +    next:
 +        if (Textures[0]) IDirect3DTexture_Release(Textures[0]);
@@ -425,10 +425,10 @@ index 2d08718d131..0a2d575e8cc 100644
      ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY;
 +    ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat);
 +    ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB;
-+    U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32;
-+    U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00FF0000;
-+    U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000FF00;
-+    U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000FF;
++    ddsd.ddpfPixelFormat.dwRGBBitCount = 32;
++    ddsd.ddpfPixelFormat.dwRBitMask = 0x00FF0000;
++    ddsd.ddpfPixelFormat.dwGBitMask = 0x0000FF00;
++    ddsd.ddpfPixelFormat.dwBBitMask = 0x000000FF;
 +
      hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &src, NULL);
      ok(SUCCEEDED(hr), "Failed to create source texture, hr %#lx.\n", hr);
@@ -436,13 +436,13 @@ index 2d08718d131..0a2d575e8cc 100644
      hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &dst, NULL);
      ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#lx.\n", hr);
  
-+    U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16;
-+    U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xf800;
-+    U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07e0;
-+    U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001f;
++    ddsd.ddpfPixelFormat.dwRGBBitCount = 16;
++    ddsd.ddpfPixelFormat.dwRBitMask = 0xf800;
++    ddsd.ddpfPixelFormat.dwGBitMask = 0x07e0;
++    ddsd.ddpfPixelFormat.dwBBitMask = 0x001f;
 +
 +    hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &dst2, NULL);
-+    ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr);
++    ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#lx.\n", hr);
 +
      hr = IDirectDrawSurface_QueryInterface(src, &IID_IDirect3DTexture, (void **)&src_tex);
      ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#lx.\n", hr);
@@ -463,7 +463,7 @@ index 2d08718d131..0a2d575e8cc 100644
 +    /* Source surface has a color key but destination differs in format */
 +    ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0;
 +    hr = IDirect3DTexture_Load(dst2_tex, src_tex);
-+    ok(hr == E_FAIL, "Got unexpected hr %#x, expected E_FAIL.\n", hr);
++    ok(hr == E_FAIL, "Got unexpected hr %#lx, expected E_FAIL.\n", hr);
 +
      /* Both surfaces have a color key: Dest ckey is overwritten */
      ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff;

patches/dinput-scancode/0001-dinput-Avoid-duplicated-objects-in-keyboard-devices.patch

@@ -0,0 +1,34 @@
+From b2764b3d21a64c3c194b29b9cb71379456e03b06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 7 Jul 2023 12:44:26 +0200
+Subject: [PATCH] dinput: Avoid duplicated objects in keyboard devices.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55205
+---
+ dlls/dinput/keyboard.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
+index cbcbf94f0f6..3fd75bb10e6 100644
+--- a/dlls/dinput/keyboard.c
++++ b/dlls/dinput/keyboard.c
+@@ -265,13 +265,15 @@ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPH
+         .dwOfs = DIK_ESCAPE,
+         .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
+     };
++    BOOL ret, mapped[0x100] = {0};
+     DWORD index, i, dik;
+-    BOOL ret;
+ 
+     for (i = 0, index = 0; i < 512; ++i)
+     {
+         if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
+         if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue;
++        if (mapped[dik]) continue;
++        mapped[dik] = TRUE;
+         instance.dwOfs = dik;
+         instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
+         ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
+-- 
+2.40.1
+

patches/dinput-scancode/0002-dinput-Enumerate-lower-keyboard-scancodes-values-fir.patch

@@ -0,0 +1,64 @@
+From bdf952bf0711a7cf22fee840197234bd413ae611 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 7 Jul 2023 12:45:04 +0200
+Subject: [PATCH] dinput: Enumerate lower keyboard scancodes values first.
+
+Windows usually doesn't have scancodes higher than 0x7f, or extended
+scancodes higher than 0x17f, but X11 does for several XF86 keys.
+
+We want to enumerate the basic keys first including in the extended
+scancode range, so they appear before the XF86 keys in the dinput
+device object list.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55205
+---
+ dlls/dinput/keyboard.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
+index 3fd75bb10e6..1f1db883b80 100644
+--- a/dlls/dinput/keyboard.c
++++ b/dlls/dinput/keyboard.c
+@@ -256,6 +256,7 @@ static BOOL try_enum_object( struct dinput_device *impl, const DIPROPHEADER *fil
+ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter,
+                                       DWORD flags, enum_object_callback callback, void *context )
+ {
++    static const UINT vsc_base[] = {0, 0x100, 0x80, 0x180};
+     struct keyboard *impl = impl_from_IDirectInputDevice8W( iface );
+     BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType );
+     DIDEVICEOBJECTINSTANCEW instance =
+@@ -266,18 +267,21 @@ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPH
+         .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
+     };
+     BOOL ret, mapped[0x100] = {0};
+-    DWORD index, i, dik;
++    DWORD index, i, dik, vsc;
+ 
+-    for (i = 0, index = 0; i < 512; ++i)
++    for (i = 0, index = 0; i < ARRAY_SIZE(vsc_base); ++i)
+     {
+-        if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
+-        if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue;
+-        if (mapped[dik]) continue;
+-        mapped[dik] = TRUE;
+-        instance.dwOfs = dik;
+-        instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
+-        ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
+-        if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
++        for (vsc = vsc_base[i]; vsc < vsc_base[i] + 0x80; vsc++)
++        {
++            if (!GetKeyNameTextW( vsc << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
++            if (!(dik = map_dik_code( vsc, 0, subtype, impl->base.dinput->dwVersion ))) continue;
++            if (mapped[dik]) continue;
++            mapped[dik] = TRUE;
++            instance.dwOfs = dik;
++            instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
++            ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
++            if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
++        }
+     }
+ 
+     return DIENUM_CONTINUE;
+-- 
+2.40.1
+

patches/dinput-scancode/definition

@@ -0,0 +1,2 @@
+Fixes: [55205] dinput: Improve keyboard devices scancode support.
+# PR 3264

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

@@ -1,100 +0,0 @@
-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

@@ -1,4 +1,4 @@
-From f58dbcdfedf4d5d78d586d54f507c647e58379c8 Mon Sep 17 00:00:00 2001
+From 87bf08071997f446498bdea2d18d1bb539a1990e 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
@@ -10,38 +10,38 @@ Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download
  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
+index 6102fd5ec2f..da40b58ad9b 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 void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
+ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
  
-+extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN;
++extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*);
 +
  /*****************************************************************************
   * Auxiliary definitions
   */
 diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
-index d69a27540d6..5578c3e523b 100644
+index 1f8de0837d5..622939f3553 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);
+@@ -253,6 +253,13 @@ static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusi
+     return CONTAINING_RECORD(iface, struct performance, IDirectMusicPerformance8_iface);
  }
  
 +IDirectSound *get_dsound_interface(IDirectMusicPerformance8* iface)
 +{
-+    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
++    struct performance *This = impl_from_IDirectMusicPerformance8(iface);
 +    return This->dsound;
 +}
 +
 +
  /* IDirectMusicPerformance8 IUnknown part: */
- static HRESULT WINAPI IDirectMusicPerformance8Impl_QueryInterface(IDirectMusicPerformance8 *iface,
-         REFIID riid, void **ppv)
+ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface)
+ {
 diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
-index 6bf9f3abf0c..0ea0c15c5e0 100644
+index 39a5333fbbb..ce49ddc9940 100644
 --- a/dlls/dmime/segment.c
 +++ b/dlls/dmime/segment.c
 @@ -37,6 +37,7 @@ typedef struct IDirectMusicSegment8Impl {
@@ -153,5 +153,5 @@ index 6bf9f3abf0c..0ea0c15c5e0 100644
  
  static HRESULT WINAPI IDirectMusicSegment8Impl_Unload(IDirectMusicSegment8 *iface,
 -- 
-2.39.1
+2.40.1
 

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

@@ -1,8 +1,7 @@
-From 8ef2197cd4c77bf562ab5b83f2a137ae565bc22d Mon Sep 17 00:00:00 2001
+From 43007318a6303312b6226c9ede009e4299826af3 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
+Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx
 
 ---
  dlls/dmime/dmime_private.h |  1 +
@@ -11,27 +10,27 @@ Subject: [PATCH 3/3] dmime: Play a sound in IDirectMusicPerformance8
  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
+index da40b58ad9b..4532528f535 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 void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
  
- extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN;
-+extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface) DECLSPEC_HIDDEN;
+ extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*);
++extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface);
  
  /*****************************************************************************
   * Auxiliary definitions
 diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
-index 5578c3e523b..03e59e95af3 100644
+index 622939f3553..c7b149f0686 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)
+@@ -1028,13 +1028,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface,
+         WCHAR *pwzSegmentName, IUnknown *pTransition, DWORD dwFlags, __int64 i64StartTime,
+         IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom, IUnknown *pAudioPath)
  {
--        IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
-+    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
+-        struct performance *This = impl_from_IDirectMusicPerformance8(iface);
++    struct performance *This = impl_from_IDirectMusicPerformance8(iface);
 +    IDirectMusicSegment8 *segment;
 +    IDirectSoundBuffer *buffer;
 +    HRESULT hr;
@@ -58,12 +57,12 @@ index 5578c3e523b..03e59e95af3 100644
 +    return S_OK;
  }
  
- static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformance8 *iface,
+ static HRESULT WINAPI performance_StopEx(IDirectMusicPerformance8 *iface, IUnknown *pObjectToStop,
 diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
-index dbf2f8203d8..9213fbf4a4c 100644
+index ce49ddc9940..ad121736acd 100644
 --- a/dlls/dmime/segment.c
 +++ b/dlls/dmime/segment.c
-@@ -45,6 +45,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu
+@@ -47,6 +47,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu
    return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface);
  }
  
@@ -77,5 +76,5 @@ index dbf2f8203d8..9213fbf4a4c 100644
          REFIID riid, void **ret_iface)
  {
 -- 
-2.38.1
+2.40.1
 

patches/dnsapi_dns_records/0001-dnsapi-tests-Add-some-tests-for-DNS_TYPE_SRV-message.patch

@@ -1,96 +0,0 @@
-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
-