wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Alexandre Julliard : winebuild: Align raw data size instead of virtual size in PE sections.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 603130cc3837524b3c2f6d4338261c3b8ea802ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=603130cc3837524b3c2f6d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 10:53:23 2022 +0100 winebuild: Align raw data size instead of virtual size in PE sections. Use the aligned size to set code/data sizes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ca3c861e60f..c09e58084cc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -796,7 +796,6 @@ static struct unsigned int file_align; unsigned int sec_count; unsigned int exp_count; - unsigned int code_size; struct dir_data dir[16]; struct sec_data sec[8]; struct exp_data exp[8]; @@ -1031,10 +1030,14 @@ static void output_apiset_section( const struct apiset *apiset ) static void output_pe_file( DLLSPEC *spec, const char signature[32] ) { const unsigned int lfanew = 0x40 + 32; - unsigned int i; + unsigned int i, code_size = 0, data_size = 0; init_output_buffer(); + for (i = 0; i < pe.sec_count; i++) + if (pe.sec[i].flags & 0x20) /* CNT_CODE */ + code_size += pe.sec[i].file_size; + /* .rsrc section */ if (spec->type == SPEC_WIN32) { @@ -1044,7 +1047,7 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) } /* .reloc section */ - if (pe.code_size) + if (code_size) { put_dword( 0 ); /* VirtualAddress */ put_dword( 0 ); /* Size */ @@ -1052,6 +1055,10 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) 0x42000040 /* CNT_INITIALIZED_DATA|MEM_DISCARDABLE|MEM_READ */ ); } + for (i = 0; i < pe.sec_count; i++) + if ((pe.sec[i].flags & 0x60) == 0x40) /* CNT_INITIALIZED_DATA */ + data_size += pe.sec[i].file_size; + put_word( 0x5a4d ); /* e_magic */ put_word( 0x40 ); /* e_cblp */ put_word( 0x01 ); /* e_cp */ @@ -1100,11 +1107,11 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) IMAGE_NT_OPTIONAL_HDR32_MAGIC ); /* Magic */ put_byte( 7 ); /* MajorLinkerVersion */ put_byte( 10 ); /* MinorLinkerVersion */ - put_dword( pe.code_size ); /* SizeOfCode */ - put_dword( 0 ); /* SizeOfInitializedData */ + put_dword( code_size ); /* SizeOfCode */ + put_dword( data_size ); /* SizeOfInitializedData */ put_dword( 0 ); /* SizeOfUninitializedData */ - put_dword( pe.code_size ? pe.sec[0].rva : 0 ); /* AddressOfEntryPoint */ - put_dword( pe.code_size ? pe.sec[0].rva : 0 ); /* BaseOfCode */ + put_dword( code_size ? pe.sec[0].rva : 0 ); /* AddressOfEntryPoint */ + put_dword( code_size ? pe.sec[0].rva : 0 ); /* BaseOfCode */ if (get_ptr_size() == 4) put_dword( 0 ); /* BaseOfData */ put_pword( 0x10000000 ); /* ImageBase */ put_dword( pe.section_align ); /* SectionAlignment */ @@ -1139,9 +1146,9 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) for (i = 0; i < pe.sec_count; i++) { put_data( pe.sec[i].name, 8 ); /* Name */ - put_dword( pe.sec[i].virt_size ); /* VirtualSize */ + put_dword( pe.sec[i].size ); /* VirtualSize */ put_dword( pe.sec[i].rva ); /* VirtualAddress */ - put_dword( pe.sec[i].size ); /* SizeOfRawData */ + put_dword( pe.sec[i].file_size ); /* SizeOfRawData */ put_dword( pe.sec[i].filepos ); /* PointerToRawData */ put_dword( 0 ); /* PointerToRelocations */ put_dword( 0 ); /* PointerToLinenumbers */ @@ -1149,12 +1156,13 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) put_word( 0 ); /* NumberOfLinenumbers */ put_dword( pe.sec[i].flags ); /* Characteristics */ } + align_output( pe.file_align ); /* section data */ for (i = 0; i < pe.sec_count; i++) { - align_output( pe.file_align ); put_data( pe.sec[i].ptr, pe.sec[i].size ); + align_output( pe.file_align ); } flush_output_buffer( output_file_name ? output_file_name : spec->file_name ); @@ -1182,7 +1190,6 @@ void output_fake_module( DLLSPEC *spec ) /* .text section */ if (spec->characteristics & IMAGE_FILE_DLL) put_data( dll_code_section, sizeof(dll_code_section) ); else put_data( exe_code_section, sizeof(exe_code_section) ); - pe.code_size = output_buffer_pos; flush_output_to_section( ".text", -1, 0x60000020 /* CNT_CODE|MEM_EXECUTE|MEM_READ */ ); if (spec->type == SPEC_WIN16)

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

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/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/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: 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/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

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

Tag vkd3d-1.3 : Alexandre Julliard : Release 1.3
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: refs/tags/vkd3d-1.3 Tag: 82c4dce99d2a99a535fc1ad15486e37a99cb61b5 URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=82c4dce99d2a99a535fc1ad154… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 21:32:57 2022 +0100 Release 1.3

1 0

Henri Verbeet : Release 1.3.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: vkd3d Branch: master Commit: d1d9e713f2a2c0ce439f7c3a44fcc5cd7dcaba76 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1d9e713f2a2c0ce439f7c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:06:24 2022 +0100 Release 1.3. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 248 ++++++++++++++++++++-------------------------- AUTHORS | 11 ++ COPYING | 2 +- Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- 8 files changed, 125 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=d1d9e713f2a2c0ce439…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022