Release v8.20

Fix warning.

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

@@ -1,38 +1,17 @@
-From 81a36b530261731d6020e09770237ae5bf58166d Mon Sep 17 00:00:00 2001
+From ebe00ceb4f2d24f2611dbec87486d6597a3466a9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 2 May 2014 20:46:19 +0200
 Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
 
 ---
- dlls/user32/tests/msg.c | 2 ++
- dlls/win32u/message.c   | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ dlls/win32u/message.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index 4519da6962d..304a3b87f46 100644
---- a/dlls/user32/tests/msg.c
-+++ b/dlls/user32/tests/msg.c
-@@ -10709,6 +10709,7 @@ static void test_timers(void)
-     start = GetTickCount();
-     while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
-         DispatchMessageA(&msg);
-+todo_wine
-     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
-        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
-@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void)
-     start = GetTickCount();
-     while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
-         DispatchMessageA(&msg);
-+todo_wine
-     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
-        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
 diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
-index d00178e6aa4..513150a3d61 100644
+index d2909339983..337d4a2cc1d 100644
 --- a/dlls/win32u/message.c
 +++ b/dlls/win32u/message.c
-@@ -170,7 +170,7 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME
+@@ -3975,7 +3975,7 @@ UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC
  
      if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE );
  
@@ -42,5 +21,5 @@ index d00178e6aa4..513150a3d61 100644
      SERVER_START_REQ( set_win_timer )
      {
 -- 
-2.35.1
+2.42.0
 

patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch

@@ -1,4 +1,4 @@
-From 36b4dbb687232d783cc3203da1dee4a797606ba7 Mon Sep 17 00:00:00 2001
+From e6354103c243e13c177f6a534a9e786cfdcf7c92 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  1 file changed, 15 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 255d5afef79..00add6728cc 100644
+index 1a87f4d1f5e..31c0a3bae94 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
+@@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
  WINE_DECLARE_DEBUG_CHANNEL(snoop);
  WINE_DECLARE_DEBUG_CHANNEL(loaddll);
  WINE_DECLARE_DEBUG_CHANNEL(imports);
@@ -20,7 +20,7 @@ index 255d5afef79..00add6728cc 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3536,6 +3537,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3749,6 +3750,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,9 +28,9 @@ index 255d5afef79..00add6728cc 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -3955,6 +3957,9 @@ static void release_address_space(void)
+@@ -4195,6 +4197,9 @@ static void release_address_space(void)
   */
- void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
+ void loader_init( CONTEXT *context, void **entry )
  {
 +    OBJECT_ATTRIBUTES staging_event_attr;
 +    UNICODE_STRING staging_event_string;
@@ -38,7 +38,7 @@ index 255d5afef79..00add6728cc 100644
      static int attach_done;
      NTSTATUS status;
      ULONG_PTR cookie;
-@@ -4041,6 +4046,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+@@ -4274,6 +4279,16 @@ void loader_init( CONTEXT *context, void **entry )
      if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
  #endif
  
@@ -56,5 +56,5 @@ index 255d5afef79..00add6728cc 100644
      InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks );
      RtlReleasePebLock();
 -- 
-2.33.0
+2.42.0
 

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

@@ -60,7 +60,7 @@ index 00000000000..75a083ad276
 +
 +HRESULT WINAPI D3D12GetInterface(REFCLSID rclsid, REFIID riid, void **out)
 +{
-+    FIXME("%d, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out);
++    FIXME("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out);
 +
 +    return E_NOINTERFACE;
 +}

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-D3DXStubs/0003-d3dx9-Implement-D3DXComputeTangent.patch

@@ -210,7 +210,7 @@ index 984b2f6..a206e06 100644
 +HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx,
 +        DWORD binorm_idx, DWORD wrap, const DWORD *adjacency)
 +{
-+    TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n",
++    TRACE("mesh %p, stage_idx %ld, tangent_idx %ld, binorm_idx %ld, wrap %ld, adjacency %p.\n",
 +           mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency);
 +
 +    return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx,

patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch

@@ -174,18 +174,18 @@ index 1daec158a5f..64b02276843 100644
 +    }
 +
 +    hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +
 +    skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest);
-+    ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
++    ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
 +    for (i = 0; i < 4; i++)
 +    {
 +        ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n",

patches/d3dx9_36_controller/0001-d3dx9-D3DXLoadMeshHierarchyFromXInMemory-return-defa.patch

@@ -0,0 +1,27 @@
+From 1772b5826cbd3adef3f5c09e6c0138a8d367fc8b Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 28 Sep 2023 09:14:00 +1000
+Subject: [PATCH 1/3] d3dx9: D3DXLoadMeshHierarchyFromXInMemory return default
+ Animation Controller
+
+---
+ dlls/d3dx9_36/mesh.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
+index 8aa4ece69fb..442b56a7e19 100644
+--- a/dlls/d3dx9_36/mesh.c
++++ b/dlls/d3dx9_36/mesh.c
+@@ -4019,7 +4019,8 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo
+     if (anim_controller)
+     {
+         *anim_controller = NULL;
+-        FIXME("Animation controller creation not implemented.\n");
++        /*FIXME("Animation controller creation not implemented.\n");*/
++        D3DXCreateAnimationController(1, 1, 1, 1, anim_controller);
+     }
+ 
+ cleanup:
+-- 
+2.40.1
+

patches/d3dx9_36_controller/0003-d3dx9-HACK-D3DXIntersect-Assign-hit-to-FALSE.patch

@@ -0,0 +1,28 @@
+From 164c33e29bfe06d99c58c1ee73dfd6f31dc4c663 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 30 Sep 2023 10:18:54 +1000
+Subject: [PATCH] d3dx9: [HACK] D3DXIntersect - Assign hit to FALSE
+
+This functions needs to be implement to make "Humanity Asset" to work correctly.
+
+Added to stop the Infinite loop - Doesn't make the game playable.
+---
+ dlls/d3dx9_36/mesh.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
+index 822b2d7d410..fdc642c4e0c 100644
+--- a/dlls/d3dx9_36/mesh.c
++++ b/dlls/d3dx9_36/mesh.c
+@@ -7645,6 +7645,8 @@ HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, co
+     FIXME("mesh %p, ray_pos %p, ray_dir %p, hit %p, face_index %p, u %p, v %p, distance %p, all_hits %p, "
+             "count_of_hits %p stub!\n", mesh, ray_pos, ray_dir, hit, face_index, u, v, distance, all_hits, count_of_hits);
+ 
++    *hit = FALSE;
++
+     return E_NOTIMPL;
+ }
+ 
+-- 
+2.42.0
+

patches/d3dx9_36_controller/definition

@@ -0,0 +1,4 @@
+Fixes: [39876] d3dx9: D3DXLoadMeshHierarchyFromXInMemory return a dummy ID3DXAnimationController.
+
+# This allow Humanity Asset to get in game - Doesn't make the game playable though.
+# Requires D3DXIntersect to be implemented.

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From e9f5c886b6b40ca77eb1dd7f0d21bbdc483b7a95 Mon Sep 17 00:00:00 2001
+From 9d274e6d152c3f3961212f3cbd71dc8f14641367 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,7 +9,7 @@ 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 74647820126..9f0aad2fc4f 100644
+index 152ef80611a..06ebb65e2af 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
@@ -18,11 +18,11 @@ index 74647820126..9f0aad2fc4f 100644
  EXTRAINCL = $(ZLIB_PE_CFLAGS)
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
- DELAYIMPORTS = version
  
- C_SRCS = \
+ SOURCES = \
+ 	coff.c \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index a2a60752a68..a2bca11048f 100644
+index 5ada8c70c9b..a9a6303c8d7 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
 @@ -1457,6 +1457,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
@@ -34,5 +34,5 @@ index a2a60752a68..a2bca11048f 100644
      }
  
 -- 
-2.40.1
+2.42.0
 

patches/ddraw-GetPickRecords/definition

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

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/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,157 +0,0 @@
-From 9eccf33cb881c2e847a22a72f1c8d8b10886d531 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 7cdc1534866..39f6cdce790 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*);
- extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);
- 
-+extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*);
-+
- /*****************************************************************************
-  * 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.40.1
-

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

@@ -1,80 +0,0 @@
-From 8f92585ece53fbcd940fe028dd7ee24d6b854ec3 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] 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 39f6cdce790..6cd45697e2f 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*);
- 
- 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
---- 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 0ea0c15c5e0..b21f93bbfc6 100644
---- a/dlls/dmime/segment.c
-+++ b/dlls/dmime/segment.c
-@@ -47,6 +47,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.40.1
-