- Wine-devel - list.winehq.org

Re: [PATCH v5 0/6] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon 05 Jul '22

05 Jul '22

On Mon Jul 4 20:26:47 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > On 6/15/22 01:58, Rémi Bernon wrote: > > +static HRESULT asf_reader_init_stream(struct strmbase_filter *iface) > > +{ > > + struct asf_reader *filter = impl_from_strmbase_filter(iface); > > + HRESULT hr; > > + int i; > > + > > + TRACE("iface %p\n", iface); > > + > > + for (i = 0; i < filter->stream_count; ++i) > > + { > > + struct asf_stream *stream = filter->streams + i; > > + > > + if (!stream->source.pin.peer) > > + continue; > > + > > + hr = IMemAllocator_Commit(stream->source.pAllocator); > > + if (FAILED(hr)) > > + { > > + WARN("Failed to commit stream %u allocator, hr %#lx\n", > i, hr); > > + continue; > > + } > > + > > + hr = IPin_NewSegment(stream->source.pin.peer, 0, 0, 1); > > + if (FAILED(hr)) > > + { > > + WARN("Failed to start stream %u new segment, hr %#lx\n", > i, hr); > > + continue; > > + } > > + } > > + > > + return IWMReader_Start(filter->reader, 0, 0, 1, NULL); > > +} > > + > > +static HRESULT asf_reader_cleanup_stream(struct strmbase_filter *iface) > > +{ > > + struct asf_reader *filter = impl_from_strmbase_filter(iface); > > + int i; > > + > > + TRACE("iface %p\n", iface); > Shouldn't the reader be stopped here? > ``` Maybe, but it causes all sort of deadlocks which I've stopped trying to fix, and in practice it seems to work without it. The deadlock is because `WMReader_Stop` calling `stop_streaming` which needs to enter the streaming thread CS to stop it, and then waits for it. It can either be that the streaming thread is blocked in `wm_reader_get_stream_sample`, which, for some reason may be waiting for samples which never come. Or, that the streaming thread calls the callbacks before exiting, and that the callbacks need to enter the filter CS, which is currently held by asf_reader_cleanup_stream. For instance either because there's a sample that's been received, or because of the `WMT_END_OF_STREAMING` notification. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/140#note_3304

2 1

[PATCH 0/1] MR380: wined3d: Add missing copy offset in wined3d_texture_vk_upload_data().
by Jan Sikorski (＠jsikorski) 05 Jul '22

05 Jul '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53307 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/380

4 4

[PATCH v5 0/5] MR302: winegstreamer: Some wg_transform H264 fixes for Mortal Kombat 11 and Yakuza 4.
by Rémi Bernon 05 Jul '22

05 Jul '22

-- v5: winegstreamer: Use an atomic queue for wg_transform input buffers. winegstreamer: Release requested samples if they are too small. winegstreamer: Introduce a new wg_allocator_set_next_sample helper. winegstreamer: Use the GstObject lock instead of a new allocator mutex. mf/tests: Add todo_wine for newer FFmpeg versions. https://gitlab.winehq.org/wine/wine/-/merge_requests/302

2 9

[PATCH vkd3d 03/12] vkd3d-shader/hlsl: Introduce hlsl_free_deref().
by Francisco Casas 05 Jul '22

05 Jul '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 13 +++++++++---- libs/vkd3d-shader/hlsl.h | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b349eb15..23136aeb 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1539,6 +1539,11 @@ void hlsl_free_instr_list(struct list *list) hlsl_free_instr(node); } +void hlsl_free_deref(struct hlsl_deref *deref) +{ + hlsl_src_remove(&deref->offset); +} + static void free_ir_constant(struct hlsl_ir_constant *constant) { vkd3d_free(constant); @@ -1568,7 +1573,7 @@ static void free_ir_jump(struct hlsl_ir_jump *jump) static void free_ir_load(struct hlsl_ir_load *load) { - hlsl_src_remove(&load->src.offset); + hlsl_free_deref(&load->src); vkd3d_free(load); } @@ -1581,8 +1586,8 @@ static void free_ir_loop(struct hlsl_ir_loop *loop) static void free_ir_resource_load(struct hlsl_ir_resource_load *load) { hlsl_src_remove(&load->coords); - hlsl_src_remove(&load->sampler.offset); - hlsl_src_remove(&load->resource.offset); + hlsl_free_deref(&load->sampler); + hlsl_free_deref(&load->resource); hlsl_src_remove(&load->texel_offset); vkd3d_free(load); } @@ -1590,7 +1595,7 @@ static void free_ir_resource_load(struct hlsl_ir_resource_load *load) static void free_ir_store(struct hlsl_ir_store *store) { hlsl_src_remove(&store->rhs); - hlsl_src_remove(&store->lhs.offset); + hlsl_free_deref(&store->lhs); vkd3d_free(store); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index ce1f69df..5bfbc5a7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -717,6 +717,8 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); +void hlsl_free_deref(struct hlsl_deref *deref); + void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); void hlsl_free_instr(struct hlsl_ir_node *node); -- 2.34.1

4 6

[tools 1/2] testbot/cgi: Improve the error handling API.
by Francois Gouget 05 Jul '22

05 Jul '22

Add IsErrField() and ResetErrors() so web pages don't need to access the error fields directly. Add AddError() where the name of the error field is optional since it is often undetermined. Document the API, particularly with regards to the content of the error message and whether all errors have an associated error field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- AddError() will later be extended to allow adding multiple error messages and multiple invalid fields and should entirely replace SetError() eventually. --- testbot/lib/ObjectModel/CGI/Page.pm | 90 ++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1b9630cc28..6e18c29ab4 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -89,8 +89,9 @@ sub new($$$@) my $self = {Request => $Request, CGIObj => CGI->new($Request), - ErrMessage => undef, - ErrField => undef}; + # ErrMessage => undef by default + # ErrField => undef by default + }; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); $self->_initialize(@_); @@ -293,26 +294,99 @@ sub Redirect($$) # Error handling framework # -sub GetErrField($) +=pod +=over 12 + +=head1 C<GetErrMessage()> + +Returns the error message if any, undef otherwise. + +=back +=cut + +sub GetErrMessage($) { my ($self) = @_; + return $self->{ErrMessage}; +} + +=pod +=over 12 +=head1 C<GetErrField()> + +Returns the name of the invalid field, undef otherwise. + +Note that if the error does not concern a specific field this may return +undef even though an error has been set. + +=back +=cut + +sub GetErrField($) +{ + my ($self) = @_; return $self->{ErrField}; } -sub GetErrMessage($) +=pod +=over 12 + +=head1 C<IsErrField()> + +Returns true if the error concerns the specified field. + +=back +=cut + +sub IsErrField($$) { - my ($self) = @_; + my ($self, $FieldName) = @_; + return defined $self->{ErrField} and $self->{ErrField} eq $FieldName; +} - return $self->{ErrMessage}; +=pod +=over 12 + +=head1 C<AddError()> + +Sets the error message to be shown to the user. +=over + +=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. + +=item ErrField +If the error concerns a specific field, the name of that field. This can be +used by the page to highlight the field that needs to be corrected. + +=back + +=back +=cut + +sub AddError($$;$) +{ + my ($self, $ErrMessage, $ErrField) = @_; + + $self->{ErrMessage} = $ErrMessage; + $self->{ErrField} = $ErrField; } +# FIXME: For legacy code, to be removed. sub SetError($$$) { my ($self, $ErrField, $ErrMessage) = @_; + $self->AddError($ErrMessage, $ErrField); +} - $self->{ErrField} = $ErrField; - $self->{ErrMessage} = $ErrMessage; +sub ResetErrors($) +{ + my ($self) = @_; + + delete $self->{ErrMessage}; + delete $self->{ErrField}; } sub GenerateErrorDiv($) -- 2.30.2

1 1

[tools] testbot/UpdateFailures: Tweak the save error message.
by Francois Gouget 05 Jul '22

05 Jul '22

The error message already contains the name of the invalid field(s). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateFailures.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl index f324cca280..b1c8e0719a 100755 --- a/testbot/bin/UpdateFailures.pl +++ b/testbot/bin/UpdateFailures.pl @@ -193,10 +193,10 @@ foreach my $FailureId (@FailureIds) } } -my ($ErrKey, $ErrProperty, $ErrMessage) = $Failures->Save(); +my ($ErrKey, $_ErrProperty, $ErrMessage) = $Failures->Save(); if ($ErrMessage) { - Error("Could not save $ErrKey because of the $ErrProperty field: $ErrMessage\n"); + Error("Could not save failure $ErrKey: $ErrMessage\n"); exit 1; } -- 2.30.2

1 0

[tools] testbot: Tweak the Failure::Validate() error message.
by Francois Gouget 05 Jul '22

05 Jul '22

The error message should indicate why the regular expression is invalid. Also use the field's actual display name instead of making one up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 6190ef25da..8d41bfcc93 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -98,20 +98,21 @@ sub Validate($) { return ("TestUnit", "The test unit '". $self->TestUnit ."' contains invalid characters"); } - foreach my $Pair (["ConfigRegExp", "configuration"], - ["FailureRegExp", "failure"]) + foreach my $Field ("ConfigRegExp", "FailureRegExp") { - my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { - return "The $Name regular expression should not match empty strings"; + return "The regular expression should not match empty strings"; } - }; - $ErrMessage = "The $Name regular expression is invalid" if ($@); - return ($Field, $ErrMessage) if ($ErrMessage); + } || "$@"; + if ($ErrMessage) + { + my $DisplayName = $self->GetPropertyDescriptorByName($Field)->GetDisplayName(); + return ($Field, "$DisplayName: $ErrMessage"); + } } return $self->SUPER::Validate(); } -- 2.30.2

1 0

[tools] testbot/web: Fix reporting the build special job errors.
by Francois Gouget 05 Jul '22

05 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/SpecialJobs.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index e267cc7d5c..2c0bbd1105 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -168,6 +168,7 @@ sub OnSubmit($) my $VMs = GetReconfigVMs($VMKey, "build"); push @Errors, "Found no build VM to update" if (!@$VMs); my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build"); + push @Errors, $ErrMessage if (defined $ErrMessage); } # Run 32 bit WineTest -- 2.30.2

1 0

[PATCH vkd3d 02/12] vkd3d-shader/hlsl: Pass field to add_record_load() via index.
by Francisco Casas 05 Jul '22

05 Jul '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f293b82e..8fd18868 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -669,10 +669,14 @@ static struct hlsl_ir_load *add_load(struct hlsl_ctx *ctx, struct list *instrs, } static bool add_record_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record, - const struct hlsl_struct_field *field, const struct vkd3d_shader_location loc) + unsigned int idx, const struct vkd3d_shader_location loc) { + const struct hlsl_struct_field *field; struct hlsl_ir_constant *c; + assert(idx < record->data_type->e.record.field_count); + field = &record->data_type->e.record.fields[idx]; + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &loc))) return false; list_add_tail(instrs, &c->node.entry); @@ -806,14 +810,18 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls } static const struct hlsl_struct_field *get_struct_field(const struct hlsl_struct_field *fields, - size_t count, const char *name) + size_t count, const char *name, unsigned int *field_indx) { size_t i; for (i = 0; i < count; ++i) { if (!strcmp(fields[i].name, name)) + { + if (field_indx) + *field_indx = i; return &fields[i]; + } } return NULL; } @@ -3050,7 +3058,7 @@ fields_list: const struct hlsl_struct_field *field = &$2.fields[i]; const struct hlsl_struct_field *existing; - if ((existing = get_struct_field($1.fields, $1.count, field->name))) + if ((existing = get_struct_field($1.fields, $1.count, field->name, NULL))) { hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Field \"%s\" is already defined.", field->name); @@ -3947,15 +3955,15 @@ postfix_expr: if (node->data_type->type == HLSL_CLASS_STRUCT) { struct hlsl_type *type = node->data_type; - const struct hlsl_struct_field *field; + unsigned int field_idx; - if (!(field = get_struct_field(type->e.record.fields, type->e.record.field_count, $3))) + if (!get_struct_field(type->e.record.fields, type->e.record.field_count, $3, &field_idx)) { hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Field \"%s\" is not defined.", $3); YYABORT; } - if (!add_record_load(ctx, $1, node, field, @2)) + if (!add_record_load(ctx, $1, node, field_idx, @2)) YYABORT; $$ = $1; } -- 2.34.1

3 4

[PATCH v11 0/7] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod
by Claire (＠ClearlyClaire) 05 Jul '22

05 Jul '22

When `GetMixFormat` or `GetDevicePeriod` are used, return values specific to the selected device instead of those of the default one. This is especially useful when the audio devices features less channels than one specifically selected by the application. This patch is part of an attempt to get Sony's DualSense controllers to work with Windows games through Wine. This is not enough by itself, but getting the proper mix format is required for most of those games to correctly use the haptic feedback features of the DualSense (which go through an audio output with 4 audio devices). -- v11: winepulse: Don't probe default devices twice winepulse: Use stream-specific period in pulse_get_latency winepulse: Store and use device period on stream creation winepulse: Remove unused pulse_config winepulse: Return device-specific values for GetDevicePeriod winepulse: Return device-specific values for GetMixFormat winepulse: Store device-specific format and periods https://gitlab.winehq.org/wine/wine/-/merge_requests/337

3 13