April 2022 - Wine-devel - list.winehq.org

[PATCH vkd3d] configure: Allow specifying the Vulkan library path with VULKAN_LIBS.
by Zebediah Figura 27 Apr '22

27 Apr '22

Do not define it for the vkd3d build, but restore support for overriding it as a configure argument. This partially reverts 99a3adcc19f2a64fad630948851616f52c00d553. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52915 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 1 + m4/check-vulkan.m4 | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b386104a..7796ae8d 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,7 @@ case $host_os in esac AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) AS_IF([test "x$SONAME_LIBVULKAN" = "x"], [VKD3D_CHECK_VULKAN], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])]) diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 index b2c3f8a1..f651a077 100644 --- a/m4/check-vulkan.m4 +++ b/m4/check-vulkan.m4 @@ -6,7 +6,8 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],, [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])]) - ]) - ]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS]) ]) -- 2.34.1

3 2

[PATCH vkd3d v5 1/7] vkd3d-shader/hlsl: Do not allow NaNs in SM1.
by Giovanni Mascellani 27 Apr '22

27 Apr '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 2e16577f..d8787c21 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -278,10 +278,10 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, "Floating point division by zero."); } dst->value[k].f = src1->value[k].f / src2->value[k].f; - if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) + if (ctx->profile->major_version < 4 && !isfinite(dst->value[k].f)) { hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, - "Infinities are not allowed by the shader model."); + "Infinities and NaNs are not allowed by the shader model."); } break; -- 2.36.0

3 8

[PATCH 3/3] msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52821 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 ++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 70 +++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletion(-)

2 1

[PATCH 2/3] msvcp140_atomic_wait: Add __std_atomic_notify_all_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] msvcp140_atomic_wait: Add __std_atomic_notify_one_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/Makefile.in | 2 +- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH 0/1] MR8: wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8

2 1

[PATCH 0/10] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: > Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page > is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. The following test script has been used to test each changes (use with `git rebase --exec=...`): ```sh set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6

2 10

[PATCH v2] ieframe: Initialize new history log entry.
by Dmitry Timoshkov 27 Apr '22

27 Apr '22

In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/dochost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..e73659f1736 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -469,6 +469,8 @@ static void update_travellog(DocHost *This) if(This->travellog.loading_pos == -1) { This->travellog.position++; + This->travellog.log[This->travellog.position].stream = NULL; + This->travellog.log[This->travellog.position].url = NULL; }else { This->travellog.position = This->travellog.loading_pos; This->travellog.loading_pos = -1; -- 2.35.3

2 1

[PATCH] po: Mark an incomplete Dutch translation as fuzzy.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It does not translate the usage exemples section and the trailing empty line is a hint that this is likely accidental. --- po/nl.po | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 1/2] msvcp140/tests: Add a broken last error result in test_Copy_file().
by Paul Gofman 27 Apr '22

27 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1df2f058424..640e44e5b7c 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1614,12 +1614,14 @@ static void test_Copy_file(void) SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3"); -- 2.35.1

2 2