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

Alexandre Julliard : makedep: Add dependency on locale.nls for rc files.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: ad44edebde62bfb80560b606b7ae3a21b08d333d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad44edebde62bfb80560b606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 10:43:20 2022 +0200 makedep: Add dependency on locale.nls for rc files. wrc will load locale.nls if the rc file uses a non-English language. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index cc988e2aee7..eaf7366da1a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2650,6 +2650,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c } output( "%s.res: %s", obj_dir_path( make, obj ), source->filename ); output_filename( tools_path( make, "wrc" )); + if (make->src_dir) output_filename( "nls/locale.nls" ); output_filenames( source->dependencies ); output( "\n" ); output( "\t%s%s -u -o $@", cmd_prefix( "WRC" ), tools_path( make, "wrc" ) );

1 0

Zebediah Figura : vkd3d-shader/hlsl: Respect the 'nointerpolation' modifier.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: vkd3d Branch: master Commit: e6dabf22bf7926cb78085836798f8a2adedaaba0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e6dabf22bf7926cb7808583… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:11 2022 -0500 vkd3d-shader/hlsl: Respect the 'nointerpolation' modifier. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> 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: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 9 ++++++--- libs/vkd3d-shader/hlsl_sm4.c | 9 ++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 64cfe534..8845be37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -352,7 +352,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/max.shader_test \ - tests/nointerpolation.shader_test \ tests/sampler-offset.shader_test \ tests/trigonometry.shader_test endif diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 98be3aeb..a6a574a7 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -34,7 +34,8 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru /* Use the synthetic name for the temp, rather than the uniform, so that we * can write the uniform name into the shader reflection data. */ - if (!(uniform = hlsl_new_var(ctx, temp->name, temp->data_type, temp->loc, NULL, 0, &temp->reg_reservation))) + if (!(uniform = hlsl_new_var(ctx, temp->name, temp->data_type, + temp->loc, NULL, temp->modifiers, &temp->reg_reservation))) return; list_add_before(&temp->scope_entry, &uniform->scope_entry); list_add_tail(&ctx->extern_vars, &uniform->extern_entry); @@ -76,7 +77,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), + type, var->loc, &new_semantic, var->modifiers, NULL))) { hlsl_release_string_buffer(ctx, name); vkd3d_free((void *)new_semantic.name); @@ -147,7 +149,8 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), + type, var->loc, &new_semantic, var->modifiers, NULL))) { vkd3d_free((void *)new_semantic.name); hlsl_release_string_buffer(ctx, name); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c1e93e93..2dd9cde8 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1203,7 +1203,14 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b } if (profile->type == VKD3D_SHADER_TYPE_PIXEL) - instr.opcode |= VKD3DSIM_LINEAR << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + { + enum vkd3d_shader_interpolation_mode mode = VKD3DSIM_LINEAR; + + if (var->modifiers & HLSL_STORAGE_NOINTERPOLATION) + mode = VKD3DSIM_CONSTANT; + + instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + } } else {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 bitwise XOR instructions.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: vkd3d Branch: master Commit: 2959ad74f74f9b48de044fcb7ee1454944db9a5f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2959ad74f74f9b48de044fc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 22 13:06:05 2022 -0500 vkd3d-shader/hlsl: Write SM4 bitwise XOR instructions. Signed-off-by: Zebediah Figura <zfigura(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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 567d311b..5ca7646f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1637,6 +1637,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_OR, &expr->node, arg1, arg2); break; + case HLSL_OP2_BIT_XOR: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_XOR, &expr->node, arg1, arg2); + break; + case HLSL_OP2_DIV: switch (dst_type->base_type) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 integer addition instructions.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: vkd3d Branch: master Commit: ea93c5c767d5e75e947411aca784f28c2b051b41 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea93c5c767d5e75e947411a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:13 2022 -0500 vkd3d-shader/hlsl: Write SM4 integer addition instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index dadb9783..94765f9e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1634,6 +1634,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break; + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IADD, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 %s addition expression.", dst_type_string->buffer); }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 bitwise NOT instructions.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: vkd3d Branch: master Commit: 8e6c526779604b033abe6b3f788f26e6946f5698 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e6c526779604b033abe6b3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 22 13:06:06 2022 -0500 vkd3d-shader/hlsl: Write SM4 bitwise NOT instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 5ca7646f..c1e93e93 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1568,6 +1568,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP1_BIT_NOT: + assert(type_is_integer(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_NOT, &expr->node, arg1, 0); + break; + case HLSL_OP1_CAST: write_sm4_cast(ctx, buffer, expr); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Declare integer semantics as having constant interpolation.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: vkd3d Branch: master Commit: c9b766924055fc20bcf4eded683897e615fba9f1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9b766924055fc20bcf4ede… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:12 2022 -0500 vkd3d-shader/hlsl: Declare integer semantics as having constant interpolation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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_sm4.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2dd9cde8..dadb9783 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -25,6 +25,20 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_block *block); +static bool type_is_integer(const struct hlsl_type *type) +{ + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + return true; + + default: + return false; + } +} + bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) { @@ -1206,7 +1220,7 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { enum vkd3d_shader_interpolation_mode mode = VKD3DSIM_LINEAR; - if (var->modifiers & HLSL_STORAGE_NOINTERPOLATION) + if ((var->modifiers & HLSL_STORAGE_NOINTERPOLATION) || type_is_integer(var->data_type)) mode = VKD3DSIM_CONSTANT; instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; @@ -1419,20 +1433,6 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer write_sm4_instruction(buffer, &instr); } -static bool type_is_integer(const struct hlsl_type *type) -{ - switch (type->base_type) - { - case HLSL_TYPE_BOOL: - case HLSL_TYPE_INT: - case HLSL_TYPE_UINT: - return true; - - default: - return false; - } -} - static bool type_is_float(const struct hlsl_type *type) { return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allow mixing "in" and "out" with other modifiers.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: vkd3d Branch: master Commit: 8e07f65595df8383583372c053b0db66f06d9efd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e07f65595df8383583372c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:10 2022 -0500 vkd3d-shader/hlsl: Allow mixing "in" and "out" with other modifiers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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 | 76 ++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2fbebf01..5da1c68a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1528,6 +1528,16 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); + if (modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(ctx, modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)))) + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on non-parameter variables.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, &v->reg_reservation))) { free_parse_variable_def(v); @@ -2434,8 +2444,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <if_body> if_body -%type <modifiers> input_mod -%type <modifiers> input_mods %type <modifiers> var_modifiers %type <name> any_identifier @@ -2812,54 +2820,21 @@ param_list: } parameter: - input_mods var_modifiers type any_identifier colon_attribute + var_modifiers type any_identifier colon_attribute { struct hlsl_type *type; - unsigned int modifiers = $2; + unsigned int modifiers = $1; - if (!(type = apply_type_modifiers(ctx, $3, &modifiers, @2))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; - $$.modifiers |= modifiers; + $$.modifiers = modifiers; + if (!($$.modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT))) + $$.modifiers |= HLSL_STORAGE_IN; $$.type = type; - $$.name = $4; - $$.semantic = $5.semantic; - $$.reg_reservation = $5.reg_reservation; - } - -input_mods: - %empty - { - $$ = 0; - } - | input_mods input_mod - { - if ($1 & $2) - { - struct vkd3d_string_buffer *string; - - if ((string = hlsl_modifiers_to_string(ctx, $2))) - hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier \"%s\" was already specified.", string->buffer); - hlsl_release_string_buffer(ctx, string); - YYABORT; - } - $$ = $1 | $2; - } - -input_mod: - KW_IN - { - $$ = HLSL_STORAGE_IN; - } - | KW_OUT - { - $$ = HLSL_STORAGE_OUT; - } - | KW_INOUT - { - $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; + $$.name = $3; + $$.semantic = $4.semantic; + $$.reg_reservation = $4.reg_reservation; } texture_type: @@ -3223,6 +3198,19 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_COLUMN_MAJOR, @1); } + | KW_IN var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_IN, @1); + } + | KW_OUT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_OUT, @1); + } + | KW_INOUT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_IN | HLSL_STORAGE_OUT, @1); + } + complex_initializer: initializer_expr

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 bitwise OR instructions.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: vkd3d Branch: master Commit: f22d866ceedfcf6e362216f6a31c129ae70d951b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f22d866ceedfcf6e362216f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 22 13:06:04 2022 -0500 vkd3d-shader/hlsl: Write SM4 bitwise OR instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fa845dc4..567d311b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1632,6 +1632,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); break; + case HLSL_OP2_BIT_OR: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_OR, &expr->node, arg1, arg2); + break; + case HLSL_OP2_DIV: switch (dst_type->base_type) {

1 0

Francois Gouget : testbot/web: Use SimpleCollectionPage for the users page.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: tools Branch: master Commit: 37c125fa262e4a9cdffc7b1388ab7d21299a7cb4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=37c125fa262e4a9cdffc7b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:58 2022 +0200 testbot/web: Use SimpleCollectionPage for the users page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 62 ++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index ae514e9..08ae5bf 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -2,7 +2,7 @@ # User list page # # Copyright 2009 Ge van Geldorp -# Copyright 2013 Francois Gouget +# Copyright 2013, 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,45 +20,35 @@ use strict; -package UsersListPage; +package UsersBlock; -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; use WineTestBot::CGI::Sessions; use WineTestBot::Config; -use WineTestBot::Users; - - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); -} -sub SortKeys($$$) +sub Create($$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($Collection, $EnclosingPage) = @_; - my @SortedKeys = sort { $a cmp $b } @$Keys; - return \@SortedKeys; + return UsersBlock->new($Collection, $EnclosingPage); } -sub DisplayProperty($$$) +sub DisplayProperty($$) { - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "EMail" || $PropertyName eq "Status" || $PropertyName eq "RealName"; } -sub GenerateDataCell($$$$$) +sub GenerateDataCell($$$$) { - my ($self, $CollectionBlock, $User, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $User, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") @@ -98,41 +88,47 @@ sub GenerateDataCell($$$$$) } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $User, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($User, $PropertyDescriptor, $DetailsPage); } } -sub GetItemActions($$) +sub GetItemActions($) { - my ($self, $CollectionBlock) = @_; + my ($self) = @_; # LDAP accounts cannot be deleted return defined $LDAPServer ? [] : ["Delete"]; } -sub OnItemAction($$$$) +sub OnItemAction($$$) { - my ($self, $CollectionBlock, $User, $Action) = @_; + my ($self, $User, $Action) = @_; if ($Action eq "Delete") { $User->Status('deleted'); - # Setting $self->{ErrField} is only useful on form pages - (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); - return 0 if (defined $self->{ErrMessage}); + my ($_ErrProperty, $ErrMessage) = $User->Save(); + if (defined $ErrMessage) + { + # Setting ErrField is only useful on form pages + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } # Forcefully log out that user by deleting the web sessions DeleteSessions($User); return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $User, $Action); + return $self->SUPER::OnItemAction($User, $Action); } package main; -my $Request = shift; +use ObjectModel::CGI::SimpleCollectionPage; +use WineTestBot::Users; -my $UsersListPage = UsersListPage->new($Request, "admin"); -$UsersListPage->GeneratePage(); +my $Request = shift; +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateUsers(), \&UsersBlock::Create); +$Page->GeneratePage();

1 0

Francois Gouget : testbot/cgi: Remove an incorrect cross-reference in the Perl POD documentation.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: tools Branch: master Commit: 1bb3b3ddf3df797a2ab37c35ea8742dd3b2655eb URL: https://source.winehq.org/git/tools.git/?a=commit;h=1bb3b3ddf3df797a2ab37c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:09:26 2022 +0200 testbot/cgi: Remove an incorrect cross-reference in the Perl POD documentation. PageBase is in fact in WineTestBot::CGI. However referencing WineTestBot from ObjectModel would be an abstraction level violation. 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, 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 0879557..d7463b5 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -110,8 +110,6 @@ sub _initialize($$$) Sets the function to be used to instantiate a new PageBase object for this website. The resulting object can be accessed through GetPageBase(). -See also ObjectModel::CGI::PageBase. - =back =cut

1 0