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

Stefan Dösinger : dxgi/tests: Test nested SetFullscreenState from the same thread.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 617831054f13922cd646ad3653f959f667604273 URL: https://gitlab.winehq.org/wine/wine/-/commit/617831054f13922cd646ad3653f959… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 13 15:51:35 2023 +0300 dxgi/tests: Test nested SetFullscreenState from the same thread. I am still deliberately not testing after which message the swapchain state changes from the old state to the new until we find a game that depends on this. ddraw, d3d8 and d3d9 do not catch recursive SetDisplayMode or Reset() calls. They will recurse for about 16 times and then return library specific weird return values like 0xd0000510 (NTSTATUS, but nonexistent facility) or 0x88760868 (non-existent HRESULT facility). I suspect it aborts when the kernel-side message processing stack is exhausted. As such, an application depending on nested calls in those libraries would have to deliberately do it, but limit the amount of nesting to a non-zero amount. --- dlls/dxgi/tests/dxgi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index fe933a3852f..ac302840dec 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5889,14 +5889,54 @@ static BOOL check_message(const struct message *expected, static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { + IDXGISwapChain *swapchain = (IDXGISwapChain *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static BOOL reentry; + IDXGIOutput *target; + HRESULT hr, hr2; + BOOL fs; + flaky ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#Ix, lparam %#Ix.\n", message, hwnd, wparam, lparam); + ok(!reentry, "Re-entered wndproc in nested SetFullscreenState call\n"); + if (expect_messages) { if (check_message(expect_messages, hwnd, message, wparam, lparam)) + { ++expect_messages; + + if (swapchain) + { + reentry = TRUE; + + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Priority of error values. */ + hr = IDXGISwapChain_GetContainingOutput(swapchain, &target); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, target); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", DXGI_ERROR_INVALID_CALL); + IDXGIOutput_Release(target); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + hr2 = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + + if (fs) + { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr2 == DXGI_STATUS_MODE_CHANGE_IN_PROGRESS, "Got unexpected hr %#lx.\n", hr); + } + else + { + ok(hr == DXGI_STATUS_MODE_CHANGE_IN_PROGRESS, "Got unexpected hr %#lx.\n", hr); + ok(hr2 == S_OK, "Got unexpected hr %#lx.\n", hr); + } + reentry = FALSE; + } + } } if (expect_messages_broken) @@ -6028,12 +6068,14 @@ static void test_swapchain_window_messages(IUnknown *device, BOOL is_d3d12) ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); /* enter fullscreen */ + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)swapchain); expect_messages = enter_fullscreen_messages; expect_messages_broken = enter_fullscreen_messages_vista; hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ "Got unexpected hr %#lx.\n", hr); + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)NULL); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); @@ -6078,9 +6120,11 @@ static void test_swapchain_window_messages(IUnknown *device, BOOL is_d3d12) expect_messages_broken = NULL; /* leave fullscreen */ + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)swapchain); expect_messages = leave_fullscreen_messages; hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)NULL); flush_events(); ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL;

1 0

Fan WenJie : opengl32: Fix missing conversion of glUnmapBuffer_params from 32bit to 64bit.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 60ce80e6ac779408d83bfc303108353fb5993d3e URL: https://gitlab.winehq.org/wine/wine/-/commit/60ce80e6ac779408d83bfc30310835… Author: Fan WenJie <fanwj(a)mail.ustc.edu.cn> Date: Thu Mar 9 22:03:59 2023 +0800 opengl32: Fix missing conversion of glUnmapBuffer_params from 32bit to 64bit. Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn> --- dlls/opengl32/unix_wgl.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 24bd904b068..a410321994d 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -2043,14 +2043,20 @@ static NTSTATUS wow64_gl_unmap_buffer( void *args, NTSTATUS (*gl_unmap_buffer64) GLenum target; GLboolean ret; } *params32 = args; + struct glUnmapBuffer_params params = + { + .teb = get_teb64(params32->teb), + .target = params32->target, + .ret = TRUE, + }; NTSTATUS status; - TEB *teb = get_teb64( params32->teb ); - if (!(ptr = get_buffer_pointer( teb, params32->target ))) return STATUS_SUCCESS; + if (!(ptr = get_buffer_pointer( params.teb, params.target ))) return STATUS_SUCCESS; - status = wow64_unmap_buffer( ptr, get_buffer_param( teb, params32->target, GL_BUFFER_MAP_LENGTH ), - get_buffer_param( teb, params32->target, GL_BUFFER_ACCESS_FLAGS ) ); - gl_unmap_buffer64( args ); + status = wow64_unmap_buffer( ptr, get_buffer_param( params.teb, params.target, GL_BUFFER_MAP_LENGTH ), + get_buffer_param( params.teb, params.target, GL_BUFFER_ACCESS_FLAGS ) ); + gl_unmap_buffer64( &params ); + params32->ret = params.ret; return status; }

1 0

Fan WenJie : opengl32: Fix missing conversion of glUnmapNamedBuffer_params from 32bit to 64bit.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: b3ae4f794788628ffa62f15db78d14564cc8c21d URL: https://gitlab.winehq.org/wine/wine/-/commit/b3ae4f794788628ffa62f15db78d14… Author: Fan WenJie <fanwj(a)mail.ustc.edu.cn> Date: Thu Mar 9 22:03:59 2023 +0800 opengl32: Fix missing conversion of glUnmapNamedBuffer_params from 32bit to 64bit. Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn> --- dlls/opengl32/unix_wgl.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index a410321994d..6c3379b90a2 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -2080,14 +2080,20 @@ static NTSTATUS wow64_gl_unmap_named_buffer( void *args, NTSTATUS (*gl_unmap_nam GLint buffer; GLboolean ret; } *params32 = args; + struct glUnmapNamedBuffer_params params = + { + .teb = get_teb64(params32->teb), + .buffer = params32->buffer, + .ret = TRUE, + }; NTSTATUS status; - TEB *teb = get_teb64( params32->teb ); - if (!(ptr = get_named_buffer_pointer( teb, params32->buffer ))) return STATUS_SUCCESS; + if (!(ptr = get_named_buffer_pointer( params.teb, params.buffer ))) return STATUS_SUCCESS; - status = wow64_unmap_buffer( ptr, get_named_buffer_param( teb, params32->buffer, GL_BUFFER_MAP_LENGTH ), - get_named_buffer_param( teb, params32->buffer, GL_BUFFER_ACCESS_FLAGS ) ); - gl_unmap_named_buffer64( args ); + status = wow64_unmap_buffer( ptr, get_named_buffer_param( params.teb, params.buffer, GL_BUFFER_MAP_LENGTH ), + get_named_buffer_param( params.teb, params.buffer, GL_BUFFER_ACCESS_FLAGS ) ); + gl_unmap_named_buffer64( &params ); + params32->ret = params.ret; return status; }

1 0

Alexandre Julliard : make_makefiles: Die when the git command fails.
by Alexandre Julliard 10 Mar '23

10 Mar '23

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

Alexandre Julliard : gitlab: Add workaround for more strict git ownership check.
by Alexandre Julliard 10 Mar '23

10 Mar '23

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

Long Junyu : packaging/android: Use correct strip when cross building.
by Alexandre Julliard 10 Mar '23

10 Mar '23

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 10 Mar '23

10 Mar '23

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: Initialize shader_runner fields after having zeroed the struct.
by Alexandre Julliard 10 Mar '23

10 Mar '23

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

Giovanni Mascellani : tests: Collect D3D12 test options in a dedicated structure.
by Alexandre Julliard 10 Mar '23

10 Mar '23

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

Henri Verbeet : build: Actually run asuint.shader_test.
by Alexandre Julliard 09 Mar '23

09 Mar '23

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