Module: wine Branch: master Commit: 126e3e280e72d70af248095c15d82706d0a52a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126e3e280e72d70af248095c15...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue Oct 17 23:28:57 2017 -0600
quartz/tests: Fix test failures on Windows XP without upgraded DirectX.
As far as I can tell, MP3 decoding in DirectShow requires DirectX 9 or later.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/tests/filtergraph.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a895071..6d5f8d1 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -392,8 +392,9 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) CloseHandle(handle);
hr = IFilterGraph2_RenderFile(filter_graph, mp3file, NULL); - todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older */ - hr == VFW_E_NO_TRANSPORT, /* win7 or newer */ + todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older + DirectX 9 */ + hr == VFW_E_NO_TRANSPORT || /* win7 or newer */ + broken(hr == CLASS_E_CLASSNOTAVAILABLE), /* xp or older + DirectX 8 or older */ "Expected 0x%08x or 0x%08x, returned 0x%08x\n", VFW_E_CANNOT_RENDER, VFW_E_NO_TRANSPORT, hr);
DeleteFileW(mp3file);