Matteo Bruni : d3dx10/tests: Only accept D3DX10_IFF_WMP tests failure on Windows.
Alexandre Julliard
julliard at winehq.org
Wed Oct 27 16:26:01 CDT 2021
Module: wine
Branch: master
Commit: ba149e129636cfe25955eff5608c511556d88c6c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba149e129636cfe25955eff5608c511556d88c6c
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Tue Oct 26 23:15:52 2021 +0200
d3dx10/tests: Only accept D3DX10_IFF_WMP tests failure on Windows.
Since eb0180e7b4df18d806ceb31e4a96e9a771b4db3e we're guaranteed to
have support for the format in Wine.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx10_43/tests/d3dx10.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c
index 70827056f5f..84a644cb55d 100644
--- a/dlls/d3dx10_43/tests/d3dx10.c
+++ b/dlls/d3dx10_43/tests/d3dx10.c
@@ -1896,7 +1896,7 @@ static void test_get_image_info(void)
winetest_push_context("Test %u", i);
hr = D3DX10GetImageInfoFromMemory(test_image[i].data, test_image[i].size, NULL, &image_info, NULL);
- ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
+ ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
"Got unexpected hr %#x.\n", hr);
if (hr == S_OK)
check_image_info(&image_info, test_image + i, __LINE__);
@@ -1919,13 +1919,13 @@ static void test_get_image_info(void)
create_file(test_filename, test_image[i].data, test_image[i].size, path);
hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL);
- ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
+ ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
"Got unexpected hr %#x.\n", hr);
if (hr == S_OK)
check_image_info(&image_info, test_image + i, __LINE__);
hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL);
- ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
+ ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
"Got unexpected hr %#x.\n", hr);
if (hr == S_OK)
check_image_info(&image_info, test_image + i, __LINE__);
@@ -1952,14 +1952,14 @@ 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 || broken(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 || broken(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)
@@ -2016,7 +2016,7 @@ static void test_create_texture(void)
hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL);
todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE)
- ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
+ ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP),
"Got unexpected hr %#x.\n", hr);
if (hr == S_OK)
{
More information about the wine-cvs
mailing list