Matteo Bruni : d3dx10/tests: Ignore D3DX10GetImageInfoFromResourceA/W() test failures on Vista.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4b6819262ccb7ebe0aed212ac8f3324e4ad9f8d0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4b6819262ccb7ebe0aed212ac8f3324e4ad9f8d0

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Wed Aug 11 19:18:56 2021 +0200

d3dx10/tests: Ignore D3DX10GetImageInfoFromResourceA/W() test failures on Vista.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51305
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3dx10_43/tests/d3dx10.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c
index f00c6fe0484..9a4de2e5ad1 100644
--- a/dlls/d3dx10_43/tests/d3dx10.c
+++ b/dlls/d3dx10_43/tests/d3dx10.c
@@ -1943,13 +1943,15 @@ static void test_get_image_info(void)
         resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size);
 
         hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL);
-        ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
+        ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP)
+                || broken(hr == D3DX10_ERR_INVALID_DATA) /* Vista */,
                 "Got unexpected hr %#x.\n", hr);
         if (hr == S_OK)
             check_image_info(&image_info, test_image + i, __LINE__);
 
         hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL);
-        ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
+        ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP)
+                || broken(hr == D3DX10_ERR_INVALID_DATA) /* Vista */,
                 "Got unexpected hr %#x.\n", hr);
         if (hr == S_OK)
             check_image_info(&image_info, test_image + i, __LINE__);