Skip to content

W
wine-winehq
Commit 4b681926 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard
Browse files
Options

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

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51305Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent da217f9b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/d3dx10_43/tests/d3dx10.c
View file @ 4b681926
...@@ -1943,13 +1943,15 @@ static void test_get_image_info(void) ...@@ -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); 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); 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); "Got unexpected hr %#x.\n", hr);
if (hr == S_OK) if (hr == S_OK)
check_image_info(&image_info, test_image + i, __LINE__); check_image_info(&image_info, test_image + i, __LINE__);
hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); 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); "Got unexpected hr %#x.\n", hr);
if (hr == S_OK) if (hr == S_OK)
check_image_info(&image_info, test_image + i, __LINE__); check_image_info(&image_info, test_image + i, __LINE__);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment