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

Alexandre Julliard : configure: Require PE cross-compilation for building on ARM64.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 11486a7b48aa43421ada5a557d892feabf27b372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11486a7b48aa43421ada5a55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 20:06:16 2022 +0100 configure: Require PE cross-compilation for building on ARM64. There's no -mabi=ms option we could use on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 32 ++++---------------------------- configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/configure b/configure index d757194be45..397bc7b71c5 100755 --- a/configure +++ b/configure @@ -6360,34 +6360,6 @@ printf "%s\n" "$wine_cv_float_abi" >&6; } TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; aarch64*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 -printf %s "checking whether $CC supports __builtin_ms_va_list... " >&6; } -if test ${wine_cv_builtin_ms_va_list+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -int -main (void) -{ -void func(__builtin_ms_va_list *args); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - wine_cv_builtin_ms_va_list=yes -else $as_nop - wine_cv_builtin_ms_va_list=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_builtin_ms_va_list" >&5 -printf "%s\n" "$wine_cv_builtin_ms_va_list" >&6; } - test $wine_cv_builtin_ms_va_list != no || as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 enable_wow64=${enable_wow64:-yes} enable_wow64win=${enable_wow64win:-yes} ;; @@ -11794,6 +11766,10 @@ esac fi +case $host_cpu in + aarch64*) test "x$CROSSTARGET" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install llvm-mingw." "$LINENO" 5 ;; +esac + if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" then diff --git a/configure.ac b/configure.ac index 7881af45e5b..a9d3ff9a85c 100644 --- a/configure.ac +++ b/configure.ac @@ -193,10 +193,6 @@ case $host in TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; aarch64*) - AC_CACHE_CHECK([whether $CC supports __builtin_ms_va_list],wine_cv_builtin_ms_va_list, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], - [wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])]) - test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.]) enable_wow64=${enable_wow64:-yes} enable_wow64win=${enable_wow64win:-yes} ;; @@ -995,6 +991,10 @@ fi WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], [MinGW compiler not found, cross-compiling PE files won't be supported.]) +case $host_cpu in + aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install llvm-mingw.]) ;; +esac + dnl **** External libraries **** if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false"

1 0

Francois Gouget : testbot/web: Make sure VM deletion errors are reported.
by Alexandre Julliard March 2, 2022

March 2, 2022

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/cgi: Remove the Cancel action from collection pages.
by Alexandre Julliard March 2, 2022

March 2, 2022

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 March 2, 2022

March 2, 2022

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/cgi: Show all errors, even about hidden parameters.
by Alexandre Julliard March 2, 2022

March 2, 2022

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

Francois Gouget : testbot/web: Simplify the users deletion code.
by Alexandre Julliard March 2, 2022

March 2, 2022

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 March 2, 2022

March 2, 2022

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

Alexandre Julliard : Vkd3d release 1.3
by Alexandre Julliard March 2, 2022

March 2, 2022

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

Henri Verbeet : vkd3d-shader/glsl: Disable support for the GLSL target.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: vkd3d Branch: master Commit: f0479f08bdb9bbc4175e697e7d4f706368a64e4c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0479f08bdb9bbc4175e697… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:23 2022 +0100 vkd3d-shader/glsl: Disable support for the GLSL target. Regrettably, support for the GLSL target is not mature enough for the upcoming 1.3 release. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bc3402a..62baf17 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1456,7 +1456,9 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( VKD3D_SHADER_TARGET_SPIRV_TEXT, #endif VKD3D_SHADER_TARGET_D3D_ASM, +#if 0 VKD3D_SHADER_TARGET_GLSL, +#endif }; static const enum vkd3d_shader_target_type hlsl_types[] =

1 0

Henri Verbeet : vkd3d-shader: Add a description for VKD3D_SHADER_TARGET_D3D_ASM.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: vkd3d Branch: master Commit: fcf36f56c5a31c3ae8a4453244b6c4a8e613a67c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fcf36f56c5a31c3ae8a4453… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:21 2022 +0100 vkd3d-shader: Add a description for VKD3D_SHADER_TARGET_D3D_ASM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 8797de5..406f3af 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -591,6 +591,9 @@ enum vkd3d_shader_target_type */ VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, + /** + * Direct3D shader assembly. \since 1.3 + */ VKD3D_SHADER_TARGET_D3D_ASM, /** * Legacy Direct3D byte-code. This is the format used for Direct3D shader

1 0