February 2021 - Wine-devel - list.winehq.org

[PATCH 2/2] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 19 Feb '21

19 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index e82b117b825..419b7fbbe64 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -974,8 +974,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.30.0

1 0

[PATCH] ddraw: HWTRANSFORMANDLIGHT is not set for software devices
by David Adam 19 Feb '21

19 Feb '21

This patch is from Michael Muller.

2 1

[PATCH v2 1/7] quartz/tests: Add more tests for media events.
by Zebediah Figura 19 Feb '21

19 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 86 ++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 55c70702e47..6288e3095dd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5156,12 +5156,12 @@ static void test_set_notify_flags(void) IMediaEventEx *media_event; struct testfilter filter; LONG_PTR param1, param2; + LONG code, flags; HANDLE event; HWND window; BSTR status; HRESULT hr; ULONG ref; - LONG code; MSG msg; window = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, @@ -5196,9 +5196,25 @@ static void test_set_notify_flags(void) while (PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE)); + hr = IMediaEventEx_SetNotifyFlags(media_event, 2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_GetNotifyFlags(media_event, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == AM_MEDIAEVENT_NONOTIFY, "Got flags %#x\n", flags); + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); @@ -5249,6 +5265,11 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_SetNotifyFlags(media_event, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Run(media_control); @@ -5295,6 +5316,8 @@ static void check_events_(unsigned int line, IMediaEventEx *media_event, ++ec_complete_count; if (code == EC_STATUS) ++ec_status_count; + hr = IMediaEventEx_FreeEventParams(media_event, code, param1, param2); + ok(hr == S_OK, "Got hr %#x.\n", hr); } ok(hr == E_ABORT, "Got hr %#x.\n", hr); todo_wine_if(todo) ok_(__FILE__, line)(ec_complete_count == expected_ec_complete_count, @@ -5336,9 +5359,51 @@ static void test_events(void) hr = IMediaEventEx_GetEventHandle(media_event, (OAEVENT *)&event); ok(hr == S_OK, "Got hr %#x.\n", hr); + code = 0xdeadbeef; + param1 = 0xdeadbeef; + param2 = 0xdeadbeef; + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 0); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(!code, "Got code %#x.\n", code); + todo_wine ok(!param1, "Got param1 %#Ix.\n", param1); + todo_wine ok(!param2, "Got param2 %#Ix.\n", param2); + + /* EC_COMPLETE is ignored while in stopped or paused state. */ + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_events(media_event, 0, 0, FALSE); + + /* Pausing and then running the graph clears pending EC_COMPLETE events. + * This remains true even with default handling canceled. */ + + hr = IMediaEventEx_CancelDefaultHandling(media_event, EC_COMPLETE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, @@ -5385,6 +5450,25 @@ static void test_events(void) check_events(media_event, 1, 2, FALSE); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, TRUE); + + /* GetEvent() resets the event object if there are no events available. */ + SetEvent(event); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); -- 2.30.1

2 8

[tools] testbot/reporttest: Add more tests from the wtbsuite.
by Francois Gouget 19 Feb '21

19 Feb '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 75 +++++++++++++++++++++----- testbot/src/reporttest/report.testwtbs | 21 +++++++- 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 9b285337c..ef3dc7d28 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -27,6 +27,7 @@ Dll info: bcrypt=dll is missing browseui=6.0.2900.5512 cabinet=5.1.2600.5512 + chcp.com=1.0 cmd.exe=5.1.2600.5512 combase=dll is missing comcat=5.0.2600.1 @@ -262,8 +263,7 @@ subprocess. advapi32:crypt_sha:08f8 done (3) in 0s advapi32:eventlog start dlls/advapi32/tests/eventlog.c - ------ WTBS Unreported test failures ------ A test unit with an unreported failed test +----- A test unit with an unreported failed test despite a non-zero exit code. ----- Expected assessement: 1 failure, "Unreported failure" error eventlog.c:20: Test failed: Something wrong 088c:eventlog: 408 tests executed (0 marked as todo, 0 failures), 0 skipped. @@ -319,7 +319,13 @@ advpack:install start dlls/advpack/tests/install.c - 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s -stub amstream:amstream +amstream:amstream start dlls/amstream/tests/amstream.c - +----- WTBS Unreported test failures +----- A test unit with an unreported failed test +----- Expected assessement: 1 failure + "Unreported failure" error +amstream.c:20: Test failed: Something wrong +088c:amstream: 408 tests executed (0 marked as todo, 0 failures), 0 skipped. +amstream:amstream:088c done (0) in 4s apphelp:apphelp start dlls/apphelp/tests/apphelp.c - ----- WTBS Failure propagation from child processes @@ -336,8 +342,17 @@ apphelp.c:44: 2 failures in child process 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. apphelp:apphelp:0c9c done (3) in 0s -stub atl:atl_ax -stub atl:module +atl:atl_ax start dlls/atl/tests/atl_ax.c - +----- WTBS Timeout after a test failure +----- Expected assessement: Timeout +atl_ax.c:20: Test failed: A failure before timing out +atl:atl_ax:0b14 done (258) in 120s + +atl:module start dlls/atl/tests/module.c - +----- WTBS Timeout after a subprocess +----- Expected assessement: Timeout +1234:module: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. +atl:module:0b14 done (258) in 120s atl:registrar start dlls/atl/tests/registrar.c - ----- A test unit with a foreign test summary line @@ -378,6 +393,12 @@ fdi.c:42: Test marked todo: Hello Wine! 0690:fdi: 265 tests executed (1 marked as todo, 0 failures), 0 skipped. cabinet:fdi:0690 done (0) in 0s +chcp.com:chcp start programs/chcp.com/tests/chcp.c - +----- WTBS New .com program test directory +----- Expected assessement: Success +2021:chcp: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. +chcp.com:chcp:2021 done (0) in 9s + cmd.exe:batch start programs/cmd/tests/batch.c - ----- A test unit with an unreported todo test ----- Expected assessement: "Unreported todo line" error @@ -485,7 +506,11 @@ security.c:42: Tests skipped: Another time ----- Keep this stub in case the previous test is mishandled stub comctl32:progress -stub comctl32:propsheet +comctl32:propsheet start dlls/comctl32/tests/propsheet.c - +----- WTBS Exit abruptly after a subprocess +----- Expected assessement: Missing summary line +1234:propsheet: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. +comctl32:propsheet:0148 done (0) in 9s comctl32:rebar start dlls/comctl32/tests/rebar.c - ----- A test unit with an unreported crash in a subprocess @@ -553,7 +578,14 @@ comctl32:toolbar start dlls/comctl32/tests/toolbar.c - ----- Expected assessement: crashed comctl32:toolbar done (-1073741819) in 0s -stub comctl32:tooltips +comctl32:tooltips start dlls/comctl32/tests/tooltips.c - +----- WTBS Timeout in a child process +----- The time out for child processes is normally shorter than for full test +----- units and the framework issues a test failure. +----- Expected assessement: 1 failure +tooltips.c:350: Test failed: Timed out waiting for the child process +0b14:tooltips: 3 tests executed (0 marked as todo, 1 failure), 0 skipped. +comctl32:tooltips:0b14 done (1) in 42s comctl32:trackbar start dlls/comctl32/tests/trackbar.c - ----- WTBS Test failures, todos and skips in a subtest @@ -567,12 +599,31 @@ driver.c:43: Tests skipped: Another time 07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. comctl32:trackbar:07b1 done (2) in 0s -stub comctl32:treeview -stub comctl32:updown -stub comdlg32:filedlg +comctl32:treeview start dlls/comctl32/tests/treeview.c - +----- WTBS Unreported child process failure +----- Expected assessement: 2 failures (1+"Returned success despite failure") +treeview.c:40: Test failed: Unreported failure +01a9:treeview: 42 tests executed (0 marked as todo, 1 failures), 0 skipped. +01a8:treeview: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. +comctl32:treeview:01a8 done (0) in 0s + +comctl32:updown start dlls/comctl32/tests/updown.c - +----- WTBS A misplaced test failure +----- Expected assessement: 2 failures (1+"Returned success despite failure") +vorlon.c:40: Test failed: Unreported failure +01a8:updown: 2 tests executed (0 marked as todo, 0 failures), 0 skipped. +comctl32:updown:01a8 done (0) in 0s + +comdlg32:filedlg start dlls/comdlg32/tests/filedlg.c - +----- WTBS A misplaced subtest line +----- Expected assessement: 1 failure +shadow.c:222: Subtest black +01a8:filedlg: 10 tests executed (0 marked as todo, 0 failures), 0 skipped. +comdlg32:filedlg:01a8 done (0) in 0s + stub comdlg32:finddlg -comctl32:fontdlg start dlls/comctl32/tests/fontdlg.c - +comdlg32:fontdlg start dlls/comdlg32/tests/fontdlg.c - ----- Check support for IgnoreExceptions ----- Expected assessement: 6 failures 01bd:fontdlg: unhandled exception c0000005 at 00001111 @@ -587,7 +638,7 @@ fontdlg.c:22: IgnoreExceptions=0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333). fontdlg.c:30: unhandled exception c0000005 in child process 3333 01bd:fontdlg: 10 tests executed (0 marked as todo, 6 failures), 0 skipped. -comctl32:fontdlg:01bd done (6) in 0s +comdlg32:fontdlg:01bd done (6) in 0s stub comdlg32:itemdlg stub comdlg32:printdlg diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index aa78c9e2d..27ca12f1d 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 51 +p tests.TestFailures 64 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -32,10 +32,18 @@ g 0 tests.report.advpack n 0 files.c:20: Test failed: A failure in the main process n 0 07b0:install: unhandled exception c0000005 at 0040167C +g 0 tests.report.amstream +n 0 amstream.c:20: Test failed: Something wrong + g 0 tests.report.apphelp n 0 apphelp.c:40: Test failed: A failure in the child process n 0 apphelp.c:41: Test succeeded inside todo block: Success in the child process +g 0 tests.report.atl +n 0 atl_ax.c:20: Test failed: A failure before timing out +n 0 atl_ax: Timeout +n 0 module: Timeout + g 0 tests.report.comctl32 n 0 animate: Timeout n 0 comboex.c:40: Test failed: A failure in the main process @@ -48,8 +56,13 @@ n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234 +n 0 tooltips.c:350: Test failed: Timed out waiting for the child process n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! +n 0 treeview.c:40: Test failed: Unreported failure +n 0 vorlon.c:40: Test failed: Unreported failure + +g 0 tests.report.comdlg32 n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111 n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111). n 0 fontdlg.c:10: unhandled exception c0000005 in child process 1111 @@ -65,6 +78,8 @@ n 0 advapi32:eventlog has unaccounted for failure messages n 0 advapi32:lsa has no test summary line (early exit of the main process?) n 0 advapi32:registry has no test summary line (early exit of the main process?) n 0 advapi32:service returned success despite having failures +n 0 amstream:amstream has unaccounted for failure messages +n 0 amstream:amstream returned success despite having failures n 0 atl:registrar contains a misplaced test summary message for alien n 0 browseui:progressdlg has unaccounted for skip messages n 0 cabinet:extract is missing some skip messages @@ -76,8 +91,12 @@ n 0 comctl32:header returned success despite having failures n 0 comctl32:ipaddress has no done line (or it is garbled) n 0 comctl32:misc had no start line (or it is garbled) n 0 comctl32:monthcal contains a misplaced todo message for security +n 0 comctl32:propsheet has no test summary line (early exit of the main process?) n 0 comctl32:rebar returned success despite having failures n 0 comctl32:toolbar has no done line (or it is garbled) +n 0 comctl32:treeview returned success despite having failures +n 0 comctl32:updown contains a misplaced failure message for vorlon +n 0 shadow has a misplaced black subtest line n 0 xmllite:writer has unaccounted for failure messages n 0 xmllite:writer returned success despite having failures ----- TestWTBS ----- -- 2.20.1

1 0

[tools] winetest/dissect: Report misplaced IgnoreExeptions directives.
by Francois Gouget 19 Feb '21

19 Feb '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4f15bddce..73eae4b8c 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -669,6 +669,7 @@ while ($line = <IN>) { add_test_line("", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "IgnoreExceptions"); $ignore_exceptions = $l_ignore; } elsif (($unit ne "" and -- 2.20.1

1 0

[tools] winetest/dissect: Stop get_source_link() from interfering with check_unit().
by Francois Gouget 19 Feb '21

19 Feb '21

When calling get_source_link() before check_unit(), setting $broken causes check_unit() to think the misplaced test unit issue has already been reported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 32c4a9269..fc83726bf 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -454,16 +454,11 @@ my ($extra_failures, $failed_units) = (0, 0); sub get_source_link($$) { my ($_unit, $_lnum) = @_; + # Let the caller check $_unit to not interfere with check_unit() my $source_link = defined $_unit ? "$_unit.c" : $source ne "-" ? $source : "$dll:$unit"; $source_link .= ":$_lnum" if (defined $_lnum); - if (defined $_unit and !$units{$_unit}) - { - # If the line is not for a current test unit we'll let its - # developer hash it out with the polluter ;-) - $broken = 1; - } - elsif ($source ne "-") + if ($source ne "-") { my $url = "$gitweb/?a=blob;f=$source;hb=$testbuild"; $url .= "#l$_lnum" if (defined $_lnum); -- 2.20.1

1 0

[tools] testbot/LogUtils: Tweak the child process exception test unit regexp.
by Francois Gouget 19 Feb '21

19 Feb '21

It should have the same structure in _GetLineKey() as the rest of the test unit filename regular expressions. 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 7bd4d3166..efa5d12dd 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1144,7 +1144,7 @@ sub _GetLineKey($) # or the process id in Wine's exc_filter() lines or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ # or child process id - or $Line =~ s/^([_.a-z0-9]+:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ + or $Line =~ s/^([_a-z0-9]+\.c:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ # The exact amount of data printed does not change the error or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; -- 2.20.1

1 0

[tools] testbot/LogUtils: Fix the unhandled exception in child process handling.
by Francois Gouget 19 Feb '21

19 Feb '21

The filename extension is not part of the test unit name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index efa5d12dd..dae8292a7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -639,8 +639,8 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or - $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) { my ($Unit, $Pid) = ($1, $2); if ($Cur->{Units}->{$Unit}) -- 2.20.1

1 0

[tools] testbot/LogUtils: Remove line numbers from some make errors.
by Francois Gouget 19 Feb '21

19 Feb '21

We would presumably not routinely have compilation errors so this is not really needed for the normal TestBot operation. But this allows TestWTBS to check the presence of expected compilation errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2cb2ad290..7bd4d3166 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1137,6 +1137,7 @@ sub _GetLineKey($) # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block):)/$1$2/ + or $Line =~ s/^([._a-zA-Z0-9-]+:)\d+(: recipe for target )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ -- 2.20.1

1 0

[tools] winetest: Make sure the cron script releases the lock once done.
by Francois Gouget 19 Feb '21

19 Feb '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/winetest.cron | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 7418f9ec9..611901380 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -31,6 +31,10 @@ then exit 1 fi lock="/tmp/winetest.lock" +cleanup() +{ + rm -f "$lock" +} # expiration age (in days) before results get archived expire=120 @@ -38,6 +42,7 @@ expire=120 if [ ! -f "$lock" ] then touch "$lock" + trap cleanup EXIT cd "$workdir" refresh_index="" @@ -87,6 +92,4 @@ then # remove old queue files find queue -maxdepth 1 -mtime +30 -name "err*" -print0 | xargs -0 rm -rf find queue -maxdepth 1 -mtime +30 -name "CGI*" -print0 | xargs -0 rm -f - - rm "$lock" fi -- 2.20.1

1 0