April 2022 - Wine-commits - list.winehq.org

Zebediah Figura : winegstreamer: Protect access to the "enabled" field.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 5861379d6df87562753322e251261868943e91ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=5861379d6df87562753322e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:55 2022 -0500 winegstreamer: Protect access to the "enabled" field. It is accessed from multiple threads. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index df563e9336e..a2ce92ccdc7 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -205,10 +205,15 @@ static NTSTATUS wg_parser_stream_enable(void *args) const struct wg_parser_stream_enable_params *params = args; struct wg_parser_stream *stream = params->stream; const struct wg_format *format = params->format; + struct wg_parser *parser = stream->parser; + + pthread_mutex_lock(&parser->mutex); stream->current_format = *format; stream->enabled = true; + pthread_mutex_unlock(&parser->mutex); + if (format->major_type == WG_MAJOR_TYPE_VIDEO) { bool flip = (format->u.video.height < 0); @@ -245,8 +250,11 @@ static NTSTATUS wg_parser_stream_enable(void *args) static NTSTATUS wg_parser_stream_disable(void *args) { struct wg_parser_stream *stream = args; + struct wg_parser *parser = stream->parser; + pthread_mutex_lock(&parser->mutex); stream->enabled = false; + pthread_mutex_unlock(&parser->mutex); return S_OK; } @@ -437,6 +445,7 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) switch (event->type) { case GST_EVENT_SEGMENT: + pthread_mutex_lock(&parser->mutex); if (stream->enabled) { const GstSegment *segment; @@ -445,29 +454,31 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) if (segment->format != GST_FORMAT_TIME) { + pthread_mutex_unlock(&parser->mutex); GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); break; } gst_segment_copy_into(segment, &stream->segment); } + pthread_mutex_unlock(&parser->mutex); break; case GST_EVENT_EOS: pthread_mutex_lock(&parser->mutex); stream->eos = true; - pthread_mutex_unlock(&parser->mutex); if (stream->enabled) pthread_cond_signal(&stream->event_cond); else pthread_cond_signal(&parser->init_cond); + pthread_mutex_unlock(&parser->mutex); break; case GST_EVENT_FLUSH_START: + pthread_mutex_lock(&parser->mutex); + if (stream->enabled) { - pthread_mutex_lock(&parser->mutex); - stream->flushing = true; pthread_cond_signal(&stream->event_empty_cond); @@ -477,9 +488,9 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) gst_buffer_unref(stream->buffer); stream->buffer = NULL; } - - pthread_mutex_unlock(&parser->mutex); } + + pthread_mutex_unlock(&parser->mutex); break; case GST_EVENT_FLUSH_STOP: @@ -528,8 +539,11 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu GST_LOG("stream %p, buffer %p.", stream, buffer); + pthread_mutex_lock(&parser->mutex); + if (!stream->enabled) { + pthread_mutex_unlock(&parser->mutex); gst_buffer_unref(buffer); return GST_FLOW_OK; } @@ -537,8 +551,6 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu /* Allow this buffer to be flushed by GStreamer. We are effectively * implementing a queue object here. */ - pthread_mutex_lock(&parser->mutex); - while (!stream->flushing && stream->buffer) pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); if (stream->flushing) @@ -573,6 +585,7 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) { struct wg_parser_stream *stream = gst_pad_get_element_private(pad); + struct wg_parser *parser = stream->parser; GST_LOG("stream %p, type \"%s\".", stream, gst_query_type_get_name(query->type)); @@ -585,10 +598,15 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); + pthread_mutex_lock(&parser->mutex); + if (stream->enabled) caps = wg_format_to_caps(&stream->current_format); else caps = gst_caps_new_any(); + + pthread_mutex_unlock(&parser->mutex); + if (!caps) return FALSE; @@ -614,8 +632,11 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gboolean ret = TRUE; GstCaps *caps; + pthread_mutex_lock(&parser->mutex); + if (!stream->enabled) { + pthread_mutex_unlock(&parser->mutex); gst_query_set_accept_caps_result(query, TRUE); return TRUE; } @@ -623,6 +644,9 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_accept_caps(query, &caps); wg_format_from_caps(&format, caps); ret = wg_format_compare(&format, &stream->current_format); + + pthread_mutex_unlock(&parser->mutex); + if (!ret && gst_debug_category_get_threshold(GST_CAT_DEFAULT) >= GST_LEVEL_WARNING) { gchar *str = gst_caps_to_string(caps);

1 0

Zebediah Figura : winegstreamer: Unblock waits in sink_chain_cb() when disabling a stream.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: bcd39c5061768d6d9a822cb8f8effa715ca62972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd39c5061768d6d9a822cb8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:56 2022 -0500 winegstreamer: Unblock waits in sink_chain_cb() when disabling a stream. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a2ce92ccdc7..e7a60ec158a 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -255,6 +255,7 @@ static NTSTATUS wg_parser_stream_disable(void *args) pthread_mutex_lock(&parser->mutex); stream->enabled = false; pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&stream->event_empty_cond); return S_OK; } @@ -541,6 +542,12 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu pthread_mutex_lock(&parser->mutex); + /* Allow this buffer to be flushed by GStreamer. We are effectively + * implementing a queue object here. */ + + while (stream->enabled && !stream->flushing && stream->buffer) + pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); + if (!stream->enabled) { pthread_mutex_unlock(&parser->mutex); @@ -548,11 +555,6 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - /* Allow this buffer to be flushed by GStreamer. We are effectively - * implementing a queue object here. */ - - while (!stream->flushing && stream->buffer) - pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); if (stream->flushing) { pthread_mutex_unlock(&parser->mutex);

1 0

Zebediah Figura : winegstreamer: Add traces to Unix call wrappers.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 3827f0487db5ad12f1beb7aabb4e6bbc278a8145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3827f0487db5ad12f1beb7aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:57 2022 -0500 winegstreamer: Add traces to Unix call wrappers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 8a41df6b223..d88a462d81e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -70,13 +70,20 @@ struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buff .unlimited_buffering = unlimited_buffering, }; + TRACE("type %#x, unlimited_buffering %d.\n", type, unlimited_buffering); + if (__wine_unix_call(unix_handle, unix_wg_parser_create, &params)) return NULL; + + TRACE("Returning parser %p.\n", params.parser); + return params.parser; } void wg_parser_destroy(struct wg_parser *parser) { + TRACE("parser %p.\n", parser); + __wine_unix_call(unix_handle, unix_wg_parser_destroy, parser); } @@ -88,11 +95,15 @@ HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) .file_size = file_size, }; + TRACE("parser %p, file_size %I64u.\n", parser, file_size); + return __wine_unix_call(unix_handle, unix_wg_parser_connect, &params); } void wg_parser_disconnect(struct wg_parser *parser) { + TRACE("parser %p.\n", parser); + __wine_unix_call(unix_handle, unix_wg_parser_disconnect, parser); } @@ -103,6 +114,8 @@ bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, .parser = parser, }; + TRACE("parser %p, offset %p, size %p.\n", parser, offset, size); + if (__wine_unix_call(unix_handle, unix_wg_parser_get_next_read_offset, &params)) return false; *offset = params.offset; @@ -119,6 +132,8 @@ void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t si .size = size, }; + TRACE("parser %p, data %p, size %u.\n", parser, data, size); + __wine_unix_call(unix_handle, unix_wg_parser_push_data, &params); } @@ -129,6 +144,8 @@ uint32_t wg_parser_get_stream_count(struct wg_parser *parser) .parser = parser, }; + TRACE("parser %p.\n", parser); + __wine_unix_call(unix_handle, unix_wg_parser_get_stream_count, &params); return params.count; } @@ -141,7 +158,11 @@ struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t .index = index, }; + TRACE("parser %p, index %u.\n", parser, index); + __wine_unix_call(unix_handle, unix_wg_parser_get_stream, &params); + + TRACE("Returning stream %p.\n", params.stream); return params.stream; } @@ -153,6 +174,8 @@ void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, stru .format = format, }; + TRACE("stream %p, format %p.\n", stream, format); + __wine_unix_call(unix_handle, unix_wg_parser_stream_get_preferred_format, &params); } @@ -164,11 +187,15 @@ void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_fo .format = format, }; + TRACE("stream %p, format %p.\n", stream, format); + __wine_unix_call(unix_handle, unix_wg_parser_stream_enable, &params); } void wg_parser_stream_disable(struct wg_parser_stream *stream) { + TRACE("stream %p.\n", stream); + __wine_unix_call(unix_handle, unix_wg_parser_stream_disable, stream); } @@ -180,6 +207,8 @@ bool wg_parser_stream_get_buffer(struct wg_parser_stream *stream, struct wg_pars .buffer = buffer, }; + TRACE("stream %p, buffer %p.\n", stream, buffer); + return !__wine_unix_call(unix_handle, unix_wg_parser_stream_get_buffer, &params); } @@ -194,11 +223,15 @@ bool wg_parser_stream_copy_buffer(struct wg_parser_stream *stream, .size = size, }; + TRACE("stream %p, data %p, offset %u, size %u.\n", stream, data, offset, size); + return !__wine_unix_call(unix_handle, unix_wg_parser_stream_copy_buffer, &params); } void wg_parser_stream_release_buffer(struct wg_parser_stream *stream) { + TRACE("stream %p.\n", stream); + __wine_unix_call(unix_handle, unix_wg_parser_stream_release_buffer, stream); } @@ -214,6 +247,9 @@ void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, .timestamp = timestamp, }; + TRACE("stream %p, underflow %d, proportion %.16e, diff %I64d, timestamp %I64u.\n", + stream, underflow, proportion, diff, timestamp); + __wine_unix_call(unix_handle, unix_wg_parser_stream_notify_qos, &params); } @@ -224,7 +260,11 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) .stream = stream, }; + TRACE("stream %p.\n", stream); + __wine_unix_call(unix_handle, unix_wg_parser_stream_get_duration, &params); + + TRACE("Returning duration %I64u.\n", params.duration); return params.duration; } @@ -241,6 +281,9 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, .stop_flags = stop_flags, }; + TRACE("stream %p, rate %.16e, start_pos %I64u, stop_pos %I64u, start_flags %#lx, stop_flags %#lx.\n", + stream, rate, start_pos, stop_pos, start_flags, stop_flags); + __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params); } @@ -253,13 +296,19 @@ struct wg_transform *wg_transform_create(const struct wg_format *input_format, .output_format = output_format, }; + TRACE("input_format %p, output_format %p.\n", input_format, output_format); + if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params)) return NULL; + + TRACE("Returning transform %p.\n", params.transform); return params.transform; } void wg_transform_destroy(struct wg_transform *transform) { + TRACE("transform %p.\n", transform); + __wine_unix_call(unix_handle, unix_wg_transform_destroy, transform); } @@ -272,6 +321,8 @@ HRESULT wg_transform_push_data(struct wg_transform *transform, struct wg_sample }; NTSTATUS status; + TRACE("transform %p, sample %p.\n", transform, sample); + if ((status = __wine_unix_call(unix_handle, unix_wg_transform_push_data, &params))) return HRESULT_FROM_NT(status); @@ -287,6 +338,8 @@ HRESULT wg_transform_read_data(struct wg_transform *transform, struct wg_sample }; NTSTATUS status; + TRACE("transform %p, sample %p.\n", transform, sample); + if ((status = __wine_unix_call(unix_handle, unix_wg_transform_read_data, &params))) return HRESULT_FROM_NT(status);

1 0

Henri Verbeet : wined3d: Spawn a separate thread to adjust the window state of windows belonging to other threads.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 1765c4594f6a11fe0df1aed7261cfafdb7514c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1765c4594f6a11fe0df1aed7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:02:59 2022 +0200 wined3d: Spawn a separate thread to adjust the window state of windows belonging to other threads. Sending messages to windows on other threads can deadlock if those threads aren't processing messages. The deeper issue is that we shouldn't be touching the window styles in the first place, but avoiding that may not be feasible without specific support from winex11/winemac. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 138 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 103 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 608a303c0f6..eef7d46ba39 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2178,12 +2178,43 @@ static LONG fullscreen_exstyle(LONG exstyle) return exstyle; } +struct wined3d_window_state +{ + HWND window; + HWND window_pos_after; + LONG style, exstyle; + int x, y, width, height; + uint32_t flags; + bool set_style; +}; + +static DWORD WINAPI wined3d_set_window_state(void *ctx) +{ + struct wined3d_window_state *s = ctx; + bool filter; + + filter = wined3d_filter_messages(s->window, TRUE); + + if (s->set_style) + { + SetWindowLongW(s->window, GWL_STYLE, s->style); + SetWindowLongW(s->window, GWL_EXSTYLE, s->exstyle); + } + SetWindowPos(s->window, s->window_pos_after, s->x, s->y, s->width, s->height, s->flags); + + wined3d_filter_messages(s->window, filter); + + heap_free(s); + + return 0; +} + HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) { - unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOACTIVATE; - LONG style, exstyle; - BOOL filter; + struct wined3d_window_state *s; + DWORD window_tid, tid; + HANDLE thread; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -2193,33 +2224,50 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state return WINED3DERR_NOTAVAILABLE; } + if (!(s = heap_alloc(sizeof(*s)))) + return E_OUTOFMEMORY; + s->window = window; + s->window_pos_after = HWND_TOPMOST; + s->x = x; + s->y = y; + s->width = width; + s->height = height; + if (state->style || state->exstyle) { ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", window, state->style, state->exstyle); } + s->flags = SWP_FRAMECHANGED | SWP_NOACTIVATE; if (state->desc.flags & WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES) - window_pos_flags |= SWP_NOZORDER; + s->flags |= SWP_NOZORDER; else - window_pos_flags |= SWP_SHOWWINDOW; + s->flags |= SWP_SHOWWINDOW; state->style = GetWindowLongW(window, GWL_STYLE); state->exstyle = GetWindowLongW(window, GWL_EXSTYLE); - style = fullscreen_style(state->style); - exstyle = fullscreen_exstyle(state->exstyle); + s->style = fullscreen_style(state->style); + s->exstyle = fullscreen_exstyle(state->exstyle); + s->set_style = true; TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", - state->style, state->exstyle, style, exstyle); - - filter = wined3d_filter_messages(window, TRUE); - - SetWindowLongW(window, GWL_STYLE, style); - SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, x, y, width, height, window_pos_flags); - - wined3d_filter_messages(window, filter); + state->style, state->exstyle, s->style, s->exstyle); + + window_tid = GetWindowThreadProcessId(window, NULL); + tid = GetCurrentThreadId(); + + TRACE("Window %p belongs to thread %#x.\n", window, window_tid); + /* If the window belongs to a different thread, modifying the style and/or + * position can potentially deadlock if that thread isn't processing + * messages. */ + if (window_tid == tid) + wined3d_set_window_state(s); + else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) + ERR("Failed to create thread.\n"); + else + CloseHandle(thread); return WINED3D_OK; } @@ -2227,21 +2275,27 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) { - unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; - HWND window_pos_after = NULL; + struct wined3d_window_state *s; + DWORD window_tid, tid; LONG style, exstyle; - RECT rect = {0}; - BOOL filter; + HANDLE thread; if (!state->style && !state->exstyle) return; + if (!(s = heap_alloc(sizeof(*s)))) + return; + + s->window = window; + s->window_pos_after = NULL; + s->flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; + if ((state->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) && !(state->desc.flags & WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES)) { - window_pos_after = (state->exstyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_NOTOPMOST; - window_pos_flags |= (state->style & WS_VISIBLE) ? SWP_SHOWWINDOW : SWP_HIDEWINDOW; - window_pos_flags &= ~SWP_NOZORDER; + s->window_pos_after = (state->exstyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_NOTOPMOST; + s->flags |= (state->style & WS_VISIBLE) ? SWP_SHOWWINDOW : SWP_HIDEWINDOW; + s->flags &= ~SWP_NOZORDER; } style = GetWindowLongW(window, GWL_STYLE); @@ -2259,26 +2313,40 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st TRACE("Restoring window style of window %p to %08x, %08x.\n", window, state->style, state->exstyle); - filter = wined3d_filter_messages(window, TRUE); - + s->style = state->style; + s->exstyle = state->exstyle; /* Only restore the style if the application didn't modify it during the * fullscreen phase. Some applications change it before calling Reset() * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ - if (style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle)) - { - SetWindowLongW(window, GWL_STYLE, state->style); - SetWindowLongW(window, GWL_EXSTYLE, state->exstyle); - } + s->set_style = style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle); if (window_rect) - rect = *window_rect; + { + s->x = window_rect->left; + s->y = window_rect->top; + s->width = window_rect->right - window_rect->left; + s->height = window_rect->bottom - window_rect->top; + } else - window_pos_flags |= (SWP_NOMOVE | SWP_NOSIZE); - SetWindowPos(window, window_pos_after, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); + { + s->x = s->y = s->width = s->height = 0; + s->flags |= (SWP_NOMOVE | SWP_NOSIZE); + } - wined3d_filter_messages(window, filter); + window_tid = GetWindowThreadProcessId(window, NULL); + tid = GetCurrentThreadId(); + + TRACE("Window %p belongs to thread %#x.\n", window, window_tid); + /* If the window belongs to a different thread, modifying the style and/or + * position can potentially deadlock if that thread isn't processing + * messages. */ + if (window_tid == tid) + wined3d_set_window_state(s); + else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) + ERR("Failed to create thread.\n"); + else + CloseHandle(thread); /* Delete the old values. */ state->style = 0;

1 0

Piotr Caban : msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 2d2dba53740a3bf6407e19c33e530a84945aceff URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d2dba53740a3bf6407e19c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Apr 3 20:30:41 2022 +0200 msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45916 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 54b2c49db99..2ca6421b0e7 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1220,11 +1220,45 @@ DEFINE_THISCALL_WRAPPER(ThreadScheduler_CreateScheduleGroup, 4) return NULL; } +typedef struct +{ + void (__cdecl *proc)(void*); + void *data; +} schedule_task_arg; + +static void WINAPI schedule_task_proc(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) +{ + schedule_task_arg arg; + + arg = *(schedule_task_arg*)context; + operator_delete(context); + arg.proc(arg.data); +} + DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask_loc, 16) void __thiscall ThreadScheduler_ScheduleTask_loc(ThreadScheduler *this, void (__cdecl *proc)(void*), void* data, /*location*/void *placement) { + schedule_task_arg *arg; + TP_WORK *work; + FIXME("(%p %p %p %p) stub\n", this, proc, data, placement); + + arg = operator_new(sizeof(*arg)); + arg->proc = proc; + arg->data = data; + + work = CreateThreadpoolWork(schedule_task_proc, arg, NULL); + if(!work) { + scheduler_resource_allocation_error e; + + operator_delete(arg); + scheduler_resource_allocation_error_ctor_name(&e, NULL, + HRESULT_FROM_WIN32(GetLastError())); + _CxxThrowException(&e, &scheduler_resource_allocation_error_exception_type); + } + SubmitThreadpoolWork(work); + CloseThreadpoolWork(work); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask, 12) @@ -1232,6 +1266,7 @@ void __thiscall ThreadScheduler_ScheduleTask(ThreadScheduler *this, void (__cdecl *proc)(void*), void* data) { FIXME("(%p %p %p) stub\n", this, proc, data); + ThreadScheduler_ScheduleTask_loc(this, proc, data, NULL); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_IsAvailableLocation, 8)

1 0

Alexandre Julliard : wrc: Avoid loading locale.nls when not necessary.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 701ed2591b4dfc5bac273b6f6c75f8fa69377fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=701ed2591b4dfc5bac273b6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 10:43:09 2022 +0200 wrc: Avoid loading locale.nls when not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 27 +++++++++++++++------------ tools/wrc/utils.c | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 81e7a52c9a9..aeec61a06bd 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -177,29 +177,32 @@ static int parse_accel_string( const string_t *key, int flags ) */ static void put_string(const string_t *str, int isterm, language_t lang) { - int cnt, codepage; + int cnt; if (win32) { - string_t *newstr; - codepage = get_language_codepage( lang ); - newstr = convert_string_unicode( str, codepage ); - if (str->type == str_char && check_valid_utf8( str, codepage )) + if (str->type == str_char) { - print_location( &str->loc ); - warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use, maybe use --utf8?\n", - str->str.cstr, codepage ); + int codepage = get_language_codepage( lang ); + string_t *newstr = convert_string_unicode( str, codepage ); + + if (check_valid_utf8( str, codepage )) + { + print_location( &str->loc ); + warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use, maybe use --utf8?\n", + str->str.cstr, codepage ); + } + str = newstr; } - if (!isterm) put_word(newstr->size); - for(cnt = 0; cnt < newstr->size; cnt++) + if (!isterm) put_word(str->size); + for(cnt = 0; cnt < str->size; cnt++) { - WCHAR c = newstr->str.wstr[cnt]; + WCHAR c = str->str.wstr[cnt]; if (isterm && !c) break; put_word(c); } if (isterm) put_word(0); - free_string(newstr); } else { diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 3aaecdd1f78..bafc763692a 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -385,6 +385,7 @@ int get_language_codepage( language_t lang ) const NLS_LOCALE_LCID_INDEX *entry; if (!lang) return 1252; + if (lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) return 1252; if (!locale_table) load_locale_nls(); if (!(entry = find_lcid_entry( lang ))) return -1; return get_locale_data( entry->idx )->idefaultansicodepage;

1 0

Alexandre Julliard : makedep: Add dependency on locale.nls for rc files.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: ad44edebde62bfb80560b606b7ae3a21b08d333d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad44edebde62bfb80560b606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 10:43:20 2022 +0200 makedep: Add dependency on locale.nls for rc files. wrc will load locale.nls if the rc file uses a non-English language. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index cc988e2aee7..eaf7366da1a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2650,6 +2650,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c } output( "%s.res: %s", obj_dir_path( make, obj ), source->filename ); output_filename( tools_path( make, "wrc" )); + if (make->src_dir) output_filename( "nls/locale.nls" ); output_filenames( source->dependencies ); output( "\n" ); output( "\t%s%s -u -o $@", cmd_prefix( "WRC" ), tools_path( make, "wrc" ) );

1 0

Rémi Bernon : winegstreamer: Use a GstAtomicQueue for wg_transform output queue.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: b5d6c5992092fd0c96deacbe892668aba6759f93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d6c5992092fd0c96deacbe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:29 2022 +0200 winegstreamer: Use a GstAtomicQueue for wg_transform output queue. Some GStreamer video plugins such as vaapi do not expect their buffers to be appended to each other, and it breaks some of their assertions. We will also later need to queue caps change events, and the atomic queue will let us queue GstSample instead to hold the caps too. It also removes the need of a mutex or locking operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 67 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 200dd946e02..0327b92ce8e 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -50,9 +50,8 @@ struct wg_transform GstSegment segment; GstBufferList *input; guint input_max_length; - - pthread_mutex_t mutex; - GstBuffer *output; + GstAtomicQueue *output_queue; + GstBuffer *output_buffer; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -61,12 +60,7 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst GST_LOG("transform %p, buffer %p.", transform, buffer); - pthread_mutex_lock(&transform->mutex); - if (transform->output) - transform->output = gst_buffer_append(transform->output, buffer); - else - transform->output = buffer; - pthread_mutex_unlock(&transform->mutex); + gst_atomic_queue_push(transform->output_queue, buffer); return GST_FLOW_OK; } @@ -74,19 +68,24 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; + GstBuffer *buffer; if (transform->input) gst_buffer_list_unref(transform->input); - if (transform->output) - gst_buffer_unref(transform->output); gst_element_set_state(transform->container, GST_STATE_NULL); + + if (transform->output_buffer) + gst_buffer_unref(transform->output_buffer); + while ((buffer = gst_atomic_queue_pop(transform->output_queue))) + gst_buffer_unref(buffer); + g_object_unref(transform->their_sink); g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); - pthread_mutex_destroy(&transform->mutex); + gst_atomic_queue_unref(transform->output_queue); free(transform); return STATUS_SUCCESS; @@ -182,6 +181,8 @@ NTSTATUS wg_transform_create(void *args) goto out; if (!(transform->input = gst_buffer_list_new())) goto out; + if (!(transform->output_queue = gst_atomic_queue_new(8))) + goto out; transform->input_max_length = 1; if (!(src_caps = wg_format_to_caps(&input_format))) @@ -308,8 +309,6 @@ NTSTATUS wg_transform_create(void *args) gst_caps_unref(sink_caps); gst_caps_unref(src_caps); - pthread_mutex_init(&transform->mutex, NULL); - GST_INFO("Created winegstreamer transform %p.", transform); params->transform = transform; return STATUS_SUCCESS; @@ -327,6 +326,8 @@ out: gst_object_unref(transform->my_src); if (src_caps) gst_caps_unref(src_caps); + if (transform->output_queue) + gst_atomic_queue_unref(transform->output_queue); if (transform->input) gst_buffer_list_unref(transform->input); if (transform->container) @@ -368,10 +369,8 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } -static NTSTATUS read_transform_output_data(struct wg_transform *transform, - struct wg_sample *sample) +static NTSTATUS read_transform_output_data(GstBuffer *buffer, struct wg_sample *sample) { - GstBuffer *buffer = transform->output; GstMapInfo info; if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) @@ -392,12 +391,6 @@ static NTSTATUS read_transform_output_data(struct wg_transform *transform, gst_buffer_unmap(buffer, &info); gst_buffer_resize(buffer, sample->size, -1); - if (info.size <= sample->size) - { - gst_buffer_unref(transform->output); - transform->output = NULL; - } - GST_INFO("Copied %u bytes, sample %p, flags %#x", sample->size, sample, sample->flags); return STATUS_SUCCESS; } @@ -424,20 +417,26 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_UNSUCCESSFUL; } - sample->size = 0; - pthread_mutex_lock(&transform->mutex); - if (transform->output) - { - params->result = S_OK; - status = read_transform_output_data(transform, sample); - } - else + if (!transform->output_buffer && !(transform->output_buffer = gst_atomic_queue_pop(transform->output_queue))) { + sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT; - status = STATUS_SUCCESS; GST_INFO("Cannot read %u bytes, no output available", sample->max_size); + return STATUS_SUCCESS; } - pthread_mutex_unlock(&transform->mutex); - return status; + if ((status = read_transform_output_data(transform->output_buffer, sample))) + { + sample->size = 0; + return status; + } + + if (!(sample->flags & WG_SAMPLE_FLAG_INCOMPLETE)) + { + gst_buffer_unref(transform->output_buffer); + transform->output_buffer = NULL; + } + + params->result = S_OK; + return STATUS_SUCCESS; }

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder Process(Input|Output).
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: ebd2b7d7049e46b37caad7b0235064d1a7ec3104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd2b7d7049e46b37caad7b0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:30 2022 +0200 winegstreamer: Implement H264 decoder Process(Input|Output). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++--- dlls/winegstreamer/h264_decoder.c | 54 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 48eeeeffde2..d6a504a1a68 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6822,7 +6822,6 @@ static void test_h264_decoder(void) status = 0; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == E_INVALIDARG || hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %lu\n", output.dwStreamID); ok(!output.pSample, "got pSample %p\n", output.pSample); @@ -6850,14 +6849,12 @@ static void test_h264_decoder(void) ok(ret == 0, "Release returned %lu\n", ret); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - todo_wine ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); ret = IMFSample_Release(sample); ok(ret <= 1, "Release returned %lu\n", ret); sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - todo_wine ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); ret = IMFSample_Release(sample); ok(ret <= 1, "Release returned %lu\n", ret); @@ -6883,7 +6880,8 @@ static void test_h264_decoder(void) todo_wine ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS, "got status %#lx\n", status); - check_sample(output.pSample, NULL, 0, NULL); + if (status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS) + check_sample(output.pSample, NULL, 0, NULL); ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 4edd4cdf39c..950d9ebf335 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -496,15 +496,61 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("iface %p, id %#lx, sample %p, flags %#lx stub!\n", iface, id, sample, flags); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + struct wg_sample *wg_sample; + MFT_INPUT_STREAM_INFO info; + HRESULT hr; + + TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); + + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) + return hr; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = mf_create_wg_sample(sample, &wg_sample))) + return hr; + + hr = wg_transform_push_data(decoder->wg_transform, wg_sample); + + mf_destroy_wg_sample(wg_sample); + return hr; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { - FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + MFT_OUTPUT_STREAM_INFO info; + struct wg_sample *wg_sample; + HRESULT hr; + + TRACE("iface %p, flags %#lx, count %lu, samples %p, status %p.\n", iface, flags, count, samples, status); + + if (count != 1) + return E_INVALIDARG; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info))) + return hr; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + *status = 0; + samples[0].dwStatus = 0; + if (!samples[0].pSample) return E_INVALIDARG; + + if (FAILED(hr = mf_create_wg_sample(samples[0].pSample, &wg_sample))) + return hr; + + if (wg_sample->max_size < info.cbSize) + hr = MF_E_BUFFERTOOSMALL; + else + hr = wg_transform_read_data(decoder->wg_transform, wg_sample); + + mf_destroy_wg_sample(wg_sample); + return hr; } static const IMFTransformVtbl transform_vtbl =

1 0

Rémi Bernon : winegstreamer: Return S_OK from H264 decoder ProcessMessage.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 55282e0d0988b66809ddb58b9f3b7449f8284fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55282e0d0988b66809ddb58b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:31 2022 +0200 winegstreamer: Return S_OK from H264 decoder ProcessMessage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/winegstreamer/h264_decoder.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d6a504a1a68..31a84e47bc1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6862,7 +6862,6 @@ static void test_h264_decoder(void) i++; hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); - todo_wine ok(hr == S_OK, "ProcessMessage returned %#lx\n", hr); } todo_wine diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 950d9ebf335..8bfa15529db 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -491,7 +491,7 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { FIXME("iface %p, message %#x, param %Ix stub!\n", iface, message, param); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)

1 0