wine-devel

wine-devel@winehq.org

2 participants
84399 discussions

[tools] testbot: Also identify Failure test units on unhandled exception lines.
by Francois Gouget 04 Jul '22

04 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This only simplifies the cases where the test framework caught the unhandled exception. The other cases have no information on the source test unit. --- testbot/lib/WineTestBot/LogUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 651c1d0a47..afbd9432f9 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1409,7 +1409,9 @@ sub MatchLogFailures($$) foreach my $ErrIndex (0..$#{$Group->{Errors}}) { my $Line = $Group->{Errors}->[$ErrIndex]; - my $TestUnit = $Line =~ /^([_a-z0-9]+)\.c:\d+:/ ? $1 : ""; + my $TestUnit = $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* / ? $1 : + $Line =~ /^[0-9a-f]+:([_a-z0-9]+):[0-9.]* unhandled exception / ? $1 : + ""; my $UnitFailures = $FailureTree{$GroupName}->{$TestUnit}; next if (!$UnitFailures); -- 2.30.2

1 0

[tools] testbot/web: Only show the date for the latest failures occurrence.
by Francois Gouget 04 Jul '22

04 Jul '22

This limits line wrapping in the failures list. This adds ValueFormatter::GenerateDateTipTime(). As usual the time is shown as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 53 ++++++++++++++++++- testbot/web/FailuresList.pl | 1 + testbot/web/WineTestBot.css | 1 + testbot/web/js/datetime.js | 12 +++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 49bf856587..343c61c726 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -23,7 +23,8 @@ package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime - GenerateDayTimeTipDate GenerateTimeTipDate GenerateValueHTML); + GenerateDayTimeTipDate GenerateTimeTipDate GenerateDateTipTime + GenerateValueHTML); use POSIX qw(strftime); @@ -238,6 +239,51 @@ sub GenerateTimeTipDate($;$$) } } +=pod +=over 12 + +=item C<GenerateDateTipTime()> + +Show the timestamp's date with the time as a tooltip. + +The timestamp is shown 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 GenerateDateTipTime($;$$) +{ + my ($Sec1970, $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}datetiptime' timestamp='$Sec1970' ", + strftime("title='%H:%M:%S'>%Y-%m-%d", localtime($Sec1970)), + "</$Tag>"; + } + else + { + print " "; + } +} + # # Property value formatting @@ -303,6 +349,11 @@ sub GenerateValueHTML($$$;$) GenerateDayTimeTipDate($Value); return; } + if ($Format eq "datetiptime") + { + GenerateDateTipTime($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index e271ee1d54..2cb40c482e 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -56,6 +56,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp)$/ ? "" : + $PropertyName =~ /^Last(?:Old|New)$/ ? ("ro", "datetiptime") : $self->SUPER::DisplayProperty($PropertyDescriptor); } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 5e0c39ff45..78d33f886d 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -414,6 +414,7 @@ a.title { color:inherit; text-decoration: none; } a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } a.daytimetipdate { color:inherit; text-decoration: none; } +a.datetiptime { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index d21bf5c6ea..842a6ec30a 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -60,6 +60,16 @@ function ShowTimeTipDate(dom) Pad2(dt.getSeconds()); } +function ShowDateTipTime(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.setAttribute('title', Pad2(dt.getHours()) +':'+ Pad2(dt.getMinutes()) + +':'+ Pad2(dt.getSeconds())); + dom.innerHTML = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ + Pad2(dt.getDate()); +} + function init() { document.querySelectorAll(".datetime").forEach(dom => { @@ -73,6 +83,8 @@ function init() }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); + document.querySelectorAll(".datetiptime").forEach(dom => { + ShowDateTipTime(dom); }); } -- 2.30.2

1 0

[PATCH v5 0/1] MR320: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo (#53289).
by Jinoh Kang (＠iamahuman) 04 Jul '22

04 Jul '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v5: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo. https://gitlab.winehq.org/wine/wine/-/merge_requests/320

2 1

[PATCH 0/7] MR370: mciqtz32: Simplify video window management by creating default window.
by Akihiro Sagawa (＠sgwaki) 04 Jul '22

04 Jul '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/370

3 13

[PATCH 0/2] MR326: riched20: Emulate a Windows bug that ignores undo/redo failure.
by Jinoh Kang (＠iamahuman) 04 Jul '22

04 Jul '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/326

4 7

[PATCH v4 0/1] MR320: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo (#53289).
by Jinoh Kang (＠iamahuman) 04 Jul '22

04 Jul '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v4: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo. https://gitlab.winehq.org/wine/wine/-/merge_requests/320

2 4

[PATCH v2 2/2] combase: Execute local server for correct architecture in a WoW64 setup.
by Dmitry Timoshkov 04 Jul '22

04 Jul '22

Based on implementation of create_surrogate_server(). This patch makes 64-bit application work with its own shipped 32-bit COM server. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/rpc.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 3a171dbb324..c51b59de4bf 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -477,6 +477,9 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) { static const WCHAR embeddingW[] = L" -Embedding"; HKEY key; + int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32; + REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64 = FALSE, is_opposite = FALSE; HRESULT hr; WCHAR command[MAX_PATH + ARRAY_SIZE(embeddingW)]; DWORD size = (MAX_PATH+1) * sizeof(WCHAR); @@ -484,7 +487,14 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) PROCESS_INFORMATION pinfo; LONG ret; + TRACE("Attempting to start server for %s\n", debugstr_guid(rclsid)); + hr = open_key_for_clsid(rclsid, L"LocalServer32", KEY_READ, &key); + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + hr = open_key_for_clsid(rclsid, L"LocalServer32", opposite | KEY_READ, &key); + is_opposite = TRUE; + } if (FAILED(hr)) { ERR("class %s not registered\n", debugstr_guid(rclsid)); @@ -510,7 +520,19 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) /* FIXME: Win2003 supports a ServerExecutable value that is passed into * CreateProcess */ - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + if (is_opposite) + { + void *cookie; + Wow64DisableWow64FsRedirection(&cookie); + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run local server %s\n", debugstr_w(command)); + hr = HRESULT_FROM_WIN32(GetLastError()); + } + Wow64RevertWow64FsRedirection(cookie); + if (FAILED(hr)) return hr; + } + else if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) { WARN("failed to run local server %s\n", debugstr_w(command)); return HRESULT_FROM_WIN32(GetLastError()); -- 2.36.1

2 1

[PATCH v2 1/2] combase: Use file system redirection path only for an opposite architecture in a WoW64 setup.
by Dmitry Timoshkov 04 Jul '22

04 Jul '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/rpc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index bed7518358c..3a171dbb324 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -527,7 +527,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) HKEY key; int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32; REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; - BOOL is_wow64 = FALSE; + BOOL is_wow64 = FALSE, is_opposite = FALSE; HRESULT hr; WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID]; DWORD size; @@ -548,6 +548,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) { hr = open_appidkey_from_clsid(rclsid, opposite | KEY_READ, &key); if (FAILED(hr)) return hr; + is_opposite = TRUE; } size = (MAX_PATH + 1) * sizeof(WCHAR); @@ -574,7 +575,7 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) TRACE("Activating surrogate local server %s\n", debugstr_w(command)); - if (is_wow64 && arch == 64) + if (is_opposite) { void *cookie; Wow64DisableWow64FsRedirection(&cookie); -- 2.36.1

2 1

[PATCH 0/7] MR368: win32u: scroll conversion
by Jacek Caban (＠jacek) 04 Jul '22

04 Jul '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/368

3 8

[PATCH v3 0/1] MR362: ntoskrnl: Add KeQueryPriorityThread stub
by Alexander Wilms (＠Alexander-Wilms) 04 Jul '22

04 Jul '22

Range of possible return values taken from https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/nf-wdm-ke… -- v3: ntoskrnl: Add KeQueryPriorityThread stub https://gitlab.winehq.org/wine/wine/-/merge_requests/362

2 1

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-devel