dmusic/tests: Change the way of detecting a workable dmusic.
Michael Stefaniuc
mstefani at redhat.de
Wed Jan 1 18:50:47 CST 2014
The Win2K boxes have a broken dmusic setup and reply with
CLASS_E_NOAGGREGATION on the original check
https://testbot.winehq.org/JobDetails.pl?Key=27625&log_201=1#k201
but don't know anything about IID_IDirectMusic
https://testbot.winehq.org/JobDetails.pl?Key=27627&log_201=1#k201
---
dlls/dmusic/tests/dmusic.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c
index ced2336..3e67c56 100644
--- a/dlls/dmusic/tests/dmusic.c
+++ b/dlls/dmusic/tests/dmusic.c
@@ -323,10 +323,15 @@ static void test_COM_dmcoll(void)
static BOOL missing_dmusic(void)
{
IDirectMusic8 *dm;
- HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm, CLSCTX_INPROC_SERVER,
- &IID_IUnknown, (void**)&dm);
+ HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic,
+ (void**)&dm);
- return (hr == REGDB_E_CLASSNOTREG || hr == CLASS_E_CLASSNOTAVAILABLE);
+ if (hr == S_OK && dm)
+ {
+ IDirectMusic_Release(dm);
+ return FALSE;
+ }
+ return TRUE;
}
START_TEST(dmusic)
--
1.8.3.1
More information about the wine-patches
mailing list