Nikolay Sivov : dmime/tests: Fix some failures on Win2k VMs.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Apr 27 07:45:10 CDT 2015
Module: wine
Branch: master
Commit: 494c67402849566e425231eb7912a90cc8fed370
URL: http://source.winehq.org/git/wine.git/?a=commit;h=494c67402849566e425231eb7912a90cc8fed370
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Apr 27 00:45:00 2015 +0300
dmime/tests: Fix some failures on Win2k VMs.
---
dlls/dmime/tests/dmime.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index f833a10..18586fd 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -421,9 +421,10 @@ static void test_graph(void)
hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps);
ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
hr = IPersistStream_GetClassID(ps, &class);
- ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr);
- ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph),
- "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class));
+ ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr);
+ if (hr == S_OK)
+ ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph),
+ "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class));
/* Unimplemented IPersistStream methods */
hr = IPersistStream_IsDirty(ps);
@@ -452,9 +453,10 @@ static void test_segment(void)
hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps);
ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
hr = IPersistStream_GetClassID(ps, &class);
- ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr);
- ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment),
- "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class));
+ ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr);
+ if (hr == S_OK)
+ ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment),
+ "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class));
/* Unimplemented IPersistStream methods */
hr = IPersistStream_IsDirty(ps);
More information about the wine-cvs
mailing list