February 2021 - Wine-commits

Jacek Caban : winebuild: Use lld-link for static libraries on msvc target.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 8c2ad8e403fbc30355eacda1d315f36e812ec15b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c2ad8e403fbc30355eacda1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 10 17:29:27 2021 +0100 winebuild: Use lld-link for static libraries on msvc target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 45 +++++++++++++++++++++++++++++++++------------ tools/winebuild/utils.c | 11 +++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 4fb6e23700e..104c77db593 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -264,6 +264,7 @@ extern void output_rva( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void spawn( struct strarray array ); extern struct strarray find_tool( const char *name, const char * const *names ); +extern struct strarray find_link_tool(void); extern struct strarray get_as_command(void); extern struct strarray get_ld_command(void); extern const char *get_nm_command(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 827a875e5df..3c2547c5584 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1838,23 +1838,36 @@ static void assemble_files( const char *prefix ) } /* build a library from the current asm files and any additional object files in argv */ -static void build_library( const char *output_name, char **argv, int create ) +static void build_library( const char *output_name, char **argv, const char *importlib ) { - struct strarray args = find_tool( "ar", NULL ); - struct strarray ranlib = find_tool( "ranlib", NULL ); + int create = !importlib || importlib != output_name; + struct strarray args; - strarray_add( &args, create ? "rc" : "r", output_name, NULL ); + if (target_platform != PLATFORM_WINDOWS) + { + args = find_tool( "ar", NULL ); + strarray_add( &args, create ? "rc" : "r", output_name, importlib, NULL ); + } + else + { + args = find_link_tool(); + strarray_add( &args, "/lib", strmake( "-out:%s", output_name ), importlib, NULL ); + } strarray_addall( &args, as_files ); strarray_addv( &args, argv ); if (create) unlink( output_name ); spawn( args ); - strarray_add( &ranlib, output_name, NULL ); - spawn( ranlib ); + if (target_platform != PLATFORM_WINDOWS) + { + struct strarray ranlib = find_tool( "ranlib", NULL ); + strarray_add( &ranlib, output_name, NULL ); + spawn( ranlib ); + } } /* create a Windows-style import library */ -static void build_windows_import_lib( DLLSPEC *spec ) +static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) { struct strarray args; char *def_file; @@ -1887,8 +1900,9 @@ static void build_windows_import_lib( DLLSPEC *spec ) m_flag = NULL; break; } - strarray_add( &args, "-k", strendswith( output_file_name, ".delay.a" ) ? "-y" : "-l", - output_file_name, "-d", def_file, NULL ); + + strarray_add( &args, "-k", strendswith( lib_name, ".delay.a" ) ? "-y" : "-l", + lib_name, "-d", def_file, NULL ); if (m_flag) strarray_add( &args, "-m", m_flag, as_flags, NULL ); spawn( args ); @@ -1960,12 +1974,19 @@ void output_static_lib( DLLSPEC *spec, char **argv ) { if (is_pe()) { - if (spec) build_windows_import_lib( spec ); - if (argv[0] || !spec) build_library( output_file_name, argv, !spec ); + const char *importlib = NULL; + if (spec) + { + importlib = (argv[0] && target_platform == PLATFORM_WINDOWS) + ? get_temp_file_name( output_file_name, ".a" ) + : output_file_name; + build_windows_import_lib( importlib, spec ); + } + if (argv[0] || !spec) build_library( output_file_name, argv, importlib ); } else { if (spec) build_unix_import_lib( spec ); - build_library( output_file_name, argv, 1 ); + build_library( output_file_name, argv, NULL ); } } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 928a2460aa1..411a53c7133 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -387,6 +387,17 @@ struct strarray find_tool( const char *name, const char * const *names ) fatal_error( "cannot find the '%s' tool\n", name ); } +/* find a link tool in the path */ +struct strarray find_link_tool(void) +{ + struct strarray ret = empty_strarray; + const char *file; + if (!(file = find_binary( NULL, "lld-link" ))) + fatal_error( "cannot find the 'lld-link tool\n" ); + strarray_add_one( &ret, file ); + return ret; +} + struct strarray get_as_command(void) { struct strarray args;

1 0

Zebediah Figura : winegstreamer: Store the wg_parser_stream pointers as our sink pads' private data.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: d5a2599140549916eaf25b0b69185a2b89923c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a2599140549916eaf25b0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 16:18:23 2021 -0600 winegstreamer: Store the wg_parser_stream pointers as our sink pads' private data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e1309e97c4c..ba632f3297d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -102,6 +102,8 @@ struct wg_parser_event struct wg_parser_stream { + struct wg_parser *parser; + GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; struct wg_format preferred_format, current_format; @@ -917,10 +919,9 @@ static bool wg_format_compare(const struct wg_format *a, const struct wg_format static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { - struct parser_source *pin = gst_pad_get_element_private(pad); - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser_stream *stream = gst_pad_get_element_private(pad); - GST_LOG("pin %p, type \"%s\".", pin, gst_query_type_get_name(query->type)); + GST_LOG("stream %p, type \"%s\".", stream, gst_query_type_get_name(query->type)); switch (query->type) { @@ -1053,10 +1054,9 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) return ret; } -static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct wg_parser_event *event) +static GstFlowReturn queue_stream_event(struct wg_parser_stream *stream, const struct wg_parser_event *event) { - struct wg_parser *parser = impl_from_strmbase_filter(pin->pin.pin.filter)->wg_parser; - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser *parser = stream->parser; /* Unlike request_buffer_src() [q.v.], we need to watch for GStreamer * flushes here. The difference is that we can be blocked by the streaming @@ -1082,12 +1082,10 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { - struct parser_source *pin = gst_pad_get_element_private(pad); - 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; + struct wg_parser_stream *stream = gst_pad_get_element_private(pad); + struct wg_parser *parser = stream->parser; - GST_LOG("pin %p, type \"%s\".", pin, GST_EVENT_TYPE_NAME(event)); + GST_LOG("stream %p, type \"%s\".", stream, GST_EVENT_TYPE_NAME(event)); switch (event->type) { @@ -1109,7 +1107,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) 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); + queue_stream_event(stream, &stream_event); } break; @@ -1119,7 +1117,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) struct wg_parser_event stream_event; stream_event.type = WG_PARSER_EVENT_EOS; - queue_stream_event(pin, &stream_event); + queue_stream_event(stream, &stream_event); } else { @@ -1237,12 +1235,11 @@ static void *push_data(void *arg) static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buffer) { - struct parser_source *pin = gst_pad_get_element_private(pad); - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser_stream *stream = gst_pad_get_element_private(pad); struct wg_parser_event stream_event; GstFlowReturn ret; - GST_LOG("pin %p, buffer %p.", pin, buffer); + GST_LOG("stream %p, buffer %p.", stream, buffer); if (!stream->enabled) { @@ -1253,7 +1250,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu stream_event.type = WG_PARSER_EVENT_BUFFER; stream_event.u.buffer = buffer; /* Transfer our reference to the buffer to the thread. */ - if ((ret = queue_stream_event(pin, &stream_event)) != GST_FLOW_OK) + if ((ret = queue_stream_event(stream, &stream_event)) != GST_FLOW_OK) gst_buffer_unref(buffer); return ret; } @@ -2842,6 +2839,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name } pin->wg_stream = stream; + stream->parser = parser; strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, @@ -2855,7 +2853,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name sprintf(pad_name, "qz_sink_%u", filter->source_count); stream->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); - gst_pad_set_element_private(stream->my_sink, pin); + gst_pad_set_element_private(stream->my_sink, stream); gst_pad_set_chain_function(stream->my_sink, got_data_sink); gst_pad_set_event_function(stream->my_sink, event_sink); gst_pad_set_query_function(stream->my_sink, query_sink);

1 0

Zebediah Figura : winegstreamer: Separate parser_source and wg_parser_stream allocation.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: fd7c07ea3475b1f41bc4a78a665c6e8ecf035d7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7c07ea3475b1f41bc4a78a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 16:18:24 2021 -0600 winegstreamer: Separate parser_source and wg_parser_stream allocation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 89 ++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ba632f3297d..2767b027f92 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -168,7 +168,9 @@ static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl GST_Seeking_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; -static struct parser_source *create_pin(struct parser *filter, const WCHAR *name); +static struct wg_parser_stream *create_stream(struct wg_parser *parser); +static struct parser_source *create_pin(struct parser *filter, + struct wg_parser_stream *stream, const WCHAR *name); static HRESULT GST_RemoveOutputPins(struct parser *This); static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); @@ -1578,6 +1580,8 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) g_free(name); } +static void free_stream(struct wg_parser_stream *stream); + static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *This) { static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; @@ -1604,12 +1608,14 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *Th arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (!(pin = create_pin(This, nameW))) + if (!(stream = create_stream(parser))) + goto out; + + if (!(pin = create_pin(This, stream, nameW))) { - ERR("Failed to allocate memory.\n"); + free_stream(stream); goto out; } - stream = pin->wg_stream; if (!strcmp(typename, "video/x-raw")) { @@ -2813,53 +2819,56 @@ static const struct strmbase_source_ops source_ops = .source_disconnect = source_disconnect, }; -static struct parser_source *create_pin(struct parser *filter, const WCHAR *name) +static struct wg_parser_stream *create_stream(struct wg_parser *parser) { - struct wg_parser *parser = filter->wg_parser; - struct wg_parser_stream *stream; - struct parser_source *pin; + struct wg_parser_stream *stream, **new_array; char pad_name[19]; - void *new_array; - - if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*filter->sources)))) - return NULL; - filter->sources = new_array; if (!(new_array = realloc(parser->streams, (parser->stream_count + 1) * sizeof(*parser->streams)))) return NULL; parser->streams = new_array; - if (!(pin = heap_alloc_zero(sizeof(*pin)))) - return NULL; - if (!(stream = calloc(1, sizeof(*stream)))) - { - heap_free(pin); return NULL; - } - pin->wg_stream = stream; stream->parser = parser; - strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); - pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; - strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, - GST_ChangeCurrent, GST_ChangeRate); pthread_cond_init(&stream->event_cond, NULL); pthread_cond_init(&stream->event_empty_cond, NULL); - BaseFilterImpl_IncrementPinVersion(&filter->filter); - - InitializeCriticalSection(&pin->flushing_cs); - pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); - sprintf(pad_name, "qz_sink_%u", filter->source_count); + sprintf(pad_name, "qz_sink_%u", parser->stream_count); stream->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(stream->my_sink, stream); gst_pad_set_chain_function(stream->my_sink, got_data_sink); gst_pad_set_event_function(stream->my_sink, event_sink); gst_pad_set_query_function(stream->my_sink, query_sink); - filter->sources[filter->source_count++] = pin; parser->streams[parser->stream_count++] = stream; + return stream; +} + +static struct parser_source *create_pin(struct parser *filter, + struct wg_parser_stream *stream, const WCHAR *name) +{ + struct parser_source *pin, **new_array; + + if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*filter->sources)))) + return NULL; + filter->sources = new_array; + + if (!(pin = heap_alloc_zero(sizeof(*pin)))) + return NULL; + + pin->wg_stream = stream; + strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); + pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; + strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, + GST_ChangeCurrent, GST_ChangeRate); + BaseFilterImpl_IncrementPinVersion(&filter->filter); + + InitializeCriticalSection(&pin->flushing_cs); + pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); + + filter->sources[filter->source_count++] = pin; return pin; } @@ -2984,9 +2993,15 @@ static BOOL wave_parser_init_gst(struct parser *filter) return FALSE; } - if (!(pin = create_pin(filter, source_name))) + if (!(stream = create_stream(parser))) + return FALSE; + + if (!(pin = create_pin(filter, stream, source_name))) + { + free_stream(stream); return FALSE; - stream = pin->wg_stream; + } + stream->their_src = gst_element_get_static_pad(element, "src"); gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) @@ -3228,9 +3243,15 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) return FALSE; } - if (!(pin = create_pin(filter, source_name))) + if (!(stream = create_stream(parser))) return FALSE; - stream = pin->wg_stream; + + if (!(pin = create_pin(filter, stream, source_name))) + { + free_stream(stream); + return FALSE; + } + gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) {

1 0

Zebediah Figura : winegstreamer: Defer source pin creation until after all pads are exposed.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: c46505c0abd1a4317982d5ce4c62a41fbc05b923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46505c0abd1a4317982d5ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 16:18:25 2021 -0600 winegstreamer: Defer source pin creation until after all pads are exposed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2767b027f92..9ecd1e0b7fb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1584,21 +1584,16 @@ static void free_stream(struct wg_parser_stream *stream); static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *This) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; struct wg_parser *parser = This->wg_parser; struct wg_parser_stream *stream; const char *typename; char *name; GstCaps *caps; GstStructure *arg; - struct parser_source *pin; int ret; - WCHAR nameW[128]; TRACE("%p %p %p\n", This, bin, pad); - sprintfW(nameW, formatW, This->source_count); - name = gst_pad_get_name(pad); TRACE("Name: %s\n", name); g_free(name); @@ -1611,12 +1606,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *Th if (!(stream = create_stream(parser))) goto out; - if (!(pin = create_pin(This, stream, nameW))) - { - free_stream(stream); - goto out; - } - if (!strcmp(typename, "video/x-raw")) { GstElement *deinterlace, *vconv, *flip, *vconv2; @@ -2203,8 +2192,11 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_init_gst(struct parser *filter) { + static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; GstElement *element = gst_element_factory_make("decodebin", NULL); struct wg_parser *parser = filter->wg_parser; + WCHAR source_name[20]; + unsigned int i; int ret; if (!element) @@ -2250,6 +2242,14 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } pthread_mutex_unlock(&parser->mutex); + + for (i = 0; i < parser->stream_count; ++i) + { + sprintfW(source_name, formatW, i); + if (!create_pin(filter, parser->streams[i], source_name)) + return FALSE; + } + return TRUE; } @@ -2909,7 +2909,10 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) CloseHandle(This->read_thread); for (i = 0; i < This->source_count; ++i) - free_source_pin(This->sources[i]); + { + if (This->sources[i]) + free_source_pin(This->sources[i]); + } This->source_count = 0; heap_free(This->sources); @@ -3094,8 +3097,11 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_init_gst(struct parser *filter) { + static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; GstElement *element = gst_element_factory_make("avidemux", NULL); struct wg_parser *parser = filter->wg_parser; + WCHAR source_name[20]; + unsigned int i; int ret; if (!element) @@ -3140,6 +3146,14 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } pthread_mutex_unlock(&parser->mutex); + + for (i = 0; i < parser->stream_count; ++i) + { + sprintfW(source_name, formatW, i); + if (!create_pin(filter, parser->streams[i], source_name)) + return FALSE; + } + return TRUE; }

1 0

Zebediah Figura : winegstreamer: Pass a wg_parser pointer to signal callbacks.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: wine Branch: master Commit: 68f0cc4a7b23f4d3f0fc91bcddf9b139519c6c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68f0cc4a7b23f4d3f0fc91bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 16:18:26 2021 -0600 winegstreamer: Pass a wg_parser pointer to signal callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9ecd1e0b7fb..12e06ed9fd5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1552,12 +1552,11 @@ static DWORD CALLBACK read_thread(void *arg) static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) { - struct parser *filter = user; - struct wg_parser *parser = filter->wg_parser; + struct wg_parser *parser = user; unsigned int i; char *name; - GST_LOG("filter %p, bin %p, pad %p.", filter, bin, pad); + GST_LOG("parser %p, bin %p, pad %p.", parser, bin, pad); for (i = 0; i < parser->stream_count; ++i) { @@ -1582,9 +1581,8 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) static void free_stream(struct wg_parser_stream *stream); -static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *This) +static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct wg_parser *parser) { - struct wg_parser *parser = This->wg_parser; struct wg_parser_stream *stream; const char *typename; char *name; @@ -1592,7 +1590,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *Th GstStructure *arg; int ret; - TRACE("%p %p %p\n", This, bin, pad); + TRACE("parser %p, bin %p, pad %p.\n", parser, bin, pad); name = gst_pad_get_name(pad); TRACE("Name: %s\n", name); @@ -1723,7 +1721,7 @@ out: static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) { - struct parser *This = user; + struct wg_parser *This = user; TRACE("%p %p %p\n", This, bin, pad); @@ -1816,10 +1814,9 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g static void no_more_pads(GstElement *decodebin, gpointer user) { - struct parser *filter = user; - struct wg_parser *parser = filter->wg_parser; + struct wg_parser *parser = user; - GST_DEBUG("filter %p.", filter); + GST_DEBUG("parser %p.", parser); pthread_mutex_lock(&parser->mutex); parser->no_more_pads = true; @@ -2208,10 +2205,10 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) gst_bin_add(GST_BIN(parser->container), element); - g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); - g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), filter); - g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); + g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), parser); + g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), parser); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), parser); + g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), parser); parser->their_sink = gst_element_get_static_pad(element, "sink"); @@ -3113,9 +3110,9 @@ static BOOL avi_splitter_init_gst(struct parser *filter) gst_bin_add(GST_BIN(parser->container), element); - g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); - g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); + g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), parser); + g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), parser); + g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), parser); parser->their_sink = gst_element_get_static_pad(element, "sink");

1 0

Francois Gouget : testbot/web: Speed up the main index page.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: tools Branch: master Commit: 45339484508126df9c1d5c9e546d5dbc0a7ddda8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=45339484508126df9c1d5c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 11 13:57:21 2021 +0100 testbot/web: Speed up the main index page. In order to present the per-job failures tally, the main index needs to go through the tasks of every job except for the pretty rare queued jobs. But doing so one job at a time results in many SQL queries which is inefficient. So do it all at once and store the results in a hash for later use in GenerateDataCell(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 2486229..c88adfc 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -124,30 +124,17 @@ sub GenerateDataCell($$$$) my $HTMLStatus = $HTMLChunks{$Status} || $Status; if ($Status eq "completed" || $Status eq "boterror" || $Status eq "canceled") { - my $Failures = 0; - my $HasTestResult; - foreach my $Step (@{$Item->Steps->GetItems()}) - { - foreach my $Task (@{$Step->Tasks->GetItems()}) - { - my $TaskFailures = $Task->TestFailures; - if (defined $TaskFailures) - { - $HasTestResult = 1; - $Failures += $TaskFailures; - } - } - } - if (!$HasTestResult) + my $JobInfo = $self->{JobsInfo}->{$Item->Id}; + if (!exists $JobInfo->{TestFailures}) { print $HTMLStatus; } else { - $HTMLStatus = $Item->Status eq "completed" ? "" : "$HTMLStatus - "; - my $class = $Failures ? "testfail" : "success"; - my $s = $Failures == 1 ? "" : "s"; - print "$HTMLStatus<span class='$class'>$Failures test failure$s</span>"; + $HTMLStatus = $Status eq "completed" ? "" : "$HTMLStatus - "; + my $class = $JobInfo->{TestFailures} ? "testfail" : "success"; + my $s = $JobInfo->{TestFailures} == 1 ? "" : "s"; + print "$HTMLStatus<span class='$class'>$JobInfo->{TestFailures} test failure$s</span>"; } } else @@ -233,6 +220,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; +use WineTestBot::Tasks; use WineTestBot::VMs; @@ -318,6 +306,18 @@ sub GenerateBody($) print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs(); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); + + # We need to collect information about the tasks of all jobs except the + # pretty rare queued jobs. But doing so one job at a time is inefficient so + # do it all at once now and store the results in ...->{JobsInfo}. + my $Tasks = CreateTasks(); + foreach my $Task (@{$Tasks->GetItems()}) + { + my $JobInfo = ($JobsCollectionBlock->{JobsInfo}->{$Task->JobId} ||= {}); + my $TestFailures = $Task->TestFailures; + $JobInfo->{TestFailures} += $TestFailures if (defined $TestFailures); + } + $JobsCollectionBlock->GenerateList(); print "<h2><a name='vms'></a>VMs</h2>\n";

1 0

Francois Gouget : testbot/reporttest: Add tests for child processes.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: tools Branch: master Commit: cd1765fd1cd78f1abe85d1341dea51d3e727e084 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cd1765fd1cd78f1abe85d13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 11 13:58:36 2021 +0100 testbot/reporttest: Add tests for child processes. Test the failure propagation and crash handling. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 28 ++++++++++++++++++++++++++-- testbot/src/reporttest/report.testwtbs | 8 +++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 8ff6e14..da4ce50 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -320,7 +320,22 @@ advpack:install start dlls/advpack/tests/install.c - advpack:install:07b0 done (-1073741819) in 0s stub amstream:amstream -stub apphelp:apphelp + +apphelp:apphelp start dlls/apphelp/tests/apphelp.c - +----- WTBS Failure propagation from child processes +----- A test unit with a subprocess and failed, todo and skipped tests in the +----- child process. +----- Expected assessement: 1 todo, 1 skip, 3 failures +----- (2 failures + the non-zero child process exit code) +apphelp.c:40: Test failed: A failure in the child process +apphelp.c:41: Test succeeded inside todo block: Success in the child process +apphelp.c:42: Test marked todo: Fixme in the child process +apphelp.c:43: Tests skipped: Skipped in the child process +4321:apphelp: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. +timer:44: 2 failures in child process +0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. +apphelp:apphelp:0c9c done (3) in 0s + stub atl:atl_ax stub atl:module @@ -522,7 +537,16 @@ comctl32:tab start dlls/comctl32/tests/tab.c - Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). comctl32:tab:07b0 done (-1073741819) in 0s -stub comctl32:taskdialog +comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - +----- WTBS Crash in a child process +----- A test unit with a proper subprocess crash reported by the framework +----- Ignore the wine/test.h vs. winedbg difference here. What matters is the +----- "in child process" line. See also comctl32:rebar. +----- Expected assessement: 1 failure +1234:taskdialog: unhandled exception c0000005 at 0040167C +taskdialog:33: unhandled exception c0000005 in child process 1234 +07b0:taskdialog: 3 tests executed (0 marked as todo, 1 failures), 0 skipped. +comctl32:taskdialog:07b0 done (1) in 0s comctl32:toolbar start dlls/comctl32/tests/toolbar.c - ----- A test unit crash with no unhandled exception line diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index b444b69..64057bc 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 41 +p tests.TestFailures 45 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -32,6 +32,10 @@ g 0 tests.report.advpack n 0 files.c:20: Test failed: A failure in the main process n 0 07b0:install: unhandled exception c0000005 at 0040167C +g 0 tests.report.apphelp +n 0 apphelp.c:40: Test failed: A failure in the child process +n 0 apphelp.c:41: Test succeeded inside todo block: Success in the child process + g 0 tests.report.comctl32 n 0 animate: Timeout n 0 comboex.c:40: Test failed: A failure in the main process @@ -42,6 +46,8 @@ n 0 1234:subclass: unhandled exception c0000005 at 0040167C n 0 Do not cut syslink.c:40: Test failed: Something wrong n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). +n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C +n 0 taskdialog:471: unhandled exception c0000005 in child process 1234 n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right!

1 0

Francois Gouget : testbot/LogUtils: Improve handling of child process crashes.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: tools Branch: master Commit: 551a16bd22932087c13106e884f6e5a2f7eec6d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=551a16bd22932087c13106e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 11 13:58:59 2021 +0100 testbot/LogUtils: Improve handling of child process crashes. The "unhandled exception in child process" line also tells us the pid of the child process so we can add it to the list of pids for the current test unit. ParseWineTestReport() should also count at least one failure for the child process (in case the regular "unhandled exception" line got lost). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9164b47..7a72958 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -639,10 +639,17 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or - $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) + $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or + $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) { - _CheckUnit($LogInfo, $Cur, $1, "child exception"); + my ($Unit, $Pid) = ($1, $2); + if ($Cur->{Units}->{$Unit}) + { + # This also replaces a test summary line. + $Cur->{Pids}->{$Pid || 0} = 1; + $Cur->{SummaryFailures}++; + } + _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and

1 0

Francois Gouget : winetest/dissect: Handle child process crashes.
by Alexandre Julliard 11 Feb '21

11 Feb '21

Module: tools Branch: master Commit: 19fc5428430d5c207858af002fe8824ffdcb91e5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=19fc5428430d5c207858af0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 11 13:59:13 2021 +0100 winetest/dissect: Handle child process crashes. Make sure they are included in the failure count. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48651 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index c20dab6..c1590ba 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -693,6 +693,21 @@ while ($line = <IN>) { $failures++; add_test_line("failed", escapeHTML($line)); } + elsif (($unit ne "" and + $line =~ /($units_re):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or + $line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + { + my ($l_unit, $l_pid) = ($1, $2); + if ($units{$l_unit}) + { + # This also replaces a test summary line. + $pids{$l_pid || 0} = 1; + $s_failures++; + } + add_test_line("failed", escapeHTML($line)); + check_unit($l_unit, "child exception"); + $failures++; + } elsif (($unit ne "" and $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or $line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)

1 0

Jeremy Newman : fix typo
by Jeremy Newman 10 Feb '21

10 Feb '21

Module: website Branch: master Commit: dad6d3a71ff64576223d0ab3fcd9cea989d9281a URL: https://source.winehq.org/git/website.git/?a=commit;h=dad6d3a71ff64576223d0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Feb 10 15:40:11 2021 -0600 fix typo --- templates/en/global/xml/trans/lang.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/en/global/xml/trans/lang.xml b/templates/en/global/xml/trans/lang.xml index 40ac471e..47712fb4 100644 --- a/templates/en/global/xml/trans/lang.xml +++ b/templates/en/global/xml/trans/lang.xml @@ -31,7 +31,7 @@ <str name="fr">Changez la langue</str> <str name="ko">언어 변경</str> <str name="he">החלפת השפה</str> - <srr name="nl">Taal veranderen</srr> + <str name="nl">Taal veranderen</str> <str name="pl">Zmień język</str> <str name="pt">Mudar a língua</str> <str name="tr">Lisan Değiştir</str>

1 0