[PATCH] dmstyle/tests: Relax style descriptor test with nothing loaded
Alex Henrie
alexhenrie24 at gmail.com
Thu Mar 15 00:11:09 CDT 2018
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
This test has been failing on the Windows 7 testbot since February 26,
likely because of a Windows update.
dlls/dmstyle/tests/dmstyle.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c
index ed12315a19..a773607f8b 100644
--- a/dlls/dmstyle/tests/dmstyle.c
+++ b/dlls/dmstyle/tests/dmstyle.c
@@ -458,9 +458,8 @@ static void test_parsedescriptor(void)
/* Nothing loaded */
hr = IDirectMusicObject_GetDescriptor(dmo, &desc);
ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ ||
- broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */
- "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData);
+ ok(desc.dwValidData & DMUS_OBJ_CLASS,
+ "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle),
"Got class guid %s, expected CLSID_DirectMusicStyle\n",
wine_dbgstr_guid(&desc.guidClass));
--
2.16.2
More information about the wine-devel
mailing list