- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Explicitly hold ref to the plugin host in NPP_New.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 08dc691dfb410de7115db3f9c34b225327e21f67 URL: https://gitlab.winehq.org/wine/wine/-/commit/08dc691dfb410de7115db3f9c34b22… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 22 19:03:22 2023 +0300 mshtml: Explicitly hold ref to the plugin host in NPP_New. Currently this worked by luck because it is leaking; the element holding it never releases it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/npplugin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index a1c38e5ed1a..6dfb65c0a6e 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -301,6 +301,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I } instance->pdata = container->plugin_host; + IOleClientSite_AddRef(&container->plugin_host->IOleClientSite_iface); node_release(&container->element.node); return err;

1 0

Gabriel Ivăncescu : mshtml: Release ref from the element when detaching the plugin host.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 5c939222d339f02264f92183a973d4471c495425 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c939222d339f02264f92183a973d4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 22 19:03:22 2023 +0300 mshtml: Release ref from the element when detaching the plugin host. When the plugin host is created, its only ref is being held by the element it is associated with. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/pluginhost.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 4ee5c37de19..83ce9aa5d7f 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -2672,14 +2672,15 @@ void detach_plugin_host(PluginHost *host) release_plugin_ifaces(host); + list_remove(&host->entry); + list_init(&host->entry); + host->doc = NULL; + if(host->element) { host->element->plugin_host = NULL; host->element = NULL; + IOleClientSite_Release(&host->IOleClientSite_iface); } - - list_remove(&host->entry); - list_init(&host->entry); - host->doc = NULL; } HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: baebde4b29131ee620ce545b4b28f973674bfdd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/baebde4b29131ee620ce545b4b28f9… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 25 00:14:14 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index 13a491fc5d4..a4b5f05e436 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-05-03 00:00+0300\n" +"PO-Revision-Date: 2023-05-25 00:13+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -17144,38 +17144,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: Sėkmingai pašalinta DLL biblioteka „%1“\n" #: programs/start/start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/exec Exec the specified file (for internal Wine usage).\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17228,6 +17196,7 @@ msgstr "" "/belownormal Paleisti programą prioriteto klasėje žemiau normalios.\n" "/node n Paleisti programą nurodytame NUMA mazge.\n" "/affinity mask Paleisti programą su nurodyta atitikimo kauke.\n" +"/machine arch Priverstinai naudoti architektūrą (x86,arm,amd64,arm64).\n" "/wait Laukti, kol paleista programa baigs darbą, tada išeiti su " "jos\n" " išėjimo kodu.\n"

1 0

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

May 25, 2023

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

Alex Henrie : mshtml: Fix memory leak on error path in add_func_info (Coverity).
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: e7c6cdddf364b81daebb29a6649f3b0033473042 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7c6cdddf364b81daebb29a6649f3b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 11 18:01:57 2023 -0600 mshtml: Fix memory leak on error path in add_func_info (Coverity). --- dlls/mshtml/dispex.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 817d77dda7d..e332dfdbd9d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -302,8 +302,10 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, if(info == data->funcs+data->func_cnt) { if(data->func_cnt == data->func_size) { info = realloc(data->funcs, data->func_size * 2 * sizeof(func_info_t)); - if(!info) + if(!info) { + SysFreeString(name); return; + } memset(info + data->func_size, 0, data->func_size * sizeof(func_info_t)); data->funcs = info; data->func_size *= 2;

1 0

Francois Gouget : wininet/tests: Consistently use strlen() in the InternetGetConnectedStateExA() tests.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: a551821a4e979df40a8288d57df06bf47e3e753e URL: https://gitlab.winehq.org/wine/wine/-/commit/a551821a4e979df40a8288d57df06b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 7 15:18:19 2023 +0200 wininet/tests: Consistently use strlen() in the InternetGetConnectedStateExA() tests. --- dlls/wininet/tests/internet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7cd21efcd36..6772036244e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1730,7 +1730,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(sz - 1 == strlen(buffer), "Expected len %lu, got %Iu: %s\n", sz - 1, strlen(buffer), wine_dbgstr_a(buffer)); memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; @@ -1738,7 +1738,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz / 2 - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(sz / 2 - 1 == strlen(buffer), "Expected len %lu, got %Iu: %s\n", sz / 2 - 1, strlen(buffer), wine_dbgstr_a(buffer)); memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; @@ -1746,7 +1746,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(strlen(buffer) == 1, "Expected len 1, got %Iu: %s\n", strlen(buffer), wine_dbgstr_a(buffer)); memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0;

1 0

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

May 25, 2023

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

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

May 25, 2023

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

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

May 24, 2023

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: Update desktop window size on display changes.
by Alexandre Julliard May 24, 2023

May 24, 2023

Module: wine Branch: master Commit: e10da7ab2e3d151c8347802600862aa608672f6f URL: https://gitlab.winehq.org/wine/wine/-/commit/e10da7ab2e3d151c8347802600862a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Apr 26 15:58:43 2023 +0300 winewayland.drv: Update desktop window size on display changes. Update the desktop window size to match the current virtual screen rect. --- dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index ecd144950c2..57125e011cb 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -110,6 +110,7 @@ void wayland_output_use_xdg_extension(struct wayland_output *output) DECLSPEC_HI * USER driver functions */ +LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) 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; diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index 1d9877f4518..2a7bed9d1d8 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -31,6 +31,7 @@ static const struct user_driver_funcs waylanddrv_funcs = { + .pDesktopWindowProc = WAYLAND_DesktopWindowProc, .pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices, .pWindowMessage = WAYLAND_WindowMessage }; diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 946ad6801a9..ea5ac22a8a2 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -30,6 +30,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); +static void wayland_resize_desktop(void) +{ + RECT virtual_rect = NtUserGetVirtualScreenRect(); + NtUserSetWindowPos(NtUserGetDesktopWindow(), 0, + virtual_rect.left, virtual_rect.top, + virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE); +} + /********************************************************************** * WAYLAND_WindowMessage */ @@ -39,9 +49,25 @@ LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { case WM_WAYLAND_INIT_DISPLAY_DEVICES: wayland_init_display_devices(TRUE); + wayland_resize_desktop(); return 0; default: FIXME("got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (long)wp, lp); return 0; } } + +/********************************************************************** + * WAYLAND_DesktopWindowProc + */ +LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch (msg) + { + case WM_DISPLAYCHANGE: + wayland_resize_desktop(); + break; + } + + return NtUserMessageCall(hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE); +}

1 0