February 2022 - Wine-commits

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 unsigned multiplication instructions.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: 52a3e0af559b2728546763c3f6c0f66183086fd0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52a3e0af559b2728546763c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 11 21:04:06 2022 +0100 vkd3d-shader/hlsl: Write SM4 unsigned multiplication instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9db8a69..6996bb2 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -806,7 +806,7 @@ struct sm4_instruction { struct sm4_register reg; unsigned int writemask; - } dsts[1]; + } dsts[2]; unsigned int dst_count; struct sm4_src_register @@ -1286,6 +1286,30 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d write_sm4_instruction(buffer, &instr); } +static void write_sm4_binary_op_with_two_destinations(struct vkd3d_bytecode_buffer *buffer, + enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned dst_idx, + const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = opcode; + + assert(dst_idx < ARRAY_SIZE(instr.dsts)); + sm4_dst_from_node(&instr.dsts[dst_idx], dst); + assert(1 - dst_idx >= 0); + instr.dsts[1 - dst_idx].reg.type = VKD3D_SM4_RT_NULL; + instr.dsts[1 - dst_idx].reg.dim = VKD3D_SM4_DIMENSION_NONE; + instr.dsts[1 - dst_idx].reg.idx_count = 0; + instr.dst_count = 2; + + sm4_src_from_node(&instr.srcs[0], src1, instr.dsts[dst_idx].writemask); + sm4_src_from_node(&instr.srcs[1], src2, instr.dsts[dst_idx].writemask); + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_constant(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_constant *constant) { @@ -1591,6 +1615,12 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_UMIN, &expr->node, arg1, arg2); break; + case HLSL_OP2_MUL: + /* Using IMUL instead of UMUL because we're taking the low + * bits, and the native compiler generates IMUL. */ + write_sm4_binary_op_with_two_destinations(buffer, VKD3D_SM4_OP_IMUL, &expr->node, 1, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 uint \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse bitwise AND.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: c0ff9184cf1fde6df37cfbeddb54190bce5f2ce6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c0ff9184cf1fde6df37cfbe… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 11 21:04:07 2022 +0100 vkd3d-shader/hlsl: Parse bitwise AND. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 40fdd49..397397b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1057,6 +1057,49 @@ static struct list *add_binary_arithmetic_expr_merge(struct hlsl_ctx *ctx, struc return list1; } +static struct hlsl_ir_expr *add_binary_bitwise_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + const struct vkd3d_shader_location *loc) +{ + if (arg1->data_type->base_type != HLSL_TYPE_INT && arg1->data_type->base_type != HLSL_TYPE_UINT + && arg1->data_type->base_type != HLSL_TYPE_BOOL) + { + struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg1->data_type); + + if (type_str) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "The first argument has type '%s', which is not integer.", type_str->buffer); + hlsl_release_string_buffer(ctx, type_str); + return NULL; + } + + if (arg2->data_type->base_type != HLSL_TYPE_INT && arg2->data_type->base_type != HLSL_TYPE_UINT + && arg2->data_type->base_type != HLSL_TYPE_BOOL) + { + struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg2->data_type); + + if (type_str) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "The second argument has type '%s', which is not integer.", type_str->buffer); + hlsl_release_string_buffer(ctx, type_str); + return NULL; + } + + return add_binary_arithmetic_expr(ctx, instrs, op, arg1, arg2, loc); +} + +static struct list *add_binary_bitwise_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_binary_bitwise_expr(ctx, list1, op, arg1, arg2, loc); + + return list1; +} + static struct hlsl_ir_expr *add_binary_comparison_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, struct vkd3d_shader_location *loc) @@ -3600,7 +3643,7 @@ bitand_expr: equality_expr | bitand_expr '&' equality_expr { - hlsl_fixme(ctx, &@$, "Bitwise AND."); + $$ = add_binary_bitwise_expr_merge(ctx, $1, $3, HLSL_OP2_BIT_AND, &@2); } bitxor_expr:

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse bitwise XOR.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: c7695d051105e3224c5da9c17e4ec68278294732 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7695d051105e3224c5da9c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 11 21:04:08 2022 +0100 vkd3d-shader/hlsl: Parse bitwise XOR. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 397397b..1d9d7e8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3650,7 +3650,7 @@ bitxor_expr: bitand_expr | bitxor_expr '^' bitand_expr { - hlsl_fixme(ctx, &@$, "Bitwise XOR."); + $$ = add_binary_bitwise_expr_merge(ctx, $1, $3, HLSL_OP2_BIT_XOR, &@2); } bitor_expr:

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse bitwise OR.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: vkd3d Branch: master Commit: 02a2a9a9299591bd13273c51074035c6bb181d3a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02a2a9a9299591bd13273c5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 11 21:04:09 2022 +0100 vkd3d-shader/hlsl: Parse bitwise OR. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1d9d7e8..459ad03 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3657,7 +3657,7 @@ bitor_expr: bitxor_expr | bitor_expr '|' bitxor_expr { - hlsl_fixme(ctx, &@$, "Bitwise OR."); + $$ = add_binary_bitwise_expr_merge(ctx, $1, $3, HLSL_OP2_BIT_OR, &@2); } logicand_expr:

1 0

Francois Gouget : testbot: Use rebase when updating the Wine source.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: tools Branch: master Commit: 0dfc4662ab3f4a661b91f7e29c18dafb39424afb URL: https://source.winehq.org/git/tools.git/?a=commit;h=0dfc4662ab3f4a661b91f7e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 14 16:59:04 2022 +0100 testbot: Use rebase when updating the Wine source. The TestBot's Wine source should be unmodified so there should be no difference between 'git merge' and 'git rebase'. If there are local patches (for debugging?) rebase will keep them more visible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a56a4f2..9d16963 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -89,7 +89,7 @@ sub GitPull($) else { InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && (set -x && git pull) && ". + system("cd '$DataDir/$Dir' && (set -x && git pull --rebase) && ". "echo $Dir:HEAD=`git rev-parse HEAD`"); } if ($? != 0)

1 0

Francois Gouget : testbot/LibvirtTool: Move waiting for the X session start to its own function.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: tools Branch: master Commit: 6771cd17521c810c04edd1f19908ab1330d6e608 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6771cd17521c810c04edd1f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 14 16:47:15 2022 +0100 testbot/LibvirtTool: Move waiting for the X session start to its own function. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 0cccd12..a4ae7df 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -440,6 +440,30 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub WaitForSession($) +{ + my ($TA) = @_; + + if ($VM->Type eq "wine") + { + # For Wine VMs we have to wait some more for the X session to start. + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the $VMKey X session\n"); + } + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); + } + } +} + sub SetupTestAgentd($$$) { my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; @@ -505,24 +529,7 @@ sub SetupTestAgentd($$$) FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } - if ($Booting and $VM->Type eq "wine") - { - # Make sure the X session has had time to start - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the $VMKey X session\n") if (!$Pid); - - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the $VMKey X session\n"); - } - FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); - } - } + WaitForSession($TA) if ($Booting); if ($ResetStartCount) {

1 0

Francois Gouget : testbot/WineRunReconfig: Only the build VMs produce TestAgentd.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: tools Branch: master Commit: b80df9cda4ff5b27fe8378373189ab4e41aab18f URL: https://source.winehq.org/git/tools.git/?a=commit;h=b80df9cda4ff5b27fe83783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 14 16:57:44 2022 +0100 testbot/WineRunReconfig: Only the build VMs produce TestAgentd. Usually this is not an issue because the TestBot server has the TestAgentd.exe binary and the build log does not contain the "Updated TestAgentd.exe" line. But during the initial setup the TestBot server would still try to download TestAgentd.exe from the Wine VMs which would cause a failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9bd9429..0c39228 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -457,11 +457,20 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - foreach my $FileName ("../src/testagentd/TestAgentd.exe", - "../src/TestLauncher/TestLauncher32.exe", - "../src/TestLauncher/TestLauncher64.exe", - "latest/winefiles.txt", - "latest/wine-parentsrc.txt") + my @FileNames = ( + # TestLauncher is used by both Windows and Wine VMs + "../src/TestLauncher/TestLauncher32.exe", + "../src/TestLauncher/TestLauncher64.exe", + # Needed by the TestBot server + "latest/winefiles.txt", + "latest/wine-parentsrc.txt", + ); + if ($VM->Type eq "build") + { + # Only needed for the Windows VMs and only built by the build VMs. + push @FileNames, "../src/testagentd/TestAgentd.exe"; + } + foreach my $FileName (@FileNames) { my $BaseName = basename($FileName); if ($FileName !~ m~^latest/~ and !$LogInfo->{$BaseName} and

1 0

Francois Gouget : testbot/Janitor: Make the TestLauncher and WineTest matches stricter.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: tools Branch: master Commit: 0398ad4a60134a2293819de5e9993041ddb189ce URL: https://source.winehq.org/git/tools.git/?a=commit;h=0398ad4a60134a2293819de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 14 16:57:57 2022 +0100 testbot/Janitor: Make the TestLauncher and WineTest matches stricter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c68920e..1b5bb33 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -321,8 +321,8 @@ if (opendir(my $dh, "$DataDir/latest")) # Needed to update Windows VMs next if ($Entry eq "TestAgentd.exe"); # Needed to run the tests - next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); - next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); + next if ($Entry =~ /^TestLauncher(?:32|64)\.exe$/); + next if ($Entry =~ /^winetest(?:64)?-latest\.exe$/); $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1";

1 0

Francois Gouget : testbot/WineRunReconfig: Use rebase when updating the TestBot source.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: tools Branch: master Commit: 2fc5be931eb92037b65ff6b89950e5c85b36d99c URL: https://source.winehq.org/git/tools.git/?a=commit;h=2fc5be931eb92037b65ff6b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 14 16:58:41 2022 +0100 testbot/WineRunReconfig: Use rebase when updating the TestBot source. The TestBot source should be unmodified so there should be no difference between 'git merge' and 'git rebase'. If there are local patches (for debugging?) rebase will keep them more visible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0c39228..73595c1 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -362,7 +362,7 @@ if ($Step->FileType ne "none") my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". - " git pull &&\n". + " git pull --rebase &&\n". " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent();

1 0

Alexandre Julliard : Wine release 7.2
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: website Branch: master Commit: 2d417aae3e373f3e994be7f39320d3c88da8283e URL: https://source.winehq.org/git/website.git/?a=commit;h=2d417aae3e373f3e994be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 11 21:34:41 2022 +0100 Wine release 7.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022021101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2022021101.xml b/news/en/2022021101.xml new file mode 100644 index 00000000..0204c170 --- /dev/null +++ b/news/en/2022021101.xml @@ -0,0 +1,18 @@ +<news> +<date>February 11, 2022</date> +<title>Wine 7.2 Released</title> +<body> + The Wine development release 7.2 is now available. + <a href="{$root}/announce/7.2">What's new</a> in this release: +<ul> + <li>Large scale cleanup to support 'long' type with MSVCRT.</li> + <li>Mono engine updated to version 7.1.1.</li> + <li>More theming fixes in common controls.</li> + <li>Beginnings of a WMA decoder.</li> + <li>Support for 64-bit time_t.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0