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

Rémi Bernon : mf/tests: Add todo_wine for newer FFmpeg versions.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: 7187965a75ca6abeb512a436bc7fcd84640591fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7187965a75ca6abeb512a436… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 23 16:09:53 2022 +0200 mf/tests: Add todo_wine for newer FFmpeg versions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fd4acf6dfbf..00be50c8494 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6390,7 +6390,7 @@ static void check_sample_pcm16_(int line, IMFSample *sample, const BYTE *expect_ if (expect - value + 512 > 1024) break; } - todo_wine_if(todo) + todo_wine_if(todo && i < length / 2) ok_(__FILE__, line)(i == length, "unexpected buffer data\n"); if (output_file) WriteFile(output_file, buffer, length, &length, NULL); @@ -7027,6 +7027,9 @@ static void test_wma_decoder(void) hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); winetest_pop_context(); + + /* some FFmpeg version request more input to complete decoding */ + if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT && i == 2) break; } todo_wine ok(wmadec_data_len == 0, "missing %#lx bytes\n", wmadec_data_len);

1 0

Rémi Bernon : winegstreamer: Release requested samples if they are too small.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: 7e046aa49e70f97aac2adacc5c0bc5f55e52b2a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e046aa49e70f97aac2adacc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 09:53:25 2022 +0200 winegstreamer: Release requested samples if they are too small. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_allocator.c | 8 +++++++- dlls/winegstreamer/wg_transform.c | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/wg_allocator.c b/dlls/winegstreamer/wg_allocator.c index c31751ce83f..5b2c48dcf77 100644 --- a/dlls/winegstreamer/wg_allocator.c +++ b/dlls/winegstreamer/wg_allocator.c @@ -150,6 +150,7 @@ static GstMemory *wg_allocator_alloc(GstAllocator *gst_allocator, gsize size, GstAllocationParams *params) { WgAllocator *allocator = (WgAllocator *)gst_allocator; + struct wg_sample *sample; WgMemory *memory; GST_LOG("allocator %p, size %#zx, params %p", allocator, size, params); @@ -162,7 +163,12 @@ static GstMemory *wg_allocator_alloc(GstAllocator *gst_allocator, gsize size, pthread_mutex_lock(&allocator->mutex); - memory->sample = allocator->request_sample(size, allocator->request_sample_context); + sample = allocator->request_sample(size, allocator->request_sample_context); + if (sample->max_size < size) + InterlockedDecrement(&sample->refcount); + else + memory->sample = sample; + list_add_tail(&allocator->memory_list, &memory->entry); pthread_mutex_unlock(&allocator->mutex); diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index e05432f6ac7..adefd16c787 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -310,15 +310,10 @@ static bool transform_append_element(struct wg_transform *transform, GstElement static struct wg_sample *transform_request_sample(gsize size, void *context) { struct wg_transform *transform = context; - struct wg_sample *sample; GST_LOG("size %#zx, context %p", size, transform); - sample = InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL); - if (!sample || sample->max_size < size) - return NULL; - - return sample; + return InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL); } NTSTATUS wg_transform_create(void *args)

1 0

Rémi Bernon : winegstreamer: Use an atomic queue for wg_transform input buffers.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: f5f741842287e1db81c85c2ed737ae086781ae58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f741842287e1db81c85c2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 09:54:42 2022 +0200 winegstreamer: Use an atomic queue for wg_transform input buffers. And push them one by one until an output buffer is generated, to avoid generating multiple output buffers without a backing wg_sample. This makes zero-copy more efficient for games which queue multiple input buffers before checking output, such as Yakuza 4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 70 ++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index adefd16c787..070263698fb 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -51,8 +51,10 @@ struct wg_transform GstPad *my_src, *my_sink; GstPad *their_sink, *their_src; GstSegment segment; - GstBufferList *input; + guint input_max_length; + GstAtomicQueue *input_queue; + guint output_plane_align; struct wg_sample *output_wg_sample; GstAtomicQueue *output_queue; @@ -215,9 +217,11 @@ NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; GstSample *sample; + GstBuffer *buffer; - if (transform->input) - gst_buffer_list_unref(transform->input); + while ((buffer = gst_atomic_queue_pop(transform->input_queue))) + gst_buffer_unref(buffer); + gst_atomic_queue_unref(transform->input_queue); gst_element_set_state(transform->container, GST_STATE_NULL); @@ -336,7 +340,7 @@ NTSTATUS wg_transform_create(void *args) return STATUS_NO_MEMORY; if (!(transform->container = gst_bin_new("wg_transform"))) goto out; - if (!(transform->input = gst_buffer_list_new())) + if (!(transform->input_queue = gst_atomic_queue_new(8))) goto out; if (!(transform->output_queue = gst_atomic_queue_new(8))) goto out; @@ -503,8 +507,8 @@ out: wg_allocator_destroy(transform->allocator); if (transform->output_queue) gst_atomic_queue_unref(transform->output_queue); - if (transform->input) - gst_buffer_list_unref(transform->input); + if (transform->input_queue) + gst_atomic_queue_unref(transform->input_queue); if (transform->container) { gst_element_set_state(transform->container, GST_STATE_NULL); @@ -530,7 +534,7 @@ NTSTATUS wg_transform_push_data(void *args) GstBuffer *buffer; guint length; - length = gst_buffer_list_length(transform->input); + length = gst_atomic_queue_length(transform->input_queue); if (length >= transform->input_max_length) { GST_INFO("Refusing %u bytes, %u buffers already queued", sample->size, length); @@ -556,7 +560,7 @@ NTSTATUS wg_transform_push_data(void *args) GST_BUFFER_DURATION(buffer) = sample->duration * 100; if (!(sample->flags & WG_SAMPLE_FLAG_SYNC_POINT)) GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT); - gst_buffer_list_insert(transform->input, -1, buffer); + gst_atomic_queue_push(transform->input_queue, buffer); params->result = S_OK; return STATUS_SUCCESS; @@ -705,48 +709,52 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi return STATUS_SUCCESS; } -NTSTATUS wg_transform_read_data(void *args) +static bool get_transform_output(struct wg_transform *transform, struct wg_sample *sample) { - struct wg_transform_read_data_params *params = args; - struct wg_transform *transform = params->transform; - struct wg_sample *sample = params->sample; - struct wg_format *format = params->format; GstFlowReturn ret = GST_FLOW_OK; - GstBuffer *output_buffer; - GstBufferList *input; - GstCaps *output_caps; - bool discard_data; - NTSTATUS status; + GstBuffer *input_buffer; /* Provide the sample for transform_request_sample to pick it up */ InterlockedIncrement(&sample->refcount); InterlockedExchangePointer((void **)&transform->output_wg_sample, sample); - if (!gst_buffer_list_length(transform->input)) - GST_DEBUG("Not input buffer queued"); - else if ((input = gst_buffer_list_new())) + while (!(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) { - ret = gst_pad_push_list(transform->my_src, transform->input); - transform->input = input; - } - else - { - GST_ERROR("Failed to allocate new input queue"); - ret = GST_FLOW_ERROR; + if (!(input_buffer = gst_atomic_queue_pop(transform->input_queue))) + break; + + if ((ret = gst_pad_push(transform->my_src, input_buffer))) + { + GST_ERROR("Failed to push transform input, error %d", ret); + break; + } } /* Remove the sample so transform_request_sample cannot use it */ if (InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL)) InterlockedDecrement(&sample->refcount); - if (ret) + return ret == GST_FLOW_OK; +} + +NTSTATUS wg_transform_read_data(void *args) +{ + struct wg_transform_read_data_params *params = args; + struct wg_transform *transform = params->transform; + struct wg_sample *sample = params->sample; + struct wg_format *format = params->format; + GstBuffer *output_buffer; + GstCaps *output_caps; + bool discard_data; + NTSTATUS status; + + if (!transform->output_sample && !get_transform_output(transform, sample)) { - GST_ERROR("Failed to push transform input, error %d", ret); wg_allocator_release_sample(transform->allocator, sample, false); return STATUS_UNSUCCESSFUL; } - if (!transform->output_sample && !(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) + if (!transform->output_sample) { sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT;

1 0

Francois Gouget : testbot/web: Use AddError() in the job details page.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: tools Branch: master Commit: 8087405e341b2cb9a1fbff430e4a69c210f6f1c3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8087405e341b2cb9a1fbff4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 7 15:12:29 2022 +0200 testbot/web: Use AddError() in the job details page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 6d3f13cd..3fbdb427 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -185,20 +185,10 @@ sub OnJobControl($$) { my ($self, $Action) = @_; - my $ErrMessage = $self->CanDoJobControl($Action); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } + return !1 if ($self->{EnclosingPage}->AddError($self->CanDoJobControl($Action))); my $JobId = $self->{EnclosingPage}->GetJob()->Id; - $ErrMessage = JobControl($Action, $JobId); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } + return !1 if ($self->{EnclosingPage}->AddError(JobControl($Action, $JobId))); # Ideally this would use something like GetMoreInfoLink() to rebuild a Get # URL to preserve which logs and screenshots have been expanded. But if the

1 0

Francois Gouget : testbot/web: Use AddError() and ResetErrors() on the submit job page.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: tools Branch: master Commit: 08d24b4762337414ac53bee616b8fbe2e773289a URL: https://source.winehq.org/git/tools.git/?a=commit;h=08d24b4762337414ac53bee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 7 15:13:22 2022 +0200 testbot/web: Use AddError() and ResetErrors() on the submit job page. This replaces a lot of direct field accesses. Also clearly identify unused variables. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 100 +++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 63 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index c5423c79..4368aeeb 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -77,16 +77,14 @@ sub _Upload($) { umask($OldUMask); delete $self->{FileName}; - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unable to save the uploaded file"; + $self->AddError("Unable to save the uploaded file", "File"); return undef; } } else { delete $self->{FileName}; - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unable to upload the file"; + $self->AddError("Unable to upload the file", "File"); return undef; } return 1; @@ -102,8 +100,7 @@ sub _GetFileType($) my $Fh; if (!sysopen($Fh, $self->_GetStagingFilePath(), O_RDONLY)) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "Unable to open '$self->{FileName}'"; + $self->AddError("Unable to open '$self->{FileName}'", "FileName"); return undef; } @@ -153,8 +150,7 @@ sub _GetFileType($) if ($self->{FileType} !~ /^(?:exe32|exe64|patch)$/) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "Unsupported file type"; + $self->SerError("FileName", "Unsupported file type"); return undef; } @@ -169,14 +165,12 @@ sub _AnalyzePatch($) if (!$self->{Impacts}->{TestBuild}) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "'$self->{FileName}' is not a valid patch"; + $self->AddError("'$self->{FileName}' is not a valid patch", "FileName"); return undef; } if ($self->{Impacts}->{PatchedModuleOrTests} == 0) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The patch does not directly impact the Wine dlls and programs"; + $self->AddError("The patch does not directly impact the Wine dlls and programs", "FileName"); return undef; } return 1; @@ -194,23 +188,20 @@ sub _ValidateFileName($) if (!defined $self->{FileName}) { delete $self->{FileName}; - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "You must provide a file to test"; + $self->AddError("You must provide a file to test", "FileName"); return undef; } if (!IsValidFileName($self->{FileName})) { delete $self->{FileName}; - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The filename contains invalid characters"; + $self->AddError("The filename contains invalid characters", "FileName"); return undef; } my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($self->{FileName})) { delete $self->{FileName}; - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The filename is too long"; + $self->AddError("The filename is too long", "FileName"); return undef; } @@ -290,7 +281,7 @@ sub _ValidateVMSelection($;$) if (@Deselected) { - $self->{ErrMessage} = "The following VMs are incompatible and have been deselected: @Deselected"; + $self->AddError("The following VMs are incompatible and have been deselected: @Deselected"); return undef; } return 1; @@ -337,8 +328,7 @@ sub _ValidateTestExecutable($;$) if (!defined $self->{TestExecutable}) { - $self->{ErrField} = "TestExecutable"; - $self->{ErrMessage} = "You must specify the test executable filename"; + $self->AddError("You must specify the test executable filename", "TestExecutable"); return undef; } elsif (!$self->{TestExecutables}->{$self->{TestExecutable}} or @@ -346,8 +336,7 @@ sub _ValidateTestExecutable($;$) # to defend against malicious patches. !IsValidFileName($self->{TestExecutable})) { - $self->{ErrField} = "TestExecutable"; - $self->{ErrMessage} = "Invalid test executable filename"; + $self->AddError("Invalid test executable filename", "TestExecutable"); return undef; } @@ -393,14 +382,12 @@ sub Validate($) { # Note that Page 1 should have provided a default # so there is no reason for it to still be undefined. - $self->{ErrField} = "Branch"; - $self->{ErrMessage} = "You must specify the branch to test"; + $self->AddError("You must specify the branch to test", "Branch"); return undef; } if (!CreateBranches()->GetItem($self->{Branch})) { - $self->{ErrField} = "Branch"; - $self->{ErrMessage} = "The '$self->{Branch}' branch does not exist"; + $self->AddError("The '$self->{Branch}' branch does not exist", "Branch"); return undef; } } @@ -410,7 +397,7 @@ sub Validate($) return undef if (!$self->_ValidateVMSelection()); if (!$self->{CheckedVMCount}) { - $self->{ErrMessage} = "Select at least one VM"; + $self->AddError("Select at least one VM"); return undef; } } @@ -424,18 +411,17 @@ sub Validate($) !$self->{Run64} and $self->{ShowRun64}) { # Don't set ErrField since Run32 and Run64 may be hidden - $self->{ErrMessage} = "You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs."; + $self->AddError("You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs."); return undef; } if ($self->{CmdLineArg} eq "" and !$self->{NoCmdLineArgWarn}) { - $self->{ErrMessage} = "You did not specify a command line argument. ". - "This is most likely not correct, so please ". - "fix this. If you are sure that you really don't ". - 'want a command line argument, press "Submit" '. - "again."; - $self->{ErrField} = "CmdLineArg"; + $self->AddError("You did not specify a command line argument. ". + "This is most likely not correct, so please ". + "fix this. If you are sure that you really don't ". + 'want a command line argument, press "Submit" again.', + "CmdLineArg"); $self->{NoCmdLineArgWarn} = 1; return undef; } @@ -969,8 +955,7 @@ sub OnUnset($) if (!$self->_ValidateFileName()) { # Ignore the error. What counts is not using a suspicious FileName. - delete $self->{ErrField}; - delete $self->{ErrMessage}; + $self->ResetErrors(); } elsif (defined $self->{FileName}) { @@ -1012,12 +997,8 @@ sub OnSinglePage($) my ($self) = @_; # The checks and defaults are the same as for Page1Next() - if (!$self->OnPage1Next()) - { - # But ignore all errors. The user can change everything anyway. - delete $self->{ErrField}; - delete $self->{ErrMessage}; - } + # But ignore all errors. The user can change everything anyway. + $self->ResetErrors() if (!$self->OnPage1Next()); $self->_SetPage(4); return 1; @@ -1151,7 +1132,7 @@ sub _SubmitJob($$) } if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return !1; } } @@ -1210,7 +1191,7 @@ sub _SubmitJob($$) my ($ErrMessage, $Missions) = ParseMissionStatement($WineMissions{$VM}); if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return !1; } my $Missions = $Missions->[0]; @@ -1229,34 +1210,32 @@ sub _SubmitJob($$) } # Now save it all (or whatever's left to save) - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return undef; } # Stage the test patch/executable so the job can pick it up if (!rename($Staging, "$DataDir/staging/job". $NewJob->Id ."_$self->{FileName}")) { - $self->{ErrMessage} = "Could not stage '$self->{FileName}': $!\n"; + $self->AddError("Could not stage '$self->{FileName}': $!"); return undef; } # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return undef; } # Notify engine - my $ErrMessage = RescheduleJobs(); - if (defined $ErrMessage) + if ($self->AddError(RescheduleJobs())) { - $self->{ErrMessage} = $ErrMessage; $self->_SetPage(0); $self->{JobKey} = $NewJob->GetKey(); return undef; @@ -1277,15 +1256,15 @@ sub OnSubmit($) my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", "-websubmit2_$self->{FileName}"); if (!defined $Staging) { - $self->{ErrMessage} = "Could not rename '$self->{FileName}': $!"; + $self->AddError("Could not rename '$self->{FileName}': $!"); return undef; } if (!unlink $OldStaging) { unlink $Staging; - $self->{ErrMessage} = $!{ENOENT} ? + $self->AddError($!{ENOENT} ? "$self->{FileName} has already been submitted or has expired" : - "Could not remove the staging '$self->{FileName}' file: $!"; + "Could not remove the staging '$self->{FileName}' file: $!"); return undef; } @@ -1303,13 +1282,8 @@ sub OnSetShowAllVMs($$) my ($self, $Value) = @_; # Call _ValidateVMSelection() to identify incompatible VMs so they are not - # marked as Checked - if (!$self->_ValidateVMSelection("deselect")) - { - # Ignore errors - delete $self->{ErrField}; - delete $self->{ErrMessage}; - } + # marked as Checked but ignore errors. + $self->ResetErrors() if (!$self->_ValidateVMSelection("deselect")); $self->{ShowAll} = $Value; return undef;

1 0

Francois Gouget : testbot: Clean up the Authenticate() and NewSession() methods.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: tools Branch: master Commit: 32f58a1c44f77f2a8907a325f1b15a8a1e45f27a URL: https://source.winehq.org/git/tools.git/?a=commit;h=32f58a1c44f77f2a8907a32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 7 15:11:09 2022 +0200 testbot: Clean up the Authenticate() and NewSession() methods. Make sure all Authenticate() methods return an (error, user) pair instead of just an error string. The result is the same but it's better to be consistent. Clearly identify unused variables and tweak the formatting a bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 3 +- testbot/lib/WineTestBot/Users.pm | 52 ++++++++------------------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 8594cfcd..afe78d06 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -131,8 +131,7 @@ sub NewSession($$$) $Session->User($User); $Session->Permanent($Permanent); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); return ($ErrMessage, $Session); } diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 70d0d7b7..e9d68b09 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -223,15 +223,10 @@ sub Authenticate($$) if (! $self->Activated()) { - if ($self->WaitingForApproval()) - { - return ("Your account has not been approved yet", undef); - } - else - { - return ("You need to activate your account, see email for instructions", - undef); - } + return ($self->WaitingForApproval() ? + "Your account has not been approved yet" : + "You need to activate your account, see email for instructions", + undef); } my $CorrectHashedPassword = $self->Password; @@ -352,41 +347,22 @@ sub AuthenticateLDAP($$$) my ($self, $Name, $Password) = @_; my $LDAP = Net::LDAP->new($LDAPServer); - if (! defined($LDAP)) - { - return ("Can't connect to LDAP server: $@", undef); - } + return ("Can't connect to LDAP server: $@", undef) if (!$LDAP); my $BindDN = $LDAPBindDN; $BindDN =~ s/%USERNAME%/$Name/; my $Msg = $LDAP->bind($BindDN, password => $Password); - if ($Msg->code) - { - return "Unknown username or incorrect password"; - } + return ("Unknown username or incorrect password", undef) if ($Msg->code); my $User = $self->GetItem($Name); - if (defined($User)) - { - return (undef, $User); - } + return (undef, $User) if (defined $User); $User = $self->Add(); my $ErrMessage = $User->FromLDAP($LDAP, $Name); - if ($ErrMessage) - { - return $ErrMessage; - } - - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - if ($ErrMessage) - { - return $ErrMessage; - } + return ($ErrMessage, undef) if ($ErrMessage); - return (undef, $User); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage ? ($ErrMessage, undef) : (undef, $User); } sub AuthenticateBuiltin($$$) @@ -394,12 +370,8 @@ sub AuthenticateBuiltin($$$) my ($self, $Name, $Password) = @_; my $User = $self->GetItem($Name); - if (! defined($User)) - { - return "Unknown username or incorrect password"; - } - - return $User->Authenticate($Password); + return $User ? $User->Authenticate($Password) : + ("Unknown username or incorrect password", undef); } sub Authenticate($$$)

1 0

Francois Gouget : testbot/web: Use AddError() for the user details page.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: tools Branch: master Commit: eb357c66419222f217f240d7dad2b194a0f0dac1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb357c66419222f217f240d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 7 15:13:39 2022 +0200 testbot/web: Use AddError() for the user details page. This replaces SetError() and direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UserDetails.pl | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 833a36d1..da8cebf2 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -88,10 +88,10 @@ sub OnItemAction($$$) return 1 if ($self->{User}->Roles->HasItem($Item->Name)); $self->{User}->AddRole($Item); - my $ErrMessage = $self->{User}->Roles->Save(); + my ($_ErrKey, $ErrProperty, $ErrMessage) = $self->{User}->Roles->Save(); if (defined $ErrMessage) { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + $self->{EnclosingPage}->AddError($ErrMessage, $ErrProperty); return 0; } NotifyAdministrator("New administrator user: $self->{UserName}", @@ -100,13 +100,12 @@ sub OnItemAction($$$) } if ($self->{RW} and $Action eq "Remove role") { - my $UserRole = $self->{User}->Roles->GetItem($Item->Name); + my $Roles = $self->{User}->Roles; + my $UserRole = $Roles->GetItem($Item->Name); return 1 if (!$UserRole); - my $ErrMessage = $self->{User}->Roles->DeleteItem($UserRole); - if (defined $ErrMessage) + if ($self->{EnclosingPage}->AddError($Roles->DeleteItem($UserRole))) { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); return 0; } NotifyAdministrator("Removed an administrator: $self->{UserName}", @@ -114,7 +113,7 @@ sub OnItemAction($$$) return 1; } - $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + $self->{EnclosingPage}->AddError("No per-Item action defined for $Action"); return 0; } @@ -194,8 +193,7 @@ sub OnApprove($) my ($self) = @_; return !1 if (!$self->Save()); - $self->{ErrMessage} = $self->{Item}->Approve(); - return !1 if (defined $self->{ErrMessage}); + return !1 if ($self->AddError($self->{Item}->Approve())); exit($self->RedirectToParent()); } @@ -204,8 +202,12 @@ sub OnReject($) my ($self) = @_; $self->{Item}->Status('deleted'); - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); - return !1 if (defined $self->{ErrMessage}); + my ($ErrProperty, $ErrMessage) = $self->{Item}->Save(); + if (defined $ErrMessage) + { + $self->AddError($ErrMessage, $ErrProperty); + return !1; + } # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); exit($self->RedirectToParent());

1 0

Francois Gouget : testbot/web: Use AddError() in the login and related pages.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: tools Branch: master Commit: 6a304bc183add8cb8453ac7505c62833538c942c URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a304bc183add8cb8453ac7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 7 15:12:38 2022 +0200 testbot/web: Use AddError() in the login and related pages. 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/Feedback.pl | 3 +-- testbot/web/ForgotPassword.pl | 12 ++---------- testbot/web/Login.pl | 6 ++---- testbot/web/Register.pl | 3 +-- testbot/web/ResetPassword.pl | 24 ++++++++++-------------- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 6185d26d..23e19440 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -86,8 +86,7 @@ sub OnSend($) my $FeedA = $self->GetParam("FeedA"); if ($FeedA !~ /$RegistrationARE/) { - $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; - $self->{ErrField} = "Captcha"; + $self->AddError("Wrong 'captcha' answer. Please try again.", "Captcha"); return !1; } } diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 19098526..ee175d3d 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -82,21 +82,13 @@ sub OnResetPassword($) my $Keys = $Users->GetKeys; if (scalar @$Keys == 0) { - $self->{ErrField} = "Name"; - $self->{ErrMessage} = "Unknown username or email address"; + $self->AddError("Unknown username or email address", "Name"); return !1; } $User = $Users->GetItem($Keys->[0]); } - $self->{ErrMessage} = $User->SendResetCode(); - if (defined($self->{ErrMessage})) - { - $self->{ErrField} = "Name"; - return !1; - } - - return 1; + return $self->AddError($User->SendResetCode(), "Name") ? !1 : 1; } sub OnAction($$) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 7b9a6ffe..9380583a 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -106,8 +106,7 @@ sub OnLogIn($) $self->GetParam("Password")); if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } @@ -116,8 +115,7 @@ sub OnLogIn($) defined($self->GetParam("AutoLogin"))); if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index b31dc14c..667a19b0 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -116,8 +116,7 @@ sub OnSendRequest($) my $RegA = $self->GetParam("RegA"); if ($RegA !~ /$RegistrationARE/) { - $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; - $self->{ErrField} = "Captcha"; + $self->AddError("Wrong 'captcha' answer. Please try again.", "Captcha"); return !1; } } diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 081e27f1..65dcdd53 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -85,8 +85,7 @@ sub Validate($) if ($self->GetParam("Password1") ne $self->GetParam("Password2")) { - $self->{ErrField} = "Password1"; - $self->{ErrMessage} = "Passwords don't match"; + $self->AddError("Passwords don't match", "Password1"); return !1; } @@ -108,24 +107,22 @@ sub OnChangePassword($) my $User = $Users->GetItem($self->GetParam("Name")); if (! defined($User)) { - $self->{ErrField} = "Name"; - $self->{ErrMessage} = "Unknown username or incorrect activation code"; + $self->AddError("Unknown username or incorrect activation code", "Name"); return !1; } - $self->{ErrMessage} = $User->ResetPassword($self->GetParam("ResetCode"), - $self->GetParam("Password1")); - if (defined($self->{ErrMessage})) + my $ErrMessage = $User->ResetPassword($self->GetParam("ResetCode"), + $self->GetParam("Password1")); + if (defined $ErrMessage) { - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } - my ($ErrMessage, $User) = $Users->Authenticate($self->GetParam("Name"), + ($ErrMessage, my $User) = $Users->Authenticate($self->GetParam("Name"), $self->GetParam("Password1")); - if ($ErrMessage) + if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } @@ -134,8 +131,7 @@ sub OnChangePassword($) defined($self->GetParam("AutoLogin"))); if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; }

1 0

Francois Gouget : testbot/cgi: Use AddError() to report collection block errors.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: tools Branch: master Commit: 89c70785d318d262a6316da97fb56ee0c7ad5cc2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=89c70785d318d262a6316da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 7 15:11:27 2022 +0200 testbot/cgi: Use AddError() to report collection block errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 0f0a3bd6..bbff74c6 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -600,16 +600,10 @@ sub OnItemAction($$$) if ($self->{RW} and $Action eq "Delete") { - my $ErrMessage = $self->{Collection}->DeleteItem($Item); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return 0; - } - return 1; + return $self->{EnclosingPage}->AddError($self->{Collection}->DeleteItem($Item)) ? 0 : 1; } - $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + $self->{EnclosingPage}->AddError("No per-Item action defined for $Action"); return 0; }

1 0

Jeremy Newman : wine-releases links reversed, fix.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: website Branch: master Commit: d2106d431ef2b964f52a49545a165e8ee6ac17e7 URL: https://source.winehq.org/git/website.git/?a=commit;h=d2106d431ef2b964f52a4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jul 7 13:34:30 2022 -0500 wine-releases links reversed, fix. --- templates/en/forums.template | 4 ++-- templates/fr/forums.template | 4 ++-- templates/ko/forums.template | 4 ++-- templates/nl/forums.template | 4 ++-- templates/pl/forums.template | 4 ++-- templates/pt/forums.template | 4 ++-- templates/tr/forums.template | 4 ++-- templates/zh-cn/forums.template | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 951d1a3a..a38f41f2 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -75,8 +75,8 @@ mailing list software. <li> <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">(Un-)Subscribe</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">Archive 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">(Un-)Subscribe</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">Archive 1</a>] A low traffic (2/month) read only list for receiving a large diff file at every Wine official release. </li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index a208ed47..7418ad22 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -59,8 +59,8 @@ Voici les plus utiles pour les utilisateurs : </li> <li> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">(Dés-)inscription</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">Archive 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">(Dés-)inscription</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">Archive 1</a>] <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> Une liste bas trafic (2 messages par mois) en lecture seule pour la réception de fichiers diff conséquents lors de la sortie d'une version officielle de Wine. </li> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index eb2841f7..2223884c 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -76,8 +76,8 @@ href="https://www.winehq.org/mailman3/postorius/lists/?all-lists">웹 페이지< </li> <li> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">구독/해지</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">메시지 기록 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">구독/해지</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">메시지 기록 1</a>] <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> 매 Wine 공식 릴리스마다 큰 diff 파일을 전송하는 읽기 전용 메일링 리스트입니다. 메시지 전송 빈도: 1개월에 2여통(낮음) diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 0d4f9f88..ad67b33d 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -65,8 +65,8 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam. <li> <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">In- uitschrijven</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">Archief 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">In- uitschrijven</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">Archief 1</a>] Een lijst (alleen-lezen) met ongeveer 2 berichten per maand met alle verschillen bij iedere officiële Wine versie. </li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index e3c0680b..148f4cb8 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -66,8 +66,8 @@ oprogramowanie listy mailingowej. Średni ruch (25/dziennie) lista tylko-do-odczytu, która śledzi zatwierdzenia do drzewa Git. <li> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">(Wy-/Za-)pisz</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">Archiwum 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">(Wy-/Za-)pisz</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">Archiwum 1</a>] <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> Niski ruch (2/miesięcznie) lista tylko-do-odczytu do otrzymywania dużych plików diff przy każdym oficjalnym wydaniu Wine. diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 509be1b6..1a8705d2 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -67,8 +67,8 @@ do contrário o seu email será tratado como um possível spam pelo software da na árvore Git. <li> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">(Des-)Inscrever</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">Arquivo 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">(Des-)Inscrever</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">Arquivo 1</a>] <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> Uma lista de baixo tráfego (2/mês) de somente leitura para receber um grande arquivo diff para cada novo lançamento do Wine. diff --git a/templates/tr/forums.template b/templates/tr/forums.template index b133007d..14625f22 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -60,8 +60,8 @@ </li> <li> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">Abone ol/iptal et</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">Arşiv 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">Abone ol/iptal et</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">Arşiv 1</a>] <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> Her resmi Wine sürümünde büyük diff dosyasını almak için salt okunur düşük trafikli (2/ay) bir liste </li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index acc20903..e3406836 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -57,8 +57,8 @@ <li> <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">（取消）订阅</a>] - [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">存档 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-releases.winehq.org/">（取消）订阅</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-releases(a)winehq.org/">存档 1</a>] 一个低流量（2封/月）的只读列表，用于接收每个 Wine official release 的大体积 diff 文件。 </li>

1 0