February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Retrieve the preferred format through a Unix library function.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 442c9d43c8c8a8ea6b3557bab2c49eacd1f42dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=442c9d43c8c8a8ea6b3557ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:50 2021 -0600 winegstreamer: Retrieve the preferred format through a Unix library function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/gstdemux.c | 35 +++++++++++++++++++++-------------- dlls/winegstreamer/wg_parser.c | 7 +++++++ 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 0a37e10c840..d95f58dc607 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -217,6 +217,8 @@ struct unix_funcs uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); + + void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index be1c59453d5..95e55a55f22 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1064,8 +1064,7 @@ static HRESULT decodebin_parser_source_query_accept(struct parser_source *pin, c static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; - struct wg_format format = stream->preferred_format; + struct wg_format format; static const enum wg_video_format video_formats[] = { @@ -1086,6 +1085,8 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, WG_VIDEO_FORMAT_RGB15, }; + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); if (amt_from_wg_format(mt, &format)) @@ -1673,11 +1674,12 @@ static BOOL wave_parser_filter_init_gst(struct parser *filter) static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_wg_format(&pad_mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(&pad_mt, &format)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1687,11 +1689,12 @@ static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_wg_format(mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(mt, &format)) return E_OUTOFMEMORY; return S_OK; } @@ -1761,11 +1764,12 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_wg_format(&pad_mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(&pad_mt, &format)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1775,11 +1779,12 @@ static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_wg_format(mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(mt, &format)) return E_OUTOFMEMORY; return S_OK; } @@ -1847,11 +1852,12 @@ static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_wg_format(&pad_mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(&pad_mt, &format)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1861,11 +1867,12 @@ static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, cons static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_format format; if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_wg_format(mt, &stream->preferred_format)) + unix_funcs->wg_parser_stream_get_preferred_format(pin->wg_stream, &format); + if (!amt_from_wg_format(mt, &format)) return E_OUTOFMEMORY; return S_OK; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 1cbe123ca2f..208abc59a9b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -327,6 +327,11 @@ static struct wg_parser_stream * CDECL wg_parser_get_stream(struct wg_parser *pa return parser->streams[index]; } +static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) +{ + *format = stream->preferred_format; +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1480,6 +1485,8 @@ static const struct unix_funcs funcs = wg_parser_get_stream_count, wg_parser_get_stream, + + wg_parser_stream_get_preferred_format, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Set the stream's current format and connected state through Unix library functions.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 563ccc4df5bcf887e0cd277e9a54ec3888c9cbf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=563ccc4df5bcf887e0cd277e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:51 2021 -0600 winegstreamer: Set the stream's current format and connected state through Unix library functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/gstdemux.c | 9 ++++----- dlls/winegstreamer/wg_parser.c | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index d95f58dc607..15c62fa29c5 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -219,6 +219,8 @@ struct unix_funcs struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); + void (CDECL *wg_parser_stream_enable)(struct wg_parser_stream *stream, const struct wg_format *format); + void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 95e55a55f22..1f80a8fec8c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1507,6 +1507,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, struct wg_parser_stream *stream = pin->wg_stream; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; + struct wg_format format; bool ret; if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_VideoInfo)) @@ -1526,11 +1527,10 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->nAvgBytesPerSec; } - ret = amt_to_wg_format(&pin->pin.pin.mt, &stream->current_format); + ret = amt_to_wg_format(&pin->pin.pin.mt, &format); assert(ret); - stream->enabled = true; + unix_funcs->wg_parser_stream_enable(pin->wg_stream, &format); - gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); /* We do need to drop any buffers that might have been sent with the old * caps, but this will be handled in parser_init_stream(). */ @@ -1543,9 +1543,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, static void source_disconnect(struct strmbase_source *iface) { struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); - struct wg_parser_stream *stream = pin->wg_stream; - stream->enabled = false; + unix_funcs->wg_parser_stream_disable(pin->wg_stream); } static void free_source_pin(struct parser_source *pin) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 208abc59a9b..107dfdd1a7f 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -332,6 +332,18 @@ static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *format = stream->preferred_format; } +static void CDECL wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) +{ + stream->current_format = *format; + stream->enabled = true; + gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); +} + +static void CDECL wg_parser_stream_disable(struct wg_parser_stream *stream) +{ + stream->enabled = false; +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1487,6 +1499,8 @@ static const struct unix_funcs funcs = wg_parser_get_stream, wg_parser_stream_get_preferred_format, + wg_parser_stream_enable, + wg_parser_stream_disable, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Move get_stream_event() to the Unix library.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: aa695e212522fdd8653877cdf95426255cbe80d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa695e212522fdd8653877cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:52 2021 -0600 winegstreamer: Move get_stream_event() to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/gstdemux.c | 29 +---------------------------- dlls/winegstreamer/wg_parser.c | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 15c62fa29c5..08ff6ee21f0 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -221,6 +221,8 @@ struct unix_funcs void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); void (CDECL *wg_parser_stream_enable)(struct wg_parser_stream *stream, const struct wg_format *format); void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); + + bool (CDECL *wg_parser_stream_get_event)(struct wg_parser_stream *stream, struct wg_parser_event *event); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1f80a8fec8c..d4614ca5a65 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -686,33 +686,6 @@ static void send_buffer(struct parser_source *pin, GstBuffer *buf) gst_buffer_unref(buf); } -static bool get_stream_event(struct parser_source *pin, struct wg_parser_event *event) -{ - struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - struct wg_parser_stream *stream = pin->wg_stream; - struct wg_parser *parser = filter->wg_parser; - - pthread_mutex_lock(&parser->mutex); - - while (!parser->flushing && stream->event.type == WG_PARSER_EVENT_NONE) - pthread_cond_wait(&stream->event_cond, &parser->mutex); - - if (parser->flushing) - { - pthread_mutex_unlock(&parser->mutex); - TRACE("Filter is flushing.\n"); - return false; - } - - *event = stream->event; - stream->event.type = WG_PARSER_EVENT_NONE; - - pthread_mutex_unlock(&parser->mutex); - pthread_cond_signal(&stream->event_empty_cond); - - return true; -} - static DWORD CALLBACK stream_thread(void *arg) { struct parser_source *pin = arg; @@ -726,7 +699,7 @@ static DWORD CALLBACK stream_thread(void *arg) EnterCriticalSection(&pin->flushing_cs); - if (!get_stream_event(pin, &event)) + if (!unix_funcs->wg_parser_stream_get_event(pin->wg_stream, &event)) { LeaveCriticalSection(&pin->flushing_cs); continue; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 107dfdd1a7f..b3f8eff43ad 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -344,6 +344,31 @@ static void CDECL wg_parser_stream_disable(struct wg_parser_stream *stream) stream->enabled = false; } +static bool CDECL wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event) +{ + struct wg_parser *parser = stream->parser; + + pthread_mutex_lock(&parser->mutex); + + while (!parser->flushing && stream->event.type == WG_PARSER_EVENT_NONE) + pthread_cond_wait(&stream->event_cond, &parser->mutex); + + if (parser->flushing) + { + pthread_mutex_unlock(&parser->mutex); + TRACE("Filter is flushing.\n"); + return false; + } + + *event = stream->event; + stream->event.type = WG_PARSER_EVENT_NONE; + + pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&stream->event_empty_cond); + + return true; +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1501,6 +1526,8 @@ static const struct unix_funcs funcs = wg_parser_stream_get_preferred_format, wg_parser_stream_enable, wg_parser_stream_disable, + + wg_parser_stream_get_event, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Move wg_parser flushing to the Unix library.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 7a5224beb6be2a86131c51f4e308adadbfb1784b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5224beb6be2a86131c51f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:53 2021 -0600 winegstreamer: Move wg_parser flushing to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 3 +++ dlls/winegstreamer/gstdemux.c | 28 ++++------------------------ dlls/winegstreamer/wg_parser.c | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 08ff6ee21f0..ee698bdf32f 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -215,6 +215,9 @@ struct unix_funcs HRESULT (CDECL *wg_parser_connect)(struct wg_parser *parser, uint64_t file_size); void (CDECL *wg_parser_disconnect)(struct wg_parser *parser); + void (CDECL *wg_parser_begin_flush)(struct wg_parser *parser); + void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); + uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d4614ca5a65..63368febc5c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -856,9 +856,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = true; - pthread_mutex_lock(&parser->mutex); - parser->flushing = false; - pthread_mutex_unlock(&parser->mutex); + unix_funcs->wg_parser_end_flush(filter->wg_parser); /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ @@ -899,17 +897,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = false; - pthread_mutex_lock(&parser->mutex); - parser->flushing = true; - pthread_mutex_unlock(&parser->mutex); - - for (i = 0; i < parser->stream_count; ++i) - { - struct wg_parser_stream *stream = parser->streams[i]; - - if (stream->enabled) - pthread_cond_signal(&stream->event_cond); - } + unix_funcs->wg_parser_begin_flush(filter->wg_parser); for (i = 0; i < filter->source_count; ++i) { @@ -1228,7 +1216,6 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, struct parser_source *pin = impl_from_IMediaSeeking(iface); struct wg_parser_stream *stream = pin->wg_stream; struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - struct wg_parser *parser = filter->wg_parser; GstSeekFlags flags = 0; HRESULT hr = S_OK; int i; @@ -1247,17 +1234,12 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&parser->mutex); - parser->flushing = true; - pthread_mutex_unlock(&parser->mutex); + unix_funcs->wg_parser_begin_flush(filter->wg_parser); for (i = 0; i < filter->source_count; ++i) { if (filter->sources[i]->pin.pin.peer) - { - pthread_cond_signal(&stream->event_cond); IPin_BeginFlush(filter->sources[i]->pin.pin.peer); - } } if (filter->reader) @@ -1296,9 +1278,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&parser->mutex); - parser->flushing = false; - pthread_mutex_unlock(&parser->mutex); + unix_funcs->wg_parser_end_flush(filter->wg_parser); for (i = 0; i < filter->source_count; ++i) { diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index b3f8eff43ad..bb1d6188a8b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -327,6 +327,28 @@ static struct wg_parser_stream * CDECL wg_parser_get_stream(struct wg_parser *pa return parser->streams[index]; } +static void CDECL wg_parser_begin_flush(struct wg_parser *parser) +{ + unsigned int i; + + pthread_mutex_lock(&parser->mutex); + parser->flushing = true; + pthread_mutex_unlock(&parser->mutex); + + for (i = 0; i < parser->stream_count; ++i) + { + if (parser->streams[i]->enabled) + pthread_cond_signal(&parser->streams[i]->event_cond); + } +} + +static void CDECL wg_parser_end_flush(struct wg_parser *parser) +{ + pthread_mutex_lock(&parser->mutex); + parser->flushing = false; + pthread_mutex_unlock(&parser->mutex); +} + static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) { *format = stream->preferred_format; @@ -1520,6 +1542,9 @@ static const struct unix_funcs funcs = wg_parser_connect, wg_parser_disconnect, + wg_parser_begin_flush, + wg_parser_end_flush, + wg_parser_get_stream_count, wg_parser_get_stream,

1 0

Zebediah Figura : winegstreamer: Move QoS notification to the Unix library.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 8547ee35135114e752292175237f43a7cf520ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8547ee35135114e752292175… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:54 2021 -0600 winegstreamer: Move QoS notification to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/gstdemux.c | 28 ++++++++++------------------ dlls/winegstreamer/wg_parser.c | 12 ++++++++++++ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index ee698bdf32f..3c6d1147477 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -226,6 +226,8 @@ struct unix_funcs void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); bool (CDECL *wg_parser_stream_get_event)(struct wg_parser_stream *stream, struct wg_parser_event *event); + void (CDECL *wg_parser_stream_notify_qos)(struct wg_parser_stream *stream, + bool underflow, double proportion, int64_t diff, uint64_t timestamp); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 63368febc5c..da294c31e01 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1350,11 +1350,8 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { struct parser_source *pin = impl_from_IQualityControl(iface); - struct wg_parser_stream *stream = pin->wg_stream; - GstQOSType type = GST_QOS_TYPE_OVERFLOW; - GstClockTime timestamp; - GstClockTimeDiff diff; - GstEvent *event; + uint64_t timestamp; + int64_t diff; TRACE("pin %p, sender %p, type %s, proportion %u, late %s, timestamp %s.\n", pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion, @@ -1362,20 +1359,14 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil mark_wine_thread(); - /* GST_QOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but - * DirectShow filters might use Famine, so check that there actually is an - * underrun. */ - if (q.Type == Famine && q.Proportion < 1000) - type = GST_QOS_TYPE_UNDERFLOW; - /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the * current time instead of the time of the last buffer). GstClockTime is * unsigned, so clamp it to 0. */ - timestamp = max(q.TimeStamp * 100, 0); + timestamp = max(q.TimeStamp, 0); /* The documentation specifies that timestamp + diff must be nonnegative. */ - diff = q.Late * 100; - if (diff < 0 && timestamp < (GstClockTime)-diff) + diff = q.Late; + if (diff < 0 && timestamp < (uint64_t)-diff) diff = -timestamp; /* DirectShow "Proportion" describes what percentage of buffers the upstream @@ -1395,10 +1386,11 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil return S_OK; } - if (!(event = gst_event_new_qos(type, 1000.0 / q.Proportion, diff, timestamp))) - ERR("Failed to create QOS event.\n"); - - gst_pad_push_event(stream->my_sink, event); + /* GST_QOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + unix_funcs->wg_parser_stream_notify_qos(pin->wg_stream, q.Type == Famine && q.Proportion < 1000, + 1000.0 / q.Proportion, diff, timestamp); return S_OK; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index bb1d6188a8b..79fa45eadca 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -391,6 +391,17 @@ static bool CDECL wg_parser_stream_get_event(struct wg_parser_stream *stream, st return true; } +static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, + bool underflow, double proportion, int64_t diff, uint64_t timestamp) +{ + GstEvent *event; + + if (!(event = gst_event_new_qos(underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, + 1000.0 / proportion, diff * 100, timestamp * 100))) + ERR("Failed to create QOS event.\n"); + gst_pad_push_event(stream->my_sink, event); +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1553,6 +1564,7 @@ static const struct unix_funcs funcs = wg_parser_stream_disable, wg_parser_stream_get_event, + wg_parser_stream_notify_qos, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : advapi32/tests: Rename test_sid() to test_ConvertStringSidToSid().
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 0c0a7b7be7a1a83edf8d5ffaa612eec1460f0745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0a7b7be7a1a83edf8d5ffa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:50 2021 -0600 advapi32/tests: Rename test_sid() to test_ConvertStringSidToSid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e6d2f565943..1cd5f576621 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -246,7 +246,7 @@ static void test_group_equal(HANDLE Handle, PSID expected, int line) HeapFree(GetProcessHeap(), 0, queriedSD); } -static void test_sid(void) +static void test_ConvertStringSidToSid(void) { struct sidRef refs[] = { { { {0x00,0x00,0x33,0x44,0x55,0x66} }, "S-1-860116326-1" }, @@ -7961,7 +7961,7 @@ START_TEST(security) return; } test_kernel_objects_security(); - test_sid(); + test_ConvertStringSidToSid(); test_trustee(); test_luid(); test_CreateWellKnownSid();

1 0

Zebediah Figura : advapi32/tests: Get rid of the test_luid() helper.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: b250831adca4ad0f26400bee9def30571391d92f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b250831adca4ad0f26400bee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:51 2021 -0600 advapi32/tests: Get rid of the test_luid() helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1cd5f576621..e86b8e5cbde 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -769,13 +769,6 @@ static void test_lookupPrivilegeValue(void) } } -static void test_luid(void) -{ - test_allocateLuid(); - test_lookupPrivilegeName(); - test_lookupPrivilegeValue(); -} - static void test_FileSecurity(void) { char wintmpdir [MAX_PATH]; @@ -7963,7 +7956,9 @@ START_TEST(security) test_kernel_objects_security(); test_ConvertStringSidToSid(); test_trustee(); - test_luid(); + test_allocateLuid(); + test_lookupPrivilegeName(); + test_lookupPrivilegeValue(); test_CreateWellKnownSid(); test_FileSecurity(); test_AccessCheck();

1 0

Zebediah Figura : advapi32/tests: Rename test_acls() to test_InitializeAcl().
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: 50cf8ee9c0385e492fc7a25ae585576ceba9fd2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50cf8ee9c0385e492fc7a25a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:52 2021 -0600 advapi32/tests: Rename test_acls() to test_InitializeAcl(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e86b8e5cbde..d9849f44c9a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4594,7 +4594,7 @@ static void test_PrivateObjectSecurity(void) #undef CHECK_RESULT_AND_FREE #undef CHECK_ONE_OF_AND_FREE -static void test_acls(void) +static void test_InitializeAcl(void) { char buffer[256]; PACL pAcl = (PACL)buffer; @@ -7976,7 +7976,7 @@ START_TEST(security) test_ConvertStringSecurityDescriptor(); test_ConvertSecurityDescriptorToString(); test_PrivateObjectSecurity(); - test_acls(); + test_InitializeAcl(); test_GetWindowsAccountDomainSid(); test_EqualDomainSid(); test_GetSecurityInfo();

1 0

Zebediah Figura : advapi32/tests: Explicitly test the ACL contents in test_AddMandatoryAce().
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: f6a723f1214a55a03c613ab1c195e9b79e437263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a723f1214a55a03c613ab1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:53 2021 -0600 advapi32/tests: Explicitly test the ACL contents in test_AddMandatoryAce(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 69 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9849f44c9a..75217524315 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6395,13 +6395,13 @@ static void test_AddMandatoryAce(void) static SID_IDENTIFIER_AUTHORITY sia_world = {SECURITY_WORLD_SID_AUTHORITY}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd2, *sd = (SECURITY_DESCRIPTOR *)&buffer_sd; - BOOL defaulted, present, ret, found, found2; + BOOL defaulted, present, ret; ACL_SIZE_INFORMATION acl_size_info; SYSTEM_MANDATORY_LABEL_ACE *ace; char buffer_acl[256]; ACL *acl = (ACL *)&buffer_acl; SECURITY_ATTRIBUTES sa; - DWORD index, size; + DWORD size; HANDLE handle; SID *everyone; ACL *sacl; @@ -6453,18 +6453,17 @@ static void test_AddMandatoryAce(void) ret = pAddMandatoryAce(acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); ok(ret, "AddMandatoryAce failed with %u\n", GetLastError()); - index = 0; - found = FALSE; - while (GetAce(acl, index++, (void **)&ace)) - { - if (ace->Header.AceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) continue; - ok(ace->Header.AceFlags == 0, "Expected flags 0, got %x\n", ace->Header.AceFlags); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, - "Expected mask SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, got %x\n", ace->Mask); - ok(EqualSid(&ace->SidStart, &low_level), "Expected low integrity level\n"); - found = TRUE; - } - ok(found, "Could not find mandatory label ace\n"); + ret = GetAce(acl, 0, (void **)&ace); + ok(ret, "got error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, "got type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "got flags %#x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "got mask %#x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &low_level), "wrong sid\n"); + + SetLastError(0xdeadbeef); + ret = GetAce(acl, 1, (void **)&ace); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); ret = SetSecurityDescriptorSacl(sd, TRUE, acl, FALSE); ok(ret, "SetSecurityDescriptorSacl failed with error %u\n", GetLastError()); @@ -6525,30 +6524,24 @@ static void test_AddMandatoryAce(void) ok(sacl->AceCount == 2, "Expected 2 ACEs, got %d\n", sacl->AceCount); ok(!defaulted, "SACL defaulted\n"); - index = 0; - found = found2 = FALSE; - while (GetAce(sacl, index++, (void **)&ace)) - { - if (ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE) - { - if (EqualSid(&ace->SidStart, &low_level)) - { - found = TRUE; - ok(!ace->Header.AceFlags, "Expected 0 as flags, got %#x\n", ace->Header.AceFlags); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, - "Expected SYSTEM_MANDATORY_LABEL_NO_WRITE_UP as mask, got %#x\n", ace->Mask); - } - if (EqualSid(&ace->SidStart, &medium_level)) - { - found2 = TRUE; - ok(!ace->Header.AceFlags, "Expected 0 as flags, got %#x\n", ace->Header.AceFlags); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP, - "Expected SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP as mask, got %#x\n", ace->Mask); - } - } - } - ok(found, "Could not find low mandatory label\n"); - ok(found2, "Could not find medium mandatory label\n"); + ret = GetAce(acl, 0, (void **)&ace); + ok(ret, "got error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, "got type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "got flags %#x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "got mask %#x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &low_level), "wrong sid\n"); + + ret = GetAce(acl, 1, (void **)&ace); + ok(ret, "got error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, "got type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "got flags %#x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP, "got mask %#x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &medium_level), "wrong sid\n"); + + SetLastError(0xdeadbeef); + ret = GetAce(acl, 2, (void **)&ace); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); HeapFree(GetProcessHeap(), 0, sd2);

1 0

Zebediah Figura : advapi32/tests: Skip test_token_label() if AddMandatoryAce() is not present.
by Alexandre Julliard 16 Feb '21

16 Feb '21

Module: wine Branch: master Commit: d6fed9c360183df11a6274b286aceeea2e8c3ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fed9c360183df11a6274b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:54 2021 -0600 advapi32/tests: Skip test_token_label() if AddMandatoryAce() is not present. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 43 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 75217524315..f0b6c90390d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6955,6 +6955,12 @@ static void test_token_label(void) char *str; SID *sid; + if (!pAddMandatoryAce) + { + win_skip("Mandatory integrity control is not supported.\n"); + return; + } + ret = OpenProcessToken(GetCurrentProcess(), READ_CONTROL | WRITE_OWNER, &token); ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); @@ -6968,8 +6974,7 @@ static void test_token_label(void) ret = GetSecurityDescriptorControl(sd, &control, &revision); ok(ret, "GetSecurityDescriptorControl failed with error %u\n", GetLastError()); - todo_wine ok(control == (SE_SELF_RELATIVE | SE_SACL_AUTO_INHERITED | SE_SACL_PRESENT) || - broken(control == SE_SELF_RELATIVE) /* WinXP, Win2003 */, + todo_wine ok(control == (SE_SELF_RELATIVE | SE_SACL_AUTO_INHERITED | SE_SACL_PRESENT), "Unexpected security descriptor control %#x\n", control); ok(revision == 1, "Unexpected security descriptor revision %u\n", revision); @@ -6989,28 +6994,24 @@ static void test_token_label(void) ret = GetSecurityDescriptorSacl(sd, &present, &sacl, &defaulted); ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); - ok(present || broken(!present) /* WinXP, Win2003 */, "No SACL in the security descriptor\n"); - ok(sacl || broken(!sacl) /* WinXP, Win2003 */, "NULL SACL in the security descriptor\n"); - - if (present) - { - ok(!defaulted, "SACL defaulted\n"); - ok(sacl->AceCount == 1, "SACL contains an unexpected ACE count %u\n", sacl->AceCount); + ok(present, "No SACL in the security descriptor\n"); + ok(!!sacl, "NULL SACL in the security descriptor\n"); + ok(!defaulted, "SACL defaulted\n"); + ok(sacl->AceCount == 1, "SACL contains an unexpected ACE count %u\n", sacl->AceCount); - ret = GetAce(sacl, 0, (void **)&ace); - ok(ret, "GetAce failed with error %u\n", GetLastError()); + ret = GetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); - ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, - "Unexpected ACE type %#x\n", ace->Header.AceType); - ok(!ace->Header.AceFlags, "Unexpected ACE flags %#x\n", ace->Header.AceFlags); - ok(ace->Header.AceSize, "Unexpected ACE size %u\n", ace->Header.AceSize); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "Unexpected ACE flags %#x\n", ace->Header.AceFlags); + ok(ace->Header.AceSize, "Unexpected ACE size %u\n", ace->Header.AceSize); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); - sid = (SID *)&ace->SidStart; - ConvertSidToStringSidA(sid, &str); - ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); - LocalFree(str); - } + sid = (SID *)&ace->SidStart; + ConvertSidToStringSidA(sid, &str); + ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); + LocalFree(str); ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError());

1 0