marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmusic: Support the IKsControl interface for the synth port. 

Based on a patch by Michael Müller.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Michael Stefaniuc 2016-10-05 10:36:59 +02:00 committed by Alexandre Julliard
parent 845bf2ff59
commit 883fe110ea
3 changed files with 84 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/dmusic/dmusic_private.h
View File

@ -41,6 +41,7 @@
#include "dmusici.h"
#include "dmusicf.h"
#include "dmusics.h"
#include "dmksctrl.h"
/*****************************************************************************
* Interfaces

78
dlls/dmusic/port.c
View File

@ -28,6 +28,7 @@ typedef struct SynthPortImpl {
IDirectMusicPort IDirectMusicPort_iface;
IDirectMusicPortDownload IDirectMusicPortDownload_iface;
IDirectMusicThru IDirectMusicThru_iface;
IKsControl IKsControl_iface;
LONG ref;
IDirectSound *pDirectSound;
IReferenceClock *pLatencyClock;
@ -60,6 +61,11 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus
return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface);
}
static inline SynthPortImpl *impl_from_IKsControl(IKsControl *iface)
{
return CONTAINING_RECORD(iface, SynthPortImpl, IKsControl_iface);
}
/* IDirectMusicDownloadedInstrument IUnknown part follows: */
static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface)
{
@ -152,6 +158,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI
*ret_iface = &This->IDirectMusicPortDownload_iface;
else if (IsEqualGUID(riid, &IID_IDirectMusicThru))
*ret_iface = &This->IDirectMusicThru_iface;
else if (IsEqualGUID(riid, &IID_IKsControl))
*ret_iface = &This->IKsControl_iface;
else {
WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
*ret_iface = NULL;
@ -686,6 +694,75 @@ static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = {
SynthPortImpl_IDirectMusicThru_ThruChannel
};
static HRESULT WINAPI IKsControlImpl_QueryInterface(IKsControl *iface, REFIID riid,
void **ret_iface)
{
SynthPortImpl *This = impl_from_IKsControl(iface);
return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface);
}
static ULONG WINAPI IKsControlImpl_AddRef(IKsControl *iface)
{
SynthPortImpl *This = impl_from_IKsControl(iface);
return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface);
}
static ULONG WINAPI IKsControlImpl_Release(IKsControl *iface)
{
SynthPortImpl *This = impl_from_IKsControl(iface);
return IDirectMusicPort_Release(&This->IDirectMusicPort_iface);
}
static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *prop,
ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len)
{
TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len);
TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags);
if (prop->Flags != KSPROPERTY_TYPE_GET)
{
FIXME("prop flags %u not yet supported\n", prop->Flags);
return S_FALSE;
}
if (data_len < sizeof(DWORD))
return E_NOT_SUFFICIENT_BUFFER;
FIXME("Unknown property %s\n", debugstr_guid(&prop->Set));
*(DWORD*)data = FALSE;
*ret_len = sizeof(DWORD);
return S_OK;
}
static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *method,
ULONG method_len, void *data, ULONG data_len, ULONG *ret_len)
{
FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, method, method_len, data, data_len, ret_len);
return E_NOTIMPL;
}
static HRESULT WINAPI IKsControlImpl_KsEvent(IKsControl *iface, KSEVENT *event, ULONG event_len,
void *data, ULONG data_len, ULONG *ret_len)
{
FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, event, event_len, data, data_len, ret_len);
return E_NOTIMPL;
}
static const IKsControlVtbl ikscontrol_vtbl = {
IKsControlImpl_QueryInterface,
IKsControlImpl_AddRef,
IKsControlImpl_Release,
IKsControlImpl_KsProperty,
IKsControlImpl_KsMethod,
IKsControlImpl_KsEvent
};
HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)
{
SynthPortImpl *obj;
@ -704,6 +781,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou
obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl;
obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl;
obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl;
obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl;
obj->ref = 0; /* Will be inited by QueryInterface */
obj->fActive = FALSE;
obj->params = *port_params;

12
dlls/dmusic/tests/dmusic.c
View File

@ -416,17 +416,15 @@ static void test_COM_synthport(void)
IDirectMusicPortDownload_Release(dmpd);
hr = IDirectMusicPort_QueryInterface(port, &IID_IKsControl, (void**)&iksc);
todo_wine ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr);
if (hr == S_OK) {
refcount = IKsControl_AddRef(iksc);
ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
IKsControl_Release(iksc);
}
ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr);
refcount = IKsControl_AddRef(iksc);
ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
IKsControl_Release(iksc);
hr = IDirectMusicPort_QueryInterface(port, &IID_IUnknown, (void**)&unk);
ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);
refcount = IUnknown_AddRef(unk);
todo_wine ok(refcount == 6, "refcount == %u, expected 6\n", refcount);
ok(refcount == 6, "refcount == %u, expected 6\n", refcount);
IUnknown_Release(unk);
/* Unsupported interface */