Commit 393ea6c6 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

evr/tests: Skip tests if default presenter can't be created.

parent 059a0c0b
...@@ -1246,9 +1246,7 @@ static void test_default_presenter(void) ...@@ -1246,9 +1246,7 @@ static void test_default_presenter(void)
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter);
ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr); ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr);
if (FAILED(hr))
return;
check_interface(presenter, &IID_IQualProp, TRUE); check_interface(presenter, &IID_IQualProp, TRUE);
check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE); check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE);
...@@ -2820,8 +2818,19 @@ static void test_MFIsFormatYUV(void) ...@@ -2820,8 +2818,19 @@ static void test_MFIsFormatYUV(void)
START_TEST(evr) START_TEST(evr)
{ {
IMFVideoPresenter *presenter;
HRESULT hr;
CoInitialize(NULL); CoInitialize(NULL);
if (FAILED(hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter)))
{
win_skip("Failed to create default presenter, hr %#x. Skipping tests.\n", hr);
CoUninitialize();
return;
}
IMFVideoPresenter_Release(presenter);
test_aggregation(); test_aggregation();
test_interfaces(); test_interfaces();
test_enum_pins(); test_enum_pins();
......
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