Commit 29a76fb5 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

dmsynth: Do nothing in IDirectMusicSynth_SetMasterClock.

parent f00d8639
...@@ -915,10 +915,9 @@ static HRESULT WINAPI synth_SetMasterClock(IDirectMusicSynth8 *iface, ...@@ -915,10 +915,9 @@ static HRESULT WINAPI synth_SetMasterClock(IDirectMusicSynth8 *iface,
TRACE("(%p)->(%p)\n", This, clock); TRACE("(%p)->(%p)\n", This, clock);
if (!This->sink) if (!clock)
return DMUS_E_NOSYNTHSINK; return E_POINTER;
return S_OK;
return IDirectMusicSynthSink_SetMasterClock(This->sink, clock);
} }
static HRESULT WINAPI synth_GetLatencyClock(IDirectMusicSynth8 *iface, static HRESULT WINAPI synth_GetLatencyClock(IDirectMusicSynth8 *iface,
......
...@@ -1036,19 +1036,19 @@ static void test_IDirectMusicSynth(void) ...@@ -1036,19 +1036,19 @@ static void test_IDirectMusicSynth(void)
/* SetMasterClock does nothing */ /* SetMasterClock does nothing */
hr = IDirectMusicSynth_SetMasterClock(synth, NULL); hr = IDirectMusicSynth_SetMasterClock(synth, NULL);
todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); ok(hr == E_POINTER, "got %#lx\n", hr);
hr = IDirectMusicSynth_SetMasterClock(synth, clock); hr = IDirectMusicSynth_SetMasterClock(synth, clock);
ok(hr == S_OK, "got %#lx\n", hr); ok(hr == S_OK, "got %#lx\n", hr);
ref = get_refcount(clock); ref = get_refcount(clock);
todo_wine ok(ref == 1, "got %lu\n", ref); todo_wine ok(ref == 1, "got %lu\n", ref);
hr = IDirectMusicSynth_Activate(synth, TRUE); hr = IDirectMusicSynth_Activate(synth, TRUE);
todo_wine ok(hr == DMUS_E_SYNTHNOTCONFIGURED, "got %#lx\n", hr); ok(hr == DMUS_E_SYNTHNOTCONFIGURED, "got %#lx\n", hr);
/* SetMasterClock needs to be called on the sink */ /* SetMasterClock needs to be called on the sink */
hr = IDirectMusicSynthSink_SetMasterClock(sink, clock); hr = IDirectMusicSynthSink_SetMasterClock(sink, clock);
ok(hr == S_OK, "got %#lx\n", hr); ok(hr == S_OK, "got %#lx\n", hr);
hr = IDirectMusicSynth_Activate(synth, TRUE); hr = IDirectMusicSynth_Activate(synth, TRUE);
todo_wine ok(hr == S_OK, "got %#lx\n", hr); ok(hr == S_OK, "got %#lx\n", hr);
hr = IDirectMusicSynth_Activate(synth, TRUE); hr = IDirectMusicSynth_Activate(synth, TRUE);
ok(hr == S_FALSE, "got %#lx\n", hr); ok(hr == S_FALSE, "got %#lx\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment