- Wine-Commits - list.winehq.org

Jacek Caban : widl: Don't use old typelib format in do_everything mode.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: a8fc62d1a269031b786f05b45ae9f57b4c365768 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8fc62d1a269031b786f05b45ae9f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 4 12:54:32 2024 +0200 widl: Don't use old typelib format in do_everything mode. Fixes a regression from 0bffa3222611015a3b3596c679be53c557daae1b. --- tools/widl/register.c | 2 +- tools/widl/widl.c | 5 ++--- tools/widl/widl.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index c4f81756352..66a07aeb5c4 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -317,7 +317,7 @@ void write_typelib_regscript( const statement_list_t *stmts ) error( "Cannot store multiple typelibs into %s\n", typelib_name ); else { - if (do_old_typelib) + if (old_typelib) create_sltg_typelib( stmt->u.lib ); else create_msft_typelib( stmt->u.lib ); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 489e7c2f9a2..6d7dd46c33e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -99,7 +99,6 @@ int do_everything = 1; static int preprocess_only = 0; int do_header = 0; int do_typelib = 0; -int do_old_typelib = 0; int do_proxies = 0; int do_client = 0; int do_server = 0; @@ -108,6 +107,7 @@ int do_idfile = 0; int do_dlldata = 0; static int no_preprocess = 0; int old_names = 0; +int old_typelib = 0; int winrt_mode = 0; int interpreted_mode = 0; int use_abi_namespace = 0; @@ -256,7 +256,6 @@ static void set_everything(int x) { do_header = x; do_typelib = x; - do_old_typelib = x; do_proxies = x; do_client = x; do_server = x; @@ -618,7 +617,7 @@ static void option_callback( int optc, char *optarg ) do_typelib = 1; break; case OLD_TYPELIB_OPTION: - do_old_typelib = 1; + old_typelib = 1; break; case 'T': typelib_name = xstrdup(optarg); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 33ecfa1f255..c5ccc140b36 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -39,7 +39,6 @@ extern int pedantic; extern int do_everything; extern int do_header; extern int do_typelib; -extern int do_old_typelib; extern int do_proxies; extern int do_client; extern int do_server; @@ -47,6 +46,7 @@ extern int do_regscript; extern int do_idfile; extern int do_dlldata; extern int old_names; +extern int old_typelib; extern int winrt_mode; extern int interpreted_mode; extern int use_abi_namespace;

1 0

Alexandre Julliard : widl: Map VT_USERDEFINED to VT_I4 for default values in typelibs.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 047b7fc293c651a11df7da58eb6fab33bfc5931a URL: https://gitlab.winehq.org/wine/wine/-/commit/047b7fc293c651a11df7da58eb6fab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 20:44:21 2024 +0200 widl: Map VT_USERDEFINED to VT_I4 for default values in typelibs. --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index ce99c23f16a..31e340e6bcd 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1229,6 +1229,9 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e case VT_UINT: case VT_HRESULT: break; + case VT_USERDEFINED: + vt = VT_I4; + break; case VT_VARIANT: { switch (expr->type) { case EXPR_DOUBLE:

1 0

Giovanni Mascellani : ci: Make llvmpipe from Mesa 24.0.3 available in the CI image.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: vkd3d Branch: master Commit: b3ce73984d8a16de6d38ee8b05400aab4d0c4367 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b3ce73984d8a16de6d38ee8b05400… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 28 13:52:59 2024 +0100 ci: Make llvmpipe from Mesa 24.0.3 available in the CI image. --- gitlab/README | 17 ++++++++++++++++- gitlab/image.docker | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/gitlab/README b/gitlab/README index 3b520323..94cbde4e 100644 --- a/gitlab/README +++ b/gitlab/README @@ -8,7 +8,22 @@ the vkd3d tests on each merge request. The CI target image-linux, in the file image.yml, builds a Docker image based on Debian bookworm with all the packages required for testing, and uploads it to the GitLab container registry. The Docker -script is in the file image.docker. +script is in the file image.docker. Most of the dependencies are +installed directly from the Debian repositories, with a few +exceptions: + + * widl is compiled from Wine sources, because installing it from the + Debian repositories would carry all the rest of Wine and make the + Docker image quite larger; + + * SPIRV-Tools are recompiled from sources, because the packages in + Debian do not ship shared objects and are not multiarch-compatible; + in order to make the packages multiarch-compatible, the utilities + are dropped (they're not used by the CI anyway); + + * llvmpipe from Mesa 24.0.1 is compiled (in addition to version + 22.3.6 available in Debian bookworm), because some Vulkan features + required by vkd3d are not available in Mesa 22.3.6. The file build.yml contains the actual testing targets. Currently vkd3d is tested on Linux, on x86-64 and i386, each architecture with diff --git a/gitlab/image.docker b/gitlab/image.docker index 270c509b..fb3ed626 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -23,6 +23,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \ autoconf automake libtool flex bison curl \ git ca-certificates rsync \ + llvm-15-dev meson ninja-build python3-mako \ + zlib1g-dev libexpat-dev libdrm-dev libglvnd-dev \ doxygen doxygen-latex graphviz \ mesa-vulkan-drivers mesa-vulkan-drivers:i386 \ vulkan-tools spirv-headers \ @@ -36,6 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libxcb-keysyms1-dev libxcb-keysyms1-dev:i386 && \ apt-get build-dep -y spirv-tools && \ apt-get build-dep -y -ai386 spirv-tools && \ + git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git && \ cd wine && \ mkdir build && \ @@ -45,6 +48,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cp tools/widl/widl /usr/local/bin && \ cd ../.. && \ rm -rf wine && \ + apt-get source spirv-tools && \ cd spirv-tools-* && \ sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ @@ -55,6 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ rm -f spirv-tools-dbgsym_*.deb && \ dpkg -i spirv-tools_*.deb && \ rm -fr * && \ + apt-get source spirv-tools && \ cd spirv-tools-* && \ sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ @@ -65,6 +70,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ rm -f spirv-tools-dbgsym_*.deb && \ dpkg -i spirv-tools_*.deb && \ rm -fr * && \ + + git clone --depth 1 --branch mesa-24.0.3 https://gitlab.freedesktop.org/mesa/mesa.git && \ + cd mesa && \ + mkdir build && \ + cd build && \ + meson setup -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \ + meson install && \ + cd ../.. && \ + rm -fr mesa && \ + 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 && \

1 0

Giovanni Mascellani : ci: Run tests on llvmpipe from Mesa 24.0.3.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: vkd3d Branch: master Commit: 636d8d385035a235a4bd99774a7623f9f400445d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/636d8d385035a235a4bd99774a762… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 28 14:19:18 2024 +0100 ci: Run tests on llvmpipe from Mesa 24.0.3. --- gitlab/build-linux | 2 +- gitlab/build.yml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 532a462a..b149132c 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -export LD_LIBRARY_PATH=/usr/local/lib +export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH-}" if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_GLSL" && \ make -j$(nproc) ; then make -j$(nproc) AM_COLOR_TESTS=always check || \ diff --git a/gitlab/build.yml b/gitlab/build.yml index af68e9ef..fb8a6879 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -61,6 +61,17 @@ build-llvmpipe-32: CC: 'i686-linux-gnu-gcc' VKD3D_SHADER_CONFIG: 'force_validation' +build-llvmpipe-64-mesa24: + extends: .build-linux + allow_failure: + exit_codes: + - 2 + variables: + VK_DRIVER_FILES: '/opt/mesa24/share/vulkan/icd.d/lvp_icd.x86_64.json' + LD_LIBRARY_PATH: '/opt/mesa24/lib/x86_64-linux-gnu' + __EGL_VENDOR_LIBRARY_FILENAMES: '/opt/mesa24/share/glvnd/egl_vendor.d/50_mesa.json' + VKD3D_SHADER_CONFIG: 'force_validation' + build-crosstest: stage: build rules:

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Allow 'export' modifier on functions.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: vkd3d Branch: master Commit: 4b0a328a2b58a86e3529ddcc2cdc785a08625f81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b0a328a2b58a86e3529ddcc2cdc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 15:36:00 2024 +0200 vkd3d-shader/hlsl: Allow 'export' modifier on functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 9 +++++++-- tests/hlsl/function.shader_test | 12 ++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 16ddbf3c..f5a38a29 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -375,6 +375,7 @@ struct hlsl_attribute #define HLSL_STORAGE_NOPERSPECTIVE 0x00008000 #define HLSL_STORAGE_LINEAR 0x00010000 #define HLSL_MODIFIER_SINGLE 0x00020000 +#define HLSL_MODIFIER_EXPORT 0x00040000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 600e2cf2..88b917ef 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -88,6 +88,7 @@ DomainShader {return KW_DOMAINSHADER; } do {return KW_DO; } double {return KW_DOUBLE; } else {return KW_ELSE; } +export {return KW_EXPORT; } extern {return KW_EXTERN; } false {return KW_FALSE; } for {return KW_FOR; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9135fb7a..e02e0c54 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5341,6 +5341,7 @@ static void validate_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, %token KW_DOMAINSHADER %token KW_DOUBLE %token KW_ELSE +%token KW_EXPORT %token KW_EXTERN %token KW_FALSE %token KW_FOR @@ -5969,9 +5970,9 @@ func_prototype_no_attrs: /* Functions are unconditionally inlined. */ modifiers &= ~HLSL_MODIFIER_INLINE; - if (modifiers & ~HLSL_MODIFIERS_MAJORITY_MASK) + if (modifiers & ~(HLSL_MODIFIERS_MAJORITY_MASK | HLSL_MODIFIER_EXPORT)) hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Only majority modifiers are allowed on functions."); + "Unexpected modifier used on a function."); if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) YYABORT; if ((var = hlsl_get_var(ctx->globals, $3))) @@ -6868,6 +6869,10 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_INLINE, &@1); } + | KW_EXPORT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_EXPORT, &@1); + } | var_identifier var_modifiers { if (!strcmp($1, "precise")) diff --git a/tests/hlsl/function.shader_test b/tests/hlsl/function.shader_test index dbe9d3a3..7743ee1f 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -333,3 +333,15 @@ inline float4 main() : sv_target [test] todo(glsl) draw quad probe all rgba (2.0, 3.0, 6.0, 7.0) + +% Export modifier + +[pixel shader] +export float4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo(glsl) draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: wine Branch: master Commit: f19c55867095c0571cf4a99f32036af76fc59edd URL: https://gitlab.winehq.org/wine/wine/-/commit/f19c55867095c0571cf4a99f32036a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 3 22:59:53 2024 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 86b6af3f73a..281318e9ce9 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: 2024-03-30 00:22+0200\n" +"PO-Revision-Date: 2024-04-03 22:59+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" @@ -19381,10 +19381,8 @@ msgid "Help topics: " msgstr "Žinyno temos: " #: programs/wmic/wmic.rc:28 -#, fuzzy -#| msgid "Error: Command line not supported\n" msgid "Error: Command not supported\n" -msgstr "Klaida: Komandos eilutė nepalaikoma\n" +msgstr "Klaida: Komanda nepalaikoma\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n"

1 0

Brendan Shanks : win32u: Replace sprintf with snprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: wine Branch: master Commit: 996070283c88d14b9967399d1fe511196adcfab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/996070283c88d14b9967399d1fe511… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 1 13:29:40 2024 -0700 win32u: Replace sprintf with snprintf to avoid deprecation warnings on macOS. --- dlls/win32u/defwnd.c | 8 ++-- dlls/win32u/font.c | 10 ++--- dlls/win32u/freetype.c | 4 +- dlls/win32u/input.c | 4 +- dlls/win32u/menu.c | 27 ++++++------ dlls/win32u/spy.c | 6 +-- dlls/win32u/sysparams.c | 106 +++++++++++++++++++++++------------------------ dlls/win32u/winstation.c | 2 +- 8 files changed, 84 insertions(+), 83 deletions(-)

1 0

Brendan Shanks : win32u: Use PATH_MAX for Unix paths instead of MAX_PATH (from Win32).
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: wine Branch: master Commit: 3992a76ee98c92a274830345b9f2923bb3ca3f94 URL: https://gitlab.winehq.org/wine/wine/-/commit/3992a76ee98c92a274830345b9f292… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 2 15:07:47 2024 -0700 win32u: Use PATH_MAX for Unix paths instead of MAX_PATH (from Win32). --- dlls/win32u/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 701e15c110d..5da70da0f94 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -332,7 +332,7 @@ static char *find_cache_dir(void) { FSRef ref; OSErr err; - static char cached_path[MAX_PATH]; + static char cached_path[PATH_MAX]; static const char *wine = "/Wine", *fonts = "/Fonts"; if(*cached_path) return cached_path; @@ -1439,7 +1439,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { DIR *dir; struct dirent *dent; - char path[MAX_PATH]; + char path[PATH_MAX]; TRACE("Loading fonts from %s\n", debugstr_a(dirname));

1 0

Brendan Shanks : win32u: Enlarge buffer size in format_date.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: wine Branch: master Commit: 0feed009b493e78cef9e37b4c0044ab89123ffb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/0feed009b493e78cef9e37b4c0044a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 2 12:40:20 2024 -0700 win32u: Enlarge buffer size in format_date. --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5a8fafaae6c..82182eaf078 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -885,7 +885,7 @@ static unsigned int format_date( WCHAR *bufferW, LONGLONG time ) { int cleaps, years, yearday, months, days; unsigned int day, month, year; - char buffer[32]; + char buffer[33]; days = time / TICKSPERSEC / SECSPERDAY;

1 0

Brendan Shanks : win32u: Enlarge buffer size in _CDS_flags.
by Alexandre Julliard April 3, 2024

April 3, 2024

Module: wine Branch: master Commit: 609b42c169547a5b530be4b39c14aff848165464 URL: https://gitlab.winehq.org/wine/wine/-/commit/609b42c169547a5b530be4b39c14af… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 2 15:24:40 2024 -0700 win32u: Enlarge buffer size in _CDS_flags. --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 988da5a7641..5a8fafaae6c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2798,7 +2798,7 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, static const char *_CDS_flags( DWORD fields ) { BOOL first = TRUE; - CHAR buf[128]; + CHAR buf[130]; CHAR *p = buf; _X_FIELD(CDS, UPDATEREGISTRY)

1 0