Michael Stefaniuc : dmsynth: Pass the master clock on to the sink.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 98e6e2429f43e9f9ca233c25e7e3b37fd99b3e97
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=98e6e2429f43e9f9ca233c25e...

Author: Michael Stefaniuc 
Date:   Thu Jan 20 21:20:20 2022 +0100

dmsynth: Pass the master clock on to the sink.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/dmsynth/synth.c | 7 +++++--
 dlls/dmusic/port.c   | 3 ---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index 3d3af80d005..51b33e8df8d 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -305,9 +305,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock(IDirectMusicSynth8 *
 {
     IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface);

-    FIXME("(%p)->(%p): stub\n", This, clock);
+    TRACE("(%p)->(%p)\n", This, clock);

-    return S_OK;
+    if (!This->sink)
+        return DMUS_E_NOSYNTHSINK;
+
+    return IDirectMusicSynthSink_SetMasterClock(This->sink, clock);
 }

static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 *iface,
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index 165bd520191..88c7c60a50d 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -856,9 +856,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param
     if (SUCCEEDED(hr))
         hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock);

-    if (SUCCEEDED(hr))
-        hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock);
-
     if (SUCCEEDED(hr))
         hr = IDirectMusicSynth_Open(obj->synth, port_params);