From c58f817de826fc71d5c8f39c5ceac4e920408f52 Mon Sep 17 00:00:00 2001
From: Paul Gofman <gofmanp@gmail.com>
Date: Fri, 27 Sep 2019 12:46:46 +0300
Subject: [PATCH] Updated d3dx9-32bpp_Alpha_Channel patchset.

Removed todo_wine from relevant test.
---
 ...FMT_A8R8G8B8-in-D3DXGetImageInfoFrom.patch | 30 ++++++++++++++-----
 patches/patchinstall.sh                       |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/patches/d3dx9-32bpp_Alpha_Channel/0001-d3dx9-Return-D3DFMT_A8R8G8B8-in-D3DXGetImageInfoFrom.patch b/patches/d3dx9-32bpp_Alpha_Channel/0001-d3dx9-Return-D3DFMT_A8R8G8B8-in-D3DXGetImageInfoFrom.patch
index b0d8a2cc..562930e2 100644
--- a/patches/d3dx9-32bpp_Alpha_Channel/0001-d3dx9-Return-D3DFMT_A8R8G8B8-in-D3DXGetImageInfoFrom.patch
+++ b/patches/d3dx9-32bpp_Alpha_Channel/0001-d3dx9-Return-D3DFMT_A8R8G8B8-in-D3DXGetImageInfoFrom.patch
@@ -1,18 +1,19 @@
-From b2bae3c7d8f8b6dfc7587b7a7a3147f5650096a7 Mon Sep 17 00:00:00 2001
+From bbc93f065045b7854f4446d9199c2c22c6251d3d Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 30 Jul 2017 23:50:18 +0200
-Subject: d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for
- 32 bpp BMP with alpha.
+Subject: [PATCH] d3dx9: Return D3DFMT_A8R8G8B8 in
+ D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha.
 
 ---
- dlls/d3dx9_36/surface.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
+ dlls/d3dx9_36/surface.c       | 18 ++++++++++++++++++
+ dlls/d3dx9_36/tests/surface.c |  2 +-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index c82c22289..abb1c0e5c 100644
+index a2eca9cbdb..b670657125 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -954,6 +954,24 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize,
+@@ -980,6 +980,24 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize,
                  }
              }
  
@@ -37,6 +38,19 @@ index c82c22289..abb1c0e5c 100644
              if (frame)
                   IWICBitmapFrameDecode_Release(frame);
  
+diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
+index 04ce57fa4f..db0c9c7291 100644
+--- a/dlls/d3dx9_36/tests/surface.c
++++ b/dlls/d3dx9_36/tests/surface.c
+@@ -616,7 +616,7 @@ static void test_D3DXGetImageInfo(void)
+     ok(info.Format == D3DFMT_X8R8G8B8, "Got unexpected format %u.\n", info.Format);
+     hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), &info);
+     ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+-    todo_wine ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format);
++    ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format);
+ 
+     /* Grayscale PNG */
+     hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info);
 -- 
-2.20.1
+2.21.0
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 044481ab..358dc297 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -2619,7 +2619,7 @@ fi
 # Patchset d3dx9-32bpp_Alpha_Channel
 # |
 # | Modified files:
-# |   *	dlls/d3dx9_36/surface.c
+# |   *	dlls/d3dx9_36/surface.c, dlls/d3dx9_36/tests/surface.c
 # |
 if test "$enable_d3dx9_32bpp_Alpha_Channel" -eq 1; then
 	patch_apply d3dx9-32bpp_Alpha_Channel/0001-d3dx9-Return-D3DFMT_A8R8G8B8-in-D3DXGetImageInfoFrom.patch