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

Zebediah Figura : vkd3d-shader/hlsl: Return bool from add_record_load() and add_array_load().
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: vkd3d Branch: master Commit: aaa743033a5ede8b8c946c91e942b7853315aa9a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aaa743033a5ede8b8c946c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 08:34:00 2022 +0200 vkd3d-shader/hlsl: Return bool from add_record_load() and add_array_load(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 58d71ff6..fd808648 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -569,19 +569,19 @@ static struct hlsl_ir_load *add_load(struct hlsl_ctx *ctx, struct list *instrs, return load; } -static struct hlsl_ir_load *add_record_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record, +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) { struct hlsl_ir_constant *c; if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &loc))) - return NULL; + return false; list_add_tail(instrs, &c->node.entry); - return add_load(ctx, instrs, record, &c->node, field->type, loc); + return !!add_load(ctx, instrs, record, &c->node, field->type, loc); } -static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, +static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location loc) { const struct hlsl_type *expr_type = array->data_type; @@ -597,7 +597,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in { /* This needs to be lowered now, while we still have type information. */ FIXME("Index of matrix or vector type.\n"); - return NULL; + return false; } else { @@ -605,18 +605,18 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Scalar expressions cannot be array-indexed."); else hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Expression cannot be array-indexed."); - return NULL; + return false; } if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), &loc))) - return NULL; + return false; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) - return NULL; + return false; list_add_tail(instrs, &mul->entry); index = mul; - return add_load(ctx, instrs, array, index, data_type, loc); + return !!add_load(ctx, instrs, array, index, data_type, loc); } static struct hlsl_struct_field *get_struct_field(struct list *fields, const char *name)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Support vector indexing.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: vkd3d Branch: master Commit: d1fac2660c3f5e4f5c72b785f8a0a29dbc298f05 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1fac2660c3f5e4f5c72b78… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 18 08:34:01 2022 +0200 vkd3d-shader/hlsl: Support vector indexing. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 14 ++++++++++---- tests/hlsl-vector-indexing.shader_test | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fd808648..291f8392 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -592,13 +592,21 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls if (expr_type->type == HLSL_CLASS_ARRAY) { data_type = expr_type->e.array.type; + if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), &loc))) + return false; } - else if (expr_type->type == HLSL_CLASS_MATRIX || expr_type->type == HLSL_CLASS_VECTOR) + else if (expr_type->type == HLSL_CLASS_MATRIX) { /* This needs to be lowered now, while we still have type information. */ - FIXME("Index of matrix or vector type.\n"); + FIXME("Index of matrix type.\n"); return false; } + else if (expr_type->type == HLSL_CLASS_VECTOR) + { + data_type = hlsl_get_scalar_type(ctx, expr_type->base_type); + if (!(c = hlsl_new_uint_constant(ctx, 1, &loc))) + return false; + } else { if (expr_type->type == HLSL_CLASS_SCALAR) @@ -608,8 +616,6 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls return false; } - if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), &loc))) - return false; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) return false; diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test index 1c964147..f2d20c44 100644 --- a/tests/hlsl-vector-indexing.shader_test +++ b/tests/hlsl-vector-indexing.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.02, 0.245, 0.351, 1.0) [pixel shader] @@ -23,5 +23,5 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo draw quad +draw quad probe all rgba (1.0, 2.0, 2.0, 3.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Split matrix copies.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: vkd3d Branch: master Commit: e38ee49e995a8a2436b393976ce0d514d4b4661d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e38ee49e995a8a2436b3939… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 18 08:34:02 2022 +0200 vkd3d-shader/hlsl: Split matrix copies. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 52 ++++++++++++++++++++++++++++++++++ tests/hlsl-matrix-indexing.shader_test | 17 +++++++++++ 2 files changed, 69 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 72c00430..73e3b73f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -672,6 +672,57 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static unsigned int minor_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimx; + else + return type->dimy; +} + +static unsigned int major_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimy; + else + return type->dimx; +} + +static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_ir_node *rhs; + struct hlsl_type *element_type; + const struct hlsl_type *type; + unsigned int i; + struct hlsl_ir_store *store; + + if (instr->type != HLSL_IR_STORE) + return false; + + store = hlsl_ir_store(instr); + rhs = store->rhs.node; + type = rhs->data_type; + if (type->type != HLSL_CLASS_MATRIX) + return false; + element_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + + if (rhs->type != HLSL_IR_LOAD) + { + hlsl_fixme(ctx, &instr->loc, "Copying from unsupported node type.\n"); + return false; + } + + for (i = 0; i < major_size(type); ++i) + { + if (!split_copy(ctx, store, hlsl_ir_load(rhs), 4 * i, element_type)) + return false; + } + + list_remove(&store->node.entry); + hlsl_free_instr(&store->node); + return true; +} + static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { const struct hlsl_type *src_type, *dst_type; @@ -1685,6 +1736,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry progress |= transform_ir(ctx, split_struct_copies, body, NULL); } while (progress); + transform_ir(ctx, split_matrix_copies, body, NULL); transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); do diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index 1d444ffa..e2103fe2 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -45,3 +45,20 @@ uniform 8 float4 9.0 10.0 11.0 12.0 uniform 12 float4 13.0 14.0 15.0 16.0 todo draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) + +[pixel shader] +uniform float4x4 m; + +float4 main() : SV_TARGET +{ + float4x4 m2 = m; + return float4(m2[0][0], m2[1][0], m2[1][2], m2[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 2.0, 10.0, 15.0)

1 0

Francois Gouget : testbot/cgi: Fix the CollectionBlock::GenerateHeaderView() documentation.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: 0dbb766f0a16f5fc133611cf87626dbae11eaffc URL: https://source.winehq.org/git/tools.git/?a=commit;h=0dbb766f0a16f5fc133611c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:16:20 2022 +0200 testbot/cgi: Fix the CollectionBlock::GenerateHeaderView() documentation. The Row and Rows fields were undocumented and there was a bug in the POD formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 3e3ee29..d425622 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -241,7 +241,13 @@ The base link to the item details page if any. See GetDetailsPage(). =item ItemActions The list of per-item actions. -=cut +=item Row +The row index; 0 for the header. + +=item Rows +The total number of rows (excluding the header). + +=back =back =cut

1 0

Francois Gouget : testbot/web: Simplify the register page's DisplayProperty().
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: a889402d89934a2155b0cdd0502ddc82e94593df URL: https://source.winehq.org/git/tools.git/?a=commit;h=a889402d89934a2155b0cdd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:16:34 2022 +0200 testbot/web: Simplify the register page's DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Register.pl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index b10be75..b31dc14 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -79,15 +79,9 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - my $Display; - if ($PropertyName ne "Name" && $PropertyName ne "EMail" && - $PropertyName ne "RealName") - { - return ""; - } - - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:Name|EMail|RealName)$/ ? + $self->SUPER::DisplayProperty($PropertyDescriptor) : + ""; } sub GenerateFields($)

1 0

Francois Gouget : testbot/cgi: Fix the CollectionBlock::GenerateHeaderRow() prototype.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: 54a5aab7c2f3724711106ef5b71c7be07afa4376 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54a5aab7c2f3724711106ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:17:03 2022 +0200 testbot/cgi: Fix the CollectionBlock::GenerateHeaderRow() prototype. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index d425622..958cfec 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -336,7 +336,7 @@ sub GenerateHeaderCell($$$) print "</th>\n"; } -sub GenerateHeaderRow($$$) +sub GenerateHeaderRow($$) { my ($self, $Row) = @_;

1 0

Francois Gouget : testbot/web: Always return "ro" or false in CollectionBlock::DisplayProperty().
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: d12eb5049c87183b3bc33c917b6b0d2f37f83c65 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d12eb5049c87183b3bc33c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:17:16 2022 +0200 testbot/web: Always return "ro" or false in CollectionBlock::DisplayProperty(). This better matches FormPage::DisplayProperty() and opens the door to later extending collection blocks to support edition. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/web/JobDetails.pl | 6 +----- testbot/web/PatchesList.pl | 5 ++--- testbot/web/admin/UsersList.pl | 3 +-- testbot/web/admin/VMDetails.pl | 4 ++-- testbot/web/admin/VMsList.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 958cfec..e849d5a 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -179,7 +179,7 @@ sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; - return $PropertyDescriptor->GetClass ne "Detailref"; + return $PropertyDescriptor->GetClass eq "Detailref" ? "" : "ro"; } sub GetSortedItems($$) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 2c7901a..f681ca5 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -49,11 +49,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "StepNo" || $PropertyName eq "TaskNo" || - $PropertyName eq "Status" || $PropertyName eq "VM" || - $PropertyName eq "Timeout" || $PropertyName eq "FileName" || - $PropertyName eq "CmdLineArg" || $PropertyName eq "Started" || - $PropertyName eq "Ended" || $PropertyName eq "TestFailures"; + return $PropertyName =~ /^(?:StepNo|TaskNo|Status|VM|Timeout|FileName|CmdLineArg|Started|Ended|TestFailures)$/ ? "ro" : ""; } diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 48c8382..a1c5171 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,9 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - return $PropertyName eq "Received" || $PropertyName eq "Disposition" || - $PropertyName eq "FromName" || $PropertyName eq "Subject"; + return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + ""; } sub GenerateDataView($$$) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index bc5ced8..368a6ce 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -42,8 +42,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "EMail" || - $PropertyName eq "Status" || $PropertyName eq "RealName"; + return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } sub GenerateDataCell($$$) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 35b2681..fd2d40d 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,8 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/ ? "" : + $self->SUPER::DisplayProperty($PropertyDescriptor); } sub Save($) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index f8162c6..6c3ff20 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -38,9 +38,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; } sub OnItemAction($$$) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index a189205..0b8a9cb 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -183,9 +183,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; }

1 0

Francois Gouget : testbot/web: Simplify the job details page DisplayProperty().
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: 940241aced8ee868903a5d57b15e55cb9f870281 URL: https://source.winehq.org/git/tools.git/?a=commit;h=940241aced8ee868903a5d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:17:18 2022 +0200 testbot/web: Simplify the job details page DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index f681ca5..e39df41 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -49,7 +49,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:StepNo|TaskNo|Status|VM|Timeout|FileName|CmdLineArg|Started|Ended|TestFailures)$/ ? "ro" : ""; + return $PropertyName =~ /^(?:Id|PreviousNo|Type|FileType|Missions)$/ ? "" : + $self->SUPER::DisplayProperty($PropertyDescriptor); }

1 0

Francois Gouget : testbot/web: Use GenerateDataView() for the users list.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: aee314fddcdda8d6c2f5ef2cdb30ded744fdd8d6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aee314fddcdda8d6c2f5ef2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:16:12 2022 +0200 testbot/web: Use GenerateDataView() for the users list. There is no need to override GenerateDataCell(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 368a6ce..dcdb811 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -45,7 +45,7 @@ sub DisplayProperty($$) return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } -sub GenerateDataCell($$$) +sub GenerateDataView($$$) { my ($self, $Row, $PropertyDescriptor) = @_; @@ -83,11 +83,11 @@ sub GenerateDataCell($$$) ($Class, $Label) = ('usernone', 'none'); } my $DetailsLink = $self->GetDetailsLink($Row); - print "<td><a href='$DetailsLink'><span class='$Class'>$Label</span></a></td>"; + print "<a href='$DetailsLink'><span class='$Class'>$Label</span></a>"; } else { - $self->SUPER::GenerateDataCell($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } }

1 0

Francois Gouget : riched20/tests: Fix the spelling of a comment.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: f9fa5f9e523b45766f715c6981c6a6ab5f183157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9fa5f9e523b45766f715c69… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 13:12:17 2022 +0200 riched20/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index c85a621b80b..c34c87ef646 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3421,7 +3421,7 @@ static void _insert_reobject(struct reolecb_obj *callback, IRichEditOle *reole, HRESULT hr; olecb_expect_QueryInsertObject(callback, line, 1, - &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); + &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overridden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user);

1 0