wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Paul Gofman : winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: deff1303fb822085b84653870194144ebce81067 URL: https://gitlab.winehq.org/wine/wine/-/commit/deff1303fb822085b8465387019414… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 13 18:56:48 2023 -0600 winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT. --- dlls/mf/tests/transform.c | 3 +++ dlls/winegstreamer/h264_decoder.c | 7 +++++++ include/codecapi.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index e798601a8b5..3f5524784cc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -45,6 +45,8 @@ #include "initguid.h" +#include "codecapi.h" + #include "d3d11_4.h" DEFINE_GUID(DMOVideoFormat_RGB24,D3DFMT_R8G8B8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); @@ -3933,6 +3935,7 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_SA_D3D11_AWARE, 1), ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0, .todo = TRUE), /* more H264 decoder specific attributes from CODECAPI */ + ATTR_UINT32(AVDecVideoAcceleration_H264, 1), {0}, }; static const DWORD input_width = 120, input_height = 248; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 6d8f2a146da..5c48130eee9 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -26,6 +26,10 @@ #include "wine/debug.h" +#include "initguid.h" + +#include "codecapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -881,6 +885,9 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) goto failed; if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, TRUE))) goto failed; + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + goto failed; + if (FAILED(hr = MFCreateAttributes(&decoder->output_attributes, 0))) goto failed; if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue))) diff --git a/include/codecapi.h b/include/codecapi.h index 9719389b081..a9fe7c9de3f 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -61,4 +61,6 @@ enum eAVEncH264VLevel eAVEncH264VLevel5_2 = 52 }; +DEFINE_GUID(AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2); + #endif /* __CODECAPI_H */

1 0

Eric Pouech : mmdevapi: Don't fail when no audio backends are present.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 984032823b1e47c90117e355ade778f79c8ad411 URL: https://gitlab.winehq.org/wine/wine/-/commit/984032823b1e47c90117e355ade778… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 mmdevapi: Don't fail when no audio backends are present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/mmdevapi/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index dfc6183aa7d..36c94908d67 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -295,10 +295,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL)) { - ERR("Driver initialization failed\n"); - return E_FAIL; - } + InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL); if (ppv == NULL) { WARN("invalid parameter\n");

1 0

Eric Pouech : quartz: Return correct error when no audio devices are present.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: a23402f6e79a04185f06c0e63e1b4d834e96d227 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23402f6e79a04185f06c0e63e1b4d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 quartz: Return correct error when no audio devices are present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 38a7d6f7ad7..10eed43422e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1015,7 +1015,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) IUnknown_Release(object->system_clock); strmbase_filter_cleanup(&object->filter); free(object); - return hr; + return hr == DSERR_NODRIVER ? VFW_E_NO_AUDIO_HARDWARE : hr; } if (FAILED(hr = IDirectSound8_SetCooperativeLevel(object->dsound,

1 0

Eric Pouech : dsound: Forward error code when device cannot be found.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 79264b27c173c7e44c13af5e32fc18e1c84bd862 URL: https://gitlab.winehq.org/wine/wine/-/commit/79264b27c173c7e44c13af5e32fc18… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 dsound: Forward error code when device cannot be found. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dsound/dsound.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 0b8edaaaf06..b35f9c7cbdd 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -288,9 +288,10 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU IsEqualGUID(lpcGUID, &DSDEVID_DefaultVoiceCapture)) return DSERR_NODRIVER; - if (GetDeviceID(lpcGUID, &devGUID) != DS_OK) { + hr = GetDeviceID(lpcGUID, &devGUID); + if (FAILED(hr)) { WARN("invalid parameter: lpcGUID\n"); - return DSERR_INVALIDPARAM; + return hr; } hr = get_mmdevice(eRender, &devGUID, &mmdevice);

1 0

Alexandre Julliard : ntdll: Also send segment registers to the server on suspend.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: fba6b7a1ed560c63236e9451010ad1ecf960e0bd URL: https://gitlab.winehq.org/wine/wine/-/commit/fba6b7a1ed560c63236e9451010ad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 17 20:18:28 2023 +0200 ntdll: Also send segment registers to the server on suspend. Fixes some test failures in wow64 mode. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 79d69d11547..eac5d961a07 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2117,7 +2117,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (is_inside_syscall( ucontext )) { DECLSPEC_ALIGN(64) XSTATE xs; - context.c.ContextFlags = CONTEXT_FULL; + context.c.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS; context_init_xstate( &context.c, &xs ); NtGetContextThread( GetCurrentThread(), &context.c );

1 0

Rémi Bernon : dmime: Use latency time to decide when to process messages.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 1014bab951f89a51226a17ec1d6d8d1225c46c5c URL: https://gitlab.winehq.org/wine/wine/-/commit/1014bab951f89a51226a17ec1d6d8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 11:41:34 2023 +0200 dmime: Use latency time to decide when to process messages. --- dlls/dmime/performance.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a56a35a2f45..dc6ef575713 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -89,10 +89,10 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * do { - REFERENCE_TIME current, offset = 0; + REFERENCE_TIME latency, offset = 0; IDirectMusicTool *tool; - if (FAILED(hr = IDirectMusicPerformance_GetTime(performance, &current, NULL))) return hr; + if (FAILED(hr = IDirectMusicPerformance_GetLatencyTime(performance, &latency))) return hr; if (!(tool = msg->pTool)) tool = &This->IDirectMusicTool_iface; switch (msg->dwFlags & delivery_flags) @@ -107,9 +107,9 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * offset = This->dwBumperLength * 10000; /* fallthrough */ case DMUS_PMSGF_TOOL_ATTIME: - if (msg->rtTime >= offset && msg->rtTime - offset >= current) + if (msg->rtTime >= offset && msg->rtTime - offset >= latency) { - if (timeout) *timeout = (msg->rtTime - offset - current) / 10000; + if (timeout) *timeout = (msg->rtTime - offset - latency) / 10000; return DMUS_S_REQUEUE; }

1 0

Rémi Bernon : dmime: Update performance latency time with port latency.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: d0f544669615fd3672c88504fa39822f070dfdfa URL: https://gitlab.winehq.org/wine/wine/-/commit/d0f544669615fd3672c88504fa3982… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 11:32:58 2023 +0200 dmime: Update performance latency time with port latency. --- dlls/dmime/performance.c | 56 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 4dffadb405d..a56a35a2f45 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -51,7 +51,7 @@ struct performance BOOL audio_paths_enabled; IDirectMusicAudioPath *pDefaultPath; - REFERENCE_TIME rtLatencyTime; + REFERENCE_TIME latency_offset; DWORD dwBumperLength; DWORD dwPrepareTime; @@ -737,6 +737,31 @@ static HRESULT WINAPI performance_RemoveNotificationType(IDirectMusicPerformance return hr; } +static void performance_update_latency_time(struct performance *This, IDirectMusicPort *port, + REFERENCE_TIME *ret_time) +{ + IDirectMusicPerformance8 *iface = &This->IDirectMusicPerformance8_iface; + REFERENCE_TIME latency_time, current_time; + IReferenceClock *latency_clock; + HRESULT hr; + + if (!ret_time) ret_time = &latency_time; + if (SUCCEEDED(hr = IDirectMusicPort_GetLatencyClock(port, &latency_clock))) + { + hr = IReferenceClock_GetTime(latency_clock, ret_time); + if (SUCCEEDED(hr)) hr = IDirectMusicPerformance8_GetTime(iface, &current_time, NULL); + if (SUCCEEDED(hr) && This->latency_offset < (*ret_time - current_time)) + { + TRACE("Updating performance %p latency %I64d -> %I64d\n", This, + This->latency_offset, *ret_time - current_time); + This->latency_offset = *ret_time - current_time; + } + IReferenceClock_Release(latency_clock); + } + + if (FAILED(hr)) ERR("Failed to update performance %p latency, hr %#lx\n", This, hr); +} + static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *params) { IDirectMusicPort *port; @@ -760,6 +785,7 @@ static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *par for (i = 0; i < params->dwChannelGroups; i++) pchannel_block_set(&perf->pchannels, i, port, i + 1, FALSE); + performance_update_latency_time(perf, port, NULL); return S_OK; } @@ -787,6 +813,8 @@ static HRESULT WINAPI performance_AddPort(IDirectMusicPerformance8 *iface, IDire * We should remember added Ports (for example using a list) * and control if Port is registered for each api who use ports */ + + performance_update_latency_time(This, port, NULL); return S_OK; } @@ -958,13 +986,18 @@ static HRESULT WINAPI performance_SetGlobalParam(IDirectMusicPerformance8 *iface return S_OK; } -static HRESULT WINAPI performance_GetLatencyTime(IDirectMusicPerformance8 *iface, REFERENCE_TIME *prtTime) +static HRESULT WINAPI performance_GetLatencyTime(IDirectMusicPerformance8 *iface, REFERENCE_TIME *ret_time) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + REFERENCE_TIME current_time; + HRESULT hr; - TRACE("(%p, %p): stub\n", This, prtTime); - *prtTime = This->rtLatencyTime; - return S_OK; + TRACE("(%p, %p)\n", This, ret_time); + + if (SUCCEEDED(hr = IDirectMusicPerformance8_GetTime(iface, &current_time, NULL))) + *ret_time = current_time + This->latency_offset; + + return hr; } static HRESULT WINAPI performance_GetQueueTime(IDirectMusicPerformance8 *iface, REFERENCE_TIME *prtTime) @@ -1632,7 +1665,6 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, static const UINT event_size = sizeof(DMUS_EVENTHEADER) + sizeof(DWORD); DMUS_BUFFERDESC desc = {.dwSize = sizeof(desc), .cbBuffer = 2 * event_size}; DMUS_MIDI_PMSG *midi = (DMUS_MIDI_PMSG *)msg; - IReferenceClock *latency_clock; REFERENCE_TIME latency_time; IDirectMusicBuffer *buffer; IDirectMusicPort *port; @@ -1645,13 +1677,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, WARN("Failed to get message port, hr %#lx\n", hr); return DMUS_S_FREE; } - - if (SUCCEEDED(hr = IDirectMusicPort_GetLatencyClock(port, &latency_clock))) - { - if (FAILED(hr = IReferenceClock_GetTime(latency_clock, &latency_time))) - ERR("Failed to get port latency time, hr %#lx\n", hr); - IReferenceClock_Release(latency_clock); - } + performance_update_latency_time(This, port, &latency_time); value |= channel; value |= (UINT)midi->bStatus; @@ -1796,7 +1822,7 @@ HRESULT create_dmperformance(REFIID iid, void **ret_iface) list_init(&obj->messages); list_init(&obj->notifications); - obj->rtLatencyTime = 100; /* 100 ms TO FIX */ + obj->latency_offset = 50; obj->dwBumperLength = 50; /* 50 ms default */ obj->dwPrepareTime = 1000; /* 1000 ms default */

1 0

Rémi Bernon : dmime: Use port latency time for messages with -1 time.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: a8763aab6fbcab804282a3d909e16e93ead2a867 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8763aab6fbcab804282a3d909e16e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 11:52:37 2023 +0200 dmime: Use port latency time for messages with -1 time. --- dlls/dmime/performance.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 14e290658e0..4dffadb405d 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -490,7 +490,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS if (!(msg->dwFlags & DMUS_PMSGF_REFTIME)) { if (FAILED(hr = IDirectMusicPerformance8_MusicToReferenceTime(iface, - msg->mtTime, &msg->rtTime))) + msg->mtTime == -1 ? 0 : msg->mtTime, &msg->rtTime))) goto done; msg->dwFlags |= DMUS_PMSGF_REFTIME; } @@ -1632,6 +1632,8 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, static const UINT event_size = sizeof(DMUS_EVENTHEADER) + sizeof(DWORD); DMUS_BUFFERDESC desc = {.dwSize = sizeof(desc), .cbBuffer = 2 * event_size}; DMUS_MIDI_PMSG *midi = (DMUS_MIDI_PMSG *)msg; + IReferenceClock *latency_clock; + REFERENCE_TIME latency_time; IDirectMusicBuffer *buffer; IDirectMusicPort *port; DWORD group, channel; @@ -1644,6 +1646,13 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, return DMUS_S_FREE; } + if (SUCCEEDED(hr = IDirectMusicPort_GetLatencyClock(port, &latency_clock))) + { + if (FAILED(hr = IReferenceClock_GetTime(latency_clock, &latency_time))) + ERR("Failed to get port latency time, hr %#lx\n", hr); + IReferenceClock_Release(latency_clock); + } + value |= channel; value |= (UINT)midi->bStatus; value |= (UINT)midi->bByte1 << 8; @@ -1651,6 +1660,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, if (SUCCEEDED(hr = IDirectMusic_CreateMusicBuffer(This->dmusic, &desc, &buffer, NULL))) { + if (msg->rtTime == -1) msg->rtTime = latency_time; hr = IDirectMusicBuffer_PackStructured(buffer, msg->rtTime, group, value); if (SUCCEEDED(hr)) hr = IDirectMusicPort_PlayBuffer(port, buffer); IDirectMusicBuffer_Release(buffer);

1 0

Rémi Bernon : dmusic: Forward IDirectMusicPort_Activate to synth and sink.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 72165fc8ec2cfb86ff641ed817b1fb7cace24dfe URL: https://gitlab.winehq.org/wine/wine/-/commit/72165fc8ec2cfb86ff641ed817b1fb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 12 11:13:33 2023 +0200 dmusic: Forward IDirectMusicPort_Activate to synth and sink. --- dlls/dmusic/port.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 28c5c3cff17..f98d73f4444 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -274,30 +274,36 @@ static HRESULT WINAPI synth_port_GetNumChannelGroups(IDirectMusicPort *iface, DW static HRESULT WINAPI synth_port_Activate(IDirectMusicPort *iface, BOOL active) { struct synth_port *This = synth_from_IDirectMusicPort(iface); + HRESULT hr; - FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, active); + TRACE("(%p/%p)->(%d)\n", iface, This, active); - if (This->active == active) - return S_FALSE; + if (This->active == active) return S_FALSE; - if (active) { - /* Acquire the dsound */ - if (!This->dsound) { - IDirectSound_AddRef(This->parent->dsound); - This->dsound = This->parent->dsound; - } - IDirectSound_AddRef(This->dsound); - } else { - /* Release the dsound */ - IDirectSound_Release(This->dsound); - IDirectSound_Release(This->parent->dsound); - if (This->dsound == This->parent->dsound) - This->dsound = NULL; + if (active) + { + if (!This->dsound && FAILED(hr = IDirectMusicPort_SetDirectSound(iface, + This->parent->dsound, NULL))) + return hr; + if (FAILED(hr = IDirectMusicSynthSink_SetDirectSound(This->synth_sink, + This->dsound, This->dsbuffer))) + return hr; + + if (FAILED(hr = IDirectMusicSynth_Activate(This->synth, active))) + return hr; + This->active = TRUE; } + else + { + if (FAILED(hr = IDirectMusicSynth_Activate(This->synth, FALSE))) return hr; + This->active = FALSE; - This->active = active; + if (FAILED(hr = IDirectMusicSynthSink_SetDirectSound(This->synth_sink, NULL, NULL))) + return hr; + hr = IDirectMusicPort_SetDirectSound(iface, NULL, NULL); + } - return S_OK; + return hr; } static HRESULT WINAPI synth_port_SetChannelPriority(IDirectMusicPort *iface, DWORD channel_group,

1 0

Rémi Bernon : dmsynth: Do nothing in IDirectMusicSynth_SetMasterClock.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 29a76fb5d1b022c1c460b694238c6be1a4c211a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/29a76fb5d1b022c1c460b694238c6b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 14:40:05 2023 +0200 dmsynth: Do nothing in IDirectMusicSynth_SetMasterClock. --- dlls/dmsynth/synth.c | 7 +++---- dlls/dmsynth/tests/dmsynth.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index b7174000e20..941fc465d17 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -915,10 +915,9 @@ static HRESULT WINAPI synth_SetMasterClock(IDirectMusicSynth8 *iface, TRACE("(%p)->(%p)\n", This, clock); - if (!This->sink) - return DMUS_E_NOSYNTHSINK; - - return IDirectMusicSynthSink_SetMasterClock(This->sink, clock); + if (!clock) + return E_POINTER; + return S_OK; } static HRESULT WINAPI synth_GetLatencyClock(IDirectMusicSynth8 *iface, diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 26619560b42..25ecff97048 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -1036,19 +1036,19 @@ static void test_IDirectMusicSynth(void) /* SetMasterClock does nothing */ 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); ok(hr == S_OK, "got %#lx\n", hr); ref = get_refcount(clock); todo_wine ok(ref == 1, "got %lu\n", ref); 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 */ hr = IDirectMusicSynthSink_SetMasterClock(sink, clock); ok(hr == S_OK, "got %#lx\n", hr); 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); ok(hr == S_FALSE, "got %#lx\n", hr);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2023