Module: wine Branch: master Commit: 44fd37a323e23c7a687dc96476edde8de4620307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fd37a323e23c7a687dc96476... Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 5 15:25:45 2017 +0200 dmsynth: Don't store a SynthSink implementation in IDirectMusicSynth8Impl. Avoids an unsafe interface to object transition. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index ed86ce0..db61e46 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -66,7 +66,7 @@ struct IDirectMusicSynth8Impl { DMUS_PORTCAPS pCaps; BOOL fActive; IReferenceClock* pLatencyClock; - IDirectMusicSynthSinkImpl* pSynthSink; + IDirectMusicSynthSink *synth_sink; }; /***************************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 88ba53e..afeebda 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -310,7 +310,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(LPDIRECTMUSICSYNTH8 if (!clock) return E_POINTER; - if (!This->pSynthSink) + if (!This->synth_sink) return DMUS_E_NOSYNTHSINK; *clock = This->pLatencyClock; @@ -336,7 +336,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(LPDIRECTMUSICSYNTH8 if TRACE("(%p)->(%p)\n", iface, synth_sink); - This->pSynthSink = (IDirectMusicSynthSinkImpl*)synth_sink; + This->synth_sink = synth_sink; if (synth_sink) return IDirectMusicSynthSink_GetLatencyClock(synth_sink, &This->pLatencyClock);