wine-devel

wine-devel@winehq.org

1 participants
84398 discussions

[tools] testbot/cgi: Use AddError() instead of direct field access in ItemPage.
by Francois Gouget 06 Jul '22

06 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index cd40ba2e4b..3ec201d99c 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -176,8 +176,13 @@ sub Save($) return !1 if (!$self->SUPER::Save()); - (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return !defined $self->{ErrMessage}; + my ($_ErrKey, $ErrProperty, $ErrMessage) = $self->{Collection}->Save(); + if (defined $ErrMessage) + { + $self->AddError($ErrMessage, $ErrProperty); + return undef; + } + return 1; } 1; -- 2.30.2

1 0

[tools] testbot/web: Use AddError() in the failure details page.
by Francois Gouget 06 Jul '22

06 Jul '22

This is better than direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index 02803ed27a..b4226f60c5 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -203,7 +203,7 @@ sub OnAction($$) { if (!$self->{RW}) { - $self->{ErrMessage} = "Only admin users can create or modify failures"; + $self->AddError("Only admin users can create or modify failures"); return 0; } if (($self->{Item}->BugId || "") ne $self->GetParam("BugId")) -- 2.30.2

1 0

[tools] testbot/web: Use AddError() to set the item list action error.
by Francois Gouget 06 Jul '22

06 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailuresList.pl | 4 ++-- testbot/web/admin/UsersList.pl | 4 ++-- testbot/web/admin/VMsList.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index 2cb40c482e..d1f8de6d8e 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -138,8 +138,8 @@ sub OnItemAction($$$) my ($_ErrProperty, $ErrMessage) = $Failure->Save(); if (defined $ErrMessage) { - # Setting ErrField is only useful on form pages - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + # Setting the error field is only useful on form pages + $self->{EnclosingPage}->AddError($ErrMessage); return 0; } return 1; diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 5f9f47b46c..6fdb06d0cf 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -109,8 +109,8 @@ sub OnItemAction($$$) my ($_ErrProperty, $ErrMessage) = $User->Save(); if (defined $ErrMessage) { - # Setting ErrField is only useful on form pages - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + # Setting the error field is only useful on form pages + $self->{EnclosingPage}->AddError($ErrMessage); return 0; } diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 6c3ff2036f..3361c03fa3 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -52,8 +52,8 @@ sub OnItemAction($$$) my ($_ErrProperty, $ErrMessage) = $VM->Save(); if (defined $ErrMessage) { - # Setting ErrField is only useful on form pages - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + # Setting the error field is only useful on form pages + $self->{EnclosingPage}->AddError($ErrMessage); return 0; } return 1; -- 2.30.2

1 0

[tools] testbot/cgi: Highlight the name of the invalid field(s) on form errors.
by Francois Gouget 06 Jul '22

06 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 +++- testbot/web/WineTestBot.css | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index f2fd0f09cd..67b3fa00d3 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -432,7 +432,9 @@ sub GenerateField($$$$) { my ($self, $PropertyDescriptor, $Display, $Format) = @_; - print "<div class='ItemProperty'><label>", + my $Class = $self->IsErrField($PropertyDescriptor->GetName()) ? + " class='errorfield'" : ""; + print "<div class='ItemProperty'><label$Class>", $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), "</label>"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 78d33f886d..fd6acac86d 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -377,6 +377,7 @@ pre margin-bottom: 2em; background-color: red; } +.errorfield { color: red; } .right { float: right; } -- 2.30.2

1 0

[tools] testbot/web: Highlight the submit page's File and Branch fields if invalid.
by Francois Gouget 06 Jul '22

06 Jul '22

Unlike the other fields, these two fields are generated by the submit page itself. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index ca225b615d..c5423c7951 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -77,7 +77,7 @@ sub _Upload($) { umask($OldUMask); delete $self->{FileName}; - $self->{ErrField} = "Upload"; + $self->{ErrField} = "File"; $self->{ErrMessage} = "Unable to save the uploaded file"; return undef; } @@ -85,7 +85,7 @@ sub _Upload($) else { delete $self->{FileName}; - $self->{ErrField} = "Upload"; + $self->{ErrField} = "File"; $self->{ErrMessage} = "Unable to upload the file"; return undef; } @@ -709,6 +709,15 @@ sub GetPropertyDescriptors($) return $self->SUPER::GetPropertyDescriptors(); } +sub GetHtmlLabel($$) +{ + my ($self, $Label) = @_; + + # This assumes that the label is also the field name + return "<label". ($self->IsErrField($Label) ? " class='errorfield'" : "") + .">$Label</label>"; +} + sub GenerateFields($) { my ($self) = @_; @@ -723,7 +732,7 @@ sub GenerateFields($) if ($self->{Page} == 1 or $self->{Page} == 4) { - print "<div class='ItemProperty'><label>File</label>", + print "<div class='ItemProperty'>", $self->GetHtmlLabel("File"), "<div class='ItemValue'>"; if (defined $self->{FileName}) { @@ -749,7 +758,7 @@ sub GenerateFields($) } else { - print "<div class='ItemProperty'><label>Branch</label>", + print "<div class='ItemProperty'>", $self->GetHtmlLabel("Branch"), "<div class='ItemValue'>", "<select name='Branch' size='1'>"; my $SortedBranches = $Branches->GetSortedItems(); -- 2.30.2

1 0

[tools] testbot/cgi: Fix an operator precedence issue in Page::IsErrField().
by Francois Gouget 06 Jul '22

06 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 6e18c29ab4..1df5392930 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -342,7 +342,7 @@ Returns true if the error concerns the specified field. sub IsErrField($$) { my ($self, $FieldName) = @_; - return defined $self->{ErrField} and $self->{ErrField} eq $FieldName; + return (defined $self->{ErrField} and $self->{ErrField} eq $FieldName); } =pod -- 2.30.2

1 0

[PATCH v7 0/3] MR355: win32u: Move more display mode logic out of graphics drivers.
by Rémi Bernon (＠rbernon) 06 Jul '22

06 Jul '22

-- v7: win32u: Set generic DEVMODEW fields in NtUserEnumDisplaySettings. win32u: Move default UpdateDisplayDevices implementation out of nulldrv. win32u: Add invisible winstation virtual monitor outside of nulldrv. https://gitlab.winehq.org/wine/wine/-/merge_requests/355

2 5

[PATCH v2 0/3] MR392: regedit: Code clean-up and invalid read fix
by Hugh McMaster (＠hmc) 06 Jul '22

06 Jul '22

-- v2: regedit: Directly use RegQueryValueExW() instead of a helper function regedit: Correctly calculate REG_MULTI_SZ size before reading from the buffer regedit: Remove unneeded valueDataLen override for DWORD values https://gitlab.winehq.org/wine/wine/-/merge_requests/392

2 3

What is the purpose of PE conversion of *.sys drivers?
by Jinoh Kang 06 Jul '22

06 Jul '22

As the Wine PE conversion process marches toward the finish line, a question of mine has stuck around for a long time: Why is the *.sys modules, which emulate the Windows kernel drivers, being converted to PE? As lots of efforts have been put into the process so far, I asume there is a valid reason for it; however, I'm yet to find any explanations on the list. Here are the best explanations I found so far: - "PE Conversion", Giovanni Mascellani, https://www.winehq.org/pipermail/wine-devel/2021-August/193127.html - "wine modules", Eric Pouech, https://www.winehq.org/pipermail/wine-devel/2022-April/213677.html To begin with, the rationale of the conversion process *in general* is twofold: 1. Accurate emulation of Windows userspace. This includes the system call interface. Such effort is necessary to appease some DRM and anti-cheat technologies. 2. Wow64 support. Some platforms (e.g. macOS) are either planning to drop, or have already dropped support for 32-bit binaries. To work around this, Wine adopts a "32-on-64" model where 32-bit code is run on 64-bit processes thanks to CPU and operating system support. Now, here's the reasons I think that both of the above do not necessarily apply to drivers: 1. Accurate emulation of Windows userspace. As kernel drivers run in kernel mode, a syscall interface does not make sense at all. 2. Wow64 support. Note that 64-bit Windows does not support running 32-bit drivers. I don't necessary see a significant value in supporting 32-bit binaries on a Wow64 wineprefix, but others may have different opinion. Also, drivers tend to interface with the host platform *a lot*, so it's much more difficult than, say, purely native modules whose PE conversion is only a matter of getting rid of "-mcygwin". Looking forward for your input. Thanks a lot! -- Sincerely, Jinoh Kang

2 4

[PATCH 0/3] MR358: atl: Avoid NULL pointer reference in AtlComModuleGetClassObject().
by Zhiyi Zhang (＠zhiyi) 06 Jul '22

06 Jul '22

Fix crash in CAXA CAD when clicking component library. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/358

3 6

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-devel