March 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : dxgi: Call wined3d_swapchain_state_set_fullscreen in d3d12_swapchain_init.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 6956746a0aa2903659fff93481fb4f803a62440b URL: https://gitlab.winehq.org/wine/wine/-/commit/6956746a0aa2903659fff93481fb4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 11:24:09 2023 +0300 dxgi: Call wined3d_swapchain_state_set_fullscreen in d3d12_swapchain_init. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e00867f8069..454d58792fe 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2794,6 +2794,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkBool32 supported; VkDevice vk_device; VkFence vk_fence; + bool fullscreen; VkResult vr; HRESULT hr; @@ -2838,6 +2839,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } + fullscreen = !wined3d_desc.windowed; + wined3d_desc.windowed = TRUE; + dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_factory->wined3d, &swapchain->state_parent, &swapchain->state))) @@ -2846,8 +2850,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } - if (!fullscreen_desc->Windowed) + if (fullscreen) { + wined3d_desc.windowed = FALSE; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); if (FAILED(hr)) {

1 0

Stefan Dösinger : dxgi: Unlock the wined3d mutex after storing the new target.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 75f7bd0eea4f0a9a351c858196ef6c83fda2a747 URL: https://gitlab.winehq.org/wine/wine/-/commit/75f7bd0eea4f0a9a351c858196ef6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 27 10:38:46 2023 +0300 dxgi: Unlock the wined3d mutex after storing the new target. Otherwise a second thread might set it to something else between the unlock and assignment. --- dlls/dxgi/swapchain.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 454d58792fe..9449d13ae49 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -410,12 +410,11 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); - wined3d_mutex_unlock(); if (FAILED(hr)) { IDXGIOutput_Release(target); - - return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + goto done; } if (!fullscreen) @@ -428,7 +427,9 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen IDXGIOutput_Release(swapchain->target); swapchain->target = target; - return S_OK; +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapChain1 *iface, @@ -2098,13 +2099,20 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, target, window, swapchain_desc, fullscreen_desc))) - goto fail; + { + IDXGIOutput_Release(target); + return hr; + } + wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); - wined3d_mutex_unlock(); if (FAILED(hr)) - goto fail; + { + IDXGIOutput_Release(target); + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + goto done; + } fullscreen_desc->Windowed = wined3d_desc.windowed; if (!fullscreen) @@ -2117,12 +2125,9 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen IDXGIOutput_Release(swapchain->target); swapchain->target = target; - return S_OK; - -fail: - IDXGIOutput_Release(target); - - return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain4 *iface,

1 0

Stefan Dösinger : dxgi: Catch nested SetFullscreenState invocations.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 33170e27206e4e94ea3365822cdd2e807e5656d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/33170e27206e4e94ea3365822cdd2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 13 16:27:59 2023 +0300 dxgi: Catch nested SetFullscreenState invocations. --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index dd17e39eca6..fa704d28b0f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -183,6 +183,7 @@ struct d3d11_swapchain IDXGIOutput *target; LONG present_count; + LONG in_set_fullscreen_state; }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9449d13ae49..1f5eb99ab4b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -383,6 +383,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain_state *state; struct dxgi_output *dxgi_output; + LONG in_set_fullscreen_state; + BOOL old_fs; HRESULT hr; TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); @@ -404,6 +406,18 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen } dxgi_output = unsafe_impl_from_IDXGIOutput(target); + /* DXGI catches nested SetFullscreenState invocations, earlier versions of d3d + * do not. Final Fantasy XIV depends on this behavior. It tries to call SFS on + * WM_WINDOWPOSCHANGED messages. */ + in_set_fullscreen_state = InterlockedExchange(&swapchain->in_set_fullscreen_state, 1); + if (in_set_fullscreen_state) + { + WARN("Nested invocation of SetFullscreenState.\n"); + IDXGIOutput_Release(target); + IDXGISwapChain1_GetFullscreenState(iface, &old_fs, NULL); + return old_fs == fullscreen ? S_OK : DXGI_STATUS_MODE_CHANGE_IN_PROGRESS; + } + wined3d_mutex_lock(); state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); @@ -429,6 +443,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen done: wined3d_mutex_unlock(); + InterlockedExchange(&swapchain->in_set_fullscreen_state, 0); return hr; } @@ -1016,6 +1031,7 @@ struct d3d12_swapchain IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + LONG in_set_fullscreen_state; ID3D12Fence *frame_latency_fence; HANDLE frame_latency_event; @@ -2077,6 +2093,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc; struct wined3d_swapchain_desc wined3d_desc; HWND window = swapchain->window; + LONG in_set_fullscreen_state; + BOOL old_fs; HRESULT hr; TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); @@ -2104,6 +2122,15 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen return hr; } + in_set_fullscreen_state = InterlockedExchange(&swapchain->in_set_fullscreen_state, 1); + if (in_set_fullscreen_state) + { + WARN("Nested invocation of SetFullscreenState.\n"); + IDXGIOutput_Release(target); + IDXGISwapChain4_GetFullscreenState(iface, &old_fs, NULL); + return old_fs == fullscreen ? S_OK : DXGI_STATUS_MODE_CHANGE_IN_PROGRESS; + } + wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); @@ -2127,6 +2154,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen done: wined3d_mutex_unlock(); + InterlockedExchange(&swapchain->in_set_fullscreen_state, 0); return hr; }

1 0

Alexandre Julliard : gitlab: Add workaround for more strict git ownership check.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 7af84c79a19afe1476c401f9be93dc6ef8ae56fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7af84c79a19afe1476c401f9be93dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 09:33:13 2023 +0100 gitlab: Add workaround for more strict git ownership check. --- tools/gitlab/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 12ffe86dd62..b474f271c8b 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -21,6 +21,7 @@ - export CCACHE_DIR="$BASEDIR/ccache" - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" + - git config --global --add safe.directory $CI_PROJECT_DIR - mkdir -p build32 build64 - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase

1 0

Alexandre Julliard : make_makefiles: Die when the git command fails.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: ce8023ea139c545fa0780ad710f74d580443c602 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce8023ea139c545fa0780ad710f74d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 09:25:46 2023 +0100 make_makefiles: Die when the git command fails. --- tools/make_makefiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2025b45b75c..2079a037f4e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -487,7 +487,7 @@ sub update_wine_inf() my $git_dir = $ENV{GIT_DIR} || ".git"; die "needs to be run from a git checkout" unless -e $git_dir; -my @all_files = split /\0/, `git ls-files -c -z`; +my @all_files = split /\0/, `git ls-files -c -z` or die "cannot get files list"; map { $ignored_source_files{$_} = 1; } split /\0/, `git ls-files -d -z`; @makefiles = grep /Makefile.in$/, @all_files;

1 0

Long Junyu : packaging/android: Use correct strip when cross building.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: tools Branch: master Commit: b78d90fc51d58446728f60e7f9ceeebab767fa0e URL: https://gitlab.winehq.org/winehq/tools/-/commit/b78d90fc51d58446728f60e7f9c… Author: Long Junyu <877730493(a)qq.com> Date: Thu Mar 9 08:39:20 2023 +0000 packaging/android: Use correct strip when cross building. --- packaging/android/build-apks | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index ef245cdb..23df1d96 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -175,6 +175,7 @@ install_all () rm -rf $destdir/assets assets-tmp $destdir/lib make $makeflags all install-lib DESTDIR=$(pwd) prefix=/assets-tmp + STRIPPROG=$host-strip for i in \ ../$freetype/objs/.libs/libfreetype.so \ ../$gmp/.libs/libgmp.so \

1 0

Zebediah Figura : tests/shader_runner: Use the global test_options structure.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: vkd3d Branch: master Commit: 9ea84ae8c91741418a7e0ab0b46887fd358b7d3c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9ea84ae8c91741418a7e0ab0b4688… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 21 17:46:36 2023 -0600 tests/shader_runner: Use the global test_options structure. Inspired by a patch by Giovanni Mascellani. --- tests/d3d12.c | 2 ++ tests/d3d12_crosstest.h | 25 ------------------------ tests/d3d12_invalid_usage.c | 2 ++ tests/hlsl_d3d12.c | 2 ++ tests/shader_runner.c | 46 ++++++++++++++++---------------------------- tests/shader_runner.h | 10 +++++----- tests/shader_runner_d3d11.c | 42 ++++++---------------------------------- tests/shader_runner_d3d12.c | 5 ++--- tests/shader_runner_d3d9.c | 20 +++---------------- tests/shader_runner_vulkan.c | 4 ++-- tests/utils.h | 30 +++++++++++++++++++++++++++++ 11 files changed, 71 insertions(+), 117 deletions(-)

1 0

Giovanni Mascellani : tests: Collect D3D12 test options in a dedicated structure.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: vkd3d Branch: master Commit: c8a05a8b105da1b66459163737a2c868997da7ba URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8a05a8b105da1b66459163737a2c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Jan 28 21:44:21 2023 +0100 tests: Collect D3D12 test options in a dedicated structure. --- tests/d3d12.c | 25 +++++++++++----------- tests/d3d12_crosstest.h | 51 +++++++++++++++++++++++---------------------- tests/d3d12_invalid_usage.c | 2 +- tests/hlsl_d3d12.c | 2 +- tests/shader_runner_d3d12.c | 2 +- 5 files changed, 42 insertions(+), 40 deletions(-)

1 0

Giovanni Mascellani : tests: Initialize shader_runner fields after having zeroed the struct.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: vkd3d Branch: master Commit: 8d7159b4be7b971b3362582ce415677d6cdbea17 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d7159b4be7b971b3362582ce4156… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 30 11:07:45 2023 +0100 tests: Initialize shader_runner fields after having zeroed the struct. --- tests/shader_runner.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 507fbdaf..80249dfe 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -705,8 +705,6 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const char line[256]; FILE *f; - runner->minimum_shader_model = SHADER_MODEL_2_0; - for (i = 1; i < argc; ++i) { if (argv[i][0] != '-') @@ -730,6 +728,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const memset(runner, 0, sizeof(*runner)); runner->ops = ops; + runner->minimum_shader_model = SHADER_MODEL_2_0; for (;;) {

1 0

Henri Verbeet : build: Actually run asuint.shader_test.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: vkd3d Branch: master Commit: 0c833056f641bd04978b175fb2a077553c93bc24 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0c833056f641bd04978b175fb2a07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 17:56:00 2023 +0100 build: Actually run asuint.shader_test. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 191f4eb9..c1606cec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ vkd3d_shader_tests = \ tests/arithmetic-int-uniform.shader_test \ tests/arithmetic-uint.shader_test \ tests/array-parameters.shader_test \ + tests/asuint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-equal.shader_test \

1 0