[PATCH] quartz/tests: Fix test failures on Windows XP without upgraded DirectX.

Alex Henrie alexhenrie24 at gmail.com
Wed Oct 18 00:28:57 CDT 2017


As far as I can tell, MP3 decoding in DirectShow requires DirectX 9 or
later.

This will fix 1 test failure in each Windows XP testbot VM that has not
been upgraded to DirectX 9:
http://test.winehq.org/data/9787af34b1c23deb67902fc7dbf2c8421b987048/index_XP.html

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 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 a895071011..6d5f8d1107 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);
-- 
2.14.2




More information about the wine-patches mailing list