commit f9ba99996e69d040def0b5e11031d9a7fc14d92f
author Christian Costa <titan.costa@gmail.com> Tue May 08 22:27:44 2012 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed May 09 11:51:00 2012 +0200
tree ae3a0cb6e5ed78b6aa7bb31dc9d427c405085393
parent 3c353607b1c6d12f5a89929237948fb0494a65da

dmsynth: Add stubbed IKsControl interface to DirectMusicSynthSink object.

dlls/dmsynth/dmsynth_private.h

diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h
index 86606bb..3635aed 100644
--- a/dlls/dmsynth/dmsynth_private.h
+++ b/dlls/dmsynth/dmsynth_private.h
@@ -75,6 +75,7 @@
 struct IDirectMusicSynthSinkImpl {
     /* IUnknown fields */
     IDirectMusicSynthSink IDirectMusicSynthSink_iface;
+    IKsControl IKsControl_iface;
     LONG ref;
 
     /* IDirectMusicSynthSinkImpl fields */

dlls/dmsynth/synthsink.c

diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index 268f6e8..e5e164f 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -41,6 +41,12 @@
 		*ppobj = This;
 		return S_OK;
 	}
+    else if (IsEqualIID(riid, &IID_IKsControl)) {
+		IUnknown_AddRef(iface);
+		*ppobj = &This->IKsControl_iface;
+		return S_OK;
+    }
+
 	WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
 	return E_NOINTERFACE;
 }
@@ -168,6 +174,66 @@
 	IDirectMusicSynthSinkImpl_GetDesiredBufferSize
 };
 
+static inline IDirectMusicSynthSinkImpl *impl_from_IKsControl(IKsControl *iface)
+{
+    return CONTAINING_RECORD(iface, IDirectMusicSynthSinkImpl, IKsControl_iface);
+}
+
+static HRESULT WINAPI DMSynthSinkImpl_IKsControl_QueryInterface(IKsControl* iface, REFIID riid, LPVOID *ppobj)
+{
+    IDirectMusicSynthSinkImpl *This = impl_from_IKsControl(iface);
+
+    return IDirectMusicSynthSinkImpl_QueryInterface(&This->IDirectMusicSynthSink_iface, riid, ppobj);
+}
+
+static ULONG WINAPI DMSynthSinkImpl_IKsControl_AddRef(IKsControl* iface)
+{
+    IDirectMusicSynthSinkImpl *This = impl_from_IKsControl(iface);
+
+    return IDirectMusicSynthSinkImpl_AddRef(&This->IDirectMusicSynthSink_iface);
+}
+
+static ULONG WINAPI DMSynthSinkImpl_IKsControl_Release(IKsControl* iface)
+{
+    IDirectMusicSynthSinkImpl *This = impl_from_IKsControl(iface);
+
+    return IDirectMusicSynthSinkImpl_Release(&This->IDirectMusicSynthSink_iface);
+}
+
+static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData,
+                                                            ULONG DataLength, ULONG* BytesReturned)
+{
+    FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData,
+                                                          ULONG DataLength, ULONG* BytesReturned)
+{
+    FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData,
+                                                         ULONG DataLength, ULONG* BytesReturned)
+{
+    FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned);
+
+    return E_NOTIMPL;
+}
+
+
+static const IKsControlVtbl DMSynthSinkImpl_IKsControl_Vtbl = {
+    DMSynthSinkImpl_IKsControl_QueryInterface,
+    DMSynthSinkImpl_IKsControl_AddRef,
+    DMSynthSinkImpl_IKsControl_Release,
+    DMSynthSinkImpl_IKsControl_KsProperty,
+    DMSynthSinkImpl_IKsControl_KsMethod,
+    DMSynthSinkImpl_IKsControl_KsEvent
+};
+
 /* for ClassFactory */
 HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter)
 {
@@ -183,6 +249,7 @@
         return E_OUTOFMEMORY;
 
     obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl;
+    obj->IKsControl_iface.lpVtbl = &DMSynthSinkImpl_IKsControl_Vtbl;
     obj->ref = 0;
 
     hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&obj->latency_clock);

dlls/dmsynth/tests/dmsynth.c

diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c
index 3a53900..4ffc90c 100644
--- a/dlls/dmsynth/tests/dmsynth.c
+++ b/dlls/dmsynth/tests/dmsynth.c
@@ -53,7 +53,7 @@
     hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth);
     ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr);
     hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink);
-    todo_wine ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr);
+    ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr);
 
     /* Synth has no default clock */
     hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth);