February 2022 - Wine-Commits

Rémi Bernon : include: Add Windows.Devices.Haptics.SimpleHapticsController definition.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 66bd6e5276d7ac54bbe294b624ef2f470e1f8b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66bd6e5276d7ac54bbe294b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 21 19:52:47 2022 +0100 include: Add Windows.Devices.Haptics.SimpleHapticsController definition. In windows.devices.haptics.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.devices.haptics.idl | 91 +++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 04537ea72ef..8a8fddddada 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -776,6 +776,7 @@ SOURCES = \ windns.h \ windot11.h \ windows.devices.enumeration.idl \ + windows.devices.haptics.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ diff --git a/include/windows.devices.haptics.idl b/include/windows.devices.haptics.idl new file mode 100644 index 00000000000..c056ab4941c --- /dev/null +++ b/include/windows.devices.haptics.idl @@ -0,0 +1,91 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows.Devices.Haptics { + interface ISimpleHapticsControllerFeedback; + interface ISimpleHapticsController; + runtimeclass SimpleHapticsControllerFeedback; + runtimeclass SimpleHapticsController; + + declare { + interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsController *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsControllerFeedback *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Devices.Haptics.SimpleHapticsControllerFeedback), + uuid(3d577ef8-4cee-11e6-b535-001bdc06ab3b) + ] + interface ISimpleHapticsControllerFeedback : IInspectable + { + [propget] HRESULT Waveform([out, retval] UINT16 *value); + [propget] HRESULT Duration([out, retval] Windows.Foundation.TimeSpan *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Devices.Haptics.SimpleHapticsController), + uuid(3d577ef9-4cee-11e6-b535-001bdc06ab3b) + ] + interface ISimpleHapticsController : IInspectable + { + [propget] HRESULT Id([out, retval] HSTRING *value); + [propget] HRESULT SupportedFeedback([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsControllerFeedback *> **value); + [propget] HRESULT IsIntensitySupported([out, retval] boolean *value); + [propget] HRESULT IsPlayCountSupported([out, retval] boolean *value); + [propget] HRESULT IsPlayDurationSupported([out, retval] boolean *value); + [propget] HRESULT IsReplayPauseIntervalSupported([out, retval] boolean *value); + HRESULT StopFeedback(); + [overload("SendHapticFeedback")] + HRESULT SendHapticFeedback([in] Windows.Devices.Haptics.SimpleHapticsControllerFeedback *feedback); + [overload("SendHapticFeedback")] + HRESULT SendHapticFeedbackWithIntensity([in] Windows.Devices.Haptics.SimpleHapticsControllerFeedback *feedback, + [in] DOUBLE intensity); + HRESULT SendHapticFeedbackForDuration([in] Windows.Devices.Haptics.SimpleHapticsControllerFeedback *feedback, + [in] DOUBLE intensity, [in] Windows.Foundation.TimeSpan duration); + HRESULT SendHapticFeedbackForPlayCount([in] Windows.Devices.Haptics.SimpleHapticsControllerFeedback *feedback, + [in] DOUBLE intensity, [in] INT32 count, + [in] Windows.Foundation.TimeSpan interval); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile) + ] + runtimeclass SimpleHapticsControllerFeedback + { + [default] interface Windows.Devices.Haptics.ISimpleHapticsControllerFeedback; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile) + ] + runtimeclass SimpleHapticsController + { + [default] interface Windows.Devices.Haptics.ISimpleHapticsController; + } +}

1 0

Zebediah Figura : winegstreamer: No longer queue WG_PARSER_EVENT_SEGMENT.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: f51b2ca8f7640dd0770a82c1e2c19caa65286eef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51b2ca8f7640dd0770a82c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 21 23:13:21 2022 -0600 winegstreamer: No longer queue WG_PARSER_EVENT_SEGMENT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 3 --- dlls/winegstreamer/quartz_parser.c | 3 --- dlls/winegstreamer/unixlib.h | 6 ------ dlls/winegstreamer/wg_parser.c | 7 ------- dlls/winegstreamer/wm_reader.c | 3 --- 5 files changed, 22 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index bccbf888a4a..e40974bf73a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -554,9 +554,6 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) dispatch_end_of_presentation(stream->parent_source); return; - case WG_PARSER_EVENT_SEGMENT: - break; - case WG_PARSER_EVENT_NONE: assert(0); } diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index eab94aca004..4afd265bca7 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -841,9 +841,6 @@ static DWORD CALLBACK stream_thread(void *arg) IPin_EndOfStream(pin->pin.pin.peer); break; - case WG_PARSER_EVENT_SEGMENT: - break; - case WG_PARSER_EVENT_NONE: assert(0); } diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 4adbb694766..f445fc7ac7e 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -108,7 +108,6 @@ enum wg_parser_event_type WG_PARSER_EVENT_NONE = 0, WG_PARSER_EVENT_BUFFER, WG_PARSER_EVENT_EOS, - WG_PARSER_EVENT_SEGMENT, }; struct wg_parser_event @@ -123,11 +122,6 @@ struct wg_parser_event uint32_t size; bool discontinuity, preroll, delta, has_pts, has_duration; } buffer; - struct - { - ULONGLONG position, stop; - DOUBLE rate; - } segment; } u; }; C_ASSERT(sizeof(struct wg_parser_event) == 40); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a2e970a4dd..d0883c4c024 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -500,7 +500,6 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_SEGMENT: if (stream->enabled) { - struct wg_parser_event stream_event; const GstSegment *segment; gst_event_parse_segment(event, &segment); @@ -512,12 +511,6 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) } gst_segment_copy_into(segment, &stream->segment); - - stream_event.type = WG_PARSER_EVENT_SEGMENT; - stream_event.u.segment.position = segment->position / 100; - stream_event.u.segment.stop = segment->stop / 100; - stream_event.u.segment.rate = segment->rate * segment->applied_rate; - queue_stream_event(stream, &stream_event, NULL); } break; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 01518c6b9a8..f49d99071e0 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1935,9 +1935,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, TRACE("End of stream.\n"); return NS_E_NO_MORE_SAMPLES; - case WG_PARSER_EVENT_SEGMENT: - break; - case WG_PARSER_EVENT_NONE: assert(0); }

1 0

Michael Stefaniuc : dmsynth/tests: Add synth GetFormat tests.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: a0addfe38d06eebab72b740d56ff7fe3d055875c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0addfe38d06eebab72b740d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 22 00:49:57 2022 +0100 dmsynth/tests: Add synth GetFormat tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 93212c0ae9f..ab3349f666b 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -51,6 +51,30 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +static void test_synth_getformat(IDirectMusicSynth *synth, DMUS_PORTPARAMS *params, const char *context) +{ + WAVEFORMATEX format; + DWORD size; + HRESULT hr; + + winetest_push_context(context); + + size = sizeof(format); + hr = IDirectMusicSynth_GetFormat(synth, &format, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(format.wFormatTag == WAVE_FORMAT_PCM, "wFormatTag: %#x\n", format.wFormatTag); + ok(format.nChannels == params->dwAudioChannels, "nChannels: %d\n", format.nChannels); + ok(format.nSamplesPerSec == params->dwSampleRate, "nSamplesPerSec: %ld\n", format.nSamplesPerSec); + ok(format.wBitsPerSample == 16, "wBitsPerSample: %d\n", format.wBitsPerSample); + ok(format.nBlockAlign == params->dwAudioChannels * format.wBitsPerSample / 8, "nBlockAlign: %d\n", + format.nBlockAlign); + ok(format.nAvgBytesPerSec == params->dwSampleRate * format.nBlockAlign, "nAvgBytesPerSec: %ld\n", + format.nAvgBytesPerSec); + ok(format.cbSize == 0, "cbSize: %d\n", format.cbSize); + + winetest_pop_context(); +} + static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; @@ -68,6 +92,8 @@ static void test_dmsynth(void) DMUS_PORTPARAMS params; const DWORD all_params = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS|DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; + WAVEFORMATEX format; + DWORD size; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %#lx\n", hr); @@ -154,6 +180,7 @@ static void test_dmsynth(void) ok(params.dwEffectFlags == DMUS_EFFECT_REVERB, "params.dwEffectFlags: %#lx\n", params.dwEffectFlags); ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); ok(params.dwFeatures == 0, "dwFeatures: %#lx\n", params.dwFeatures); + test_synth_getformat(dmsynth, &params, "defaults"); IDirectMusicSynth_Close(dmsynth); /* Requesting more than supported */ params.dwValidParams = DMUS_PORTPARAMS_SAMPLERATE; @@ -162,6 +189,7 @@ static void test_dmsynth(void) ok(hr == S_FALSE, "Open failed: %#lx\n", hr); ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); ok(params.dwSampleRate == 96000, "dwSampleRate: %ld\n", params.dwSampleRate); + test_synth_getformat(dmsynth, &params, "max"); IDirectMusicSynth_Close(dmsynth); /* Minimums */ params.dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| @@ -177,6 +205,7 @@ static void test_dmsynth(void) ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups); ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate); + test_synth_getformat(dmsynth, &params, "min"); IDirectMusicSynth_Close(dmsynth); /* Test share and features */ params.dwValidParams = DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; @@ -188,6 +217,7 @@ static void test_dmsynth(void) ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); ok(params.dwFeatures == (DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING), "dwFeatures: %#lx\n", params.dwFeatures); + test_synth_getformat(dmsynth, &params, "features"); IDirectMusicSynth_Close(dmsynth); /* Synth has no default clock */ @@ -226,6 +256,25 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); ok(hr == S_OK, "GetPortCaps failed: %#lx\n", hr); + /* GetFormat */ + hr = IDirectMusicSynth_GetFormat(dmsynth, NULL, NULL); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicSynth_GetFormat(dmsynth, NULL, &size); + ok(hr == DMUS_E_SYNTHNOTCONFIGURED, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_GetFormat(dmsynth, NULL, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + size = 1; + hr = IDirectMusicSynth_GetFormat(dmsynth, &format, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + size = sizeof(format) + 1; + hr = IDirectMusicSynth_GetFormat(dmsynth, &format, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + if (control_synth) IDirectMusicSynth_Release(control_synth); if (control_sink)

1 0

Michael Stefaniuc : dmsynth: Implement the sink GetDesiredBufferSize method.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: ec69d69f2a24b887f97abc4ff6af1ae7582b5ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec69d69f2a24b887f97abc4f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 22 00:49:58 2022 +0100 dmsynth: Implement the sink GetDesiredBufferSize method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synthsink.c | 15 +++++++++++++-- dlls/dmsynth/tests/dmsynth.c | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index fe578086a23..d34bcf9df5e 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -180,11 +180,22 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(IDirectMusicSynth } static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(IDirectMusicSynthSink *iface, - DWORD *buffer_size_in_samples) + DWORD *size) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + WAVEFORMATEX format; + DWORD fmtsize = sizeof(format); - FIXME("(%p)->(%p): stub\n", This, buffer_size_in_samples); + TRACE("(%p, %p)\n", This, size); + + if (!size) + return E_POINTER; + if (!This->synth) + return DMUS_E_SYNTHNOTCONFIGURED; + + if (FAILED(IDirectMusicSynth_GetFormat(This->synth, &format, &fmtsize))) + return E_UNEXPECTED; + *size = format.nSamplesPerSec * format.nChannels * 4; return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index ab3349f666b..a8bf65cd73e 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -149,6 +149,8 @@ static void test_dmsynth(void) /* Synth isn't fully initialized yet */ hr = IDirectMusicSynth_Activate(dmsynth, TRUE); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == DMUS_E_SYNTHNOTCONFIGURED, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); /* Open / Close */ hr = IDirectMusicSynth_Open(dmsynth, NULL); @@ -274,6 +276,28 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_GetFormat(dmsynth, &format, &size); ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + IDirectMusicSynth_Close(dmsynth); + + /* GetDesiredBufferSize */ + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, NULL); + ok(hr == E_POINTER, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == E_UNEXPECTED, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + params.dwValidParams = 0; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == S_OK, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + ok(size == params.dwSampleRate * params.dwAudioChannels * 4, "size: %ld\n", size); + IDirectMusicSynth_Close(dmsynth); + params.dwValidParams = DMUS_PORTPARAMS_AUDIOCHANNELS; + params.dwAudioChannels = 1; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == S_OK, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + ok(size == params.dwSampleRate * params.dwAudioChannels * 4, "size: %ld\n", size); + IDirectMusicSynth_Close(dmsynth); if (control_synth) IDirectMusicSynth_Release(control_synth);

1 0

Zebediah Figura : quartz/tests: Test the timestamps associated with new segments.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 3b29ef9e753339248b3a32b37a932501f927ac01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b29ef9e753339248b3a32b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 21 23:13:19 2022 -0600 quartz/tests: Test the timestamps associated with new segments. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 21 ++++++++++++++------- dlls/quartz/tests/mpegsplit.c | 21 ++++++++++++++------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index f295c074d5a..0665fad3ad8 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -809,7 +809,7 @@ struct testfilter const AM_MEDIA_TYPE *mt; HANDLE eos_event; unsigned int sample_count, eos_count, new_segment_count; - REFERENCE_TIME seek_start, seek_end; + REFERENCE_TIME segment_start, segment_end, seek_start, seek_end; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -985,14 +985,20 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface, IMediaSeeking *seeking; HRESULT hr; + if (winetest_debug > 1) + trace("%04x: Got segment with timestamps %I64d-%I64d.\n", GetCurrentThreadId(), start, end); + ++filter->new_segment_count; IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &filter->seek_start, &filter->seek_end); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(rate == 1.0, "Got rate %.16e.\n", rate); IMediaSeeking_Release(seeking); + ok(start == filter->segment_start, "Expected start %I64d, got %I64d.\n", filter->segment_start, start); + ok(end == filter->segment_end, "Expected end %I64d, got %I64d.\n", filter->segment_end, end); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; } @@ -1092,6 +1098,7 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); filter->IAsyncReader_iface.lpVtbl = &async_reader_vtbl; filter->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->segment_end = 50000000; } static void test_filter_state(IMediaControl *control) @@ -1709,11 +1716,11 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; - start = 1500 * 10000; - end = 3500 * 10000; - hr = IMediaSeeking_SetPositions(seeking, &start, AM_SEEKING_AbsolutePositioning, - &end, AM_SEEKING_AbsolutePositioning); + testsink.new_segment_count = testsink.sample_count = testsink.eos_count = 0; + testsink.segment_start = 1500 * 10000; + testsink.segment_end = 3500 * 10000; + hr = IMediaSeeking_SetPositions(seeking, &testsink.segment_start, AM_SEEKING_AbsolutePositioning, + &testsink.segment_end, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!WaitForSingleObject(testsink.eos_event, 1000), "Did not receive EOS.\n"); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 5a9efe84551..5aae09b596d 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1098,7 +1098,7 @@ struct testfilter const AM_MEDIA_TYPE *mt; HANDLE eos_event; unsigned int sample_count, eos_count, new_segment_count; - REFERENCE_TIME seek_start, seek_end; + REFERENCE_TIME segment_start, segment_end, seek_start, seek_end; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1260,14 +1260,20 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface, IMediaSeeking *seeking; HRESULT hr; + if (winetest_debug > 1) + trace("%04x: Got segment with timestamps %I64d-%I64d.\n", GetCurrentThreadId(), start, end); + ++filter->new_segment_count; IPin_QueryInterface(iface->pin.peer, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaSeeking_GetPositions(seeking, &filter->seek_start, &filter->seek_end); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(rate == 1.0, "Got rate %.16e.\n", rate); IMediaSeeking_Release(seeking); + ok(start == filter->segment_start, "Expected start %I64d, got %I64d.\n", filter->segment_start, start); + ok(end == filter->segment_end, "Expected end %I64d, got %I64d.\n", filter->segment_end, end); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; } @@ -1367,6 +1373,7 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); filter->IAsyncReader_iface.lpVtbl = &async_reader_vtbl; filter->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->segment_end = 5392500; } static void test_connect_pin(void) @@ -1862,11 +1869,11 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; - start = 100 * 10000; - end = 300 * 10000; - hr = IMediaSeeking_SetPositions(seeking, &start, AM_SEEKING_AbsolutePositioning, - &end, AM_SEEKING_AbsolutePositioning); + testsink.new_segment_count = testsink.sample_count = testsink.eos_count = 0; + testsink.segment_start = 100 * 10000; + testsink.segment_end = 300 * 10000; + hr = IMediaSeeking_SetPositions(seeking, &testsink.segment_start, AM_SEEKING_AbsolutePositioning, + &testsink.segment_end, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!WaitForSingleObject(testsink.eos_event, 1000), "Did not receive EOS.\n");

1 0

Dmitry Timoshkov : comctl32/listview: Send change notifications when inserting (LVIS_SELECTED|LVIS_FOCUSED) items.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 3cd366eee620aca79d1008644525b01165aa84c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd366eee620aca79d100864… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 22 11:06:27 2022 +0300 comctl32/listview: Send change notifications when inserting (LVIS_SELECTED|LVIS_FOCUSED) items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 22 +++++++++++++--------- dlls/comctl32/tests/listview.c | 6 +++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd7fec28e27..d8abd8236eb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4200,6 +4200,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL LVITEMW item; /* stateMask is ignored for LVM_INSERTITEM */ UINT stateMask = isNew ? ~0 : lpLVItem->stateMask; + BOOL send_change_notification; TRACE("()\n"); @@ -4260,11 +4261,16 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + /* Send change notification if the item is not being inserted, or inserted (selected|focused), and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications - are enabled. Even nothing really changed we still need to send this, + are enabled. Even if nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) + + send_change_notification = !isNew; + send_change_notification |= (uChanged & LVIF_STATE) && (lpLVItem->state & (LVIS_FOCUSED | LVIS_SELECTED)); + send_change_notification &= !!(infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE); + + if (lpItem && send_change_notification) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4352,13 +4358,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } } - /* if we're inserting the item, we're done */ - if (isNew) return TRUE; - - /* send LVN_ITEMCHANGED notification */ - if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) + if (send_change_notification) + { + if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4c2dd534dbd..92e11685331 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); } else { @@ -6060,7 +6060,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -6073,7 +6073,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state);

1 0

Michael Stefaniuc : dmsynth: Implement the synth GetFormat method.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 5715d2b5b2019deaa145f48f951ec0c6c94cb281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5715d2b5b2019deaa145f48f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 22 00:49:56 2022 +0100 dmsynth: Implement the synth GetFormat method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 2db80726408..d96ee943a5e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -505,11 +505,29 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority(IDirectMusicSynt } static HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat(IDirectMusicSynth8 *iface, - WAVEFORMATEX *wave_format, DWORD *wave_format_size) + WAVEFORMATEX *format, DWORD *size) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + WAVEFORMATEX fmt; - FIXME("(%p)->(%p, %p): stub\n", This, wave_format, wave_format_size); + TRACE("(%p, %p, %p)\n", This, format, size); + + if (!size) + return E_POINTER; + if (!This->open) + return DMUS_E_SYNTHNOTCONFIGURED; + + if (format) { + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = This->params.dwAudioChannels; + fmt.nSamplesPerSec = This->params.dwSampleRate; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = This->params.dwAudioChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = This->params.dwSampleRate * fmt.nBlockAlign; + fmt.cbSize = 0; + memcpy(format, &fmt, min(*size, sizeof(fmt))); + } + *size = sizeof(fmt); return S_OK; }

1 0

Zebediah Figura : quartz/tests: Reset sink event counters when initializing the stream.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 7b5dd73c30c892f8c85ea294ce27f35dad8b008f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5dd73c30c892f8c85ea294… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 21 23:13:18 2022 -0600 quartz/tests: Reset sink event counters when initializing the stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 13 +++++++++++-- dlls/quartz/tests/mpegsplit.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 06c2f5fed3c..f295c074d5a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -836,10 +836,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); } +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, }; static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1689,7 +1700,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1716,7 +1726,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 0809c5f861f..5a9efe84551 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1125,10 +1125,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) CloseHandle(filter->eos_event); } +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, }; static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1842,7 +1853,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1869,7 +1879,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control);

1 0

Eric Pouech : msacm32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 26c3103e50a59666efad91e1ec4eccdc007e5486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c3103e50a59666efad91e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:08:03 2022 +0100 msacm32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 4e31256e3cd..35158e7fcfd 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -988,7 +988,7 @@ static void test_prepareheader(void) ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); } else -todo_wine + todo_wine ok(mr == MMSYSERR_INVALPARAM, "expected 0x0b, got 0x%x\n", mr); memset(&hdr, 0, sizeof(hdr));

1 0

Nikolay Sivov : browseui/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 308b24d9c7cf2128aafece99db5a36ea94a597ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=308b24d9c7cf2128aafece99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 22 11:30:46 2022 +0300 browseui/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/tests/Makefile.in | 1 - dlls/browseui/tests/autocomplete.c | 85 +++++++++++++++++++------------------- dlls/browseui/tests/progressdlg.c | 15 +++---- 3 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=308b24d9c7cf2128aafe…

1 0