wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Eric Pouech : nsi/tests: Enable compilation with long types.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 4defa8d46057d115bfa60204538bd799a20bc717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4defa8d46057d115bfa60204… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:23 2022 +0100 nsi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/Makefile.in | 1 - dlls/nsi/tests/nsi.c | 196 ++++++++++++++++++++++----------------------- 2 files changed, 98 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4defa8d46057d115bfa6…

1 0

Eric Pouech : include: Don't use long types in nsi.h.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 3720c45a46c5710a2ef27c463f1d9ec87a5a6d2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3720c45a46c5710a2ef27c46… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:22 2022 +0100 include: Don't use long types in nsi.h. It'll make things simpler from unixlib when long types are enabled. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/nsi.h | 304 ++++++++++++++++++++++++++--------------------------- 1 file changed, 152 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3720c45a46c5710a2ef2…

1 0

Zhiyi Zhang : apisetschema: Add api-ms-win-core-winrt-robuffer-l1-1-0.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 5a162a763f8a7d9587803a586584f1aace1ce4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a162a763f8a7d9587803a58… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 25 16:08:35 2022 +0800 apisetschema: Add api-ms-win-core-winrt-robuffer-l1-1-0. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..b13d00f8844 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -147,6 +147,7 @@ apiset api-ms-win-core-winrt-error-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-errorprivate-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-registration-l1-1-0 = combase.dll +apiset api-ms-win-core-winrt-robuffer-l1-1-0 = wintypes.dll apiset api-ms-win-core-winrt-roparameterizediid-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-string-l1-1-1 = combase.dll apiset api-ms-win-core-wow64-l1-1-1 = kernelbase.dll

1 0

Fabian Maurer : printui: Use LocalFree for memory allocated by LocalAlloc (Coverity).
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: f1cf7a02184f758b0b578909fceffc89581d76e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1cf7a02184f758b0b578909… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Apr 23 20:17:24 2022 +0200 printui: Use LocalFree for memory allocated by LocalAlloc (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/printui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 8f65ed27e87..13669f05aab 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -227,7 +227,7 @@ void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nC cx.nCmdShow = nCmdShow; if ((pCommand) && (pCommand[0])) { - /* result is allocated with GlobalAlloc() */ + /* result is allocated with LocalAlloc() */ cx.argv = CommandLineToArgvW(pCommand, &cx.argc); TRACE("got %d args at %p\n", cx.argc, cx.argv); @@ -253,6 +253,6 @@ void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nC FIXME("dialog: Printer / The operation was not successful\n"); } - GlobalFree(cx.argv); + LocalFree(cx.argv); }

1 0

Fabian Maurer : mscoree: Use LocalFree for memory allocated by LocalAlloc.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 2c405c746866fb3b07b7df77fd57be78bbc3669b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c405c746866fb3b07b7df77… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Apr 23 20:17:25 2022 +0200 mscoree: Use LocalFree for memory allocated by LocalAlloc. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 54b72091bf5..1651ca69d29 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1093,7 +1093,7 @@ static void get_utf8_args(int *argc, char ***argv) (*argv)[*argc] = NULL; - HeapFree(GetProcessHeap(), 0, argvw); + LocalFree(argvw); } #if __i386__

1 0

Nikolay Sivov : uxtheme: Fix double free on registry key handle.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 28d572aa14300b7452f491e2a6b53b4e1ad9a104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d572aa14300b7452f491e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 24 11:42:22 2022 +0300 uxtheme: Fix double free on registry key handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52704 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 908451f0fe8..05b86e40b1a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -127,7 +127,6 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, } } - RegCloseKey(hKey); return dwRet; }

1 0

Francois Gouget : testbot/web: Fix and share the main page's job completion date formatting.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: 5e6939a84bbe45f9f97cc5f07a509e535d04e558 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e6939a84bbe45f9f97cc5f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:49 2022 +0200 testbot/web: Fix and share the main page's job completion date formatting. The main page still depended on the pre-datetime.js ShowDateTime() JavaScript function, which the new one is not compatible with. Add GenerateTipDateTime() so a timestamp can easily be added as a tooltip to an arbitrary HTML chunk. Tweak the column title to better reflect its content (contrast duration with elapsed time). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 47 ++++++++++++++++++++++++++- testbot/web/WineTestBot.css | 1 + testbot/web/index.pl | 12 ++----- testbot/web/js/datetime.js | 19 ++++++++--- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 638504d..d987cee 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -22,7 +22,7 @@ use strict; package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; -our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime +our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -106,6 +106,51 @@ sub GenerateDateTime($;$$) =pod =over 12 +=item C<GenerateTipDateTime()> + +Adds a tooltip containing the timestamp to the specified HTML chunk. + +The timestamp is converted to the ISO 8601 format in the user's timezone if +JavaScript is available and in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateTipDateTime($$;$$) +{ + my ($Sec1970, $Html, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}tipdatetime' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d %H:%M:%S'>", localtime($Sec1970)), + "$Html</$Tag>"; + } + else + { + print $Html; + } +} + +=pod +=over 12 + =item C<GenerateTimeTipDate()> Show the timestamp's time with the date as a tooltip. diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 0955f58..350ab64 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -408,6 +408,7 @@ pre .log-fullnew { color: red; font-weight: bold; } a.title { color:inherit; text-decoration: none; } +a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 4048cac..b07b39d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -25,7 +25,7 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use POSIX qw(strftime); +use ObjectModel::CGI::ValueFormatter; use WineTestBot::Branches; use WineTestBot::Users; @@ -65,7 +65,7 @@ sub GenerateHeaderView($$$) } elsif ($PropertyName eq "Ended") { - print "<a class='title' title='Ended'>Time</a>"; + print "<a class='title' title='Completion timestamp'>Elapsed</a>"; } else { @@ -156,13 +156,7 @@ sub GenerateDataView($$$) if (defined $Job->Ended) { my $Duration = $Job->Ended - $Job->Submitted; - my $TagId = "E". $Job->Id; - print "<a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), - "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>"; + GenerateTipDateTime($Job->Ended, DurationToString($Duration)); } else { diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 47b0feb..23b7b27 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -23,13 +23,21 @@ function Pad2(n) return n < 10 ? '0' + n : n; } -function ShowDateTime(dom) +function ShowDateTime(dom, attr) { const sec1970 = dom.getAttribute("timestamp"); const dt = new Date(sec1970 * 1000); - dom.innerHTML = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ - Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ - Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()) + const pretty = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ + Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()); + if (attr == null) + { + dom.innerHTML = pretty; + } + else + { + dom.setAttribute(attr, pretty); + } } function ShowTimeTipDate(dom) @@ -47,6 +55,9 @@ function init() document.querySelectorAll(".datetime").forEach(dom => { ShowDateTime(dom); }); + document.querySelectorAll(".tipdatetime").forEach(dom => { + ShowDateTime(dom, 'title'); + }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); });

1 0

Francois Gouget : testbot/web: Show the job submission date as a tooltip on the main page.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: f919e7d33b48f261840fc1a637cb084970700a26 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f919e7d33b48f261840fc1a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:41 2022 +0200 testbot/web: Show the job submission date as a tooltip on the main page. Only the jobs of the past few days are shown so the date is not very useful. Delegating it to a tooltip avoids much line-wrapping in the Submitted column, allowing more lines to fit on-screen. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 331ee85..4048cac 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -46,7 +46,8 @@ sub DisplayProperty($$) return !1; } - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName eq "Submitted" ? ("ro", "timetipdate") : + $self->SUPER::DisplayProperty($PropertyDescriptor); } sub GenerateHeaderView($$$) @@ -58,6 +59,10 @@ sub GenerateHeaderView($$$) { print "<a class='title' title='Higher values indicate a lower priority'>Nice</a>"; } + elsif ($PropertyName eq "Submitted") + { + print "<a class='title' title='Date'>Submitted</a>"; + } elsif ($PropertyName eq "Ended") { print "<a class='title' title='Ended'>Time</a>";

1 0

Francois Gouget : testbot/cgi: Let DisplayProperty() specify how to format the property.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: 4df626aaeba5c9063b7826ebc56d6783e68f0bce URL: https://source.winehq.org/git/tools.git/?a=commit;h=4df626aaeba5c9063b7826e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:29 2022 +0200 testbot/cgi: Let DisplayProperty() specify how to format the property. This applies to CollectionBlocks as well as FormPages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 24 ++++++++++++---- testbot/lib/ObjectModel/CGI/FormPage.pm | 39 +++++++++++++++----------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 14e3cfe..b2ebb2e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -166,10 +166,15 @@ sub GenerateErrorPopup($) =item C<DisplayProperty()> -Specifies whether to hide the given property. +Specifies whether to hide the given property and how to format it. -Any value evaluating to false specifies that the property should be hidden and -all others that it should be shown. +Returns a (display, format) array where the format value is optional. +If the display value is false the property is hidden. Otherwise it should be +"ro" to get a read-only view. + +The format value is passed to GenerateDataView() which can use it to decide +how to format the property. By default it is simply passed to +ValueFormatter::GenerateValueHTML(). =back =cut @@ -299,6 +304,14 @@ The object for the current row. Furthermore one can get the link to the current object's details page by passing the row to GetDetailsLink(). +The Col parameter has the following extra field: +=over 12 +=item Format +The format to be used to display the property. +If undefined the default formatting is used. + +=back + =back =cut @@ -308,7 +321,7 @@ sub GenerateDataView($$$) my $PropertyName = $Col->{Descriptor}->GetName(); my $Value = $Row->{Item}->$PropertyName; - GenerateValueHTML($self, $Col->{Descriptor}, $Value); + GenerateValueHTML($self, $Col->{Descriptor}, $Value, $Col->{Format}); } @@ -419,10 +432,11 @@ sub GenerateList($) my (@Cols, $HasDT); foreach my $PropertyDescriptor (@$PropertyDescriptors) { - my $Display = $self->DisplayProperty($PropertyDescriptor); + my ($Display, $Format) = $self->DisplayProperty($PropertyDescriptor); next if (!$Display); push @Cols, {Descriptor => $PropertyDescriptor, Display => $Display, + Format => $Format, Index => $ColIndex++}; $HasDT ||= ($PropertyDescriptor->GetClass() eq "Basic" and $PropertyDescriptor->GetType() eq "DT"); diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 7fd2f56..e286880 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -156,16 +156,18 @@ sub GetPropertyDescriptorByName($$) =item C<DisplayProperty()> -Specifies whether to hide, display or allow editing the given property. +Specifies whether to hide, display or allow editing the given property, and +optionally how to format it. -Return values: +Returns a (display, format) array where the display value is one of the +following: =over =item "" Any value evaluating to false specifies that the property should be hidden. =item "ro" Specifies that the property is read-only, i.e. GenerateField() should display -it instead of generating an edit field. +it using the default format instead of generating an edit field. =item "rw" Specifies that GenerateField() should allow editing the property. @@ -174,6 +176,11 @@ HTTP parameter name. =back +The optional format value is passed to GenerateValueInput() and +GenerateValueView() which can use it to decide how to present the value. +In the default implementation the format is only used for read-only properties +and is passed to ValueFormatter::GenerateValueHTML(). + =back =cut @@ -278,11 +285,11 @@ Generates an HTML snippet representing the value in a user-readable form. =back =cut -sub GenerateValueView($$$) +sub GenerateValueView($$$$) { - my ($self, $PropertyDescriptor, $Value) = @_; + my ($self, $PropertyDescriptor, $Value, $Format) = @_; - GenerateValueHTML($self, $PropertyDescriptor, $Value); + GenerateValueHTML($self, $PropertyDescriptor, $Value, $Format); } sub GetInputType($$) @@ -329,9 +336,9 @@ Generates an HTML snippet allowing the specified value to be edited. =back =cut -sub GenerateValueInput($$$) +sub GenerateValueInput($$$$) { - my ($self, $PropertyDescriptor, $Value) = @_; + my ($self, $PropertyDescriptor, $Value, $_Format) = @_; my $InputType = $self->GetInputType($PropertyDescriptor); if ($InputType eq "checkbox") @@ -419,9 +426,9 @@ sub GenerateFormStart($) "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } -sub GenerateField($$$) +sub GenerateField($$$$) { - my ($self, $PropertyDescriptor, $Display) = @_; + my ($self, $PropertyDescriptor, $Display, $Format) = @_; print "<div class='ItemProperty'><label>", $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), @@ -431,12 +438,12 @@ sub GenerateField($$$) if ($Display eq "rw") { print "<div class='ItemValue'>"; - $self->GenerateValueInput($PropertyDescriptor, $Value); + $self->GenerateValueInput($PropertyDescriptor, $Value, $Format); print "</div>"; } else { - $self->GenerateValueView($PropertyDescriptor, $Value); + $self->GenerateValueView($PropertyDescriptor, $Value, $Format); } print "</div>\n"; @@ -448,8 +455,8 @@ sub GenerateFields($) foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) { - my $Display = $self->DisplayProperty($PropertyDescriptor); - $self->GenerateField($PropertyDescriptor, $Display) if ($Display); + my ($Display, $Format) = $self->DisplayProperty($PropertyDescriptor); + $self->GenerateField($PropertyDescriptor, $Display, $Format) if ($Display); } } @@ -498,7 +505,7 @@ sub GenerateBody($) if (defined $self->{ErrField}) { my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); - if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) + if ($PropertyDescriptor and !($self->DisplayProperty($PropertyDescriptor))[0]) { $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; } @@ -599,7 +606,7 @@ sub Save($) { if ($PropertyDescriptor->GetClass() eq "Basic" && $PropertyDescriptor->GetType() eq "B" && - $self->DisplayProperty($PropertyDescriptor) eq "rw" && + ($self->DisplayProperty($PropertyDescriptor))[0] eq "rw" && ! defined($self->GetParam($PropertyDescriptor->GetName()))) { if (! $self->SaveProperty($PropertyDescriptor, ""))

1 0

Francois Gouget : testbot/cgi: Add a format parameter to GenerateHTMLValue().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: 46ecbb6325b91c03be6d3a376d86c67e71f9d348 URL: https://source.winehq.org/git/tools.git/?a=commit;h=46ecbb6325b91c03be6d3a3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:21 2022 +0200 testbot/cgi: Add a format parameter to GenerateHTMLValue(). This mostly allows specifying how it should format timestamps, though it could also be used to force intepreting an integer property as a boolean, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 31 ++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 62c1499..638504d 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -163,27 +163,48 @@ Generates an HTML snippet representing the value in a user-readable form. The Parent parameter must point to a class that implements the escapeHTML() method. +The format parameter can be used to specify how to display the specified +value and should have one of the basic property descriptor types with a couple +of extensions for timestamps: + +=over + +=item "DT" +Show the date and time mostly in ISO 8601 format. This is the default format +for timestamp properties. + +=item "timetipdate" +Same as above but put the date part in a tooltip. + +=back + =back =cut -sub GenerateValueHTML($$$); +sub GenerateValueHTML($$$;$); -sub GenerateValueHTML($$$) +sub GenerateValueHTML($$$;$) { - my ($Parent, $PropertyDescriptor, $Value) = @_; + my ($Parent, $PropertyDescriptor, $Value, $Format) = @_; if ($PropertyDescriptor->GetClass() eq "Basic") { - if ($PropertyDescriptor->GetType() eq "B") + $Format ||= $PropertyDescriptor->GetType(); + if ($Format eq "B") { print $Value ? "Yes" : "No"; return; } - if ($PropertyDescriptor->GetType() eq "DT") + if ($Format eq "DT") { GenerateDateTime($Value); return; } + if ($Format eq "timetipdate") + { + GenerateTimeTipDate($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) {

1 0

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 April 2022