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

Hans Leidekker : wininet: Always reset the second input buffer in netcon_secure_connect_setup().
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: f83a66f052162c1e0db6121128fe7e804ac15ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83a66f052162c1e0db61211… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 6 10:32:18 2022 +0200 wininet: Always reset the second input buffer in netcon_secure_connect_setup(). --- dlls/wininet/netconnection.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a3ca03d3ef1..b3649b5a53b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -493,14 +493,12 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode memmove(read_buf, (BYTE*)in_bufs[0].pvBuffer+in_bufs[0].cbBuffer-in_bufs[1].cbBuffer, in_bufs[1].cbBuffer); in_bufs[0].cbBuffer = in_bufs[1].cbBuffer; - - in_bufs[1].BufferType = SECBUFFER_EMPTY; - in_bufs[1].cbBuffer = 0; - in_bufs[1].pvBuffer = NULL; } assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); in_bufs[1].BufferType = SECBUFFER_EMPTY; + in_bufs[1].cbBuffer = 0; + in_bufs[1].pvBuffer = NULL; if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf;

1 0

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

06 Jul '22

Module: tools Branch: master Commit: fa454aefb4b9666c19291476e228286914fe3ad7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fa454aefb4b9666c1929147… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:04:31 2022 +0200 testbot/cgi: Fix an operator precedence issue in Page::IsErrField(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 6e18c29a..1df53929 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

1 0

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

06 Jul '22

Module: tools Branch: master Commit: 338b0c9afe882e605142d7b47490063722f62f98 URL: https://source.winehq.org/git/tools.git/?a=commit;h=338b0c9afe882e605142d7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:05:06 2022 +0200 testbot/web: Highlight the submit page's File and Branch fields if invalid. Unlike the other fields, these two fields are generated by the submit page itself. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ca225b61..c5423c79 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();

1 0

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

06 Jul '22

Module: tools Branch: master Commit: 7c2969f88d6167034b58ff9f89139d14ea89162c URL: https://source.winehq.org/git/tools.git/?a=commit;h=7c2969f88d6167034b58ff9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:05:28 2022 +0200 testbot/cgi: Highlight the name of the invalid field(s) on form 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 | 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 f2fd0f09..67b3fa00 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 78d33f88..fd6acac8 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; }

1 0

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

06 Jul '22

Module: tools Branch: master Commit: ce0a7b4413c8097fe07c82ca448fcfe6648474c3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ce0a7b4413c8097fe07c82c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:05:39 2022 +0200 testbot/web: Use AddError() to set the item list action error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 2cb40c48..d1f8de6d 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 5f9f47b4..6fdb06d0 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 6c3ff203..3361c03f 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;

1 0

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

06 Jul '22

Module: tools Branch: master Commit: f130b873281ec2b96318e45b26cbc9f53d36e075 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f130b873281ec2b96318e45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:05:48 2022 +0200 testbot/web: Use AddError() in the failure details page. This is better than direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 02803ed2..b4226f60 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"))

1 0

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

06 Jul '22

Module: tools Branch: master Commit: e6e241c32d7c7fd1aefde50aca5cbca45f2aad21 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e6e241c32d7c7fd1aefde50… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:06:08 2022 +0200 testbot/cgi: Use AddError() instead of direct field access in ItemPage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 cd40ba2e..3ec201d9 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;

1 0

Francois Gouget : testbot/web: Use AddError() on the special jobs page.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: tools Branch: master Commit: ab5a31e2f004163c2715310b4f80796b4ea30f76 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab5a31e2f004163c2715310… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:06:16 2022 +0200 testbot/web: Use AddError() on the special jobs page. This is better than direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/SpecialJobs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 2c0bbd11..d8294c1a 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -234,7 +234,7 @@ sub OnSubmit($) if (@Errors) { - $self->{ErrMessage} = join("\n", @Errors); + $self->AddError(join("\n", @Errors)); return undef; }

1 0

Francois Gouget : testbot/cgi: Allow calling AddError() without an error.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: tools Branch: master Commit: 71ff9805246dfd0834023c858f4f07bd7073056b URL: https://source.winehq.org/git/tools.git/?a=commit;h=71ff9805246dfd0834023c8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 6 16:06:21 2022 +0200 testbot/cgi: Allow calling AddError() without an error. This simplifies error handling for APIs that just return an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1df53929..a8268754 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -356,6 +356,7 @@ Sets the error message to be shown to the user. =item ErrMessage A message to be shown on the page that describes why the form data is invalid. This should include the display name of the field(s) that need to be fixed. +If this parameter is false the error message is not modified. =item ErrField If the error concerns a specific field, the name of that field. This can be @@ -363,6 +364,9 @@ used by the page to highlight the field that needs to be corrected. =back +Returns the ErrMessage parameter. This allows checking whether an error +was actually added. + =back =cut @@ -370,8 +374,12 @@ sub AddError($$;$) { my ($self, $ErrMessage, $ErrField) = @_; - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = $ErrField; + if ($ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + $self->{ErrField} = $ErrField; + } + return $ErrMessage; } # FIXME: For legacy code, to be removed.

1 0

Torge Matthies : gitlab: Make mbox splitting more robust.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: tools Branch: master Commit: 1dd718b79d3511e7e9d614fc9c6d96be4ffcc655 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1dd718b79d3511e7e9d614f… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Jun 24 07:16:35 2022 +0200 gitlab: Make mbox splitting more robust. This complements the fix in af62ee218ed25a1502490a1017cf53d23cf65307 by not splitting on every line that starts with From. The mbox split algorithm now uses the same From-line detection as git mailsplit. --- gitlab/gitlab-to-mail/gitlabtomail.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 8333588e..03824504 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -278,10 +278,12 @@ def decode_rfc2822(header): def split_mbox_into_messages(mbox): result = [] - for mail in re.split(r'^From ', mbox, flags=re.M): + # Ported from Git's mailsplit code to regex. + regex = r'^(?=.{20,})(?=From .*\d{2}:\d{2}:\d{2}\s*(?:9[1-9]|\d{3,})(?!\d)[^:\n]*$)' + for mail in re.split(regex, mbox, flags=re.M|re.A): if not mail: continue - result.append(email.message_from_string('From ' + mail)) + result.append(email.message_from_string(mail)) return result

1 0