November 2021 - Wine-commits

Rémi Bernon : dinput8/tests: Add older dinput HID force-feedback tests.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 95fca9198b2c7791bebd809888beafbecd0018b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95fca9198b2c7791bebd8098… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:23 2021 +0100 dinput8/tests: Add older dinput HID force-feedback tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/Makefile.in | 2 +- dlls/dinput8/tests/hid.c | 360 +++++++++++++++++++++++++++++------------ 2 files changed, 262 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95fca9198b2c7791bebd…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 7becaadeddb0c02ddef44ee7629b0ecca436f69d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7becaadeddb0c02ddef44ee7… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Nov 10 00:14:16 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index cfc51dc296f..c9be849321c 100644 --- a/po/nl.po +++ b/po/nl.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: 2021-09-25 22:40+0200\n" +"PO-Revision-Date: 2021-11-10 00:03+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14442,7 +14442,7 @@ msgstr "IPv6-adres" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Primair DNS-achtervoegsel" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 1aa16d05ce9e90135ea6e70ef8108c720866e7f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa16d05ce9e90135ea6e70e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 10 08:49:33 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index f8d119a0c19..d0532e095f1 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: 2021-09-25 10:47+0300\n" +"PO-Revision-Date: 2021-11-10 08:49+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14383,7 +14383,7 @@ msgstr "IPv6 adresas" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Pirminis DNS sufiksas" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Alexandre Julliard : makefiles: Substitute all defined variables in the main makefile.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 37c0f5c6908bae3e14e791fbc9a87e0a61ceee00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c0f5c6908bae3e14e791fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 11:38:10 2021 +0100 makefiles: Substitute all defined variables in the main makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 69 +--------- configure | 380 +++++++++++++++++++++++++++++++++++++---------------- configure.ac | 44 ++++--- server/Makefile.in | 2 +- tools/makedep.c | 4 +- 5 files changed, 296 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37c0f5c6908bae3e14e7…

1 0

Alexandre Julliard : makefiles: Generate the top makefile entirely from configure.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: c6b5f4a406351e7faef33de23d64db4445ef9aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b5f4a406351e7faef33de2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 12:48:59 2021 +0100 makefiles: Generate the top makefile entirely from configure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 77 ------ aclocal.m4 | 5 +- configure | 812 ++++++++++++++++++++++------------------------------------- configure.ac | 120 ++++++--- 4 files changed, 398 insertions(+), 616 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6b5f4a406351e7faef3…

1 0

Bernhard Kölbl : xml2: Use MSVC constants for NaN and infinity.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: wine Branch: master Commit: 8923be8f6871bfd32e42a51eae9932532ee038ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=8923be8f6871bfd32e42a51e… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Nov 9 22:05:05 2021 +0100 xml2: Use MSVC constants for NaN and infinity. Prevent division by zero exceptions from being thrown, if they are enabled and calls to xmlXPathInit() are being made. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52003 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xml2/xpath.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/xml2/xpath.c b/libs/xml2/xpath.c index 7497ba07d6f..5fa3c72eb6c 100644 --- a/libs/xml2/xpath.c +++ b/libs/xml2/xpath.c @@ -497,14 +497,12 @@ double xmlXPathNINF; * * Initialize the XPath environment */ -ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") void xmlXPathInit(void) { - /* MSVC doesn't allow division by zero in constant expressions. */ - double zero = 0.0; - xmlXPathNAN = 0.0 / zero; - xmlXPathPINF = 1.0 / zero; - xmlXPathNINF = -xmlXPathPINF; + /* Use MSVC definitions */ + xmlXPathNAN = NAN; + xmlXPathPINF = INFINITY; + xmlXPathNINF = -INFINITY; } /**

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle samplers in write_sm1_uniform().
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: vkd3d Branch: master Commit: eca2d90a6e843fc29fd4728bccb0d58c492ce2e9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eca2d90a6e843fc29fd4728… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 21:39:29 2021 -0600 vkd3d-shader/hlsl: Handle samplers in write_sm1_uniform(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm1.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index c3d27ee..875f521 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -352,8 +352,18 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe if (!var->semantic.name && var->reg.allocated) { put_u32(buffer, 0); /* name */ - put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->reg.id)); - put_u32(buffer, var->data_type->reg_size / 4); + if (var->data_type->type == HLSL_CLASS_OBJECT + && (var->data_type->base_type == HLSL_TYPE_SAMPLER + || var->data_type->base_type == HLSL_TYPE_TEXTURE)) + { + put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->reg.id)); + put_u32(buffer, 1); + } + else + { + put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->reg.id)); + put_u32(buffer, var->data_type->reg_size / 4); + } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 sampler declarations.
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: vkd3d Branch: master Commit: ae4ff17b18d1ac20048af711d7b4afc26852efda URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae4ff17b18d1ac20048af71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 21:39:30 2021 -0600 vkd3d-shader/hlsl: Write SM4 sampler declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index d48a41d..e597425 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -974,6 +974,20 @@ static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, write_sm4_instruction(buffer, &instr); } +static void write_sm4_dcl_sampler(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) +{ + const struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_DCL_SAMPLER, + + .dsts[0].reg.type = VKD3D_SM4_RT_SAMPLER, + .dsts[0].reg.idx = {var->reg.id}, + .dsts[0].reg.idx_count = 1, + .dst_count = 1, + }; + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_dcl_texture(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) { const struct sm4_instruction instr = @@ -1647,7 +1661,9 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, if (!var->reg.allocated || var->data_type->type != HLSL_CLASS_OBJECT) continue; - if (var->data_type->base_type == HLSL_TYPE_TEXTURE) + if (var->data_type->base_type == HLSL_TYPE_SAMPLER) + write_sm4_dcl_sampler(&buffer, var); + else if (var->data_type->base_type == HLSL_TYPE_TEXTURE) write_sm4_dcl_texture(&buffer, var); }

1 0

Joshua Ashton : vkd3d-shader/hlsl: Avoid hard-coding array sizes in hlsl_type_to_string().
by Alexandre Julliard 10 Nov '21

10 Nov '21

Module: vkd3d Branch: master Commit: a55c51a2b7a82e1d019ee834180ea7edd50d9356 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a55c51a2b7a82e1d019ee83… Author: Joshua Ashton <joshua(a)froggi.es> Date: Mon Nov 8 21:39:27 2021 -0600 vkd3d-shader/hlsl: Avoid hard-coding array sizes in hlsl_type_to_string(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c71eac3..1eee427 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -854,14 +854,14 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { struct vkd3d_string_buffer *string; - static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = - { - "float", - "half", - "double", - "int", - "uint", - "bool", + static const char *const base_types[] = + { + [HLSL_TYPE_FLOAT] = "float", + [HLSL_TYPE_HALF] = "half", + [HLSL_TYPE_DOUBLE] = "double", + [HLSL_TYPE_INT] = "int", + [HLSL_TYPE_UINT] = "uint", + [HLSL_TYPE_BOOL] = "bool", }; if (!(string = hlsl_get_string_buffer(ctx))) @@ -915,7 +915,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_OBJECT: { - static const char dimensions[5][HLSL_SAMPLER_DIM_MAX + 1] = + static const char *const dimensions[] = { [HLSL_SAMPLER_DIM_1D] = "1D", [HLSL_SAMPLER_DIM_2D] = "2D",

1 0

Martin Storsjö : winedump: Distinguish between 16 and 32 bit nop opcodes in ARM unwind data.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 22d2b61a646eda01945b9c282a1cb9b1ea13e968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d2b61a646eda01945b9c28… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:45 2021 +0200 winedump: Distinguish between 16 and 32 bit nop opcodes in ARM unwind data. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4629c3082f9..5d325fba3da 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1171,13 +1171,20 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) excode = (code << 24) | (excodes[0] << 16) | (excodes[1] << 8) | excodes[2]; printf( "%s sp, sp, #%u\n", inepilogue ? "add" : "sub", (excode & 0xffffff) * 4 ); } - else if (code <= 0xfc) + else if (code <= 0xfb) printf( "nop\n" ); - else if (code <= 0xfe) + else if (code <= 0xfc) + printf( "nop.w\n" ); + else if (code <= 0xfd) { printf( "(end) nop\n" ); inepilogue = TRUE; } + else if (code <= 0xfe) + { + printf( "(end) nop.w\n" ); + inepilogue = TRUE; + } else { printf( "end\n" );

1 0