wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Giovanni Mascellani : vkd3d-shader/hlsl: Introduce add_cast() helper.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: vkd3d Branch: master Commit: e37ac63813897323e7af82beac0d89fb747cef56 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e37ac63813897323e7af82b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 7 16:29:19 2022 -0500 vkd3d-shader/hlsl: Introduce add_cast() helper. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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 | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index faac562a..23c48cdc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -266,7 +266,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ return false; } -static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct list *instrs, +static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) { struct hlsl_type *src_type = node->data_type; @@ -275,6 +275,17 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct if (hlsl_types_are_equal(src_type, dst_type)) return node; + if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + return &cast->node; +} + +static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *src_type = node->data_type; + if (!implicit_compatible_data_types(src_type, dst_type)) { struct vkd3d_string_buffer *src_string, *dst_string; @@ -293,10 +304,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.", src_type->type == HLSL_CLASS_VECTOR ? "vector" : "matrix"); - if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) - return NULL; - list_add_tail(instrs, &cast->node.entry); - return &cast->node; + return add_cast(ctx, instrs, node, dst_type, loc); } static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, const struct vkd3d_shader_location loc) @@ -3718,7 +3726,6 @@ unary_expr: { struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *dst_type; - struct hlsl_ir_expr *cast; unsigned int i; if ($2) @@ -3746,12 +3753,11 @@ unary_expr: YYABORT; } - if (!(cast = hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3))) + if (!add_cast(ctx, $6, node_from_list($6), dst_type, &@3)) { hlsl_free_instr_list($6); YYABORT; } - list_add_tail($6, &cast->node.entry); $$ = $6; }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Allocate enough space for temporary matrices.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: vkd3d Branch: master Commit: 8cd4995958419d1375fd89e3853273e705b46fc0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cd4995958419d1375fd89e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 7 16:29:18 2022 -0500 vkd3d-shader/hlsl: Allocate enough space for temporary matrices. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6f524744..1a5e9055 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1378,7 +1378,7 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir var->last_read, var->data_type->reg_size); else var->reg = allocate_register(ctx, liveness, var->first_write, - var->last_read, var->data_type->dimx); + var->last_read, hlsl_type_component_count(var->data_type)); TRACE("Allocated %s to %s (liveness %u-%u).\n", var->name, debug_register('r', var->reg, var->data_type), var->first_write, var->last_read); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Split matrices into multiple variables in prepend_input_copy().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: vkd3d Branch: master Commit: ea38ecc4ffb0541fe4b46cddc9af31f66e18f34b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea38ecc4ffb0541fe4b46cd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 7 16:29:11 2022 -0500 vkd3d-shader/hlsl: Split matrices into multiple variables in prepend_input_copy(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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_codegen.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b4fcfd27..6f524744 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -84,6 +84,21 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_ir_load *load; struct hlsl_ir_var *input; + if (type->type == HLSL_CLASS_MATRIX) + { + struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + struct hlsl_semantic vector_semantic = *semantic; + unsigned int i; + + for (i = 0; i < major_size(type); ++i) + { + prepend_input_copy(ctx, instrs, var, vector_type, 4 * i, modifiers, &vector_semantic); + ++vector_semantic.index; + } + + return; + } + if (!(name = hlsl_get_string_buffer(ctx))) return; vkd3d_string_buffer_printf(name, "<input-%s%u>", semantic->name, semantic->index);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Split matrices into multiple variables in append_output_copy().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: vkd3d Branch: master Commit: d2d4bc24e9373b5573271bd54c294534643f9415 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2d4bc24e9373b5573271bd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 7 16:29:10 2022 -0500 vkd3d-shader/hlsl: Split matrices into multiple variables in append_output_copy(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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_codegen.c | 47 ++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 78b22910..b4fcfd27 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -21,6 +21,22 @@ #include "hlsl.h" #include <stdio.h> +static unsigned int minor_size(const struct hlsl_type *type) +{ + if (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->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimy; + else + return type->dimx; +} + /* Split uniforms into two variables representing the constant and temp * registers, and copy the former to the latter, so that writes to uniforms * work. */ @@ -141,6 +157,21 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_ir_var *output; struct hlsl_ir_load *load; + if (type->type == HLSL_CLASS_MATRIX) + { + struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + struct hlsl_semantic vector_semantic = *semantic; + unsigned int i; + + for (i = 0; i < major_size(type); ++i) + { + append_output_copy(ctx, instrs, var, vector_type, 4 * i, modifiers, &vector_semantic); + ++vector_semantic.index; + } + + return; + } + if (!(name = hlsl_get_string_buffer(ctx))) return; vkd3d_string_buffer_printf(name, "<output-%s%u>", semantic->name, semantic->index); @@ -847,22 +878,6 @@ 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->modifiers & HLSL_MODIFIER_ROW_MAJOR) - return type->dimx; - else - return type->dimy; -} - -static unsigned int major_size(const struct hlsl_type *type) -{ - if (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;

1 0

Biswapriyo Nath : include: Add ID3D12Debug interface declarations in vkd3d_d3d12sdklayers.idl.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: vkd3d Branch: master Commit: 4647209f27d88f6899e0bc319b91e623d03a3a72 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4647209f27d88f6899e0bc3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat May 21 02:12:12 2022 +0530 include: Add ID3D12Debug interface declarations in vkd3d_d3d12sdklayers.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12sdklayers.idl | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl index 027eeaa2..785aba70 100644 --- a/include/vkd3d_d3d12sdklayers.idl +++ b/include/vkd3d_d3d12sdklayers.idl @@ -899,6 +899,13 @@ typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = 0x4, } D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; +typedef enum D3D12_GPU_BASED_VALIDATION_FLAGS +{ + D3D12_GPU_BASED_VALIDATION_FLAGS_NONE = 0x00, + D3D12_GPU_BASED_VALIDATION_FLAGS_DISABLE_STATE_TRACKING = 0x01, +} D3D12_GPU_BASED_VALIDATION_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_FLAGS)") + typedef struct D3D12_MESSAGE { D3D12_MESSAGE_CATEGORY Category; @@ -948,6 +955,52 @@ interface ID3D12Debug1 : IUnknown void SetEnableSynchronizedCommandQueueValidation(BOOL enable); } +[ + uuid(93a665c4-a3b2-4e5d-b692-a26ae14e3374), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug2 : IUnknown +{ + void SetGPUBasedValidationFlags(D3D12_GPU_BASED_VALIDATION_FLAGS flags); +} + +[ + uuid(5cf4e58f-f671-4ff1-a542-3686e3d153d1), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug3 : ID3D12Debug +{ + void SetEnableGPUBasedValidation(BOOL enable); + void SetEnableSynchronizedCommandQueueValidation(BOOL enable); + void SetGPUBasedValidationFlags(D3D12_GPU_BASED_VALIDATION_FLAGS flags); +} + +[ + uuid(014b816e-9ec5-4a2f-a845-ffbe441ce13a), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug4 : ID3D12Debug3 +{ + void DisableDebugLayer(); +} + +[ + uuid(548d6b12-09fa-40e0-9069-5dcd589a52c9), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug5 : ID3D12Debug4 +{ + void SetEnableAutoName(BOOL enable); +} + [ uuid(0742a90b-c387-483f-b946-30a7e4e61458), object,

1 0

Francois Gouget : testbot/orm: Remove parameters from Create{Detail,Item}refPropertyDescriptor().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: tools Branch: master Commit: 71fa30883bc4ed37edfd937fecdb5d73cb1aaeee URL: https://source.winehq.org/git/tools.git/?a=commit;h=71fa30883bc4ed37edfd937… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 8 16:41:26 2022 +0200 testbot/orm: Remove parameters from Create{Detail,Item}refPropertyDescriptor(). Itemref properties cannot be keys so the IsKey parameter is not necessary. Similarly Detailref properties can neither be keys, nor required. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm | 6 +++--- testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm | 6 +++--- testbot/lib/WineTestBot/CGI/Sessions.pm | 2 +- testbot/lib/WineTestBot/Jobs.pm | 8 ++++---- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- testbot/lib/WineTestBot/PendingPatches.pm | 2 +- testbot/lib/WineTestBot/RecordGroups.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/UserRoles.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=71fa30883bc4ed37edf…

1 0

Francois Gouget : testbot/orm: Turn Itemrefs into virtual properties.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: tools Branch: master Commit: b1a19b109f4faa7e33aaea5bea2f656c1a367ff0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b1a19b109f4faa7e33aaea5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 8 16:41:23 2022 +0200 testbot/orm: Turn Itemrefs into virtual properties. Itemref properties are used to map foreign key columns to the object corresponding to the target table row. However so far adding an Itemref property meant hiding the underlying table column(s) with annoying side-effects: * The type of the underlying property is unknown which is not an issue for strings and integers but rules out using booleans and timestamps in foreign keys since they need conversion from / to the database format. * Filtering on an Itemref property is possible by passing the target object, but not by using the underlying property(s). This makes inequality filters (e.g. >= JobId) awkward or impossible. * This also makes it impossible to filter on a partial foreign key. For instance if one had a TaskFailures table matching known failures to the tasks (JobId, TaskNo) they appear in, one would be unable to get a collection with all the entries for a given job since it's impossible to filter on just the JobId column. So this modifies Itemref properties to come in addition to the underlying column instead of replacing them. This means declaring all the underlying columns, with their proper property descriptors, which makes it possible to access them the normal way and to use them in filters, while still being able to access the corresponding object using the extra Itemref 'virtual' property. It also means filtering out the new properties if they should not be shown in the GUI. Another consequence is that Itemref properties cannot be keys: only the underlying columns can. Finally the underlying columns should not be modified directly as that would cause them to be inconsistent with the corresponding Itemref property but this is not enforced. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 26 ++++++++++++++-------- testbot/lib/ObjectModel/Item.pm | 25 ++++++--------------- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 17 +++++++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 3 +++ testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 3 ++- testbot/web/JobDetails.pl | 6 ++--- testbot/web/index.pl | 11 +++------ 11 files changed, 50 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=b1a19b109f4faa7e33a…

1 0

Francois Gouget : testbot/cgi: Rename ItemPage::RedirectToList() to RedirectToParent().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: tools Branch: master Commit: 0c435f5126a9165ca7513a57ef5e6444451c1693 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0c435f5126a9165ca7513a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 8 16:41:06 2022 +0200 testbot/cgi: Rename ItemPage::RedirectToList() to RedirectToParent(). The parent of a Details page may not be a *List.pl page. For instance a naive web interface for a Job -> Step hierarchy would result in a JobsList -> JobDetails -> StepsList -> StepDetails page tree. But such a page hierarchy would be very cumbersome to use so one would instead have JobsList -> JobDetails (with embedded StepsBlock) -> StepDetails. So the StepDetails page would link back to the JobDetails page and not to a *List page. So a better name for the redirect method is the more generic RedirectToParent(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 6 +++--- testbot/web/admin/UserDetails.pl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 690458e..cd40ba2 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -125,7 +125,7 @@ sub GetActions($) return $self->{HasRW} ? ["Save", "Cancel"] : []; } -sub RedirectToList($) +sub RedirectToParent($) { my ($self) = @_; @@ -139,11 +139,11 @@ sub OnAction($$) if ($Action eq "Save") { return !1 if (!$self->Save()); - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } if ($Action eq "Cancel") { - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } return $self->SUPER::OnAction($Action); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 798063d..833a36d 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -196,7 +196,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } sub OnReject($) @@ -208,7 +208,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } sub OnSave($) @@ -221,7 +221,7 @@ sub OnSave($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } sub OnAction($$)

1 0

Francois Gouget : testbot/Janitor: Load only the relevant tasks when deleting VMs.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: tools Branch: master Commit: 71cfc030d05b41983e4ad8b9b4c869566c044e1d URL: https://source.winehq.org/git/tools.git/?a=commit;h=71cfc030d05b41983e4ad8b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 8 16:40:46 2022 +0200 testbot/Janitor: Load only the relevant tasks when deleting VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index af1123a..618c31d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -201,14 +201,14 @@ map { $DeletedVMs{$_} = 1 } @{$VMs->GetKeys()}; if (%DeletedVMs) { - foreach my $Task (@{CreateTasks($VMs)->GetItems()}) + my $Tasks = CreateTasks($VMs); + $Tasks->AddFilter("VMName", [keys %DeletedVMs]); + foreach my $Task (@{$Tasks->GetItems()}) { - if (exists $DeletedVMs{$Task->VM->Name}) - { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", $Task->GetSlashKey(), "\n"; - delete $DeletedVMs{$Task->VM->Name}; - last if (!%DeletedVMs); - } + next if (!exists $DeletedVMs{$Task->VMName}); + Trace "Keeping the ", $Task->VMName, " VM for task ", $Task->GetSlashKey(), "\n"; + delete $DeletedVMs{$Task->VMName}; + last if (!%DeletedVMs); } foreach my $VMKey (keys %DeletedVMs) {

1 0

Francois Gouget : testbot/cgi: Standardize the case of JsQuote().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: tools Branch: master Commit: f326b4b05b338361994d854d78ba418d70001888 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f326b4b05b338361994d854… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 8 16:40:34 2022 +0200 testbot/cgi: Standardize the case of JsQuote(). This better matches the TestBot's naming standard, particularly ShQuote() and BatchQuote(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 406ca4f..1b9630c 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -142,14 +142,14 @@ sub escapeHTML($$) =pod =over 12 -=head1 C<jsQuote()> +=head1 C<JsQuote()> Quotes a string for JavaScript code. =back =cut -sub jsQuote($$) +sub JsQuote($$) { my ($self, $String) = @_; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 40f5197..1fd15f0 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -374,7 +374,7 @@ sub GenerateErrorPopup($$) { print "<script type='text/javascript'>\n"; print "<!--\n"; - print "function ShowError() { alert(", $Page->jsQuote($ErrMessage), "); }\n"; + print "function ShowError() { alert(", $Page->JsQuote($ErrMessage), "); }\n"; my $ErrField = $Page->GetErrField(); if ($ErrField) {

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022