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

Zebediah Figura : winegstreamer: Unblock waits in sink_chain_cb() when disabling a stream.
by Alexandre Julliard April 4, 2022

April 4, 2022

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 April 4, 2022

April 4, 2022

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 April 4, 2022

April 4, 2022

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

Zebediah Figura : winegstreamer: Disconnect source pins before calling wg_parser_disconnect().
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: db41b2ae238da4a8f73060948e94b8bdc64f64bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=db41b2ae238da4a8f7306094… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 4 11:50:54 2022 -0500 winegstreamer: Disconnect source pins before calling wg_parser_disconnect(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index bb7a71283c3..f38a0c16215 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1629,6 +1629,15 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) if (!This->sink_connected) return S_OK; + /* Disconnecting source pins triggers a call to wg_parser_stream_disable(). + * The stream pointers are no longer valid after wg_parser_disconnect(), so + * make sure we disable the streams first. */ + for (i = 0; i < This->source_count; ++i) + { + if (This->sources[i]) + free_source_pin(This->sources[i]); + } + wg_parser_disconnect(This->wg_parser); /* read_thread() needs to stay alive to service any read requests GStreamer @@ -1637,12 +1646,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread); - for (i = 0; i < This->source_count; ++i) - { - if (This->sources[i]) - free_source_pin(This->sources[i]); - } - This->source_count = 0; free(This->sources); This->sources = NULL;

1 0

Nikolay Sivov : dbgeng: Update to IDebugAdvanced3 stub.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 5885f20c4af136d7a4f059d2ba3402c73d1862eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5885f20c4af136d7a4f059d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:40:39 2022 +0300 dbgeng: Update to IDebugAdvanced3 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 126 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 103 insertions(+), 23 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index e0e7c3ff98e..3ec510ef296 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -63,7 +63,7 @@ struct debug_client IDebugDataSpaces IDebugDataSpaces_iface; IDebugSymbols3 IDebugSymbols3_iface; IDebugControl4 IDebugControl4_iface; - IDebugAdvanced IDebugAdvanced_iface; + IDebugAdvanced3 IDebugAdvanced3_iface; IDebugSystemObjects IDebugSystemObjects_iface; LONG refcount; ULONG engine_options; @@ -257,9 +257,9 @@ static struct debug_client *impl_from_IDebugControl4(IDebugControl4 *iface) return CONTAINING_RECORD(iface, struct debug_client, IDebugControl4_iface); } -static struct debug_client *impl_from_IDebugAdvanced(IDebugAdvanced *iface) +static struct debug_client *impl_from_IDebugAdvanced3(IDebugAdvanced3 *iface) { - return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced_iface); + return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced3_iface); } static struct debug_client *impl_from_IDebugSystemObjects(IDebugSystemObjects *iface) @@ -301,9 +301,11 @@ static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient7 *iface { *obj = &debug_client->IDebugControl4_iface; } - else if (IsEqualIID(riid, &IID_IDebugAdvanced)) + else if (IsEqualIID(riid, &IID_IDebugAdvanced3) + || IsEqualIID(riid, &IID_IDebugAdvanced2) + || IsEqualIID(riid, &IID_IDebugAdvanced)) { - *obj = &debug_client->IDebugAdvanced_iface; + *obj = &debug_client->IDebugAdvanced3_iface; } else if (IsEqualIID(riid, &IID_IDebugSystemObjects)) { @@ -4266,28 +4268,25 @@ static const IDebugControl4Vtbl debugcontrolvtbl = debugcontrol_ResetManagedStatus, }; -static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced *iface, REFIID riid, void **obj) +static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced3 *iface, REFIID riid, void **obj) { - struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); + return IUnknown_QueryInterface((IUnknown *)&debug_client->IDebugClient_iface, riid, obj); } -static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced *iface) +static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced3 *iface) { - struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); + return IUnknown_AddRef((IUnknown *)&debug_client->IDebugClient_iface); } -static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface) +static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced3 *iface) { - struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); + return IUnknown_Release((IUnknown *)&debug_client->IDebugClient_iface); } -static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context, +static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced3 *iface, void *context, ULONG context_size) { FIXME("%p, %p, %lu stub.\n", iface, context, context_size); @@ -4295,7 +4294,7 @@ static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context, +static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced3 *iface, void *context, ULONG context_size) { FIXME("%p, %p, %lu stub.\n", iface, context, context_size); @@ -4303,17 +4302,98 @@ static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced * return E_NOTIMPL; } -static const IDebugAdvancedVtbl debugadvancedvtbl = +static HRESULT STDMETHODCALLTYPE debugadvanced_Request(IDebugAdvanced3 *iface, ULONG request, void *inbuffer, + ULONG inbuffer_size, void *outbuffer, ULONG outbuffer_size, ULONG *outsize) +{ + FIXME("%p, %lu, %p, %lu, %p, %lu, %p stub.\n", iface, request, inbuffer, inbuffer_size, outbuffer, outbuffer_size, outsize); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSourceFileInformation(IDebugAdvanced3 *iface, ULONG which, char *sourcefile, + ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + FIXME("%p, %lu, %p, %s, %#lx, %p, %lu, %p stub.\n", iface, which, sourcefile, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_FindSourceFileAndToken(IDebugAdvanced3 *iface, ULONG start_element, + ULONG64 modaddr, const char *filename, ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, + char *buffer, ULONG buffer_size, ULONG *found_size) +{ + FIXME("%p, %lu, %s, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, start_element, wine_dbgstr_longlong(modaddr), + debugstr_a(filename), flags, filetoken, filetokensize, found_element, buffer, buffer_size, found_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSymbolInformation(IDebugAdvanced3 *iface, ULONG which, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size, char *string_buffer, ULONG string_buffer_size, + ULONG *string_size) +{ + FIXME("%p, %lu, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, which, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size, string_buffer, string_buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSystemObjectInformation(IDebugAdvanced3 *iface, ULONG which, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + FIXME("%p, %lu, %s, %#lx, %p, %lu, %p stub.\n", iface, which, wine_dbgstr_longlong(arg64), arg32, buffer, + buffer_size, info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSourceFileInformationWide(IDebugAdvanced3 *iface, ULONG which, + WCHAR *source_file, ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + FIXME("%p, %lu, %p, %s, %#lx, %p, %lu, %p stub.\n", iface, which, source_file, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_FindSourceFileAndTokenWide(IDebugAdvanced3 *iface, ULONG start_element, + ULONG64 modaddr, const WCHAR *filename, ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, + WCHAR *buffer, ULONG buffer_size, ULONG *found_size) +{ + FIXME("%p, %lu, %s, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, start_element, wine_dbgstr_longlong(modaddr), + debugstr_w(filename), flags, filetoken, filetokensize, found_element, buffer, buffer_size, found_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetSymbolInformationWide(IDebugAdvanced3 *iface, ULONG which, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size, WCHAR *string_buffer, ULONG string_buffer_size, + ULONG *string_size) +{ + FIXME("%p, %lu, %s, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, which, wine_dbgstr_longlong(arg64), + arg32, buffer, buffer_size, info_size, string_buffer, string_buffer_size, string_size); + + return E_NOTIMPL; +} + +static const IDebugAdvanced3Vtbl debugadvancedvtbl = { debugadvanced_QueryInterface, debugadvanced_AddRef, debugadvanced_Release, - /* IDebugAdvanced */ debugadvanced_GetThreadContext, debugadvanced_SetThreadContext, + debugadvanced_Request, + debugadvanced_GetSourceFileInformation, + debugadvanced_FindSourceFileAndToken, + debugadvanced_GetSymbolInformation, + debugadvanced_GetSystemObjectInformation, + debugadvanced_GetSourceFileInformationWide, + debugadvanced_FindSourceFileAndTokenWide, + debugadvanced_GetSymbolInformationWide, }; - static HRESULT STDMETHODCALLTYPE debugsystemobjects_QueryInterface(IDebugSystemObjects *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); @@ -4625,7 +4705,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugDataSpaces_iface.lpVtbl = &debugdataspacesvtbl; debug_client->IDebugSymbols3_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl4_iface.lpVtbl = &debugcontrolvtbl; - debug_client->IDebugAdvanced_iface.lpVtbl = &debugadvancedvtbl; + debug_client->IDebugAdvanced3_iface.lpVtbl = &debugadvancedvtbl; debug_client->IDebugSystemObjects_iface.lpVtbl = &debugsystemobjectsvtbl; debug_client->refcount = 1; list_init(&debug_client->targets);

1 0

Nikolay Sivov : uianimation: Use CRT allocation functions.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: e12a7c3d02f00328cfa1e85efdcc364e858c9ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e12a7c3d02f00328cfa1e85e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:39:44 2022 +0300 uianimation: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index c338d836978..22bb58ddbe2 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -31,7 +31,6 @@ #include "initguid.h" #include "uianimation.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uianimation); @@ -151,7 +150,7 @@ static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -308,7 +307,7 @@ const struct IUIAnimationStoryboardVtbl animation_storyboard_vtbl = static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj ) { - struct animation_storyboard *This = heap_alloc( sizeof(*This) ); + struct animation_storyboard *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationStoryboard_iface.lpVtbl = &animation_storyboard_vtbl; @@ -371,7 +370,7 @@ static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -498,7 +497,7 @@ const struct IUIAnimationVariableVtbl animation_var_vtbl = static HRESULT animation_var_create(DOUBLE initial, IUIAnimationVariable **obj ) { - struct animation_var *This = heap_alloc( sizeof(*This) ); + struct animation_var *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationVariable_iface.lpVtbl = &animation_var_vtbl; @@ -561,7 +560,7 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) if (!ref) { - heap_free( This ); + free( This ); } return ref; @@ -730,7 +729,7 @@ const struct IUIAnimationManagerVtbl manager_vtbl = static HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj ) { - struct manager *This = heap_alloc( sizeof(*This) ); + struct manager *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -793,7 +792,7 @@ static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -866,7 +865,7 @@ const struct IUIAnimationTimerVtbl timer_vtbl = static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj ) { - struct timer *This = heap_alloc( sizeof(*This) ); + struct timer *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) @@ -930,7 +929,7 @@ static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -953,7 +952,7 @@ const struct IUIAnimationTransitionFactoryVtbl tr_factory_vtbl = static HRESULT transition_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_factory *This = heap_alloc( sizeof(*This) ); + struct tr_factory *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -1017,7 +1016,7 @@ static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -1141,7 +1140,7 @@ const struct IUIAnimationTransitionLibraryVtbl tr_library_vtbl = static HRESULT library_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_library *This = heap_alloc( sizeof(*This) ); + struct tr_library *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY;

1 0

Ziqing Hui : d2d1: Add stubs for ID2D1Factory3.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: a45a4b0b48fb69ccd7a3db747f7726708a0689c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45a4b0b48fb69ccd7a3db74… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Apr 3 10:37:43 2022 +0800 d2d1: Add stubs for ID2D1Factory3. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 108 ++++++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a45a4b0b48fb69ccd7a3…

1 0

Ziqing Hui : include: Add defines for D2D1HighlightsShadows effect.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: deb8d7fc2d4e28d2a4ebcdb5fcb74af00f1a6a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb8d7fc2d4e28d2a4ebcdb5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Apr 3 10:37:42 2022 +0800 include: Add defines for D2D1HighlightsShadows effect. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d2d1_3.idl | 1 + include/d2d1effects_2.idl | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c69194ef127..047e7ff9146 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -105,6 +105,7 @@ SOURCES = \ d2d1_3.idl \ d2d1effects.idl \ d2d1effects_1.idl \ + d2d1effects_2.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index b51adfdffdb..91835ee1a77 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -17,6 +17,7 @@ */ import "d2d1_2.idl"; +import "d2d1effects_2.idl"; typedef enum D2D1_INK_NIB_SHAPE { diff --git a/include/d2d1effects_2.idl b/include/d2d1effects_2.idl new file mode 100644 index 00000000000..79895361118 --- /dev/null +++ b/include/d2d1effects_2.idl @@ -0,0 +1,38 @@ +/* + * Copyright 2022 Ziqing Hui for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d2d1effects_1.idl"; + +cpp_quote("DEFINE_GUID(CLSID_D2D1HighlightsShadows, 0xcadc8384,0x323f,0x4c7e,0xa3,0x61,0x2e,0x2b,0x24,0xdf,0x6e,0xe4);") + +typedef enum D2D1_HIGHLIGHTSANDSHADOWS_PROP +{ + D2D1_HIGHLIGHTSANDSHADOWS_PROP_HIGHLIGHTS = 0x0, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_SHADOWS = 0x1, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_CLARITY = 0x2, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_INPUT_GAMMA = 0x3, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_MASK_BLUR_RADIUS = 0x4, + D2D1_HIGHLIGHTSANDSHADOWS_PROP_FORCE_DWORD = 0xffffffff +} D2D1_HIGHLIGHTSANDSHADOWS_PROP; + +typedef enum D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA +{ + D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_LINEAR = 0x0, + D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_SRGB = 0x1, + D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_FORCE_DWORD = 0xffffffff +} D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA;

1 0

Esme Povirk : mscoree: Update Wine Mono to 7.2.0.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 1f8eb4a9c28417ee98f90aa8a5a95177088d082a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8eb4a9c28417ee98f90aa8… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 4 11:21:55 2022 -0500 mscoree: Update Wine Mono to 7.2.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 1d87eac5b1a..73f44a80f79 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.1.1" +#define MONO_VERSION "7.2.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea" +#define MONO_SHA "5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8f3441cd84e..44b2fd88d2a 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.1.1" +#define WINE_MONO_VERSION "7.2.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Rémi Bernon : kernelbase: Remove unnecessary handler from LocalUnlock.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 4f596c04be3efdf7ce57f427f5ea643064e45aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f596c04be3efdf7ce57f427… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 4 10:02:01 2022 +0200 kernelbase: Remove unnecessary handler from LocalUnlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 9ae1b6d50dd..06dbc66b7b9 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -918,6 +918,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f */ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) { + HANDLE heap = GetProcessHeap(); struct mem_entry *mem; BOOL ret = FALSE; @@ -929,36 +930,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) return FALSE; } - RtlLockHeap( GetProcessHeap() ); - __TRY + RtlLockHeap( heap ); + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { - if ((mem = unsafe_mem_from_HLOCAL( handle ))) + if (mem->lock) { - if (mem->lock) - { - mem->lock--; - ret = (mem->lock != 0); - if (!ret) SetLastError( NO_ERROR ); - } - else - { - WARN_(globalmem)( "%p not locked\n", handle ); - SetLastError( ERROR_NOT_LOCKED ); - } + mem->lock--; + ret = (mem->lock != 0); + if (!ret) SetLastError( NO_ERROR ); } else { - WARN_(globalmem)( "invalid handle %p\n", handle ); - SetLastError( ERROR_INVALID_HANDLE ); + WARN_(globalmem)( "%p not locked\n", handle ); + SetLastError( ERROR_NOT_LOCKED ); } } - __EXCEPT_PAGE_FAULT + else { - WARN_(globalmem)( "(%p): Page fault occurred ! Caused by bug ?\n", handle ); - SetLastError( ERROR_INVALID_PARAMETER ); + WARN_(globalmem)( "invalid handle %p\n", handle ); + SetLastError( ERROR_INVALID_HANDLE ); } - __ENDTRY - RtlUnlockHeap( GetProcessHeap() ); + RtlUnlockHeap( heap ); + return ret; }

1 0