February 2020 - Wine-commits

Nikolay Sivov : mf: Subscribe for next pipeline object event after processing current one.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 9d004b84663f7e8bcc1b966ba656d8f35bec09db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d004b84663f7e8bcc1b966b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:53 2020 +0300 mf: Subscribe for next pipeline object event after processing current one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2ef4b01028..6da495e3c1 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1416,6 +1416,10 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM failed: if (event) IMFMediaEvent_Release(event); + + if (FAILED(hr = IMFMediaEventGenerator_BeginGetEvent(event_source, iface, (IUnknown *)event_source))) + WARN("Failed to re-subscribe, hr %#x.\n", hr); + IMFMediaEventGenerator_Release(event_source); return hr;

1 0

Nikolay Sivov : mf: Create separate topology object and use it as current.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: a93dde5ad8d93a1cdf666e868a76f35ec311f385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a93dde5ad8d93a1cdf666e86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:54 2020 +0300 mf: Create separate topology object and use it as current. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 243 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 125 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a93dde5ad8d93a1cdf66…

1 0

Nikolay Sivov : mf: Use separate list for source streams.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: adb420ee0df0ca885dfc97716376f894ddd21219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb420ee0df0ca885dfc9771… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:55 2020 +0300 mf: Use separate list for source streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 218 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 179 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adb420ee0df0ca885dfc…

1 0

Nikolay Sivov : mf: Use generic enum for object states.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 5dc6db5fd3e702602537d5e95593908cab4ff91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dc6db5fd3e702602537d5e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:56 2020 +0300 mf: Use generic enum for object states. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 17bb44eaa7..12685583e2 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -79,11 +79,12 @@ enum session_state SESSION_STATE_SHUT_DOWN, }; -enum source_state +enum object_state { - SOURCE_STATE_STOPPED = 0, - SOURCE_STATE_STARTED, - SOURCE_STATE_PAUSED, + OBJ_STATE_STOPPED = 0, + OBJ_STATE_STARTED, + OBJ_STATE_PAUSED, + OBJ_STATE_INVALID, }; struct media_source @@ -91,7 +92,7 @@ struct media_source struct list entry; IMFMediaSource *source; IMFPresentationDescriptor *pd; - enum source_state state; + enum object_state state; }; struct source_node @@ -1385,7 +1386,7 @@ static HRESULT session_add_media_stream(struct media_session *session, IMFMediaS return S_OK; } -static BOOL session_set_source_state(struct media_session *session, IMFMediaSource *source, enum source_state state) +static BOOL session_set_source_state(struct media_session *session, IMFMediaSource *source, enum object_state state) { struct media_source *cur; BOOL ret = TRUE; @@ -1469,7 +1470,7 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); IMFMediaEventGenerator *event_source; - enum source_state source_state; + enum object_state source_state; IMFMediaEvent *event = NULL; MediaEventType event_type; IMFMediaSource *source; @@ -1506,11 +1507,11 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM case MESourcePaused: case MESourceStopped: if (event_type == MESourceStarted) - source_state = SOURCE_STATE_STARTED; + source_state = OBJ_STATE_STARTED; else if (event_type == MESourcePaused) - source_state = SOURCE_STATE_PAUSED; + source_state = OBJ_STATE_PAUSED; else - source_state = SOURCE_STATE_STOPPED; + source_state = OBJ_STATE_STOPPED; EnterCriticalSection(&session->cs);

1 0

Zebediah Figura : winegstreamer: Don't query or set GStreamer duration if the filter is stopped.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 18bdaaaa2687d6423a479a968037c62b4b9cedbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=18bdaaaa2687d6423a479a96… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 20:40:35 2020 -0600 winegstreamer: Don't query or set GStreamer duration if the filter is stopped. This check is not equivalent to the existence of "their_src" for the MPEG-1 splitter, since that always exposes a source audio pin. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 488c9bd8a1..d469f2dbbf 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1841,7 +1841,8 @@ static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFER mark_wine_thread(); - if (!This->their_src) { + if (This->pin.pin.filter->state == State_Stopped) + { *pos = This->seek.llCurrent; TRACE("Cached value\n"); if (This->seek.llDuration) @@ -1892,7 +1893,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, return E_NOTIMPL; hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); - if (!This->their_src) + if (This->pin.pin.filter->state == State_Stopped) return hr; curtype = type_from_flags(curflags);

1 0

Zebediah Figura : winegstreamer: Don't fail seeking methods if we couldn't query duration.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 7987e84229fbfc5397e6143c055b5e97df6b43ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7987e84229fbfc5397e6143c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 20:40:36 2020 -0600 winegstreamer: Don't fail seeking methods if we couldn't query duration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48315 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d469f2dbbf..2fb158d562 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1601,7 +1601,8 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); for (i = 0; i < filter->source_count; ++i) { struct gstdemux_source *pin = filter->sources[i]; @@ -1609,8 +1610,6 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; } @@ -1845,10 +1844,7 @@ static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFER { *pos = This->seek.llCurrent; TRACE("Cached value\n"); - if (This->seek.llDuration) - return S_OK; - else - return E_NOTIMPL; + return S_OK; } if (!gst_pad_query_position(This->their_src, GST_FORMAT_TIME, pos)) { @@ -1889,9 +1885,6 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, mark_wine_thread(); - if (!This->seek.llDuration) - return E_NOTIMPL; - hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); if (This->pin.pin.filter->state == State_Stopped) return hr; @@ -2377,11 +2370,10 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) return FALSE; } - gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; events[0] = pin->caps_event; events[1] = filter->error_event; @@ -2496,7 +2488,8 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); for (i = 0; i < filter->source_count; ++i) { struct gstdemux_source *pin = filter->sources[i]; @@ -2504,8 +2497,6 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; } @@ -2633,11 +2624,10 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; - gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; events[0] = pin->caps_event; if (WaitForMultipleObjects(2, events, FALSE, INFINITE))

1 0

Zebediah Figura : winegstreamer: Defer a seek to pause time if necessary.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 2620d649c3318132bf00b703f02994827cfffad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2620d649c3318132bf00b703… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 20:40:37 2020 -0600 winegstreamer: Defer a seek to pause time if necessary. This fixes background music in Tomb Raider II. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2fb158d562..8b5eb928ce 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1387,6 +1387,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; + const SourceSeeking *seeking; GstStateChangeReturn ret; unsigned int i; @@ -1407,6 +1408,23 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) if (filter->no_more_pads_event) WaitForSingleObject(filter->no_more_pads_event, INFINITE); + seeking = &filter->sources[0]->seek; + + /* GStreamer can't seek while stopped, and it resets position to the + * beginning of the stream every time it is stopped. */ + if (seeking->llCurrent) + { + GstSeekType stop_type = GST_SEEK_TYPE_NONE; + + if (seeking->llStop && seeking->llStop != seeking->llDuration) + stop_type = GST_SEEK_TYPE_SET; + + gst_pad_push_event(filter->sources[0]->my_sink, gst_event_new_seek( + seeking->dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, seeking->llCurrent * 100, + stop_type, seeking->llStop * 100)); + } + for (i = 0; i < filter->source_count; ++i) { if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin)))

1 0

Zebediah Figura : winegstreamer: Use nAvgBytesPerSec to determine buffer size only for raw audio formats.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: fe6220dba707aa38ba76e79ddec74b4cbc117310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6220dba707aa38ba76e79d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 20:40:38 2020 -0600 winegstreamer: Use nAvgBytesPerSec to determine buffer size only for raw audio formats. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8b5eb928ce..30f3a59000 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2070,7 +2070,9 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; buffer_size = format->bmiHeader.biSizeImage; } - else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx)) + else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) + && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM) + || IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_IEEE_FLOAT))) { WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; buffer_size = format->nAvgBytesPerSec;

1 0

Alexandre Julliard : kernel32/tests: Add some tests for Idn functions.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 5d270e592dd8aaa57a1bfd66f34d99906e759465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d270e592dd8aaa57a1bfd66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 28 15:25:22 2020 +0100 kernel32/tests: Add some tests for Idn functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 404 +++++++++++++++++++++---------------------- 1 file changed, 198 insertions(+), 206 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d270e592dd8aaa57a1b…

1 0

Alexandre Julliard : ntdll: Allow final null in RtlNormalizeString() even if 0 is an invalid character.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 4aebd6a95fe8f274ad21963fd6ce682b2af3a61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aebd6a95fe8f274ad21963f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 28 15:34:52 2020 +0100 ntdll: Allow final null in RtlNormalizeString() even if 0 is an invalid character. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 1 - dlls/ntdll/locale.c | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7cc7f5d376..1df3c0dcd6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4521,7 +4521,6 @@ static void test_IdnToNameprepUnicode(void) int len = ARRAY_SIZE(buf); memset( buf, 0xcc, sizeof(buf) ); status = pRtlNormalizeString( 13, test_data[i].in, test_data[i].in_len, buf, &len ); - todo_wine_if (!test_data[i].status && (test_data[i].in_len == -1 || !test_data[i].in[test_data[i].in_len - 1])) ok( status == test_data[i].status || broken(status == test_data[i].broken_status), "%d: failed %x\n", i, status ); if (!status) ok( !wcsncmp(test_data[i].out, buf, len), "%d: buf = %s\n", i, wine_dbgstr_wn(buf, len)); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 7ec8a16074..8a2b233f88 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -437,6 +437,12 @@ static NTSTATUS decompose_string( const struct norm_table *info, const WCHAR *sr props = get_char_props( info, ch ); if (!(decomp = get_decomposition( info, ch, props, buffer, &decomp_len ))) { + /* allow final null */ + if (!ch && src_pos == src_len - 1 && dst_pos < *dst_len) + { + dst[dst_pos++] = 0; + break; + } *dst_len = src_pos; return STATUS_NO_UNICODE_TRANSLATION; } @@ -1934,6 +1940,8 @@ NTSTATUS WINAPI RtlIsNormalizedString( ULONG form, const WCHAR *str, INT len, BO /* ignore other chars in Hangul range */ if (ch >= HANGUL_LBASE && ch < HANGUL_LBASE + 0x100) continue; if (ch >= HANGUL_SBASE && ch < HANGUL_SBASE + 0x2c00) continue; + /* allow final null */ + if (!ch && i == len - 1) continue; return STATUS_NO_UNICODE_TRANSLATION; } }

1 0