[PATCH 2/3] dmsynth: Check the rigth CLSID to create the DirectMusicSynthSink object.
Christian Costa
titan.costa at gmail.com
Thu Mar 29 01:53:42 CDT 2012
---
dlls/dmsynth/dmsynth_main.c | 19 ++++++++++---------
dlls/dmsynth/tests/dmsynth.c | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c
index 966fafc..4afa7b4 100644
--- a/dlls/dmsynth/dmsynth_main.c
+++ b/dlls/dmsynth/dmsynth_main.c
@@ -148,15 +148,16 @@ HRESULT WINAPI DllCanUnloadNow(void)
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{
TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
- if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSynth) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = &Synth_CF;
- IClassFactory_AddRef((IClassFactory*)*ppv);
- return S_OK;
- } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSynth) && IsEqualIID (riid, &IID_IClassFactory)) {
- *ppv = &SynthSink_CF;
- IClassFactory_AddRef((IClassFactory*)*ppv);
- return S_OK;
- }
+
+ if (IsEqualCLSID(rclsid, &CLSID_DirectMusicSynth) && IsEqualIID(riid, &IID_IClassFactory)) {
+ *ppv = &Synth_CF;
+ IClassFactory_AddRef((IClassFactory*)*ppv);
+ return S_OK;
+ } else if (IsEqualCLSID(rclsid, &CLSID_DirectMusicSynthSink) && IsEqualIID(riid, &IID_IClassFactory)) {
+ *ppv = &SynthSink_CF;
+ IClassFactory_AddRef((IClassFactory*)*ppv);
+ return S_OK;
+ }
WARN("(%s,%s,%p): no interface found.\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
return CLASS_E_CLASSNOTAVAILABLE;
diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c
index af740c2..a9a645a 100644
--- a/dlls/dmsynth/tests/dmsynth.c
+++ b/dlls/dmsynth/tests/dmsynth.c
@@ -39,7 +39,7 @@ static void test_dmsynth(void)
ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr);
hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink);
- todo_wine ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr);
+ ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr);
if (dmsynth_sink)
IDirectMusicSynthSink_Release(dmsynth_sink);
More information about the wine-patches
mailing list