- wine-devel - winehq.org

[PATCH 0/1] MR268: riched20: Commit and repaint after the SetFont method is called.
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

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

3 2

[PATCH 0/1] MR267: riched20: Commit and repaint after changing TextFont properties.
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

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

3 2

[PATCH v3 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.
by Alex Henrie (＠alexhenrie) 17 Jun '22

17 Jun '22

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- v3: shell32/tests: Add tests for Program Manager name sanitization. https://gitlab.winehq.org/wine/wine/-/merge_requests/252

3 3

[PATCH v2 0/4] MR233: win32u: Partially move raw input APIs.
by Zebediah Figura (＠zfigura) 17 Jun '22

17 Jun '22

-- v2: win32u: Move NtUserGetRawInputBuffer from user32. win32u: Move NtUserGetRawInputData from user32. user32: Correctly fill the RAWINPUT structure on WoW64. user32/tests: Add some more tests related to the RAWINPUT structure. https://gitlab.winehq.org/wine/wine/-/merge_requests/233

4 8

[PATCH v2 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.
by Alex Henrie (＠alexhenrie) 17 Jun '22

17 Jun '22

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- v2: shell32/tests: Add tests for Program Manager name sanitization. https://gitlab.winehq.org/wine/wine/-/merge_requests/252

4 4

[PATCH 0/1] MR264: winex11.drv: Always call XSync() in destroy_whole_window() if there is client window.
by Paul Gofman (＠gofman) 17 Jun '22

17 Jun '22

XSync() is already called when there is a whole window only. When GL child window is deleted shortly after resize X error (request code 12, which is X_ConfigureWindow) may happen. XConfigureWindow is called for child window from sync_client_position. Then, destroy_whole_window() doesn't hit XSync() path because there is no whole_window. client_window is destroyed from opengl.c:release_gl_drawable() independently (that may happen right from X11DRV_DestroyWindow() or later if the drawable is still referenced elsewhere) and that may happen before XConfigureWindow request is processed. We can't flush in release_gl_drawable() as window data is unavailable at that moment and it is unknown which display to flush. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/264

2 1

[tools 1/2] patches: <span> must have an end tag.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- <span/> is not allowed, at least according to the Mozilla documentation: | Tag omission: None, both the starting and ending tag are mandatory. --- patches/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 494d2e1575..f3eac9eeac 100755 --- a/patches/update +++ b/patches/update @@ -344,8 +344,8 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k foreach my $child (@{$patch->{"children"}}) { printf INDEX "<tr class=\"%s\ $file.reply\" id=\"%s\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . - "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\" />%s</td> " . - "<td class=\"reply author\"><span class=\"indent\" /><a href=\"data/%s\">%s</a></td> " . + "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\">%s</span></td> " . + "<td class=\"reply author\"><span class=\"indent\"><a href=\"data/%s\">%s</a></span></td> " . "<td colspan=\"4\" /></tr>\n", $row & 1 ? "odd" : "even", $child->{"id"}, escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); } -- 2.30.2

1 1

[tools] testbot/WineSendLog: Remove an unused variable.
by Francois Gouget 17 Jun '22

17 Jun '22

The failure count has been split between $NewCount and $OldCount. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a2f2369b63..0848bf596c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -179,7 +179,7 @@ sub SendLog($) # my ($JobInfo, @New, %BugDescriptions); - my ($NewCount, $FailCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0, 0); + my ($NewCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0); my $FileType = "test executable"; my $Failures = CreateFailures($Job); -- 2.30.2

1 0

[tools] testbot: Fix the default Failures sort order.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Initially the last criterion was the failure id but then I decided sorting by the bug description made more sense. Unfortunately I forgot to switch the comparison from integers to strings. --- testbot/lib/WineTestBot/Failures.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index f0f78b6ff7..906205119c 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -53,7 +53,7 @@ sub Compare($$) my $Cmp = ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || $self->GetColValue("ErrorGroup") cmp $B->GetColValue("ErrorGroup") || $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") || - $self->GetColValue("BugDescription") <=> $B->GetColValue("BugDescription"); + $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription"); return $Cmp } -- 2.30.2

1 0

[tools] testbot/web: Preserve the bug status when changing a deleted failure bug id.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index c510d8d480..f39af5ac91 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -202,7 +202,7 @@ sub OnAction($$) } if (($self->{Item}->BugId || "") ne $self->GetParam("BugId")) { - $self->{Item}->BugStatus(""); + $self->{Item}->BugStatus("") if ($self->{Item}->BugStatus ne "deleted"); $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Add a trailing linefeed to a log message.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a9622de7d8..d087b3583e 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -461,7 +461,7 @@ sub Monitor() # does not exist. But only revert can tell. For this reason, let revert # announce when the VM works again. return 1 if (ChangeStatus("offline", "off", "done")); - LogMsg("Switching $VMKey from offline to off after ". PrettyElapsed($Start) ."."); + LogMsg("Switching $VMKey from offline to off after ". PrettyElapsed($Start) .".\n"); return 0; } -- 2.30.2

1 0

[tools] testbot: Empty configuration regexps match any configuration.
by Francois Gouget 17 Jun '22

17 Jun '22

Unlike the failure regexps which must not be empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e25ea3ae27..4c643b9e09 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1387,7 +1387,7 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { $ConfigRegExp and $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; -- 2.30.2

1 0

[tools] testbot/LogUtils: Make the compilation error detection stricter.
by Francois Gouget 17 Jun '22

17 Jun '22

This avoids some false positives in the d3d WINE_ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Specifically this type of messages in the Wine log which are simple WINE_ERR() messages and should thus be ignored by the TestBot: 059c:err:d3d:wined3d_debug_callback 0016A650: "0:43(1): error: error index must be >= 0". 059c:fixme:d3d_shader:print_glsl_info_log 0:43(1): error: error index must be >= 0 --- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4c643b9e09..9e73b5f63d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -102,7 +102,10 @@ sub GetLogLineCategory($) $Line =~ /^error: patch failed:/ or $Line =~ /^error: corrupt patch / or # Build errors - $Line =~ /: error: / or + # Note that just ': error:' leads to false positives. So assume the + # error location (source filename + line number) contains no space. + $Line =~ /^[^ ]+: fatal error: / or # nonexistent include file + $Line =~ /^[^ ]+: error: / or $Line =~ /: undefined reference to `/ or $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:\d+: recipe for target .* failed$/ or -- 2.30.2

1 0

[PATCH v2 0/5] MR261: win32u: nonclient conversion
by Jacek Caban (＠jacek) 17 Jun '22

17 Jun '22

-- v2: win32u: Move NtUserGetTitleBarInfo implementation from user32. win32u: Move more WM_SYSCOMMAND implementation from user32. win32u: Move WM_NCLBUTTONDBLCLK and WM_LBUTTONDBLCLK implementation from user32. win32u: Move WM_SETCURSOR implementation from user32. win32u: Move NtUserDrawCaptionTemp implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/261

4 8

[PATCH 0/6] MR261: win32u: nonclient conversion
by Jacek Caban (＠jacek) 17 Jun '22

17 Jun '22

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

4 12

[PATCH v4 0/4] MR231: SetWindowPos() parent window exposure fixes (#53153)
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v4: server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children. server: Redraw composited window child when its z-order changes. server: Correctly expose composited parent window and its child on position change. user32/tests: Test for window exposure behaviours. https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 12

[PATCH v2 0/5] MR237: winegstreamer: Implement Resampler and ColorConvert MF transforms.
by Rémi Bernon (＠rbernon) 17 Jun '22

17 Jun '22

I don't think this will cause any conflicts with the other MR, as long as the `wg_sample` API doesn't change. -- v2: winegstreamer: Implement ColorConvertDMO transform. winegstreamer: Register stub ColorConvertDMO transform. winegstreamer: Remove unnecessary WineAudioConverter transform. winegstreamer: Implement ResamplerMediaObject transform. winegstreamer: Register stub ResamplerMediaObject transform. https://gitlab.winehq.org/wine/wine/-/merge_requests/237

4 12

[PATCH 0/1] MR262: winhttp: Release object on allocation failure.
by Hans Leidekker (＠hans) 17 Jun '22

17 Jun '22

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

2 1

[tools] testbot/Engine: Prevent recursion into ScheduleJobs().
by Francois Gouget 17 Jun '22

17 Jun '22

Recursion may happen through the ScheduleJobs() -> VM::Run() -> VMStatusChange() -> ScheduleJobs() chain. It can cause multiple revert processes to run on the same VM, or even a revert process to run at the same time as a task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This issue is caused by the patch to process notifications originating from the Engine (9b0894ed386f). What's strange is I'm not seeing this issue in my test environment. --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index b9304c1c8f..bba7e6a2cc 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -946,6 +946,7 @@ sub _PowerOffDirtyVMs($) } } +my $_InScheduleJobs; my $_LastTaskCounts = ""; =pod @@ -1004,6 +1005,11 @@ kept on standby so they are ready when their turn comes. sub ScheduleJobs() { + # Don't let Engine notifications (specifically VMStatusChange) cause + # recursion into ScheduleJobs(). + return if ($_InScheduleJobs); + $_InScheduleJobs = 1; + my $Sched = _CheckAndClassifyVMs(); my $NeededVMs = _ScheduleTasks($Sched); _RevertVMs($Sched, $NeededVMs); @@ -1053,6 +1059,8 @@ sub ScheduleJobs() $Timeout = 600; } AddEvent("ScheduleJobs", $Timeout, 0, \&ScheduleJobs); + + $_InScheduleJobs = undef; } -- 2.30.2

1 0

[PATCH v3 0/4] MR231: SetWindowPos() parent window exposure fixes (#53153)
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v3: server: Don't invalidate the newly exposed child region on the parent with WS_CLIPCHILDREN. server: Redraw composited window child on its z-order change on SetWindowPos(). server: Correctly expose composited parent window on SetWindowPos(). user32/tests: Test for parent window exposure by SetWindowPos(). https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 8

[PATCH v2 0/1] MR229: comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush.
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

This is consistent with the behaviour of other static control styles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush. https://gitlab.winehq.org/wine/wine/-/merge_requests/229

3 2

Re: [PATCH v2 0/2] MR258: win32u: Move menu tracking implementation from user32. - approved
by Alexandre Julliard (＠julliard) 16 Jun '22

16 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/258

1 0

[PATCH v2 0/1] MR254: winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float.
by Sebastián Aedo (＠saedo) 16 Jun '22

16 Jun '22

Some processes use very naive string matching when detecting extensions, for example, Cossacks III checks if the extension is "contained" in the current extension is checking, causing that `WGL_ARB_pixel_format` is contained in `WGL_ARB_pixel_format_float`, but it ends up with the flag deactivated because they aren't the same. This makes it consistent with the behavior on winemac.drv/opengl.c too. -- v2: winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float. https://gitlab.winehq.org/wine/wine/-/merge_requests/254

3 2

Re: [PATCH v5 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux - approved
by Alexandre Julliard (＠julliard) 16 Jun '22

16 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/134

1 0

Re: [PATCH v7 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource - approved
by Alexandre Julliard (＠julliard) 16 Jun '22

16 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/167

1 0

[PATCH 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers.
by Nikolay Sivov (＠nsivov) 16 Jun '22

16 Jun '22

Surface interface is only supported for 1D and 2D texture, but all objects are represented as resources. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/212

6 28

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 16 Jun '22

16 Jun '22

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 79d5cd82706..9db084ccc45 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3984,10 +3984,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' ei ole Map-objekti" +msgstr "'this' ei ole |-objekti" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" -- 2.36.1

1 0

[PATCH 0/3] MR260: ntdll: Improve xstate validation in NtGetContextThread()
by Paul Gofman (＠gofman) 16 Jun '22

16 Jun '22

Supposed to fix SCP: Secret Laboratory intermittent crash at main menu. The first two patches make the existing validation also work for other thread context query (as context_from_server called through get_thread_context() doesn't do that). The last patch adds xstate alignment validation with corresponding test. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/260

2 3

[PATCH 0/5] MR255: d3d11: Fix reporting of some format caps.
by Zebediah Figura (＠zfigura) 16 Jun '22

16 Jun '22

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

5 11

[PATCH v2 1/4] httpapi/tests: Move sleep statement.
by Julian Klemann 16 Jun '22

16 Jun '22

The mentioned bug randomly occurred after some subsequent patches, so the sleep should happen before GetOverlappedResult is called. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- v2: No change. --- dlls/httpapi/tests/httpapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index be1d31c12ad..9d344f26d02 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -228,10 +228,6 @@ static void test_v1_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); - ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %lu.\n", GetLastError()); - ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); - /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 * version 1507, but probably affecting others) suffer from a bug where the * kernel will report success before completely filling the buffer or @@ -239,6 +235,10 @@ static void test_v1_server(void) * around this. */ Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); ok(req->RequestId, "Expected nonzero connection ID.\n"); -- 2.36.1

2 7

Re: [PATCH v2 0/1] MR246: Allow renaming a file/directory to a different case of itself
by Gabriel Ivăncescu (＠insn) 16 Jun '22

16 Jun '22

1 0

Re: [PATCH v2 0/1] MR246: Allow renaming a file/directory to a different case of itself
by Huw Davies (＠huw) 16 Jun '22

16 Jun '22

Since this has been around for a while and been through several iterations, could you add links to the previous email threads so I can refresh my memory? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/246#note_2201

1 0

[PATCH v3 0/1] MR256: ntdll: Do not open directory file when setting the same directory path.
by Paul Gofman (＠gofman) 16 Jun '22

16 Jun '22

Fixes The Rising of The Shield Hero: Relieve the Animation hangs on start (and maybe something else with ENIGMA protector). The protector implements virtual file system which hotpatches a lot of file related functions, in particular, NtOpenFile(). When NtOpenFile() is called from RtlSetCurrentDirectory_U() with peb lock held the hotpatcher takes its own lock and that can deadlock with other threads performing file / path operations ending up in get_full_path_helper() which also takes PEB lock. Once the hotpatcher is initialized the game only sets "." or the same full path as current and may do that rather often. It seems that reopening the file handle for the same directory is redundant anyway, so probably makes sense to just avoid that part. -- v3: ntdll: Do not open directory file when setting the same directory path. https://gitlab.winehq.org/wine/wine/-/merge_requests/256

2 2

[PATCH v2 0/1] MR256: ntdll: Do not open directory file when setting the same directory path.
by Paul Gofman (＠gofman) 16 Jun '22

16 Jun '22

Fixes The Rising of The Shield Hero: Relieve the Animation hangs on start (and maybe something else with ENIGMA protector). The protector implements virtual file system which hotpatches a lot of file related functions, in particular, NtOpenFile(). When NtOpenFile() is called from RtlSetCurrentDirectory_U() with peb lock held the hotpatcher takes its own lock and that can deadlock with other threads performing file / path operations ending up in get_full_path_helper() which also takes PEB lock. Once the hotpatcher is initialized the game only sets "." or the same full path as current and may do that rather often. It seems that reopening the file handle for the same directory is redundant anyway, so probably makes sense to just avoid that part. -- v2: ntdll: Do not open directory file when setting the same directory path. https://gitlab.winehq.org/wine/wine/-/merge_requests/256

2 1

[tools v2 1/2] testbot/web: Automatically refresh the failure bug information.
by Francois Gouget 16 Jun '22

16 Jun '22

Automatically refresh the failure bug information when the bug id is modified. Also trigger a refresh when a failure is undeleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: No change, only part 2/2 changed. This ensures failures have an initial bug status and description as soon as they are added. Later refreshes happen when UpdateFailures is called by cron. --- testbot/bin/Engine.pl | 39 ++++++++++++++++++++++++ testbot/lib/WineTestBot/Engine/Notify.pm | 20 +++++++++++- testbot/lib/WineTestBot/Failures.pm | 31 +++++++++++++++++++ testbot/web/FailureDetails.pl | 1 - testbot/web/FailuresList.pl | 5 ++- 5 files changed, 91 insertions(+), 5 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 88852730e..29dce183b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -49,6 +49,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -548,6 +549,43 @@ sub HandleGetScreenshot($) return "1" . $ImageBytes; } +sub HandleUpdateFailure($) +{ + my ($FailureId) = @_; + + # Validate FailureId + if ($FailureId !~ /^(\d+)$/) + { + LogMsg "Invalid failure id\n"; + return "0Invalid Failure Id"; + } + $FailureId = $1; + + if (!CreateFailures()->GetItem($FailureId)) + { + LogMsg "Unknown Failure $FailureId\n"; + return "0Unknown Failure $FailureId"; + } + + my $Pid = fork; + if (!defined $Pid) + { + LogMsg "Unable to fork for UpdateFailures.pl: $!\n"; + } + elsif (!$Pid) + { + # Clean up the child environment + CloseAllDBBackEnds(); + WineTestBot::Log::SetupRedirects(); + + exec("$BinDir/UpdateFailures.pl --log-only $FailureId") or + LogMsg "Unable to exec ${ProjectName}UpdateFailures.pl: $!\n"; + exit(1); + } + + return "1"; +} + my %Handlers=( "getscreenshot" => \&HandleGetScreenshot, "jobcontrol" => \&HandleJobControl, @@ -558,6 +596,7 @@ my %Handlers=( "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, + "updatefailure" => \&HandleUpdateFailure, ); sub HandleClientCmd(@) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 82221c9ed..9c1802984 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -31,7 +31,8 @@ use Exporter 'import'; our $RunningInEngine; our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl RescheduleJobs VMStatusChange - WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); + WinePatchMLSubmission WinePatchWebSubmission + UpdateFailure GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); use Socket; @@ -194,6 +195,23 @@ sub WinePatchWebSubmission() return substr($Reply, 1); } +sub UpdateFailure($) +{ + my ($FailureId) = @_; + + my $Reply = SendCmdReceiveReply("updatefailure $FailureId\n"); + if (length($Reply) < 1) + { + return "The Engine did not acknowledge the UpdateFailure command"; + } + if (substr($Reply, 0, 1) eq "1") + { + return (undef, substr($Reply, 1)); + } + + return (substr($Reply, 1), undef); +} + sub GetScreenshot($) { my ($VMName) = @_; diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index b37b9e046..a9118f64b 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -40,6 +40,8 @@ TaskFailure objects. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); +use WineTestBot::Engine::Notify; + sub Compare($$) { @@ -55,6 +57,35 @@ sub Compare($$) return $Cmp } +sub BugId($;$) +{ + my ($self, $NewBugId) = @_; + + my $CurrentBugId = $self->SUPER::BugId; + return $CurrentBugId if (!defined $NewBugId); + + if (!defined $CurrentBugId or $NewBugId ne $CurrentBugId) + { + $self->{OldBugId} = $CurrentBugId if (!defined $self->{OldBugId}); + $self->SUPER::BugId($NewBugId); + } + + return $NewBugId; +} + +sub OnSaved($) +{ + my ($self) = @_; + + $self->SUPER::OnSaved(); + if ((defined $self->{OldBugId} and $self->{OldBugId} ne $self->BugId) or + !$self->BugStatus or !$self->BugDescription) + { + UpdateFailure($self->Id); + } + delete $self->{OldBugId}; +} + sub Validate($) { my ($self) = @_; diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index 7cab1d2a6..c05146448 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -105,7 +105,6 @@ sub OnAction($$) $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); - # FIXME Notify the TestBot Engine so it updates the bug information exit($self->RedirectToParent()); } return $self->SUPER::OnAction($Action); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index f2608dc45..8825fea69 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -129,9 +129,9 @@ sub OnItemAction($$$) return 1 if ($Action eq "Restore" and $Failure->BugStatus ne "deleted"); my $NewStatus = $Action eq "Delete" ? "deleted" : - $Action eq "Restore" ? "unknown" : + $Action eq "Restore" ? "" : undef; - if ($NewStatus) + if (defined $NewStatus) { $Failure->BugStatus($NewStatus); my ($_ErrProperty, $ErrMessage) = $Failure->Save(); @@ -141,7 +141,6 @@ sub OnItemAction($$$) $self->{EnclosingPage}->SetError(undef, $ErrMessage); return 0; } - # FIXME Notify the TestBot Engine so it updates the bug information return 1; } } -- 2.30.2

1 1

[tools] testbot/web: Add failure links to full logs on the job details page.
by Francois Gouget 16 Jun '22

16 Jun '22

Long logs can make it hard to find the lines for a given failure. So add an index pointing to the first line of a given failure (identified by its bug id). Also add links to the first and last failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index efdd4d9b0..6d3f13cd0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -404,9 +404,9 @@ sub GetFailureLinks($$) } @$FailureIds); } -sub GenerateFullLog($$$$) +sub GenerateFullLog($$$$$) { - my ($self, $Dir, $LogName, $HideLog) = @_; + my ($self, $Dir, $LogId, $LogName, $HideLog) = @_; my $LogInfo = LoadLogErrors("$Dir/$LogName"); if (defined $LogInfo->{BadLog}) @@ -426,7 +426,7 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my (%ErrCategory, %ErrFailures); + my (%ErrCategory, %ErrFailures, %LogBugs); foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; @@ -437,8 +437,31 @@ sub GenerateFullLog($$$$) { $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; $ErrFailures{$LineNo} = $Group->{Failures}->{$ErrIndex}; + + if ($ErrFailures{$LineNo}) + { + foreach my $FailureId (@{$ErrFailures{$LineNo}}) + { + my $Failure = $self->{Failures}->GetItem($FailureId); + $LogBugs{$Failure->BugId} ||= [$LineNo, $Failure->BugDescription]; + } + } } + $LogBugs{-1} ||= [$LineNo, ""]; + $LogBugs{9999999} = [$LineNo, ""]; + } + } + if (%LogBugs) + { + print "<p>Failures index:"; + foreach my $Label (sort { $a <=> $b } keys %LogBugs) + { + my ($LineNo, $Title) = @{$LogBugs{$Label}}; + $Label = $Label < 0 ? "First" : $Label == 9999999 ? "Last" : $Label; + $Title = " title='". $self->escapeHTML($Title) ."'" if ($Title); + print " <a href='#k${LogId}L$LineNo'$Title>$Label</a>" } + print "</p>\n"; } my $GetCategory = $LogName =~ /\.report$/ ? \&GetReportLineCategory : @@ -463,7 +486,7 @@ sub GenerateFullLog($$$$) my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { - $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; + $Html =~ s~^(.*\S)\s*\r?$~<span id='k${LogId}L$LineNo' class='log-$Category'>$1</span>~; } if ($ErrFailures{$LineNo}) { @@ -487,7 +510,10 @@ sub GenerateFullLog($$$$) # Extra groups don't have a line number next if ($Group->{LineNo}); - print "<div class='LogDllName'>$GroupName</div>\n"; + # Extra errors don't have line numbers but there should be few of them. + # So just create one id for them all so the shortcut to the first / last + # error has somewhere to go even if it's not 100% accurate. + print "<div id='k${LogId}L0' class='LogDllName'>$GroupName</div>\n"; for my $ErrIndex (0..$#{$Group->{Errors}}) { if ($IsEmpty) @@ -592,7 +618,7 @@ EOF $Url = $self->escapeHTML($Url); my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; - my $LogIsEmpty = $self->GenerateFullLog($TaskDir, $MoreInfo->{Full}, $HideLog); + my $LogIsEmpty = $self->GenerateFullLog($TaskDir, $StepTask->GetKey(), $MoreInfo->{Full}, $HideLog); if ($LogIsEmpty) { if ($StepTask->Status eq "canceled") -- 2.30.2

1 0

[tools] testbot: Update the failures 'last seen' fields.
by Francois Gouget 16 Jun '22

16 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I lost that bit at some point :-( --- testbot/lib/WineTestBot/LogUtils.pm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index b8aaaa43c..e25ea3ae2 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1435,11 +1435,14 @@ sub MatchLogFailures($$) =item C<SaveLogFailures()> -Updates the TaskFailures objects for the task and log specified by the -$LogFailures structure. +Updates the Failures and TaskFailures objects for the task and log specified +by the $LogFailures structure. -Note that this implies deleting any preexisting TaskFailure to avoid leaving -obsolete data. +Notes: +* This implies deleting any preexisting TaskFailure to avoid leaving obsolete + data. +* This also updates the failures LastNew and LastOld fields which can however + not be undone. =back =cut @@ -1457,15 +1460,26 @@ sub SaveLogFailures($) return $ErrMessage if (defined $ErrMessage); return undef if (!$LogFailures->{Failures}); + my $Started = $LogFailures->{Task}->Started; foreach my $LogFailure (values %{$LogFailures->{Failures}}) { - my $TaskFailure = $LogFailure->{Failure}->TaskFailures->Add(); + my $Failure = $LogFailure->{Failure}; + my $TaskFailure = $Failure->TaskFailures->Add(); my $OldKey = $TaskFailure->GetKey(); $TaskFailure->Task($LogFailures->{Task}); $TaskFailure->TaskLog($LogFailures->{LogName}); $TaskFailure->KeyChanged($OldKey, $TaskFailure->GetKey()); $TaskFailure->NewCount($LogFailure->{NewCount}); $TaskFailure->OldCount($LogFailure->{OldCount}); + + if ($LogFailure->{NewCount} and ($Failure->LastNew || 0) < $Started) + { + $Failure->LastNew($Started); + } + if ($LogFailure->{OldCount} and ($Failure->LastOld || 0) < $Started) + { + $Failure->LastOld($Started); + } } (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $LogFailures->{Collection}->Save(); -- 2.30.2

1 0

[tools 1/2] testbot/web: Automatically refresh the failure bug information.
by Francois Gouget 16 Jun '22

16 Jun '22

Automatically refresh the failure bug information when the bug id is modified. Also trigger a refresh when a failure is undeleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This ensure failures have an initial bug status and description as soon as they are added. Later refreshes happen when UpdateFailures is called by cron. --- testbot/bin/Engine.pl | 39 ++++++++++++++++++++++++ testbot/lib/WineTestBot/Engine/Notify.pm | 20 +++++++++++- testbot/lib/WineTestBot/Failures.pm | 31 +++++++++++++++++++ testbot/web/FailureDetails.pl | 1 - testbot/web/FailuresList.pl | 5 ++- 5 files changed, 91 insertions(+), 5 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 88852730e..29dce183b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -49,6 +49,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -548,6 +549,43 @@ sub HandleGetScreenshot($) return "1" . $ImageBytes; } +sub HandleUpdateFailure($) +{ + my ($FailureId) = @_; + + # Validate FailureId + if ($FailureId !~ /^(\d+)$/) + { + LogMsg "Invalid failure id\n"; + return "0Invalid Failure Id"; + } + $FailureId = $1; + + if (!CreateFailures()->GetItem($FailureId)) + { + LogMsg "Unknown Failure $FailureId\n"; + return "0Unknown Failure $FailureId"; + } + + my $Pid = fork; + if (!defined $Pid) + { + LogMsg "Unable to fork for UpdateFailures.pl: $!\n"; + } + elsif (!$Pid) + { + # Clean up the child environment + CloseAllDBBackEnds(); + WineTestBot::Log::SetupRedirects(); + + exec("$BinDir/UpdateFailures.pl --log-only $FailureId") or + LogMsg "Unable to exec ${ProjectName}UpdateFailures.pl: $!\n"; + exit(1); + } + + return "1"; +} + my %Handlers=( "getscreenshot" => \&HandleGetScreenshot, "jobcontrol" => \&HandleJobControl, @@ -558,6 +596,7 @@ my %Handlers=( "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, + "updatefailure" => \&HandleUpdateFailure, ); sub HandleClientCmd(@) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 82221c9ed..9c1802984 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -31,7 +31,8 @@ use Exporter 'import'; our $RunningInEngine; our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl RescheduleJobs VMStatusChange - WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); + WinePatchMLSubmission WinePatchWebSubmission + UpdateFailure GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); use Socket; @@ -194,6 +195,23 @@ sub WinePatchWebSubmission() return substr($Reply, 1); } +sub UpdateFailure($) +{ + my ($FailureId) = @_; + + my $Reply = SendCmdReceiveReply("updatefailure $FailureId\n"); + if (length($Reply) < 1) + { + return "The Engine did not acknowledge the UpdateFailure command"; + } + if (substr($Reply, 0, 1) eq "1") + { + return (undef, substr($Reply, 1)); + } + + return (substr($Reply, 1), undef); +} + sub GetScreenshot($) { my ($VMName) = @_; diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index b37b9e046..a9118f64b 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -40,6 +40,8 @@ TaskFailure objects. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); +use WineTestBot::Engine::Notify; + sub Compare($$) { @@ -55,6 +57,35 @@ sub Compare($$) return $Cmp } +sub BugId($;$) +{ + my ($self, $NewBugId) = @_; + + my $CurrentBugId = $self->SUPER::BugId; + return $CurrentBugId if (!defined $NewBugId); + + if (!defined $CurrentBugId or $NewBugId ne $CurrentBugId) + { + $self->{OldBugId} = $CurrentBugId if (!defined $self->{OldBugId}); + $self->SUPER::BugId($NewBugId); + } + + return $NewBugId; +} + +sub OnSaved($) +{ + my ($self) = @_; + + $self->SUPER::OnSaved(); + if ((defined $self->{OldBugId} and $self->{OldBugId} ne $self->BugId) or + !$self->BugStatus or !$self->BugDescription) + { + UpdateFailure($self->Id); + } + delete $self->{OldBugId}; +} + sub Validate($) { my ($self) = @_; diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index 7cab1d2a6..c05146448 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -105,7 +105,6 @@ sub OnAction($$) $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); - # FIXME Notify the TestBot Engine so it updates the bug information exit($self->RedirectToParent()); } return $self->SUPER::OnAction($Action); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index f2608dc45..8825fea69 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -129,9 +129,9 @@ sub OnItemAction($$$) return 1 if ($Action eq "Restore" and $Failure->BugStatus ne "deleted"); my $NewStatus = $Action eq "Delete" ? "deleted" : - $Action eq "Restore" ? "unknown" : + $Action eq "Restore" ? "" : undef; - if ($NewStatus) + if (defined $NewStatus) { $Failure->BugStatus($NewStatus); my ($_ErrProperty, $ErrMessage) = $Failure->Save(); @@ -141,7 +141,6 @@ sub OnItemAction($$$) $self->{EnclosingPage}->SetError(undef, $ErrMessage); return 0; } - # FIXME Notify the TestBot Engine so it updates the bug information return 1; } } -- 2.30.2

1 2

[tools] testbot/web: Add a task failures block to the failure details page.
by Francois Gouget 16 Jun '22

16 Jun '22

This allows reviewing all instances of a given failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 101 ++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index c05146448..c510d8d48 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -19,6 +19,93 @@ use strict; + +package TaskFailuresBlock; + +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::CGI::ValueFormatter; + +use WineTestBot::Jobs; +use WineTestBot::Utils; + + +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + # Add some extra columns + my @PropertyDescriptors; + foreach my $PropertyDescriptor (@{$self->{Collection}->GetPropertyDescriptors()}) + { + my $PropertyName = $PropertyDescriptor->GetName(); + next if ($PropertyName =~ /^(?:JobId|StepNo|TaskNo)$/); + push @PropertyDescriptors, $PropertyDescriptor; + if ($PropertyName eq "TaskLog") + { + push @PropertyDescriptors, CreateBasicPropertyDescriptor("Date", "Date", !1, !1, "DT", 19); + } + } + push @PropertyDescriptors, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128); + + return \@PropertyDescriptors; +} + +sub GenerateHeaderView($$$) +{ + my ($self, $Row, $Col) = @_; + + my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName eq "NewCount" or $PropertyName eq "OldCount") + { + $PropertyName =~ s/Count$//; + print "<a class='title' title='", $self->escapeHTML($Col->{Descriptor}->GetDisplayName()), "'>$PropertyName</a>\n"; + } + else + { + $self->SUPER::GenerateHeaderView($Row, $Col); + } +} + +sub GenerateDataView($$$) +{ + my ($self, $Row, $Col) = @_; + + my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName eq "Task") + { + my $JobId = $Row->{Item}->JobId; + my $StepNo = $Row->{Item}->StepNo; + my $TaskNo = $Row->{Item}->TaskNo; + my $URL = GetTaskURL($JobId, $StepNo, $TaskNo); + print "<a href='", $self->escapeHTML($URL), "'>$JobId/$StepNo/$TaskNo</a>"; + } + elsif ($PropertyName eq "TaskLog") + { + my $URL = GetTaskURL($Row->{Item}->JobId, $Row->{Item}->StepNo, + $Row->{Item}->TaskNo, 0, $Row->{Item}->TaskLog); + print "<a href='", $self->escapeHTML($URL), "'>", + $self->escapeHTML($Row->{Item}->TaskLog), "</a>"; + } + elsif ($PropertyName eq "Date") + { + # The enclosing page already pulled in the datetime JavaScript code + GenerateDateTime($Row->{Item}->Task->Started); + } + elsif ($PropertyName eq "Remarks") + { + my $Job = CreateJobs()->GetItem($Row->{Item}->JobId); + print $self->escapeHTML($Job->Remarks); + } + else + { + $self->SUPER::GenerateDataView($Row, $Col); + } +} + + package FailureDetailsPage; use ObjectModel::CGI::ItemPage; @@ -71,6 +158,20 @@ sub GenerateValueView($$$$) } } +sub GenerateBody($) +{ + my ($self) = @_; + + $self->SUPER::GenerateBody(); + if (!$self->{Item}->GetIsNew()) + { + print "<h2><a name='TaskFailures'></a>Task Failures</h2>\n"; + my $TaskFailuresBlock = new TaskFailuresBlock($self->{Item}->TaskFailures, $self); + $TaskFailuresBlock->SetReadWrite(0) if (!$self->{RW}); + $TaskFailuresBlock->GenerateList(); + } +} + sub GenerateFooter($) { my ($self) = @_; -- 2.30.2

1 0

[tools] testbot: Better track job status changes.
by Francois Gouget 16 Jun '22

16 Jun '22

Only set OldStatus once to avoid issues in case the status is changed multiple times before the job is saved. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 3da6ae7b0..b54f864da 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -92,15 +92,6 @@ use WineTestBot::Engine::Notify; use WineTestBot::TaskFailures; -sub _initialize($$) -{ - my ($self, $Collection) = @_; - - $self->SUPER::_initialize($Collection); - - $self->{OldStatus} = undef; -} - sub InitializeNew($$) { my ($self, $Collection) = @_; @@ -171,10 +162,10 @@ sub Status($;$) my $CurrentStatus = $self->SUPER::Status; return $CurrentStatus if (!defined $NewStatus); - if (! defined($CurrentStatus) || $NewStatus ne $CurrentStatus) + if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { + $self->{OldStatus} ||= $CurrentStatus; $self->SUPER::Status($NewStatus); - $self->{OldStatus} = $CurrentStatus; } return $NewStatus; @@ -185,15 +176,11 @@ sub OnSaved($) my ($self) = @_; $self->SUPER::OnSaved(); - - if (defined($self->{OldStatus})) + if (defined $self->{OldStatus} and $self->{OldStatus} ne $self->Status) { - my $NewStatus = $self->Status; - if ($NewStatus ne $self->{OldStatus}) - { - JobStatusChange($self->GetKey(), $self->{OldStatus}, $NewStatus); - } + JobStatusChange($self->GetKey(), $self->{OldStatus}, $self->Status); } + delete $self->{OldStatus}; } =pod -- 2.30.2

1 0

[tools] patches: Take the .testbot file Status into account.
by Francois Gouget 16 Jun '22

16 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- So far whether a patch passed the tests or not seems to only be based on the wine-devel emails, despite the information being available in the locale .testbot file. --- patches/update | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 5d20f2a11..494d2e157 100755 --- a/patches/update +++ b/patches/update @@ -210,7 +210,8 @@ foreach my $file (readdir DIR) { utf8::decode($_); last if /^$/; - if (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } + if (/^Status: (.*)$/) { $patch{"testbot"} = $1; } + elsif (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } elsif (/^URL: (.*)$/) { $patch{"testurl"} = $1; } } close LOG; @@ -254,7 +255,6 @@ sub assign_parent($) if ($patch->{"from_marvin"}) { $parent->{"testbot"} = "<a href=\"data/$patch->{id}\">Failed</a>"; - $parent->{"testclass"} = "testbot botfail"; } return $parent; } @@ -320,6 +320,10 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"failmark\">X</td>"; } + if ($patch->{"testbot"} and $patch->{"testbot"} ne "OK") + { + $patch->{"testclass"} .= " botfail"; + } printf INDEX "<td class=\"%s\">%s</td>", $patch->{"testclass"}, $patch->{"testbot"}; if ($patch->{"testjob"} && $patch->{"testurl"}) { -- 2.30.2

1 0

[tools] testbot/web: Tweak the failures page columns.
by Francois Gouget 16 Jun '22

16 Jun '22

Show the bug id in the failure list: this makes it easier to find all the failures related to a given bug. Shorten some column labels so they don't make the column too wide. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 6 +++--- testbot/web/FailuresList.pl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index a9118f64b..f0f78b6ff 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -187,9 +187,9 @@ my @PropertyDescriptors = ( # Every entry must be associated with a Wine bug. # Note: The 'deleted' bug status means this failure entry should be # deleted as soon as it is not referenced anymore. - CreateBasicPropertyDescriptor("BugId", "WineHQ bug id", !1, 1, "N", 10), - CreateBasicPropertyDescriptor("BugStatus", "WineHQ bug status", !1, !1, "A", 32), - CreateBasicPropertyDescriptor("BugDescription", "WineHQ bug description", !1, !1, "A", 128), + CreateBasicPropertyDescriptor("BugId", "Bug id", !1, 1, "N", 10), + CreateBasicPropertyDescriptor("BugStatus", "Bug status", !1, !1, "A", 32), + CreateBasicPropertyDescriptor("BugDescription", "WineHQ Bug description", !1, !1, "A", 128), CreateDetailrefPropertyDescriptor("TaskFailures", "Tasks", \&CreateTaskFailures), ); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index 8825fea69..e271ee1d5 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -55,7 +55,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp|BugId)$/ ? "" : + return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp)$/ ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -79,7 +79,7 @@ sub GenerateDataView($$$) my ($self, $Row, $Col) = @_; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName =~ /^Test(?:Module|Unit)$/) + if ($PropertyName eq "TestUnit") { print "<a href='", $self->escapeHTML($self->GetDetailsLink($Row)), "'>", $self->escapeHTML($Row->{Item}->$PropertyName), "</a>"; -- 2.30.2

1 0

[PATCH v3 1/8] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani 16 Jun '22

16 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the multiplier * The missing test cases will be reinsterted in a later commit --- dlls/mfplat/buffer.c | 22 ++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 40 ++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..1b5e8cf7ed5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5723,48 +5723,49 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int fourcc; unsigned int contiguous_length; int pitch; - unsigned int plane_multiplier; unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5998,13 +5999,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1

3 22

[PATCH 0/2] MR258: win32u: Move menu tracking implementation from user32.
by Jacek Caban (＠jacek) 16 Jun '22

16 Jun '22

The first patch is much larger than I'd like, but the combination of global variables and dependencies between functions made attempts to split it ugly and it didn't feel like an improvement. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/258

4 4

[PATCH vkd3d 2/2] include: Add ID3D12Device3 declaration in vkd3d_d3d12.idl.
by Biswapriyo Nath 16 Jun '22

16 Jun '22

2 1

[PATCH vkd3d 1/2] include: Add more D3D12_HEAP_FLAGS in vkd3d_d3d12.idl.
by Biswapriyo Nath 16 Jun '22

16 Jun '22

2 1

[PATCH 0/5] MR237: winegstreamer: Implement Resampler and ColorConvert MF transforms.
by Rémi Bernon (＠rbernon) 16 Jun '22

16 Jun '22

I don't think this will cause any conflicts with the other MR, as long as the `wg_sample` API doesn't change. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/237

5 10

[PATCH 0/1] MR259: d3d11: Remove null dxgi object checks.
by Nikolay Sivov (＠nsivov) 16 Jun '22

16 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/259

2 1

Re: [PATCH v5 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers.
by Nikolay Sivov (＠nsivov) 16 Jun '22

16 Jun '22

Another thing that I noticed, that is potentially relevant to how relationship between d3d11 and dxgi objects is tracked, is IDXGIResource1::CreateSubresourceSurface. I didn't do any testing with it, but it implies you can create multiple dxgi objects for the same d3d11/wined3d resource, at least as many as subresource count, but potentially any number of them. Right now afaict lifetime is tracked in d3d11 object, and dxgi one do not take a reference to them. So i'm not sure yet, how this is supposed to coexist. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/212#note_2188

1 0

[PATCH 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.
by Alex Henrie (＠alexhenrie) 16 Jun '22

16 Jun '22

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/252

3 2

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