[PATCH] dmstyle/tests: Relax dwValidData test

[Alex Henrie]

This fixes the consistent test failures on Windows 7 and intermittent
test failures on Windows 8.

Signed-off-by: Alex Henrie 
---
 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 245424c649..65d9348fba 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_OBJECT | DMUS_OBJ_VERSION) == 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));

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=45828

Your paranoid android.

=== build (build log) ===

../../../../wine/dlls/dmstyle/tests/dmstyle.c:460:13: error: expected ‘)’ before string constant
../../../../wine/include/wine/test.h:122:83: error: too few arguments to function ‘winetest_ok’
Makefile:165: recipe for target 'dmstyle.o' failed
Makefile:7509: recipe for target 'dlls/dmstyle/tests' failed
Task: The exe32 Wine crossbuild failed

=== debian9 (build log) ===

../../../../wine/dlls/dmstyle/tests/dmstyle.c:460:13: error: expected ‘)’ before string constant
../../../../wine/include/wine/test.h:122:83: error: too few arguments to function ‘winetest_ok’
Makefile:165: recipe for target 'dmstyle.o' failed
Makefile:8648: recipe for target 'dlls/dmstyle/tests' failed
Task: The win32 build failed

=== debian9 (build log) ===

../../../../wine/dlls/dmstyle/tests/dmstyle.c:460:13: error: expected ‘)’ before string constant
../../../../wine/include/wine/test.h:122:83: error: too few arguments to function ‘winetest_ok’
Makefile:165: recipe for target 'dmstyle.o' failed
Makefile:8371: recipe for target 'dlls/dmstyle/tests' failed
Task: The wow64 build failed