January 2021 - Wine-commits

Rémi Bernon : windowscodecs: Use create_instance instead of ImagingFactory_CreateInstance.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: f6c7f150ec33d6ab53e18cdf4cef37470cc2cda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c7f150ec33d6ab53e18cdf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 20 10:30:05 2021 +0100 windowscodecs: Use create_instance instead of ImagingFactory_CreateInstance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/clsfactory.c | 2 +- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/palette.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 914e8ad52cd..b2914a7fd5b 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -206,7 +206,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return ret; } -HRESULT create_instance(CLSID *clsid, const IID *iid, void **ppv) +HRESULT create_instance(const CLSID *clsid, const IID *iid, void **ppv) { int i; diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 3e43fa91114..5970a44cd53 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -665,7 +665,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc else { if (SUCCEEDED(hr)) - hr = ImagingFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); if (SUCCEEDED(hr)) { diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 34329717201..051a5944eb2 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -679,7 +679,7 @@ static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, else rgb24_source = source; - hr = ImagingFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICImagingFactory, (void **)&factory); if (hr != S_OK) goto fail; hr = IWICImagingFactory_CreateBitmapFromSource(factory, rgb24_source, WICBitmapCacheOnLoad, &rgb24_bitmap); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 3b20f7d6c24..85d057cc278 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IMILUnknown2,IUnknown) }; #undef INTERFACE -HRESULT create_instance(CLSID *clsid, const IID *iid, void **ppv) DECLSPEC_HIDDEN; +HRESULT create_instance(const CLSID *clsid, const IID *iid, void **ppv) DECLSPEC_HIDDEN; typedef HRESULT(*class_constructor)(REFIID,void**); extern HRESULT FormatConverter_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : windowscodecs: Use IWICComponentFactory_CreateStream in GetReaderByIndex.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 3c6cf6ef2c3c919ef82de28a634a22f70ce8312a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c6cf6ef2c3c919ef82de28a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 20 10:30:06 2021 +0100 windowscodecs: Use IWICComponentFactory_CreateStream in GetReaderByIndex. Instead of StreamImpl_Create. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 5970a44cd53..b05d50dfea9 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -595,7 +595,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc { CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface); HRESULT hr; - IWICComponentFactory* factory; + IWICComponentFactory* factory = NULL; IWICStream* stream; TRACE("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); @@ -609,7 +609,10 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc hr = E_INVALIDARG; if (SUCCEEDED(hr)) - hr = StreamImpl_Create(&stream); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + hr = IWICComponentFactory_CreateStream(factory, &stream); if (SUCCEEDED(hr)) { @@ -664,23 +667,17 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc } else { - if (SUCCEEDED(hr)) - hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); - - if (SUCCEEDED(hr)) - { - hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, - &This->parent->decoder_info.block_format, NULL, - This->metadata_blocks[nIndex].options & DECODER_BLOCK_OPTION_MASK, - (IStream*)stream, ppIMetadataReader); - - IWICComponentFactory_Release(factory); - } + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &This->parent->decoder_info.block_format, NULL, + This->metadata_blocks[nIndex].options & DECODER_BLOCK_OPTION_MASK, + (IStream*)stream, ppIMetadataReader); } IWICStream_Release(stream); } + if (factory) IWICComponentFactory_Release(factory); + if (FAILED(hr)) *ppIMetadataReader = NULL;

1 0

Zebediah Figura : winegstreamer: Move pin duration and caps retrieval to GST_Connect().
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 911bc74a1e494eeffe5e1a21922c58f913bd5ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=911bc74a1e494eeffe5e1a21… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:51 2021 -0600 winegstreamer: Move pin duration and caps retrieval to GST_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 99 +++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 66 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index da53556eb0c..903305724a4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1452,8 +1452,29 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) return GST_BUS_DROP; } +static LONGLONG query_duration(GstPad *pad) +{ + gint64 duration, byte_length; + + if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) + return duration / 100; + + WARN("Failed to query time duration; trying to convert from byte length.\n"); + + /* To accurately get a duration for the stream, we want to only consider the + * length of that stream. Hence, query for the pad duration, instead of + * using the file duration. */ + if (gst_pad_query_duration(pad, GST_FORMAT_BYTES, &byte_length) + && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) + return duration / 100; + + ERR("Failed to query duration.\n"); + return 0; +} + static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) { + unsigned int i; LONGLONG avail; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( "quartz_src", @@ -1483,28 +1504,19 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) if (!This->init_gst(This)) return E_FAIL; - This->nextofs = This->nextpullofs = 0; - return S_OK; -} - -static LONGLONG query_duration(GstPad *pad) -{ - gint64 duration, byte_length; - - if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) - return duration / 100; - - WARN("Failed to query time duration; trying to convert from byte length.\n"); + for (i = 0; i < This->source_count; ++i) + { + struct parser_source *pin = This->sources[i]; + const HANDLE events[2] = {pin->caps_event, This->error_event}; - /* To accurately get a duration for the stream, we want to only consider the - * length of that stream. Hence, query for the pad duration, instead of - * using the file duration. */ - if (gst_pad_query_duration(pad, GST_FORMAT_BYTES, &byte_length) - && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) - return duration / 100; + pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); + pin->seek.llCurrent = 0; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return E_FAIL; + } - ERR("Failed to query duration.\n"); - return 0; + This->nextofs = This->nextpullofs = 0; + return S_OK; } static inline struct parser_source *impl_from_IMediaSeeking(IMediaSeeking *iface) @@ -1714,7 +1726,6 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("decodebin", NULL); - unsigned int i; HANDLE events[2]; int ret; @@ -1754,18 +1765,6 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; - for (i = 0; i < filter->source_count; ++i) - { - struct parser_source *pin = filter->sources[i]; - - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - events[0] = pin->caps_event; - events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - } - return TRUE; } @@ -2506,7 +2505,6 @@ static BOOL wave_parser_init_gst(struct parser *filter) static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; struct parser_source *pin; GstElement *element; - HANDLE events[2]; int ret; if (!(element = gst_element_factory_make("wavparse", NULL))) @@ -2544,14 +2542,6 @@ static BOOL wave_parser_init_gst(struct parser *filter) return FALSE; } - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - - events[0] = pin->caps_event; - events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - return TRUE; } @@ -2621,7 +2611,6 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("avidemux", NULL); - unsigned int i; HANDLE events[2]; int ret; @@ -2660,18 +2649,6 @@ static BOOL avi_splitter_init_gst(struct parser *filter) if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; - for (i = 0; i < filter->source_count; ++i) - { - struct parser_source *pin = filter->sources[i]; - - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - events[0] = pin->caps_event; - events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - } - return TRUE; } @@ -2791,17 +2768,7 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) events[1] = filter->error_event; events[2] = pin->eos_event; res = WaitForMultipleObjects(3, events, FALSE, INFINITE); - if (res == 1) - return FALSE; - - pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); - pin->seek.llCurrent = 0; - - events[0] = pin->caps_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) - return FALSE; - - return TRUE; + return (res != 1); } static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt)

1 0

Zebediah Figura : winegstreamer: Store the segment parameters in the parser_event structure.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 2546ad81158946c98d6fcf63e3f15d84909421d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2546ad81158946c98d6fcf63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:52 2021 -0600 winegstreamer: Store the segment parameters in the parser_event structure. Instead of the segment event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 49 ++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9cd3c8adff5..b6942e5ae77 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <gst/gst.h> #include <gst/video/video.h> diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 903305724a4..d79622094f6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -94,7 +94,11 @@ struct parser_event union { GstBuffer *buffer; - GstEvent *segment; + struct + { + uint64_t position, stop; + double rate; + } segment; } u; }; @@ -709,14 +713,23 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (pin->pin.pin.peer) { struct parser_event stream_event; + const GstSegment *segment; - stream_event.type = PARSER_EVENT_SEGMENT; - stream_event.u.segment = event; - if (queue_stream_event(pin, &stream_event) == GST_FLOW_OK) + gst_event_parse_segment(event, &segment); + + if (segment->format != GST_FORMAT_TIME) { - /* Transfer our reference to the event to the thread. */ - return TRUE; + FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); + break; } + + gst_segment_copy_into(segment, pin->segment); + + stream_event.type = 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(pin, &stream_event); } break; @@ -744,15 +757,12 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { case PARSER_EVENT_NONE: case PARSER_EVENT_EOS: + case PARSER_EVENT_SEGMENT: break; case PARSER_EVENT_BUFFER: gst_buffer_unref(pin->event.u.buffer); break; - - case PARSER_EVENT_SEGMENT: - gst_event_unref(pin->event.u.segment); - break; } pin->event.type = PARSER_EVENT_NONE; @@ -1057,24 +1067,9 @@ static DWORD CALLBACK stream_thread(void *arg) break; case PARSER_EVENT_SEGMENT: - { - const GstSegment *segment; - - gst_event_parse_segment(event.u.segment, &segment); - - if (segment->format != GST_FORMAT_TIME) - { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); - break; - } - - gst_segment_copy_into(segment, pin->segment); - - IPin_NewSegment(pin->pin.pin.peer, segment->position / 100, - segment->stop / 100, segment->rate * segment->applied_rate); - gst_event_unref(event.u.segment); + IPin_NewSegment(pin->pin.pin.peer, event.u.segment.position, + event.u.segment.stop, event.u.segment.rate); break; - } case PARSER_EVENT_NONE: assert(0);

1 0

Zebediah Figura : winegstreamer: Use a pthread condition variable to wait for filter initialization.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 1f7ab818d8f0778b6c7c80f650f7f5558cffb399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f7ab818d8f0778b6c7c80f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:53 2021 -0600 winegstreamer: Use a pthread condition variable to wait for filter initialization. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 120 +++++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f7ab818d8f0778b6c7c…

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in watch_bus().
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 871c5673d95ebf685f6a4f34e16e3abf2eb98d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=871c5673d95ebf685f6a4f34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:54 2021 -0600 winegstreamer: Avoid using Wine debug functions in watch_bus(). They depend on a valid TEB and can't be called from non-Wine threads. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bab9804bdbd..4653536afcc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1431,14 +1431,14 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) GError *err = NULL; gchar *dbg_info = NULL; - TRACE("filter %p, message type %s.\n", filter, GST_MESSAGE_TYPE_NAME(msg)); + GST_DEBUG("filter %p, message type %s.", filter, GST_MESSAGE_TYPE_NAME(msg)); switch (msg->type) { case GST_MESSAGE_ERROR: gst_message_parse_error(msg, &err, &dbg_info); - ERR("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - ERR("%s\n", dbg_info); + fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); pthread_mutex_lock(&filter->mutex); @@ -1449,8 +1449,8 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) case GST_MESSAGE_WARNING: gst_message_parse_warning(msg, &err, &dbg_info); - WARN("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - WARN("%s\n", dbg_info); + fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + fprintf(stderr, "winegstreamer: warning: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); break;

1 0

Zebediah Figura : winegstreamer: Don't force watch_bus() onto a Wine thread.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 4782f67bca6f4e6aed585701a517c5b17598f8f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4782f67bca6f4e6aed585701… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 17:22:55 2021 -0600 winegstreamer: Don't force watch_bus() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index cb07cafb7bc..b9effe73a5b 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -136,19 +136,6 @@ static void call_cb(struct cb_data *cbdata) pthread_mutex_destroy(&cbdata->lock); } -GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) -{ - struct cb_data cbdata = { WATCH_BUS }; - - cbdata.u.watch_bus_data.bus = bus; - cbdata.u.watch_bus_data.msg = msg; - cbdata.u.watch_bus_data.user = user; - - call_cb(&cbdata); - - return cbdata.u.watch_bus_data.ret; -} - void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { EXISTING_NEW_PAD }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 9bb3572c5db..0e262c12db8 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -30,7 +30,6 @@ typedef enum { } GstAutoplugSelectResult; enum CB_TYPE { - WATCH_BUS, EXISTING_NEW_PAD, QUERY_FUNCTION, ACTIVATE_MODE, @@ -133,7 +132,6 @@ void mark_wine_thread(void) DECLSPEC_HIDDEN; void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; -GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4653536afcc..e85e54c2e34 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1503,7 +1503,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) if (!This->bus) { This->bus = gst_bus_new(); - gst_bus_set_sync_handler(This->bus, watch_bus_wrapper, This, NULL); + gst_bus_set_sync_handler(This->bus, watch_bus, This, NULL); } This->container = gst_bin_new(NULL); @@ -2424,12 +2424,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) { switch(cbdata->type) { - case WATCH_BUS: - { - struct watch_bus_data *data = &cbdata->u.watch_bus_data; - cbdata->u.watch_bus_data.ret = watch_bus(data->bus, data->msg, data->user); - break; - } case EXISTING_NEW_PAD: { struct pad_added_data *data = &cbdata->u.pad_added_data;

1 0

Zebediah Figura : server: Avoid leaking "acceptsock" on allocation failure.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: fe11ff87ac8918f5e5104cccccb5544d9c6c30c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe11ff87ac8918f5e5104ccc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 18:16:42 2021 -0600 server: Avoid leaking "acceptsock" on allocation failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 5f207e7f180..8c146a0a8f8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1473,7 +1473,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - if (!(req = alloc_accept_req( acceptsock, async, params ))) return 0; + if (!(req = alloc_accept_req( acceptsock, async, params ))) + { + release_object( acceptsock ); + return 0; + } list_add_tail( &sock->accept_list, &req->entry ); acceptsock->accept_recv_req = req; release_object( acceptsock );

1 0

Zebediah Figura : server: Use default_fd_get_poll_events() for file objects.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: 70d12630716f1edf28f555abdd2ea306711140d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d12630716f1edf28f555ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 21 18:16:41 2021 -0600 server: Use default_fd_get_poll_events() for file objects. This avoids sending the server into a busy-loop when trying to perform an asynchronous read from a non-regular file (say, a FIFO). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/server/file.c b/server/file.c index 2cc4a9d978c..fd8e3f96033 100644 --- a/server/file.c +++ b/server/file.c @@ -75,7 +75,6 @@ static struct object *file_open_file( struct object *obj, unsigned int access, static struct list *file_get_kernel_obj_list( struct object *obj ); static void file_destroy( struct object *obj ); -static int file_get_poll_events( struct fd *fd ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -104,7 +103,7 @@ static const struct object_ops file_ops = static const struct fd_ops file_fd_ops = { - file_get_poll_events, /* get_poll_events */ + default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ file_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ @@ -287,16 +286,6 @@ struct object_type *file_get_type( struct object *obj ) return get_object_type( &str ); } -static int file_get_poll_events( struct fd *fd ) -{ - struct file *file = get_fd_user( fd ); - int events = 0; - assert( file->obj.ops == &file_ops ); - if (file->access & FILE_UNIX_READ_ACCESS) events |= POLLIN; - if (file->access & FILE_UNIX_WRITE_ACCESS) events |= POLLOUT; - return events; -} - static enum server_fd_type file_get_fd_type( struct fd *fd ) { struct file *file = get_fd_user( fd );

1 0

Alexandre Julliard : gdi32: Merge rectangles horizontally when possible in CreatePolyPolygonRgn.
by Alexandre Julliard 22 Jan '21

22 Jan '21

Module: wine Branch: master Commit: b67f39ccc6ea4b366e4a839f64d72d5200518a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67f39ccc6ea4b366e4a839f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:02:45 2021 +0100 gdi32: Merge rectangles horizontally when possible in CreatePolyPolygonRgn. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50539 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index fba2e125731..b3764b31442 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2613,12 +2613,15 @@ static void scan_convert( WINEREGION *obj, EdgeTable *ET, INT mode, const RECT * { obj->rects[obj->numRects].left = active->bres.minor_axis; obj->rects[obj->numRects].top = y; + obj->rects[obj->numRects].bottom = y + 1; } else if (obj->rects[obj->numRects].left != active->bres.minor_axis) { - obj->rects[obj->numRects].right = active->bres.minor_axis; - obj->rects[obj->numRects].bottom = y + 1; - obj->numRects++; + /* create new rect only if we can't merge with the previous one */ + if (!obj->numRects || obj->rects[obj->numRects-1].top != y || + obj->rects[obj->numRects-1].right < obj->rects[obj->numRects].left) + obj->numRects++; + obj->rects[obj->numRects-1].right = active->bres.minor_axis; } first = !first; }

1 0