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

dmsynth: COM cleanup of IDirectMusicSynthSink and rename parameters.

oldstable
Christian Costa 2012-04-30 11:43:35 +02:00 committed by Alexandre Julliard
parent 01e4ee0ac0
commit addf806c7c
2 changed files with 77 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/dmsynth/dmsynth_private.h
View File

@ -71,11 +71,11 @@ struct IDirectMusicSynth8Impl {
* IDirectMusicSynthSinkImpl implementation structure * IDirectMusicSynthSinkImpl implementation structure
*/ */
struct IDirectMusicSynthSinkImpl { struct IDirectMusicSynthSinkImpl {
/* IUnknown fields */ /* IUnknown fields */
const IDirectMusicSynthSinkVtbl *lpVtbl; IDirectMusicSynthSink IDirectMusicSynthSink_iface;
LONG ref; LONG ref;
/* IDirectMusicSynthSinkImpl fields */ /* IDirectMusicSynthSinkImpl fields */
}; };
/********************************************************************** /**********************************************************************

113
dlls/dmsynth/synthsink.c
View File

@ -1,4 +1,5 @@
/* IDirectMusicSynthSink Implementation /*
* IDirectMusicSynthSink Implementation
* *
* Copyright (C) 2003-2004 Rok Mandeljc * Copyright (C) 2003-2004 Rok Mandeljc
* *
@ -21,9 +22,15 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); WINE_DEFAULT_DEBUG_CHANNEL(dmsynth);
static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirectMusicSynthSink *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicSynthSinkImpl, IDirectMusicSynthSink_iface);
}
/* IDirectMusicSynthSinkImpl IUnknown part: */ /* IDirectMusicSynthSinkImpl IUnknown part: */
static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||
@ -36,8 +43,9 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYN
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK iface) { static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
@ -47,8 +55,9 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK ifa
return refCount; return refCount;
} }
static ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) { static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
@ -63,52 +72,76 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK if
} }
/* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */
static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init (LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* pSynth) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* synth)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, %p): stub\n", This, pSynth); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(%p): stub\n", This, synth);
return S_OK;
} }
static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* pClock) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* clock)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, %p): stub\n", This, pClock); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(%p): stub\n", This, clock);
return S_OK;
} }
static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** ppClock) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** clock)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, %p): stub\n", This, ppClock); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(%p): stub\n", This, clock);
return S_OK;
} }
static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate (LPDIRECTMUSICSYNTHSINK iface, BOOL fEnable) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK iface, BOOL enable)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, %d): stub\n", This, fEnable); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(%d): stub\n", This, enable);
return S_OK;
} }
static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime (LPDIRECTMUSICSYNTHSINK iface, LONGLONG llSampleTime, REFERENCE_TIME* prfTime) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYNTHSINK iface, LONGLONG sample_time, REFERENCE_TIME* ref_time)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(llSampleTime), prfTime); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(0x%s, %p): stub\n", This, wine_dbgstr_longlong(sample_time), ref_time);
return S_OK;
} }
static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample (LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME rfTime, LONGLONG* pllSampleTime) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME ref_time, LONGLONG* sample_time)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(rfTime), pllSampleTime ); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(0x%s, %p): stub\n", This, wine_dbgstr_longlong(ref_time), sample_time);
return S_OK;
} }
static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound (LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND dsound, LPDIRECTSOUNDBUFFER dsound_buffer)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, %p, %p): stub\n", This, pDirectSound, pDirectSoundBuffer); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(%p, %p): stub\n", This, dsound, dsound_buffer);
return S_OK;
} }
static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize (LPDIRECTMUSICSYNTHSINK iface, LPDWORD pdwBufferSizeInSamples) { static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(LPDIRECTMUSICSYNTHSINK iface, LPDWORD buffer_size_in_samples)
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; {
FIXME("(%p, %p): stub\n", This, pdwBufferSizeInSamples); IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);
return S_OK;
FIXME("(%p)->(%p): stub\n", This, buffer_size_in_samples);
return S_OK;
} }
static const IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl = { static const IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl = {
@ -135,7 +168,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* p
*ppobj = NULL; *ppobj = NULL;
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
obj->lpVtbl = &DirectMusicSynthSink_Vtbl; obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl;
obj->ref = 0; obj->ref = 0;
return IDirectMusicSynthSinkImpl_QueryInterface((LPDIRECTMUSICSYNTHSINK)obj, lpcGUID, ppobj); return IDirectMusicSynthSinkImpl_QueryInterface((LPDIRECTMUSICSYNTHSINK)obj, lpcGUID, ppobj);