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

Eric Pouech : ntoskrnl.exe/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: bb7481d24b778768badccb8ec4b2d4856f9bce48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb7481d24b778768badccb8e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:51 2022 +0100 ntoskrnl.exe/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 1 - dlls/ntoskrnl.exe/tests/driver.c | 474 ++++++++++++++-------------- dlls/ntoskrnl.exe/tests/driver_netio.c | 160 +++++----- dlls/ntoskrnl.exe/tests/driver_pnp.c | 54 ++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 542 ++++++++++++++++----------------- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 6 files changed, 616 insertions(+), 617 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb7481d24b778768badc…

1 0

Francois Gouget : testbot/cgi: Remove the Cancel action from collection pages.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: tools Branch: master Commit: 7cba9ec2de2ea760adbb55de05da10d9932d911a URL: https://source.winehq.org/git/tools.git/?a=commit;h=7cba9ec2de2ea760adbb55d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 2 16:59:53 2022 +0100 testbot/cgi: Remove the Cancel action from collection pages. What this action would do is not defined, it has not been implemented and there does not seem to be a need for it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 058bb47..effd039 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -391,11 +391,6 @@ sub GetActions($) { $Actions[0] = "Add " . $self->{Collection}->GetItemName(); } - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - push @Actions, "Cancel"; - } return \@Actions; } @@ -506,11 +501,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "Cancel") - { - # FIXME Todo - } - elsif ($Action eq "Add " . $self->{Collection}->GetItemName()) + if ($Action eq "Add " . $self->{Collection}->GetItemName()) { my $Target = $self->CallGetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols();

1 0

Francois Gouget : testbot/web: Tweak the wording of the new account link.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: tools Branch: master Commit: 1e47e977f81405a3a149d4f9e653aeb228e48c8f URL: https://source.winehq.org/git/tools.git/?a=commit;h=1e47e977f81405a3a149d4f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 2 17:01:22 2022 +0100 testbot/web: Tweak the wording of the new account link. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Login.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 14cf4bd..3c93dd8 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -57,7 +57,7 @@ sub GetFooterText($) #my ($self) = @_; return defined($LDAPServer) ? "" : "<a href='ForgotPassword.pl'>I forgot my password</a> \n" . - "<a href='Register.pl'>I want to register an account</a>"; + "<a href='Register.pl'>I want to create an account</a>"; } sub GetInputType($$)

1 0

Francois Gouget : testbot/web: Make sure VM deletion errors are reported.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: tools Branch: master Commit: 501d35df9e27fff00336684cca68c7d634389c65 URL: https://source.winehq.org/git/tools.git/?a=commit;h=501d35df9e27fff00336684… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 2 17:05:15 2022 +0100 testbot/web: Make sure VM deletion errors are reported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/VMsList.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 832c3bd..283c542 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -59,8 +59,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $Item->Role("deleted"); - my ($ErrProperty, $ErrMessage) = $Item->Save(); - return ! defined($ErrMessage); + (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + return !defined $self->{ErrMessage}; } return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action);

1 0

Francois Gouget : testbot/web: Simplify the users deletion code.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: tools Branch: master Commit: 75be651535ede96432dce018d4027e9240be39c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=75be651535ede96432dce01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 2 17:05:49 2022 +0100 testbot/web: Simplify the users deletion code. Use CollectionPage's per-item action methods. Also make sure the actions report all failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 2799070..3621702 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -102,43 +102,30 @@ sub GenerateDataCell($$$$$) } } -sub GetActions($$) +sub GetItemActions($$) { my ($self, $CollectionBlock) = @_; - if (defined($LDAPServer)) - { - # LDAP accounts cannot be deleted - return []; - } - - return $self->SUPER::GetActions($CollectionBlock); + # LDAP accounts cannot be deleted + return defined $LDAPServer ? [] : ["Delete"]; } -sub OnAction($$$) +sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Action) = @_; + my ($self, $CollectionBlock, $Item, $Action) = @_; if ($Action eq "Delete") { - foreach my $UserName (@{$self->{Collection}->GetKeys()}) - { - next if (!defined $self->GetParam($CollectionBlock->SelName($UserName))); - my $User = $self->{Collection}->GetItem($UserName); - $User->Status('deleted'); - my ($ErrProperty, $ErrMessage) = $User->Save(); - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - # Forcefully log out that user by deleting his web sessions - DeleteSessions($User); - } + $Item->Status('deleted'); + (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + return 0 if (defined $self->{ErrMessage}); + + # Forcefully log out that user by deleting the web sessions + DeleteSessions($Item); return 1; } - return $self->SUPER::OnAction($CollectionBlock, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); }

1 0

Francois Gouget : testbot/cgi: Better escape error messages.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: tools Branch: master Commit: db5b61b57833f73ac984954921390968ea49ded5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=db5b61b57833f73ac984954… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 2 17:02:30 2022 +0100 testbot/cgi: Better escape error messages. This allows using newlines and quotes in error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index fa40699..8b046c8 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -358,8 +358,10 @@ sub GenerateErrorPopup($$) { print "<script type='text/javascript'>\n"; print "<!--\n"; - $ErrMessage =~ s/'/\\'/g; - print "function ShowError() { alert('", $ErrMessage, "'); }\n"; + $ErrMessage =~ s~\\~\\\\~g; + $ErrMessage =~ s~"~\\\"~g; + $ErrMessage =~ s~\n~\\n~g; + print "function ShowError() { alert(\"$ErrMessage\"); }\n"; my $ErrField = $Page->GetErrField(); if ($ErrField) {

1 0

Francois Gouget : testbot/cgi: Show all errors, even about hidden parameters.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: tools Branch: master Commit: 9cea5cde40a7e132ecdc738c738fb377c116a54b URL: https://source.winehq.org/git/tools.git/?a=commit;h=9cea5cde40a7e132ecdc738… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 2 17:02:34 2022 +0100 testbot/cgi: Show all errors, even about hidden parameters. Hiding errors related to hidden parameters causes actions to have no effect which is very confusing. So show these errors too but prefix them with text hinting they are likely internal errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 735755f..0ac599e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -108,18 +108,17 @@ sub GenerateBody($) $self->GenerateFields(); $self->GenerateRequiredLegend(); - if (defined($self->{ErrMessage})) + if (defined $self->{ErrMessage}) { - my $PropertyDescriptor; - if (defined($self->{ErrField})) + if (defined $self->{ErrField}) { - $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); - } - if (! defined($PropertyDescriptor) || - $self->DisplayProperty($PropertyDescriptor)) - { - $self->GenerateErrorPopup(); + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); + if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) + { + $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; + } } + $self->GenerateErrorPopup(); } $self->GenerateActions(); $self->GenerateFormEnd();

1 0

Alexandre Julliard : Vkd3d release 1.3
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: website Branch: master Commit: 3fa7e691de2f88c5b2e13b7cb2f805db9ab4561f URL: https://source.winehq.org/git/website.git/?a=commit;h=3fa7e691de2f88c5b2e13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 20:30:18 2022 +0100 Vkd3d release 1.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022030201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022030201.xml b/news/en/2022030201.xml new file mode 100644 index 00000000..b3eef897 --- /dev/null +++ b/news/en/2022030201.xml @@ -0,0 +1,17 @@ +<news> +<date>March 2, 2022</date> +<title>Vkd3d 1.3 Released</title> +<body> +The Wine team is proud to announce that release 1.3 of vkd3d, the Direct3D to +Vulkan translation library, is now available. + +This release contains improvements that are listed in the <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.3:/ANNOUNCE">release notes</a>. +The main highlights are: +<ul> + <li>Initial HLSL compilation support.</li> + <li>Shader model 5.1 descriptor array support.</li> + <li>Support for disassembling Direct3D shaders.</li> +</ul> + +The source is <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.3.tar.xz">available here</a>. +</body></news>

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse logical AND.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 2c3094b2dc5899edf8f02bbf8e08d5458faa9d70 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2c3094b2dc5899edf8f02bb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:16 2022 -0600 vkd3d-shader/hlsl: Parse logical AND. Signed-off-by: Giovanni Mascellani <gmascellani(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: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 01e6b3d..bb24e39 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1136,6 +1136,41 @@ static struct list *add_binary_comparison_expr_merge(struct hlsl_ctx *ctx, struc return list1; } +static struct hlsl_ir_expr *add_binary_logical_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) +{ + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *common_type; + enum hlsl_type_class type; + unsigned int dimx, dimy; + + if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) + return NULL; + + common_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_BOOL, dimx, dimy); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) + return NULL; + + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, common_type, loc); +} + +static struct list *add_binary_logical_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_logical_expr(ctx, list1, op, arg1, arg2, loc); + + return list1; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -3664,7 +3699,7 @@ logicand_expr: bitor_expr | logicand_expr OP_AND bitor_expr { - hlsl_fixme(ctx, &@$, "Logical AND."); + $$ = add_binary_logical_expr_merge(ctx, $1, $3, HLSL_OP2_LOGIC_AND, &@2); } logicor_expr:

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse logical OR.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: 786f95ffcf558fc59c731d99dd93e092c8f209e5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=786f95ffcf558fc59c731d9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 24 12:45:17 2022 -0600 vkd3d-shader/hlsl: Parse logical OR. 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> Signed-off-by: Francisco Casas <fcasas(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.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bb24e39..4cdb471 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3706,7 +3706,7 @@ logicor_expr: logicand_expr | logicor_expr OP_OR logicand_expr { - hlsl_fixme(ctx, &@$, "Logical OR."); + $$ = add_binary_logical_expr_merge(ctx, $1, $3, HLSL_OP2_LOGIC_OR, &@2); } conditional_expr:

1 0