Michael Stefaniuc : dmstyle/tests: Relax a test for a pristine DMStyle object.
Alexandre Julliard
julliard at winehq.org
Wed Dec 19 16:04:43 CST 2018
Module: wine
Branch: master
Commit: 6b42be395daabec358870b0bb065935226a166c5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b42be395daabec358870b0bb065935226a166c5
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Wed Dec 19 21:55:42 2018 +0100
dmstyle/tests: Relax a test for a pristine DMStyle object.
Based on a patch by Alex Henrie.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 245424c..4c09d44 100644
--- a/dlls/dmstyle/tests/dmstyle.c
+++ b/dlls/dmstyle/tests/dmstyle.c
@@ -456,9 +456,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));
More information about the wine-cvs
mailing list