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

Francois Gouget : wininet/tests: Consistently use strlen() instead of lstrlenA().
by Alexandre Julliard 25 May '23

25 May '23

Module: wine Branch: master Commit: 5d516dd931b67729c05865f6a4e4c76ccb715988 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d516dd931b67729c05865f6a4e4c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 21 18:23:17 2023 +0200 wininet/tests: Consistently use strlen() instead of lstrlenA(). --- dlls/wininet/tests/internet.c | 42 +++++++++++++++++++++--------------------- dlls/wininet/tests/url.c | 14 +++++++------- 2 files changed, 28 insertions(+), 28 deletions(-)

1 0

Alex Henrie : mshtml: Only allow one thread to use Gecko.
by Alexandre Julliard 25 May '23

25 May '23

Module: wine Branch: master Commit: 624b008f2ea2de1acedc7700141e88543f3752a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/624b008f2ea2de1acedc7700141e88… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 16 22:54:33 2023 -0600 mshtml: Only allow one thread to use Gecko. The new test doesn't pass, but it doesn't crash either, and that's enough to fix the WinZip installer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54071 --- dlls/mshtml/nsembed.c | 3 ++- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9952a553afd..95c07c90390 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -818,7 +818,8 @@ BOOL load_gecko(void) MESSAGE("Could not find Wine Gecko. HTML rendering will be disabled.\n"); } }else { - ret = pCompMgr != NULL; + FIXME("Gecko can only be used from one thread.\n"); + ret = FALSE; } LeaveCriticalSection(&cs_load_gecko); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bb86a7e0a1b..07c4fec9bd8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -11980,6 +11980,29 @@ static void test_document_mode_lock(void) IHTMLDocument2_Release(doc); } +static DWORD WINAPI create_document_proc(void *param) +{ + IHTMLDocument2 *doc = NULL; + HRESULT hres; + + CoInitialize(NULL); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHTMLDocument2, (void**)&doc); + todo_wine + ok(hres == S_OK, "Creation of an HTMLDocument in a separate thread failed: %08lx\n", hres); + + if (doc) IHTMLDocument2_Release(doc); + return 0; +} + +static void test_threads(void) +{ + HANDLE thread = CreateThread(NULL, 0, create_document_proc, 0, 0, NULL); + DWORD ret = WaitForSingleObject(thread, 2000); + ok(!ret, "Document creation thread failed to complete\n"); +} + static void test_custom_user_agent(IHTMLDocument2 *doc) { static const WCHAR ua[] = L"1234567890xxxABC"; @@ -12080,6 +12103,7 @@ START_TEST(dom) test_quirks_mode(); test_document_mode_lock(); + test_threads(); /* Run this last since it messes with the process-wide user agent */ if (winetest_interactive || ! is_ie_hardened()) {

1 0

Tim Clem : wow64win: Only marshal MSGs in wow64_NtUserCallWindowsHook if needed.
by Alexandre Julliard 25 May '23

25 May '23

Module: wine Branch: master Commit: a001c0a030abff2bbcfd597c5786736ca30a6835 URL: https://gitlab.winehq.org/wine/wine/-/commit/a001c0a030abff2bbcfd597c578673… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon May 8 14:08:13 2023 -0700 wow64win: Only marshal MSGs in wow64_NtUserCallWindowsHook if needed. lparam != 0 does not imply lparam_size is big enough for a MSG, so we can end up manipulating memory past the end of the buffer. Co-authored-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wow64win/user.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 3d0041a7e04..1f378aa0a76 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -704,7 +704,6 @@ static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) BOOL prev_unicode; BOOL next_unicode; } *params32; - void *ret_lparam = (void *)params->lparam; UINT lparam32_size = 0, module_size, size32; void *ret_ptr; ULONG ret_len; @@ -738,13 +737,11 @@ static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) case WH_SYSMSGFILTER: case WH_MSGFILTER: case WH_GETMESSAGE: - msg_32to64( (MSG *)(params + 1), (const MSG32 *)(params32 + 1) ); - if (ret_lparam) + if (params->lparam_size == sizeof(MSG)) { - memcpy( ret_lparam, params + 1, params->lparam_size ); - return ret; + msg_32to64( (MSG *)(params + 1), (const MSG32 *)(params32 + 1) ); + return NtCallbackReturn( params + 1, params->lparam_size, ret ); } - return NtCallbackReturn( params + 1, params->lparam_size, ret ); } return ret;

1 0

Zebediah Figura : mmdevapi/tests: Remove some unnecessary workarounds.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: fd757e6ba4cd0da130179f85593655347002ec22 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd757e6ba4cd0da130179f85593655… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 21 17:22:02 2023 -0500 mmdevapi/tests: Remove some unnecessary workarounds. --- dlls/mmdevapi/tests/propstore.c | 56 ++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index bbefd5a9ead..72dae09d0c3 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -47,12 +47,9 @@ static void test_propertystore(IPropertyStore *store) hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_LPWSTR, "Value should be %i, is %i\n", VT_LPWSTR, pv.vt); - if (hr == S_OK && pv.vt == VT_LPWSTR) - { - WideCharToMultiByte(CP_ACP, 0, pv.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); - trace("guid: %s\n", temp); - PropVariantClear(&pv); - } + WideCharToMultiByte(CP_ACP, 0, pv.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); + trace("guid: %s\n", temp); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); @@ -204,33 +201,25 @@ START_TEST(propstore) CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); - if (FAILED(hr)) - { - skip("mmdevapi not available: 0x%08lx\n", hr); - goto cleanup; - } + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK) { - if (hr == E_NOTFOUND) - skip("No sound card available\n"); - else - skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); + skip("No sound card available\n"); goto cleanup; } + store = NULL; hr = IMMDevice_OpenPropertyStore(dev, 3, &store); ok(hr == E_INVALIDARG, "Wrong hr returned: %08lx\n", hr); - if (hr != S_OK) - /* It seems on windows returning with E_INVALIDARG doesn't - * set store to NULL, so just don't set store to non-null - * before calling this function - */ - ok(!store, "Store set to non-NULL on failure: %p/%08lx\n", store, hr); - else if (store) - IPropertyStore_Release(store); + /* It seems on windows returning with E_INVALIDARG doesn't + * set store to NULL, so just don't set store to non-null + * before calling this function + */ + ok(!store, "Got unexpected store %p\n", store); + hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, NULL); ok(hr == E_POINTER, "Wrong hr returned: %08lx\n", hr); @@ -239,18 +228,17 @@ START_TEST(propstore) if(hr == E_ACCESSDENIED) hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); ok(hr == S_OK, "Opening valid store returned %08lx\n", hr); - if (store) - { - test_propertystore(store); - test_deviceinterface(store); - test_getat(store); - if (is_wow64) - test_setvalue_on_wow64(store); - IPropertyStore_Release(store); - } + + test_propertystore(store); + test_deviceinterface(store); + test_getat(store); + if (is_wow64) + test_setvalue_on_wow64(store); + IPropertyStore_Release(store); + IMMDevice_Release(dev); + cleanup: - if (mme) - IMMDeviceEnumerator_Release(mme); + IMMDeviceEnumerator_Release(mme); CoUninitialize(); }

1 0

Zebediah Figura : mmdevapi/tests: Run property store tests for all devices.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: d41303b6d09fe7b18f1f835639f3286a54473d13 URL: https://gitlab.winehq.org/wine/wine/-/commit/d41303b6d09fe7b18f1f835639f328… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 21 17:30:07 2023 -0500 mmdevapi/tests: Run property store tests for all devices. --- dlls/mmdevapi/tests/propstore.c | 74 ++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 72dae09d0c3..0eb524c8dbd 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -188,11 +188,12 @@ static void test_setvalue_on_wow64(IPropertyStore *store) START_TEST(propstore) { HRESULT hr; + IMMDeviceCollection *collection; IMMDeviceEnumerator *mme = NULL; - IMMDevice *dev = NULL; IPropertyStore *store; BOOL is_wow64 = FALSE; HMODULE hk32 = GetModuleHandleA("kernel32.dll"); + unsigned int i, count; pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); @@ -203,42 +204,47 @@ START_TEST(propstore) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); - if (hr != S_OK) + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eRender, DEVICE_STATE_ACTIVE, &collection); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMMDeviceCollection_GetCount(collection, &count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (i = 0; i < count; ++i) { - skip("No sound card available\n"); - goto cleanup; + IMMDevice *dev; + + hr = IMMDeviceCollection_Item(collection, i, &dev); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + store = NULL; + hr = IMMDevice_OpenPropertyStore(dev, 3, &store); + ok(hr == E_INVALIDARG, "Wrong hr returned: %08lx\n", hr); + /* It seems on windows returning with E_INVALIDARG doesn't + * set store to NULL, so just don't set store to non-null + * before calling this function + */ + ok(!store, "Got unexpected store %p\n", store); + + hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, NULL); + ok(hr == E_POINTER, "Wrong hr returned: %08lx\n", hr); + + store = NULL; + hr = IMMDevice_OpenPropertyStore(dev, STGM_READWRITE, &store); + if (hr == E_ACCESSDENIED) + hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); + ok(hr == S_OK, "Opening valid store returned %08lx\n", hr); + + test_propertystore(store); + test_deviceinterface(store); + test_getat(store); + if (is_wow64) + test_setvalue_on_wow64(store); + + IPropertyStore_Release(store); + IMMDevice_Release(dev); } - store = NULL; - hr = IMMDevice_OpenPropertyStore(dev, 3, &store); - ok(hr == E_INVALIDARG, "Wrong hr returned: %08lx\n", hr); - /* It seems on windows returning with E_INVALIDARG doesn't - * set store to NULL, so just don't set store to non-null - * before calling this function - */ - ok(!store, "Got unexpected store %p\n", store); - - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, NULL); - ok(hr == E_POINTER, "Wrong hr returned: %08lx\n", hr); - - store = NULL; - hr = IMMDevice_OpenPropertyStore(dev, STGM_READWRITE, &store); - if(hr == E_ACCESSDENIED) - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); - ok(hr == S_OK, "Opening valid store returned %08lx\n", hr); - - test_propertystore(store); - test_deviceinterface(store); - test_getat(store); - if (is_wow64) - test_setvalue_on_wow64(store); - IPropertyStore_Release(store); - - IMMDevice_Release(dev); - -cleanup: + IMMDeviceCollection_Release(collection); IMMDeviceEnumerator_Release(mme); CoUninitialize(); }

1 0

Zebediah Figura : mmdevapi/tests: Add some tests for PKEY_AudioEngine_DeviceFormat.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 5eeed9ab26331afc1cab42e09097e318bcd1bdad URL: https://gitlab.winehq.org/wine/wine/-/commit/5eeed9ab26331afc1cab42e09097e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 21 17:30:44 2023 -0500 mmdevapi/tests: Add some tests for PKEY_AudioEngine_DeviceFormat. --- dlls/mmdevapi/tests/propstore.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 0eb524c8dbd..9701f074e2f 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -29,6 +29,9 @@ #include "uuids.h" #include "mmdeviceapi.h" #include "devpkey.h" +#include "ks.h" +#include "ksmedia.h" +#include "mmreg.h" static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); @@ -38,6 +41,7 @@ static const WCHAR software_renderW[] = static void test_propertystore(IPropertyStore *store) { + const WAVEFORMATEXTENSIBLE *format; HRESULT hr; PROPVARIANT pv; char temp[128]; @@ -68,6 +72,20 @@ static void test_propertystore(IPropertyStore *store) ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); PropVariantClear(&pv); + + pv.vt = VT_EMPTY; + hr = IPropertyStore_GetValue(store, (const PROPERTYKEY *)&PKEY_AudioEngine_DeviceFormat, &pv); + ok(hr == S_OK, "Failed with %08lx\n", hr); + ok(pv.vt == VT_BLOB, "Got type %u\n", pv.vt); + ok(pv.blob.cbSize == sizeof(WAVEFORMATEXTENSIBLE), "Got size %lu\n", pv.blob.cbSize); + format = (const void *)pv.blob.pBlobData; + ok(format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Got format tag %#x\n", format->Format.wFormatTag); + ok(format->Format.cbSize == sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX), + "Got extra size %u\n", format->Format.cbSize); + todo_wine ok(format->Format.wBitsPerSample == 16, "Got bit depth %u\n", format->Format.wBitsPerSample); + todo_wine ok(IsEqualGUID(&format->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), + "Got subformat %s\n", debugstr_guid(&format->SubFormat)); + PropVariantClear(&pv); } static void test_deviceinterface(IPropertyStore *store)

1 0

Alexandros Frantzis : winewayland.drv: Allocate process_wayland statically.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: e352fa19fae8f36f09970e3d2aa930570251c0dc URL: https://gitlab.winehq.org/wine/wine/-/commit/e352fa19fae8f36f09970e3d2aa930… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue May 2 11:34:49 2023 +0300 winewayland.drv: Allocate process_wayland statically. There is currently no benefit to dynamic allocation, and static allocation allows us to simplify some aspects of initialization. --- dlls/winewayland.drv/display.c | 2 +- dlls/winewayland.drv/wayland.c | 41 +++++++++++++++-------------------- dlls/winewayland.drv/wayland_output.c | 8 +++---- dlls/winewayland.drv/waylanddrv.h | 4 ++-- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 5234a1f03aa..d822a785898 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -290,7 +290,7 @@ BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manage wl_array_init(&output_info_array); - wl_list_for_each(output, &process_wayland->output_list, link) + wl_list_for_each(output, &process_wayland.output_list, link) { if (!output->current_mode) continue; output_info = wl_array_add(&output_info_array, sizeof(*output_info)); diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index 22a7a8cc63f..dab23a555a2 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -32,8 +32,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); -struct wl_display *process_wl_display = NULL; -struct wayland *process_wayland = NULL; +struct wayland process_wayland = +{ + .output_list = {&process_wayland.output_list, &process_wayland.output_list} +}; /********************************************************************** * Registry handling @@ -54,12 +56,12 @@ static void registry_handle_global(void *data, struct wl_registry *registry, { struct wayland_output *output; - process_wayland->zxdg_output_manager_v1 = + process_wayland.zxdg_output_manager_v1 = wl_registry_bind(registry, id, &zxdg_output_manager_v1_interface, version < 3 ? version : 3); /* Add zxdg_output_v1 to existing outputs. */ - wl_list_for_each(output, &process_wayland->output_list, link) + wl_list_for_each(output, &process_wayland.output_list, link) wayland_output_use_xdg_extension(output); } } @@ -71,7 +73,7 @@ static void registry_handle_global_remove(void *data, struct wl_registry *regist TRACE("id=%u\n", id); - wl_list_for_each_safe(output, tmp, &process_wayland->output_list, link) + wl_list_for_each_safe(output, tmp, &process_wayland.output_list, link) { if (output->global_id == id) { @@ -97,48 +99,41 @@ BOOL wayland_process_init(void) { struct wl_display *wl_display_wrapper; - process_wl_display = wl_display_connect(NULL); - if (!process_wl_display) + process_wayland.wl_display = wl_display_connect(NULL); + if (!process_wayland.wl_display) return FALSE; - process_wayland = calloc(1, sizeof(*process_wayland)); - if (!process_wayland) - return FALSE; + TRACE("wl_display=%p\n", process_wayland.wl_display); - TRACE("process_wayland=%p wl_display=%p\n", process_wayland, process_wl_display); - - if (!(process_wayland->wl_event_queue = wl_display_create_queue(process_wl_display))) + if (!(process_wayland.wl_event_queue = wl_display_create_queue(process_wayland.wl_display))) { ERR("Failed to create event queue\n"); return FALSE; } - if (!(wl_display_wrapper = wl_proxy_create_wrapper(process_wl_display))) + if (!(wl_display_wrapper = wl_proxy_create_wrapper(process_wayland.wl_display))) { ERR("Failed to create proxy wrapper for wl_display\n"); return FALSE; } wl_proxy_set_queue((struct wl_proxy *) wl_display_wrapper, - process_wayland->wl_event_queue); + process_wayland.wl_event_queue); - process_wayland->wl_registry = wl_display_get_registry(wl_display_wrapper); + process_wayland.wl_registry = wl_display_get_registry(wl_display_wrapper); wl_proxy_wrapper_destroy(wl_display_wrapper); - if (!process_wayland->wl_registry) + if (!process_wayland.wl_registry) { ERR("Failed to get to wayland registry\n"); return FALSE; } - wl_list_init(&process_wayland->output_list); - /* Populate registry */ - wl_registry_add_listener(process_wayland->wl_registry, &registry_listener, - process_wayland); + wl_registry_add_listener(process_wayland.wl_registry, &registry_listener, NULL); /* We need two roundtrips. One to get and bind globals, one to handle all * initial events produced from registering the globals. */ - wl_display_roundtrip_queue(process_wl_display, process_wayland->wl_event_queue); - wl_display_roundtrip_queue(process_wl_display, process_wayland->wl_event_queue); + wl_display_roundtrip_queue(process_wayland.wl_display, process_wayland.wl_event_queue); + wl_display_roundtrip_queue(process_wayland.wl_display, process_wayland.wl_event_queue); wayland_init_display_devices(); diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 5cd6e74f24a..5c93e16f3e1 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -230,7 +230,7 @@ BOOL wayland_output_create(uint32_t id, uint32_t version) goto err; } - output->wl_output = wl_registry_bind(process_wayland->wl_registry, id, + output->wl_output = wl_registry_bind(process_wayland.wl_registry, id, &wl_output_interface, version < 2 ? version : 2); output->global_id = id; @@ -252,10 +252,10 @@ BOOL wayland_output_create(uint32_t id, uint32_t version) goto err; } - if (process_wayland->zxdg_output_manager_v1) + if (process_wayland.zxdg_output_manager_v1) wayland_output_use_xdg_extension(output); - wl_list_insert(process_wayland->output_list.prev, &output->link); + wl_list_insert(process_wayland.output_list.prev, &output->link); return TRUE; @@ -293,7 +293,7 @@ void wayland_output_destroy(struct wayland_output *output) void wayland_output_use_xdg_extension(struct wayland_output *output) { output->zxdg_output_v1 = - zxdg_output_manager_v1_get_xdg_output(process_wayland->zxdg_output_manager_v1, + zxdg_output_manager_v1_get_xdg_output(process_wayland.zxdg_output_manager_v1, output->wl_output); zxdg_output_v1_add_listener(output->zxdg_output_v1, &zxdg_output_v1_listener, output); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index e1ea66f3b33..d5cbb47bf9e 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -39,8 +39,7 @@ * Globals */ -extern struct wl_display *process_wl_display DECLSPEC_HIDDEN; -extern struct wayland *process_wayland DECLSPEC_HIDDEN; +extern struct wayland process_wayland DECLSPEC_HIDDEN; /********************************************************************** * Definitions for wayland types @@ -48,6 +47,7 @@ extern struct wayland *process_wayland DECLSPEC_HIDDEN; struct wayland { + struct wl_display *wl_display; struct wl_event_queue *wl_event_queue; struct wl_registry *wl_registry; struct zxdg_output_manager_v1 *zxdg_output_manager_v1;

1 0

Alexandros Frantzis : winewayland.drv: Read and dispatch Wayland events.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 4a69ec6f9679dade8b65c26774d8827d55ec7f34 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a69ec6f9679dade8b65c26774d882… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 24 11:11:16 2023 +0300 winewayland.drv: Read and dispatch Wayland events. Create a dedicated thread from which we read and dispatch Wayland events (beyond the initial ones). --- dlls/winewayland.drv/dllmain.c | 20 ++++++++++++++++++++ dlls/winewayland.drv/unixlib.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 12 ++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/winewayland.drv/dllmain.c b/dlls/winewayland.drv/dllmain.c index 89d981a4314..d040620957b 100644 --- a/dlls/winewayland.drv/dllmain.c +++ b/dlls/winewayland.drv/dllmain.c @@ -20,8 +20,25 @@ #include "waylanddrv_dll.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); + +static DWORD WINAPI wayland_read_events_thread(void *arg) +{ + WAYLANDDRV_UNIX_CALL(read_events, NULL); + /* This thread terminates only if an unrecoverable error occurred + * during event reading (e.g., the connection to the Wayland + * compositor is broken). */ + ERR("Failed to read events from the compositor, terminating process\n"); + TerminateProcess(GetCurrentProcess(), 1); + return 0; +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { + DWORD tid; + if (reason != DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls(instance); @@ -30,5 +47,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) if (WAYLANDDRV_UNIX_CALL(init, NULL)) return FALSE; + /* Read wayland events from a dedicated thread. */ + CloseHandle(CreateThread(NULL, 0, wayland_read_events_thread, NULL, 0, &tid)); + return TRUE; } diff --git a/dlls/winewayland.drv/unixlib.h b/dlls/winewayland.drv/unixlib.h index 427837523e3..dc3bfdf8893 100644 --- a/dlls/winewayland.drv/unixlib.h +++ b/dlls/winewayland.drv/unixlib.h @@ -26,6 +26,7 @@ enum waylanddrv_unix_func { waylanddrv_unix_func_init, + waylanddrv_unix_func_read_events, waylanddrv_unix_func_count, }; diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index a9297edc500..a578db76c66 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -49,9 +49,20 @@ err: return STATUS_UNSUCCESSFUL; } +static NTSTATUS waylanddrv_unix_read_events(void *arg) +{ + while (wl_display_dispatch_queue(process_wayland.wl_display, + process_wayland.wl_event_queue) != -1) + continue; + /* This function only returns on a fatal error, e.g., if our connection + * to the Wayland server is lost. */ + return STATUS_UNSUCCESSFUL; +} + const unixlib_entry_t __wine_unix_call_funcs[] = { waylanddrv_unix_init, + waylanddrv_unix_read_events, }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == waylanddrv_unix_func_count); @@ -61,6 +72,7 @@ C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == waylanddrv_unix_func_count); const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { waylanddrv_unix_init, + waylanddrv_unix_read_events, }; C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == waylanddrv_unix_func_count);

1 0

Alexandros Frantzis : winewayland.drv: Handle dynamic Wayland output events.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 0031c3b46c89ca81d169213fae38d1a94ccc2506 URL: https://gitlab.winehq.org/wine/wine/-/commit/0031c3b46c89ca81d169213fae38d1… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 24 15:48:00 2023 +0300 winewayland.drv: Handle dynamic Wayland output events. Handle Wayland output events sent after process initialization, and update the win32u display devices when handling these events in the desktop window process. --- dlls/winewayland.drv/display.c | 14 +++++++++++--- dlls/winewayland.drv/wayland.c | 4 +++- dlls/winewayland.drv/wayland_output.c | 24 ++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 3 ++- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index d822a785898..f734c1714fa 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -34,9 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); -void wayland_init_display_devices(void) +static BOOL force_display_devices_refresh; + +void wayland_init_display_devices(BOOL force) { UINT32 num_path, num_mode; + + TRACE("force=%d\n", force); + + if (force) force_display_devices_refresh = TRUE; /* Trigger refresh in win32u */ NtUserGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode); } @@ -284,9 +290,11 @@ BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manage struct wl_array output_info_array; struct output_info *output_info; - if (!force) return TRUE; + if (!force && !force_display_devices_refresh) return TRUE; - TRACE("force=%d\n", force); + TRACE("force=%d force_refresh=%d\n", force, force_display_devices_refresh); + + force_display_devices_refresh = FALSE; wl_array_init(&output_info_array); diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index dab23a555a2..38c53e280c5 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -135,7 +135,9 @@ BOOL wayland_process_init(void) wl_display_roundtrip_queue(process_wayland.wl_display, process_wayland.wl_event_queue); wl_display_roundtrip_queue(process_wayland.wl_display, process_wayland.wl_event_queue); - wayland_init_display_devices(); + wayland_init_display_devices(FALSE); + + process_wayland.initialized = TRUE; return TRUE; } diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 5c93e16f3e1..8293f43b56f 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -97,6 +97,26 @@ static void wayland_output_add_mode(struct wayland_output *output, if (current) output->current_mode = mode; } +static void maybe_init_display_devices(void) +{ + DWORD desktop_pid = 0; + HWND desktop_hwnd; + + /* Right after process init we initialize all the display devices, so there + * is no need to react to each individual event at that time. This check + * also helps us avoid calling NtUserGetDesktopWindow() (see below) at + * process init time, since it may not be safe. */ + if (!process_wayland.initialized) return; + + desktop_hwnd = NtUserGetDesktopWindow(); + NtUserGetWindowThread(desktop_hwnd, &desktop_pid); + + /* We only update the display devices from the desktop process. */ + if (GetCurrentProcessId() != desktop_pid) return; + + wayland_init_display_devices(TRUE); +} + static void wayland_output_done(struct wayland_output *output) { struct wayland_output_mode *mode; @@ -111,6 +131,8 @@ static void wayland_output_done(struct wayland_output *output) mode->width, mode->height, mode->refresh, output->current_mode == mode ? "*" : ""); } + + maybe_init_display_devices(); } static void output_handle_geometry(void *data, struct wl_output *wl_output, @@ -283,6 +305,8 @@ void wayland_output_destroy(struct wayland_output *output) wl_output_destroy(output->wl_output); free(output->name); free(output); + + maybe_init_display_devices(); } /********************************************************************** diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index d5cbb47bf9e..95d115113b3 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -47,6 +47,7 @@ extern struct wayland process_wayland DECLSPEC_HIDDEN; struct wayland { + BOOL initialized; struct wl_display *wl_display; struct wl_event_queue *wl_event_queue; struct wl_registry *wl_registry; @@ -80,7 +81,7 @@ struct wayland_output */ BOOL wayland_process_init(void) DECLSPEC_HIDDEN; -void wayland_init_display_devices(void) DECLSPEC_HIDDEN; +void wayland_init_display_devices(BOOL force) DECLSPEC_HIDDEN; /********************************************************************** * Wayland output

1 0

Alexandros Frantzis : winewayland.drv: Make access to Wayland output information thread-safe.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 1a336a259ce58def1d435ffe8f3ee50900d7cb76 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a336a259ce58def1d435ffe8f3ee5… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Apr 26 10:38:04 2023 +0300 winewayland.drv: Make access to Wayland output information thread-safe. Store all incoming Wayland output state as pending and make it current in a thread-safe way when the "done" event arrives. This enables other threads, with proper locking, to safely read consistent and complete Wayland output information. --- dlls/winewayland.drv/Makefile.in | 2 +- dlls/winewayland.drv/display.c | 10 ++- dlls/winewayland.drv/wayland.c | 5 +- dlls/winewayland.drv/wayland_output.c | 115 +++++++++++++++++++++++++--------- dlls/winewayland.drv/waylanddrv.h | 18 ++++-- 5 files changed, 112 insertions(+), 38 deletions(-)

1 0