October 2023 - Wine-commits

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .y files.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: wine Branch: master Commit: ffeb530cc0bd21016d1ea718de720edb3879d8d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffeb530cc0bd21016d1ea718de720e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:51:42 2023 +0200 makefiles: Always use the global SOURCES variable for .y files. --- dlls/jscript/Makefile.in | 17 ++++++----------- dlls/msi/Makefile.in | 17 ++++++----------- dlls/vbscript/Makefile.in | 13 ++++--------- dlls/wbemprox/Makefile.in | 10 ++++------ tools/make_makefiles | 4 +--- 5 files changed, 21 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3e019201eb8..c37b0dd69f3 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -1,10 +1,11 @@ MODULE = jscript.dll IMPORTS = oleaut32 ole32 user32 advapi32 -C_SRCS = \ +SOURCES = \ activex.c \ array.c \ bool.c \ + cc_parser.y \ compile.c \ date.c \ decode.c \ @@ -15,7 +16,10 @@ C_SRCS = \ function.c \ global.c \ jscript.c \ + jscript.rc \ + jscript_classes.idl \ jscript_main.c \ + jsglobal.idl \ json.c \ jsregexp.c \ jsstr.c \ @@ -24,17 +28,8 @@ C_SRCS = \ math.c \ number.c \ object.c \ + parser.y \ regexp.c \ set.c \ string.c \ vbarray.c - -RC_SRCS = jscript.rc - -IDL_SRCS = \ - jscript_classes.idl \ - jsglobal.idl - -BISON_SRCS = \ - cc_parser.y \ - parser.y diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 7140e5a3308..21420909a92 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -4,13 +4,14 @@ IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 EXTRAIDLFLAGS = --prefix-server=s_ -C_SRCS = \ +SOURCES = \ action.c \ alter.c \ appsearch.c \ assembly.c \ automation.c \ classes.c \ + cond.y \ create.c \ custom.c \ database.c \ @@ -26,8 +27,10 @@ C_SRCS = \ install.c \ media.c \ msi.c \ + msi.rc \ msi_main.c \ msiquery.c \ + msiserver.idl \ package.c \ patch.c \ record.c \ @@ -35,6 +38,7 @@ C_SRCS = \ script.c \ select.c \ source.c \ + sql.y \ storages.c \ streams.c \ string.c \ @@ -43,14 +47,5 @@ C_SRCS = \ tokenize.c \ update.c \ upgrade.c \ - where.c - -IDL_SRCS = \ - msiserver.idl \ + where.c \ winemsi.idl - -BISON_SRCS = \ - cond.y \ - sql.y - -RC_SRCS = msi.rc diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index a6a0569cc03..0dcc928460b 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,25 +3,20 @@ IMPORTS = oleaut32 ole32 user32 EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ compile.c \ global.c \ interp.c \ lex.c \ + parser.y \ regexp.c \ utils.c \ vbdisp.c \ vbregexp.c \ vbscript.c \ - vbscript_main.c - -BISON_SRCS = \ - parser.y - -RC_SRCS = vbscript.rc - -IDL_SRCS = \ + vbscript.rc \ vbscript_classes.idl \ + vbscript_main.c \ vbsglobal.idl \ vbsregexp10.idl \ vbsregexp55.idl diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 48a43646491..53835c748ff 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,7 +1,7 @@ MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi -C_SRCS = \ +SOURCES = \ builtin.c \ class.c \ main.c \ @@ -14,8 +14,6 @@ C_SRCS = \ services.c \ sysrestore.c \ table.c \ - wbemlocator.c - -IDL_SRCS = wbemprox.idl - -BISON_SRCS = wql.y + wbemlocator.c \ + wbemprox.idl \ + wql.y diff --git a/tools/make_makefiles b/tools/make_makefiles index bd84414d9c5..0e4a31648c3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/) + if ($name =~ /\.(in|l|m|mc|po|sfd|svg|y)$/) { push @{${$make}{"=SOURCES"}}, $name; next; } - elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; @@ -394,7 +393,6 @@ sub assign_sources_to_makefiles(@) preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); - preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); } }

1 0

Giovanni Mascellani : ci: Build widl for 64 bit.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 1ee0cbb627997694263be5e3b0f857bb04c36482 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ee0cbb627997694263be5e3b0f85… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 26 16:33:09 2023 +0200 ci: Build widl for 64 bit. --- gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/image.docker b/gitlab/image.docker index dd6923cb..ec63dee4 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -29,7 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd wine && \ mkdir build && \ cd build && \ - ../configure --without-x --without-freetype && \ + ../configure --enable-win64 --without-x --without-freetype && \ make tools/widl/widl && \ cp tools/widl/widl /usr/local/bin && \ cd ../.. && \

1 0

Giovanni Mascellani : tests: Fail if dxcompiler is not available at runtime.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: c1de65a99ba851f97cb5f345b66a2bba1fc98fc2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c1de65a99ba851f97cb5f345b66a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 2 14:08:44 2023 +0200 tests: Fail if dxcompiler is not available at runtime. --- tests/shader_runner.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index cae0bf02..423f42bd 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1457,23 +1457,20 @@ static IDxcCompiler3 *dxcompiler_create() HRESULT hr; void *dll; - if (!(dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER))) - { - trace("Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); + dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER); + ok(dll, "Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); + if (!dll) return NULL; - } - if (!(create_instance = (DxcCreateInstanceProc)vkd3d_dlsym(dll, "DxcCreateInstance"))) - { - trace("Failed to get DxcCreateInstance() pointer.\n"); + create_instance = (DxcCreateInstanceProc)vkd3d_dlsym(dll, "DxcCreateInstance"); + ok(create_instance, "Failed to get DxcCreateInstance() pointer.\n"); + if (!create_instance) return NULL; - } - if (FAILED(hr = create_instance(&CLSID_DxcCompiler, &IID_IDxcCompiler3, (void **)&compiler))) - { - trace("Failed to create instance, hr %#x.\n", hr); + hr = create_instance(&CLSID_DxcCompiler, &IID_IDxcCompiler3, (void **)&compiler); + ok(SUCCEEDED(hr), "Failed to create instance, hr %#x.\n", hr); + if (FAILED(hr)) return NULL; - } return compiler; }

1 0

Giovanni Mascellani : ci: Build the DXIL parser.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 680a5aaa78943d78d7257fe873590b4e07fb813d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/680a5aaa78943d78d7257fe873590… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 4 12:51:02 2023 +0200 ci: Build the DXIL parser. --- gitlab/build-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 661180f5..9a26849c 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos CFLAGS="-g -O2 -Werror" && \ +../configure --enable-demos CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) && \ make -j$(nproc) check || \ touch ../pipeline_failed

1 0

Giovanni Mascellani : ci: Run tests using dxcompiler.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 1bd8baf4209892d9828b8e88d24ec69d03bf8acb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bd8baf4209892d9828b8e88d24ec… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 2 14:07:28 2023 +0200 ci: Run tests using dxcompiler. The dxcompiler is only used for 64 bit builds, because no official 32 bit implementation is distributed. This might change in the future building the compiler ourselves and using vkd3d-shader to sign the generated shaders. --- gitlab/build-linux | 3 ++- gitlab/image.docker | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 9a26849c..ee00e61e 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,8 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ +export LD_LIBRARY_PATH=/usr/local/lib +../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) && \ make -j$(nproc) check || \ touch ../pipeline_failed diff --git a/gitlab/image.docker b/gitlab/image.docker index ec63dee4..b7e40ee0 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -14,7 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y build-essential pkg-config gcc-multilib gcc-mingw-w64 \ - autoconf automake libtool flex bison \ + autoconf automake libtool flex bison curl \ git ca-certificates rsync \ doxygen doxygen-latex graphviz \ mesa-vulkan-drivers mesa-vulkan-drivers:i386 \ @@ -35,6 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd ../.. && \ rm -rf wine && \ apt-get clean && \ + curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2… | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ groupadd host-render -g 800 && \ useradd -m gitlab -G host-render

1 0

Nikolay Sivov : d3dx9: Check for tx_1_0 blob magic earlier in D3DXCreateTextureShader().
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: f6907843385c01e58cdeb2d7701fdba085735d37 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6907843385c01e58cdeb2d7701fdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 01:12:52 2023 +0200 d3dx9: Check for tx_1_0 blob magic earlier in D3DXCreateTextureShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 2 ++ dlls/d3dx9_36/preshader.c | 1 - dlls/d3dx9_36/shader.c | 3 +++ dlls/d3dx9_36/tests/texture.c | 14 +++++++++++--- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 5d8f5b332f8..991ff5b79b5 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -32,6 +32,8 @@ #define ULONG64_MAX (~(ULONG64)0) +#define FOURCC_TX_1 0x54580100 + struct vec4 { float x, y, z, w; diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index ebf62a99c6a..14cc2e234f4 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -144,7 +144,6 @@ static double pres_div(double *args, int n) {return 0.0;} #define FOURCC_CLIT 0x54494c43 #define FOURCC_FXLC 0x434c5846 #define FOURCC_PRSI 0x49535250 -#define FOURCC_TX_1 0x54580100 #define PRES_SIGN 0x46580000 struct op_info diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 7d06090aa15..f31a609ab04 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2653,6 +2653,9 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader if (!function || !texture_shader) return D3DERR_INVALIDCALL; + if (*function != FOURCC_TX_1) + return D3DXERR_INVALIDDATA; + if (!(size = D3DXGetShaderSize(function))) return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 30495508ac3..b0dd3c0c6c3 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2475,17 +2475,25 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR hr = D3DXCreateTextureShader(NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(NULL, &tx); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(shader_invalid, &tx); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(shader_zero, &tx); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(shader_empty, &tx); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); hr = D3DXCreateTextureShader(shader_code, &tx); ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);

1 0

Alexandre Julliard : Release 8.18.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 9d78031de6261f29d42e18db04f9925cfba24108 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d78031de6261f29d42e18db04f992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 23:00:12 2023 +0200 Release 8.18. --- ANNOUNCE | 746 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 382 insertions(+), 384 deletions(-)

1 0

Tag wine-8.18 : Alexandre Julliard : Release 8.18
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: refs/tags/wine-8.18 Tag: f13b73c535fe4c1d5176422aa4ea707f2270d6d5 URL: https://gitlab.winehq.org/wine/wine/-/tags/f13b73c535fe4c1d5176422aa4ea707f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 23:00:12 2023 +0200 Release 8.18

1 0

Alexandros Frantzis : winewayland.drv: Handle xdg_toplevel tiled states.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 52decb1ca6eaf20728c1a31da95bbe7251d32b1f URL: https://gitlab.winehq.org/wine/wine/-/commit/52decb1ca6eaf20728c1a31da95bbe… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Sep 29 13:36:53 2023 +0300 winewayland.drv: Handle xdg_toplevel tiled states. Tiled states don't place strict constraints on the surface size, but they indicate a strong size preference, so try to respect it. --- dlls/winewayland.drv/wayland_surface.c | 6 ++++++ dlls/winewayland.drv/waylanddrv.h | 3 ++- dlls/winewayland.drv/window.c | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 8551ad98eeb..ddb10be6e06 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -91,6 +91,12 @@ static void xdg_toplevel_handle_configure(void *data, case XDG_TOPLEVEL_STATE_RESIZING: config_state |= WAYLAND_SURFACE_CONFIG_STATE_RESIZING; break; + case XDG_TOPLEVEL_STATE_TILED_LEFT: + case XDG_TOPLEVEL_STATE_TILED_RIGHT: + case XDG_TOPLEVEL_STATE_TILED_TOP: + case XDG_TOPLEVEL_STATE_TILED_BOTTOM: + config_state |= WAYLAND_SURFACE_CONFIG_STATE_TILED; + break; default: break; } diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index faff529940d..fcfc187925d 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -60,7 +60,8 @@ enum wayland_window_message enum wayland_surface_config_state { WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED = (1 << 0), - WAYLAND_SURFACE_CONFIG_STATE_RESIZING = (1 << 1) + WAYLAND_SURFACE_CONFIG_STATE_RESIZING = (1 << 1), + WAYLAND_SURFACE_CONFIG_STATE_TILED = (1 << 2) }; struct wayland_cursor diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 5704931c21e..9833daee0e1 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -401,8 +401,13 @@ static void wayland_configure_window(HWND hwnd) } /* The Wayland maximized state is very strict about surface size, so don't - * let the application override it. */ - if (state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) flags |= SWP_NOSENDCHANGING; + * let the application override it. The tiled state is not as strict, + * but it indicates a strong size preference, so try to respect it. */ + if (state & (WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED | + WAYLAND_SURFACE_CONFIG_STATE_TILED)) + { + flags |= SWP_NOSENDCHANGING; + } NtUserSetWindowPos(hwnd, 0, 0, 0, width, height, flags); }

1 0

Alexandros Frantzis : winewayland.drv: Store and use the latest window config for a wayland_surface.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 8f0d3ec13de9191cbd0d243f371775c5afc3e47a URL: https://gitlab.winehq.org/wine/wine/-/commit/8f0d3ec13de9191cbd0d243f371775… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Oct 3 15:20:08 2023 +0300 winewayland.drv: Store and use the latest window config for a wayland_surface. Instead of querying the window config for a wayland_surface on demand, query it and store it only when it is applied through SetWindowPos. In addition to being more efficient, this prevents deadlocks by avoiding calling NtUser functions that require the user lock, while holding the window_surface lock. --- dlls/winewayland.drv/wayland_surface.c | 20 ++++++----------- dlls/winewayland.drv/waylanddrv.h | 7 ++++++ dlls/winewayland.drv/window.c | 39 ++++++++++++++++++++++------------ 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index ddb10be6e06..5bb8c959537 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -349,22 +349,16 @@ static BOOL wayland_surface_configure_is_compatible(struct wayland_surface_confi */ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) { - RECT window_rect; + struct wayland_window_config *window = &surface->window; int width, height; - enum wayland_surface_config_state window_state; if (!surface->xdg_toplevel) return TRUE; - if (!NtUserGetWindowRect(surface->hwnd, &window_rect)) return FALSE; - width = window_rect.right - window_rect.left; - height = window_rect.bottom - window_rect.top; - - window_state = - (NtUserGetWindowLongW(surface->hwnd, GWL_STYLE) & WS_MAXIMIZE) ? - WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0; + width = surface->window.rect.right - surface->window.rect.left; + height = surface->window.rect.bottom - surface->window.rect.top; TRACE("hwnd=%p window=%dx%d,%#x processing=%dx%d,%#x current=%dx%d,%#x\n", - surface->hwnd, width, height, window_state, + surface->hwnd, width, height, window->state, surface->processing.width, surface->processing.height, surface->processing.state, surface->current.width, surface->current.height, surface->current.state); @@ -373,7 +367,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) if (surface->processing.serial && surface->processing.processed && wayland_surface_configure_is_compatible(&surface->processing, width, height, - window_state)) + window->state)) { surface->current = surface->processing; memset(&surface->processing, 0, sizeof(surface->processing)); @@ -385,7 +379,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) else if (!surface->current.serial && surface->requested.serial && wayland_surface_configure_is_compatible(&surface->requested, width, height, - window_state)) + window->state)) { surface->current = surface->requested; memset(&surface->requested, 0, sizeof(surface->requested)); @@ -394,7 +388,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) else if (!surface->current.serial || !wayland_surface_configure_is_compatible(&surface->current, width, height, - window_state)) + window->state)) { return FALSE; } diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index fcfc187925d..4b74b674ea6 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -141,6 +141,12 @@ struct wayland_surface_config BOOL processed; }; +struct wayland_window_config +{ + RECT rect; + enum wayland_surface_config_state state; +}; + struct wayland_surface { HWND hwnd; @@ -151,6 +157,7 @@ struct wayland_surface struct wayland_surface_config pending, requested, processing, current; struct wayland_shm_buffer *latest_window_buffer; BOOL resizing; + struct wayland_window_config window; }; struct wayland_shm_buffer diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 9833daee0e1..8fcca9fbec2 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -43,6 +43,8 @@ struct wayland_win_data struct wayland_surface *wayland_surface; /* wine window_surface backing this window */ struct window_surface *window_surface; + /* USER window rectangle relative to win32 parent window client area */ + RECT window_rect; }; static int wayland_win_data_cmp_rb(const void *key, @@ -65,7 +67,8 @@ static struct rb_tree win_data_rb = { wayland_win_data_cmp_rb }; * * Create a data window structure for an existing window. */ -static struct wayland_win_data *wayland_win_data_create(HWND hwnd) +static struct wayland_win_data *wayland_win_data_create(HWND hwnd, + const RECT *window_rect) { struct wayland_win_data *data; struct rb_entry *rb_entry; @@ -79,6 +82,7 @@ static struct wayland_win_data *wayland_win_data_create(HWND hwnd) if (!(data = calloc(1, sizeof(*data)))) return NULL; data->hwnd = hwnd; + data->window_rect = *window_rect; pthread_mutex_lock(&win_data_mutex); @@ -146,6 +150,14 @@ static void wayland_win_data_release(struct wayland_win_data *data) pthread_mutex_unlock(&win_data_mutex); } +static void wayland_win_data_get_config(struct wayland_win_data *data, + struct wayland_window_config *conf) +{ + conf->rect = data->window_rect; + conf->state = (NtUserGetWindowLongW(data->hwnd, GWL_STYLE) & WS_MAXIMIZE) ? + WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0; +} + static void wayland_win_data_update_wayland_surface(struct wayland_win_data *data) { struct wayland_surface *surface = data->wayland_surface; @@ -170,20 +182,22 @@ static void wayland_win_data_update_wayland_surface(struct wayland_win_data *dat visible = (NtUserGetWindowLongW(data->hwnd, GWL_STYLE) & WS_VISIBLE) == WS_VISIBLE; xdg_visible = surface->xdg_toplevel != NULL; + pthread_mutex_lock(&surface->mutex); + if (visible != xdg_visible) { - pthread_mutex_lock(&surface->mutex); - /* If we have a pre-existing surface ensure it has no role. */ if (data->wayland_surface) wayland_surface_clear_role(surface); /* If the window is a visible toplevel make it a wayland * xdg_toplevel. Otherwise keep it role-less to avoid polluting the * compositor with empty xdg_toplevels. */ if (visible) wayland_surface_make_toplevel(surface); - - pthread_mutex_unlock(&surface->mutex); } + wayland_win_data_get_config(data, &surface->window); + + pthread_mutex_unlock(&surface->mutex); + if (data->window_surface) wayland_window_surface_update_wayland_surface(data->window_surface, surface); @@ -195,22 +209,17 @@ out: static void wayland_win_data_update_wayland_state(struct wayland_win_data *data) { struct wayland_surface *surface = data->wayland_surface; - uint32_t window_state; BOOL processing_config; pthread_mutex_lock(&surface->mutex); if (!surface->xdg_toplevel) goto out; - window_state = - (NtUserGetWindowLongW(surface->hwnd, GWL_STYLE) & WS_MAXIMIZE) ? - WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0; - processing_config = surface->processing.serial && !surface->processing.processed; TRACE("hwnd=%p window_state=%#x %s->state=%#x\n", - data->hwnd, window_state, + data->hwnd, surface->window.state, processing_config ? "processing" : "current", processing_config ? surface->processing.state : surface->current.state); @@ -218,12 +227,12 @@ static void wayland_win_data_update_wayland_state(struct wayland_win_data *data) * window state to determine and update the Wayland state. */ if (!processing_config) { - if ((window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && + if ((surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && !(surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) { xdg_toplevel_set_maximized(surface->xdg_toplevel); } - else if (!(window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && + else if (!(surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && (surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) { xdg_toplevel_unset_maximized(surface->xdg_toplevel); @@ -268,7 +277,7 @@ BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, 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; + if (!data && !(data = wayland_win_data_create(hwnd, window_rect))) return TRUE; /* Release the dummy surface wine provides for toplevels. */ if (*surface) window_surface_release(*surface); @@ -318,6 +327,8 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, if (!data) return; + data->window_rect = *window_rect; + if (surface) window_surface_add_ref(surface); if (data->window_surface) window_surface_release(data->window_surface); data->window_surface = surface;

1 0