June 2023 - Wine-commits - list.winehq.org

Rémi Bernon : winegstreamer: Pass the object context to media_source_create.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: 9258d7abe8a47945cb9c45e9958e04f78721e2b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9258d7abe8a47945cb9c45e9958e04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:39:04 2023 +0200 winegstreamer: Pass the object context to media_source_create. --- dlls/winegstreamer/media_source.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a6c48b7e297..3ba305b897a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1610,7 +1610,7 @@ static void media_source_init_descriptors(struct media_source *source) } } -static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **out) +static HRESULT media_source_create(struct object_context *context, IMFMediaSource **out) { unsigned int stream_count = UINT_MAX; struct media_source *object; @@ -1620,7 +1620,7 @@ static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **o unsigned int i; HRESULT hr; - if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) + if (FAILED(hr = IMFByteStream_GetCapabilities(context->stream, &bytestream_caps))) return hr; if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) @@ -1629,7 +1629,7 @@ static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **o return MF_E_BYTESTREAM_NOT_SEEKABLE; } - if (FAILED(hr = IMFByteStream_GetLength(bytestream, &file_size))) + if (FAILED(hr = IMFByteStream_GetLength(context->stream, &file_size))) { FIXME("Failed to get byte stream length, hr %#lx.\n", hr); return hr; @@ -1644,8 +1644,8 @@ static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **o object->IMFRateControl_iface.lpVtbl = &media_source_rate_control_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; - object->byte_stream = bytestream; - IMFByteStream_AddRef(bytestream); + object->byte_stream = context->stream; + IMFByteStream_AddRef(context->stream); object->rate = 1.0f; InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -2003,7 +2003,7 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM if (!state || !(context = impl_from_IUnknown(state))) return E_INVALIDARG; - if (FAILED(hr = media_source_create(context->stream, (IMFMediaSource **)&object))) + if (FAILED(hr = media_source_create(context, (IMFMediaSource **)&object))) WARN("Failed to create media source, hr %#lx\n", hr); else {

1 0

Rémi Bernon : winegstreamer: Move byte stream caps checks to BeginCreateObject.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: 5b1a2014a1dc21734bbfe5c901fe2226b6974c01 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b1a2014a1dc21734bbfe5c901fe22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:40:15 2023 +0200 winegstreamer: Move byte stream caps checks to BeginCreateObject. --- dlls/winegstreamer/media_source.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3ba305b897a..ca1c9c445f4 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1615,20 +1615,10 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc unsigned int stream_count = UINT_MAX; struct media_source *object; struct wg_parser *parser; - DWORD bytestream_caps; QWORD file_size; unsigned int i; HRESULT hr; - if (FAILED(hr = IMFByteStream_GetCapabilities(context->stream, &bytestream_caps))) - return hr; - - if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) - { - FIXME("Non-seekable bytestreams not supported.\n"); - return MF_E_BYTESTREAM_NOT_SEEKABLE; - } - if (FAILED(hr = IMFByteStream_GetLength(context->stream, &file_size))) { FIXME("Failed to get byte stream length, hr %#lx.\n", hr); @@ -1870,6 +1860,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa IMFAsyncResult *result; IUnknown *context; HRESULT hr; + DWORD caps; TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); @@ -1881,6 +1872,14 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (flags != MF_RESOLUTION_MEDIASOURCE) FIXME("Unimplemented flags %#lx\n", flags); + if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) + return hr; + if (!(caps & MFBYTESTREAM_IS_SEEKABLE)) + { + FIXME("Non-seekable bytestreams not supported.\n"); + return MF_E_BYTESTREAM_NOT_SEEKABLE; + } + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr;

1 0

Rémi Bernon : winegstreamer: Move stream length query to BeginCreateObject.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: 6942d7a035bc3a94c2270a23462289a95bb014d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6942d7a035bc3a94c2270a23462289… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 18 14:42:43 2023 +0200 winegstreamer: Move stream length query to BeginCreateObject. --- dlls/winegstreamer/media_source.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index ca1c9c445f4..010f6d27b94 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -34,6 +34,7 @@ struct object_context IMFAsyncResult *result; IMFByteStream *stream; + UINT64 file_size; WCHAR *url; }; @@ -94,7 +95,7 @@ static const IUnknownVtbl object_context_vtbl = }; static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const WCHAR *url, - IMFAsyncResult *result, IUnknown **out) + QWORD file_size, IMFAsyncResult *result, IUnknown **out) { WCHAR *tmp_url = url ? wcsdup(url) : NULL; struct object_context *context; @@ -109,6 +110,7 @@ static HRESULT object_context_create(DWORD flags, IMFByteStream *stream, const W context->refcount = 1; context->stream = stream; IMFByteStream_AddRef(context->stream); + context->file_size = file_size; context->url = tmp_url; context->result = result; IMFAsyncResult_AddRef(context->result); @@ -181,6 +183,7 @@ struct media_source CRITICAL_SECTION cs; struct wg_parser *wg_parser; + UINT64 file_size; UINT64 duration; IMFStreamDescriptor **descriptors; @@ -1615,16 +1618,9 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc unsigned int stream_count = UINT_MAX; struct media_source *object; struct wg_parser *parser; - QWORD file_size; unsigned int i; HRESULT hr; - if (FAILED(hr = IMFByteStream_GetLength(context->stream, &file_size))) - { - FIXME("Failed to get byte stream length, hr %#lx.\n", hr); - return hr; - } - if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1636,6 +1632,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc object->ref = 1; object->byte_stream = context->stream; IMFByteStream_AddRef(context->stream); + object->file_size = context->file_size; object->rate = 1.0f; InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -1663,7 +1660,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc object->state = SOURCE_OPENING; - if (FAILED(hr = wg_parser_connect(parser, file_size))) + if (FAILED(hr = wg_parser_connect(parser, object->file_size))) goto fail; stream_count = wg_parser_get_stream_count(parser); @@ -1859,6 +1856,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); IMFAsyncResult *result; IUnknown *context; + QWORD file_size; HRESULT hr; DWORD caps; @@ -1879,11 +1877,15 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa FIXME("Non-seekable bytestreams not supported.\n"); return MF_E_BYTESTREAM_NOT_SEEKABLE; } + if (FAILED(hr = IMFByteStream_GetLength(stream, &file_size))) + { + FIXME("Failed to get byte stream length, hr %#lx.\n", hr); + return hr; + } if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; - - if (FAILED(hr = object_context_create(flags, stream, url, result, &context))) + if (FAILED(hr = object_context_create(flags, stream, url, file_size, result, &context))) { IMFAsyncResult_Release(result); return hr;

1 0

Alexandros Frantzis : winewayland.drv: Introduce per-window driver data.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: 00663792004f25bc79344594758228a663992202 URL: https://gitlab.winehq.org/wine/wine/-/commit/00663792004f25bc79344594758228… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 3 13:10:50 2023 +0300 winewayland.drv: Introduce per-window driver data. Create and manage an internal driver data structure for each non-desktop, non-message window. --- dlls/winewayland.drv/waylanddrv.h | 4 + dlls/winewayland.drv/waylanddrv_main.c | 4 +- dlls/winewayland.drv/window.c | 139 +++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 57125e011cb..ed1d3ea0be2 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -111,8 +111,12 @@ void wayland_output_use_xdg_extension(struct wayland_output *output) DECLSPEC_HI */ LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; +void WAYLAND_DestroyWindow(HWND hwnd) DECLSPEC_HIDDEN; BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, BOOL force, void *param) DECLSPEC_HIDDEN; LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; +BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, + const RECT *window_rect, const RECT *client_rect, + RECT *visible_rect, struct window_surface **surface) DECLSPEC_HIDDEN; #endif /* __WINE_WAYLANDDRV_H */ diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index 2a7bed9d1d8..3ef03e16d0b 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -32,8 +32,10 @@ static const struct user_driver_funcs waylanddrv_funcs = { .pDesktopWindowProc = WAYLAND_DesktopWindowProc, + .pDestroyWindow = WAYLAND_DestroyWindow, .pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices, - .pWindowMessage = WAYLAND_WindowMessage + .pWindowMessage = WAYLAND_WindowMessage, + .pWindowPosChanging = WAYLAND_WindowPosChanging }; static NTSTATUS waylanddrv_unix_init(void *arg) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index ea5ac22a8a2..1ea8c77934d 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -24,12 +24,151 @@ #include "config.h" +#include <assert.h> +#include <stdlib.h> + #include "waylanddrv.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); +/* private window data */ +struct wayland_win_data +{ + struct rb_entry entry; + /* hwnd that this private data belongs to */ + HWND hwnd; +}; + +static int wayland_win_data_cmp_rb(const void *key, + const struct rb_entry *entry) +{ + HWND key_hwnd = (HWND)key; /* cast to work around const */ + const struct wayland_win_data *entry_win_data = + RB_ENTRY_VALUE(entry, const struct wayland_win_data, entry); + + if (key_hwnd < entry_win_data->hwnd) return -1; + if (key_hwnd > entry_win_data->hwnd) return 1; + return 0; +} + +static pthread_mutex_t win_data_mutex = PTHREAD_MUTEX_INITIALIZER; +static struct rb_tree win_data_rb = { wayland_win_data_cmp_rb }; + +/*********************************************************************** + * wayland_win_data_create + * + * Create a data window structure for an existing window. + */ +static struct wayland_win_data *wayland_win_data_create(HWND hwnd) +{ + struct wayland_win_data *data; + struct rb_entry *rb_entry; + HWND parent; + + /* Don't create win data for desktop or HWND_MESSAGE windows. */ + if (!(parent = NtUserGetAncestor(hwnd, GA_PARENT))) return NULL; + if (parent != NtUserGetDesktopWindow() && !NtUserGetAncestor(parent, GA_PARENT)) + return NULL; + + if (!(data = calloc(1, sizeof(*data)))) return NULL; + + data->hwnd = hwnd; + + pthread_mutex_lock(&win_data_mutex); + + /* Check that another thread hasn't already created the wayland_win_data. */ + if ((rb_entry = rb_get(&win_data_rb, hwnd))) + { + free(data); + return RB_ENTRY_VALUE(rb_entry, struct wayland_win_data, entry); + } + + rb_put(&win_data_rb, hwnd, &data->entry); + + TRACE("hwnd=%p\n", data->hwnd); + + return data; +} + +/*********************************************************************** + * wayland_win_data_destroy + */ +static void wayland_win_data_destroy(struct wayland_win_data *data) +{ + TRACE("hwnd=%p\n", data->hwnd); + + rb_remove(&win_data_rb, &data->entry); + + pthread_mutex_unlock(&win_data_mutex); + + free(data); +} + +/*********************************************************************** + * wayland_win_data_get + * + * Lock and return the data structure associated with a window. + */ +static struct wayland_win_data *wayland_win_data_get(HWND hwnd) +{ + struct rb_entry *rb_entry; + + pthread_mutex_lock(&win_data_mutex); + + if ((rb_entry = rb_get(&win_data_rb, hwnd))) + return RB_ENTRY_VALUE(rb_entry, struct wayland_win_data, entry); + + pthread_mutex_unlock(&win_data_mutex); + + return NULL; +} + +/*********************************************************************** + * wayland_win_data_release + * + * Release the data returned by wayland_win_data_get. + */ +static void wayland_win_data_release(struct wayland_win_data *data) +{ + assert(data); + pthread_mutex_unlock(&win_data_mutex); +} + +/*********************************************************************** + * WAYLAND_DestroyWindow + */ +void WAYLAND_DestroyWindow(HWND hwnd) +{ + struct wayland_win_data *data; + + TRACE("%p\n", hwnd); + + if (!(data = wayland_win_data_get(hwnd))) return; + wayland_win_data_destroy(data); +} + +/*********************************************************************** + * WAYLAND_WindowPosChanging + */ +BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, + const RECT *window_rect, const RECT *client_rect, + RECT *visible_rect, struct window_surface **surface) +{ + struct wayland_win_data *data = wayland_win_data_get(hwnd); + + TRACE("hwnd %p window %s client %s visible %s after %p flags %08x\n", + hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), + wine_dbgstr_rect(visible_rect), insert_after, swp_flags); + + if (!data && !(data = wayland_win_data_create(hwnd))) return TRUE; + + wayland_win_data_release(data); + + return TRUE; +} + static void wayland_resize_desktop(void) { RECT virtual_rect = NtUserGetVirtualScreenRect();

1 0

Alexandros Frantzis : winewayland.drv: Basic Wayland toplevel surface support.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: 285c47d15d499aab136fb841125992f084b84cec URL: https://gitlab.winehq.org/wine/wine/-/commit/285c47d15d499aab136fb841125992… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu May 4 13:57:50 2023 +0300 winewayland.drv: Basic Wayland toplevel surface support. Use the xdg-shell Wayland protocol to create Wayland xdg_surface xdg_toplevel surfaces for non-child windows. --- dlls/winewayland.drv/Makefile.in | 4 +- dlls/winewayland.drv/wayland.c | 41 + dlls/winewayland.drv/wayland_surface.c | 179 +++++ dlls/winewayland.drv/waylanddrv.h | 24 + dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 65 ++ dlls/winewayland.drv/xdg-shell.xml | 1351 ++++++++++++++++++++++++++++++++ 7 files changed, 1664 insertions(+), 1 deletion(-)

1 0

Alexandros Frantzis : winewayland.drv: Ensure Wayland surface handlers don't access invalid data.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: a7ec328fa8020d48e77c6e39630edc4c320aebc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7ec328fa8020d48e77c6e39630edc… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon May 29 18:13:16 2023 +0300 winewayland.drv: Ensure Wayland surface handlers don't access invalid data. In our setup with a dedicated event dispatch thread, libwayland ensures that object proxies associated with an event handler remain valid (or NULL) while the handler is executing. However, no such guarantees are given for the proxy user data. It is thus possible for the user data to become invalid (e.g., its memory freed from a different thread) right after the event handler is entered. This is an issue for wayland_surface associated proxies since they may receive unsolicited events from the compositor at any time (e.g., xdg_surface.configure), even while we are destroying the wayland_surface. To avoid the problem, we introduce a lock that protects access to xdg_surface user data and ensures that the associated wayland_surface remains valid for the duration of the handler. Co-authored-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winewayland.drv/wayland_surface.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 9ee0a41f02c..d679492b94a 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -31,18 +31,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); +/* Protects access to the user data of xdg_surface */ +static pthread_mutex_t xdg_data_mutex = PTHREAD_MUTEX_INITIALIZER; + +static struct wayland_surface *wayland_surface_lock_xdg(struct xdg_surface *xdg_surface) +{ + struct wayland_surface *surface; + + pthread_mutex_lock(&xdg_data_mutex); + surface = xdg_surface_get_user_data(xdg_surface); + if (surface) pthread_mutex_lock(&surface->mutex); + pthread_mutex_unlock(&xdg_data_mutex); + + return surface; +} + static void xdg_surface_handle_configure(void *data, struct xdg_surface *xdg_surface, uint32_t serial) { - struct wayland_surface *surface = data; + struct wayland_surface *surface; TRACE("serial=%u\n", serial); - pthread_mutex_lock(&surface->mutex); + if (!(surface = wayland_surface_lock_xdg(xdg_surface))) return; + /* Handle this event only if wayland_surface is still associated with * the target xdg_surface. */ if (surface->xdg_surface == xdg_surface) xdg_surface_ack_configure(xdg_surface, serial); + pthread_mutex_unlock(&surface->mutex); } @@ -92,6 +109,7 @@ err: */ void wayland_surface_destroy(struct wayland_surface *surface) { + pthread_mutex_lock(&xdg_data_mutex); pthread_mutex_lock(&surface->mutex); if (surface->xdg_toplevel) @@ -102,6 +120,7 @@ void wayland_surface_destroy(struct wayland_surface *surface) if (surface->xdg_surface) { + xdg_surface_set_user_data(surface->xdg_surface, NULL); xdg_surface_destroy(surface->xdg_surface); surface->xdg_surface = NULL; } @@ -113,6 +132,7 @@ void wayland_surface_destroy(struct wayland_surface *surface) } pthread_mutex_unlock(&surface->mutex); + pthread_mutex_unlock(&xdg_data_mutex); wl_display_flush(process_wayland.wl_display);

1 0

Alexandros Frantzis : winewayland.drv: Introduce window_surface for Wayland.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: d53cb7206d65db3f70a5f2390e53cc2e9c408c62 URL: https://gitlab.winehq.org/wine/wine/-/commit/d53cb7206d65db3f70a5f2390e53cc… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri May 5 11:20:10 2023 +0300 winewayland.drv: Introduce window_surface for Wayland. --- dlls/winewayland.drv/Makefile.in | 1 + dlls/winewayland.drv/waylanddrv.h | 6 ++ dlls/winewayland.drv/window.c | 39 ++++++- dlls/winewayland.drv/window_surface.c | 184 ++++++++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+), 1 deletion(-)

1 0

Alexandros Frantzis : winewayland.drv: Implement a simple window_surface flush.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: 6b0a84c8d93006d63c4b5624fb3c1f19e81faf7a URL: https://gitlab.winehq.org/wine/wine/-/commit/6b0a84c8d93006d63c4b5624fb3c1f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri May 5 17:22:29 2023 +0300 winewayland.drv: Implement a simple window_surface flush. Flush a window_surface to a Wayland surface by creating a wl_shm buffer matching the window size, copying the whole window contents to that buffer and attaching it to the corresponding Wayland surface. --- dlls/winewayland.drv/wayland.c | 9 +++ dlls/winewayland.drv/wayland_surface.c | 132 +++++++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 21 ++++++ dlls/winewayland.drv/window.c | 11 ++- dlls/winewayland.drv/window_surface.c | 68 ++++++++++++++++- 5 files changed, 239 insertions(+), 2 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Do not commit buffers to unconfigured surfaces.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: fc8570a1a611da6fa90245e213bd12c585c87958 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc8570a1a611da6fa90245e213bd12… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Jun 13 13:52:28 2023 +0300 winewayland.drv: Do not commit buffers to unconfigured surfaces. The xdg-shell protocol disallows buffer commits to a wl_surface with an xdg_surface based role before we ack the first configure event. Failing to adhere to this requirement will get our client disconnected by the compositor with a protocol error. --- dlls/winewayland.drv/wayland_surface.c | 16 +++++++++++++++- dlls/winewayland.drv/waylanddrv.h | 5 ++++- dlls/winewayland.drv/window.c | 19 ++++++++++++++++++- dlls/winewayland.drv/window_surface.c | 14 +++++++++++--- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 544c5df2a5a..ad30745fbc5 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -55,6 +55,8 @@ static void xdg_surface_handle_configure(void *data, struct xdg_surface *xdg_sur uint32_t serial) { struct wayland_surface *surface; + BOOL initial_configure = FALSE; + HWND hwnd; TRACE("serial=%u\n", serial); @@ -63,9 +65,18 @@ static void xdg_surface_handle_configure(void *data, struct xdg_surface *xdg_sur /* Handle this event only if wayland_surface is still associated with * the target xdg_surface. */ if (surface->xdg_surface == xdg_surface) + { + initial_configure = surface->current_serial == 0; + hwnd = surface->hwnd; + surface->current_serial = serial; xdg_surface_ack_configure(xdg_surface, serial); + } pthread_mutex_unlock(&surface->mutex); + + /* Flush the window surface in case there is content that we weren't + * able to flush before due to the lack of the initial configure. */ + if (initial_configure) wayland_window_flush(hwnd); } static const struct xdg_surface_listener xdg_surface_listener = @@ -78,7 +89,7 @@ static const struct xdg_surface_listener xdg_surface_listener = * * Creates a role-less wayland surface. */ -struct wayland_surface *wayland_surface_create(void) +struct wayland_surface *wayland_surface_create(HWND hwnd) { struct wayland_surface *surface; @@ -93,6 +104,7 @@ struct wayland_surface *wayland_surface_create(void) pthread_mutex_init(&surface->mutex, NULL); + surface->hwnd = hwnd; surface->wl_surface = wl_compositor_create_surface(process_wayland.wl_compositor); if (!surface->wl_surface) { @@ -196,6 +208,8 @@ void wayland_surface_clear_role(struct wayland_surface *surface) surface->xdg_surface = NULL; } + surface->current_serial = 0; + /* Ensure no buffer is attached, otherwise future role assignments may fail. */ wl_surface_attach(surface->wl_surface, NULL, 0, 0); wl_surface_commit(surface->wl_surface); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 95fbd474c5d..0afc03f4147 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -97,10 +97,12 @@ struct wayland_output struct wayland_surface { + HWND hwnd; struct wl_surface *wl_surface; struct xdg_surface *xdg_surface; struct xdg_toplevel *xdg_toplevel; pthread_mutex_t mutex; + uint32_t current_serial; }; struct wayland_shm_buffer @@ -130,7 +132,7 @@ void wayland_output_use_xdg_extension(struct wayland_output *output) DECLSPEC_HI * Wayland surface */ -struct wayland_surface *wayland_surface_create(void) DECLSPEC_HIDDEN; +struct wayland_surface *wayland_surface_create(HWND hwnd) DECLSPEC_HIDDEN; void wayland_surface_destroy(struct wayland_surface *surface) DECLSPEC_HIDDEN; void wayland_surface_make_toplevel(struct wayland_surface *surface) DECLSPEC_HIDDEN; void wayland_surface_clear_role(struct wayland_surface *surface) DECLSPEC_HIDDEN; @@ -152,6 +154,7 @@ void wayland_shm_buffer_destroy(struct wayland_shm_buffer *shm_buffer) DECLSPEC_ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect) DECLSPEC_HIDDEN; void wayland_window_surface_update_wayland_surface(struct window_surface *surface, struct wayland_surface *wayland_surface) DECLSPEC_HIDDEN; +void wayland_window_flush(HWND hwnd) DECLSPEC_HIDDEN; /********************************************************************** * USER driver functions diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index cf5e5f0ec3f..efe72baf92e 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -165,7 +165,7 @@ static void wayland_win_data_update_wayland_surface(struct wayland_win_data *dat } /* Otherwise ensure that we have a wayland surface. */ - if (!surface && !(surface = wayland_surface_create())) return; + if (!surface && !(surface = wayland_surface_create(data->hwnd))) return; visible = (NtUserGetWindowLongW(data->hwnd, GWL_STYLE) & WS_VISIBLE) == WS_VISIBLE; xdg_visible = surface->xdg_toplevel != NULL; @@ -321,3 +321,20 @@ LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return NtUserMessageCall(hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE); } + +/********************************************************************** + * wayland_window_flush + * + * Flush the window_surface associated with a HWND. + */ +void wayland_window_flush(HWND hwnd) +{ + struct wayland_win_data *data = wayland_win_data_get(hwnd); + + if (!data) return; + + if (data->window_surface) + data->window_surface->funcs->flush(data->window_surface); + + wayland_win_data_release(data); +} diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index cb1c83d4b92..ca613c667c6 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -149,11 +149,19 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) memcpy(shm_buffer->map_data, wws->bits, shm_buffer->map_size); pthread_mutex_lock(&wws->wayland_surface->mutex); - wayland_surface_attach_shm(wws->wayland_surface, shm_buffer); - wl_surface_commit(wws->wayland_surface->wl_surface); + if (wws->wayland_surface->current_serial) + { + wayland_surface_attach_shm(wws->wayland_surface, shm_buffer); + wl_surface_commit(wws->wayland_surface->wl_surface); + flushed = TRUE; + } + else + { + TRACE("Wayland surface not configured yet, not flushing\n"); + wayland_shm_buffer_destroy(shm_buffer); + } pthread_mutex_unlock(&wws->wayland_surface->mutex); wl_display_flush(process_wayland.wl_display); - flushed = TRUE; done: if (flushed) reset_bounds(&wws->bounds);

1 0

Rémi Bernon : explorer: Fix command-line parameter parsing.
by Alexandre Julliard 29 Jun '23

29 Jun '23

Module: wine Branch: master Commit: 467201a85b8e423cce5ac12491df7d2e7ba086c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/467201a85b8e423cce5ac12491df7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 29 10:29:00 2023 +0200 explorer: Fix command-line parameter parsing. Fixes: 5b11157ecf787e545062000ab6afd1c55ee8dacc Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55141 --- programs/explorer/explorer.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 879fda42135..26f3c8d6d9c 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -838,49 +838,56 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = L"/select,"; static const WCHAR arg_desktop[] = L"/desktop"; static const WCHAR arg_desktop_quotes[] = L"\"/desktop"; + const size_t len_n = wcslen(arg_n); + const size_t len_e = wcslen(arg_e); + const size_t len_cd = wcslen(arg_cd); + const size_t len_root = wcslen(arg_root); + const size_t len_select = wcslen(arg_select); + const size_t len_desktop = wcslen(arg_desktop); + const size_t len_desktop_quotes = wcslen(arg_desktop_quotes); LPWSTR p = commandline; while (*p) { while (iswspace(*p)) p++; - if (wcsncmp(p, arg_n, ARRAY_SIZE( arg_n ))==0) + if (wcsncmp(p, arg_n, len_n )==0) { parameters->explorer_mode = FALSE; - p += ARRAY_SIZE( arg_n ); + p += len_n; } - else if (wcsncmp(p, arg_e, ARRAY_SIZE( arg_e ))==0) + else if (wcsncmp(p, arg_e, len_e )==0) { parameters->explorer_mode = TRUE; - p += ARRAY_SIZE( arg_e ); + p += len_e; } - else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + else if (wcsncmp(p, arg_cd, len_cd )==0) { - p += ARRAY_SIZE( arg_cd ); + p += len_cd; p = copy_path_string(parameters->root,p); } - else if (wcsncmp(p, arg_root, ARRAY_SIZE( arg_root ))==0) + else if (wcsncmp(p, arg_root, len_root )==0) { - p += ARRAY_SIZE( arg_root ); + p += len_root; p = copy_path_string(parameters->root,p); } - else if (wcsncmp(p, arg_select, ARRAY_SIZE( arg_select ))==0) + else if (wcsncmp(p, arg_select, len_select )==0) { - p += ARRAY_SIZE( arg_select ); + p += len_select; p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection); } - else if (wcsncmp(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) + else if (wcsncmp(p, arg_desktop, len_desktop )==0) { - p += ARRAY_SIZE( arg_desktop ); + p += len_desktop; manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (wcsncmp(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) + else if (wcsncmp(p, arg_desktop_quotes, len_desktop_quotes )==0) { - p += ARRAY_SIZE( arg_desktop_quotes ); + p += len_desktop_quotes; manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } else

1 0