February 2020 - Wine-Devel - list.winehq.org

Unicode Sorting Weight Tables
by Fabian Maurer Feb. 12, 2020

Feb. 12, 2020

Hello wine-devel, Looking at https://bugs.winehq.org/show_bug.cgi?id=35009, the problem is that windows uses completely different sorting weight tables from the official unicode version. However, MS disclosed them under their "Open Specifications" program: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/ (The tables are as download available, under the same license, according to MS support) If we could use that, we should be able to produce the exact same sorting windows has. And to properly solve those unicode bugs, that's what we need. However, two questions arise: 1) If we could, would we even want to use those tables? 2) Is the license of that content compatible with Wine? Your thoughts on this? Question 1) is probably the easiest. The copyright notice can be found inside the PDF FWIW, but I don't really understand laywer- speak. Regards, Fabian Maurer

3 5

[PATCH 3/3] winealsa.drv: send MIDI events to port subscribers
by Andrew Eikum Feb. 12, 2020

Feb. 12, 2020

From: Jacek Konieczny <jajcus(a)jajcus.net> This way changes to the port connections made by other applications will be honoured. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 879d48d824b..f2fe6307bb2 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -871,7 +871,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); switch (evt & 0xF0) { case MIDI_CMD_NOTE_OFF: @@ -1040,8 +1040,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); - snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_ev_set_subs(&event); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); EnterCriticalSection(&midiSeqLock); snd_seq_event_output_direct(midiSeq, &event); -- 2.25.0

1 0

[PATCH 2/3] winealsa.drv: allow external MIDI port connection changes
by Jacek Konieczny Feb. 12, 2020

Feb. 12, 2020

That is generally the expected behaviour of any ALSA sequencer client. Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7be7bc58f31..879d48d824b 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -248,16 +248,16 @@ static int midiOpenSeq(BOOL create_client) snd_seq_set_client_name(midiSeq, "WINE midi driver"); port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", - SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", - SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else -- 2.25.0

1 0

[PATCH 1/3] winealsa.drv: Clean up midiOpenSeq
by Andrew Eikum Feb. 12, 2020

Feb. 12, 2020

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 58b10bf666b..7be7bc58f31 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -243,33 +243,26 @@ static int midiOpenSeq(BOOL create_client) return -1; } - if (create_client) { - /* Setting the client name is the only init to do */ - snd_seq_set_client_name(midiSeq, "WINE midi driver"); + if (create_client) { + /* Setting the client name is the only init to do */ + snd_seq_set_client_name(midiSeq, "WINE midi driver"); -#if 0 /* FIXME: Is it possible to use a port for READ & WRITE ops */ - port_in = port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input/Output", SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", + SND_SEQ_PORT_CAP_READ, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) - TRACE("Unable to create output port\n"); + TRACE("Unable to create output port\n"); else - TRACE("Outport port %d created successfully\n", port_out); -#else - port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, - SND_SEQ_PORT_TYPE_APPLICATION); - if (port_out < 0) - TRACE("Unable to create output port\n"); - else - TRACE("Outport port %d created successfully\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, - SND_SEQ_PORT_TYPE_APPLICATION); + port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", + SND_SEQ_PORT_CAP_WRITE, + SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port %d created successfully\n", port_in); -#endif - } + TRACE("Input port %d created successfully\n", port_in); + } } numOpenMidiSeq++; LeaveCriticalSection(&midiSeqLock); -- 2.25.0

1 0

[PATCH v2 1/6] quartz/vmr9: Fix copying from the d3d9 surface if the pitch doesn't match the width.
by Zebediah Figura Feb. 12, 2020

Feb. 12, 2020

Spotted by Henri Verbeet. Fixes: 9b1ba3414953fe09cf8b95e781e5d9c0119cacfc Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: actually remove the memcpy... dlls/quartz/vmr9.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 928e98f6056..bc2a905650c 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -627,7 +627,10 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L IDirect3DSurface9 *rt = NULL, *surface = NULL; D3DLOCKED_RECT locked_rect; IDirect3DDevice9 *device; + unsigned int row_size; BITMAPINFOHEADER bih; + LONG i, size_left; + char *dst; HRESULT hr; TRACE("filter %p, size %d, image %p.\n", filter, *size, image); @@ -661,10 +664,19 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L if (FAILED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_READONLY))) goto out; - memcpy(image, &bih, min(*size, sizeof(BITMAPINFOHEADER))); - if (*size > sizeof(BITMAPINFOHEADER)) - memcpy((char *)image + sizeof(BITMAPINFOHEADER), locked_rect.pBits, - min(*size - sizeof(BITMAPINFOHEADER), bih.biSizeImage)); + size_left = *size; + memcpy(image, &bih, min(size_left, sizeof(BITMAPINFOHEADER))); + size_left -= sizeof(BITMAPINFOHEADER); + + dst = (char *)image + sizeof(BITMAPINFOHEADER); + row_size = bih.biWidth * bih.biBitCount / 8; + + for (i = 0; i < bih.biHeight && size_left > 0; ++i) + { + memcpy(dst, (char *)locked_rect.pBits + (i * locked_rect.Pitch), min(row_size, size_left)); + dst += row_size; + size_left -= row_size; + } IDirect3DSurface9_UnlockRect(surface); -- 2.25.0

2 6

[PATCH v2 1/4] hid/tests: Call CancelIo before closing device.
by Rémi Bernon Feb. 12, 2020

Feb. 12, 2020

This was causing some leak to be reported on wineserver shutdown when no data can be read from a device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index bb819cc83f2..19f450045f1 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -316,6 +316,7 @@ static void test_read_device(void) CloseHandle(overlapped.hEvent); rc = HidD_FreePreparsedData(ppd); ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + CancelIo(device); CloseHandle(device); HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, report); -- 2.25.0

4 12

[PATCH 1/6] d3d9: Retrieve textures from the primary stateblock.
by Zebediah Figura Feb. 12, 2020

Feb. 12, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 24 +++++++++++++++++------- dlls/d3d9/stateblock.c | 6 ++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1ff178881c..3d2dd38d9c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2512,19 +2512,30 @@ static HRESULT WINAPI d3d9_device_GetClipStatus(IDirect3DDevice9Ex *iface, D3DCL return hr; } -static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD stage, IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, + DWORD sampler_idx, IDirect3DBaseTexture9 **texture) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_texture *wined3d_texture = NULL; struct d3d9_texture *texture_impl; - TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); + TRACE("iface %p, sampler_idx %u, texture %p.\n", iface, sampler_idx, texture); if (!texture) return D3DERR_INVALIDCALL; + if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) + sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (sampler_idx >= WINED3D_MAX_COMBINED_SAMPLERS) + { + WARN("Invalid sampler %u.\n", sampler_idx); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[sampler_idx])) { texture_impl = wined3d_texture_get_parent(wined3d_texture); *texture = &texture_impl->IDirect3DBaseTexture9_iface; @@ -2815,16 +2826,15 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_texture *texture; - unsigned int i, stage, map; + unsigned int i, map; map = device->auto_mipmaps; while (map) { i = wined3d_bit_scan(&map); - - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((texture = state->textures[i])) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); } } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index dfb8d8d755..a65fa1cd8d 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -116,9 +116,9 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); struct wined3d_texture *wined3d_texture; - unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; + unsigned int i, offset, stride; enum wined3d_format_id format; struct d3d9_texture *texture; struct d3d9_device *device; @@ -151,9 +151,7 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) { - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[i]) && (texture = wined3d_texture_get_parent(wined3d_texture)) && texture->usage & D3DUSAGE_AUTOGENMIPMAP) device->auto_mipmaps |= 1u << i; -- 2.25.0

3 14

[tools] testbot: Identify testbot.log information and error messages.
by Francois Gouget Feb. 12, 2020

Feb. 12, 2020

The testbot.log error messages have no common prefix such as 'error:' which makes them hard to identify. Expand GetLogLineCategory() to identify the most important ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Error handling in the WineRun* scripts is all wrong :-( I'll submit a patch to sort it out 'soon' but that won't help with the existing testbot.log files. So this patch is here to take care of those. As is it will only have an effect on the new jobs though. To have the TestBot website show the correct testbot.log error summaries for past jobs, the matching .errors files need to be rebuilt using UpdateTaskLogs. For instance: cd testbot/var ../bin/UpdateTaskLogs --debug --rebuild 2>&1 | tee UpdateTaskLogs.log testbot/lib/WineTestBot/LogUtils.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9bde76c6c6..2128c97986 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -86,7 +86,11 @@ sub GetLogLineCategory($) $Line =~ /^\+ \S/ or $Line =~ /^LANG=/ or $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + $Line =~ /^Task: (?:ok|tests|Updated)/ or + # testbot.log information messages + $Line =~ /^----- Run / or + $Line =~ /^The test VM has crashed/ or # Context for an error message + $Line =~ /^The previous \d+ run$s$ terminated abnormally/) { return "info"; } @@ -101,7 +105,12 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors - _IsPerlError($Line)) + _IsPerlError($Line) or + # The main testbot.log errors + $Line =~ /^An error occurred while / or + $Line =~ /^Could not create / or + $Line =~ /^Giving up after \d+ run$s$$/ or + $Line =~ /^The (?:build|task) timed out$/) { return "error"; } -- 2.20.1

1 0

[tools] testbot/JobDetails: Improve the error reporting.
by Francois Gouget Feb. 12, 2020

Feb. 12, 2020

Clearly indicate when the log or its errors cache could not be read. Also show a note when new errors could not be detected, either because there is no reference WineTest results (which would typically happen shortly after a new test configuration has been added), or because there was an issue reading one or more of the reference reports. And don't claim there are no errors when the task has not run yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 59 ++++++++++++++++++++++++++++++++----- testbot/web/WineTestBot.css | 1 + 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ccf3410f5b..5a484da362 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -351,6 +351,22 @@ sub GenerateFullLog($$$$) my ($self, $Dir, $LogName, $HideLog) = @_; my $LogInfo = LoadLogErrors("$Dir/$LogName"); + if (defined $LogInfo->{BadLog}) + { + print "<pre class='log-note'>Could not highlight new errors: ", ($LogInfo->{BadRef} || $LogInfo->{BadLog}), "</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } my %NewLineNos; if ($LogInfo->{ErrCount}) @@ -397,6 +413,11 @@ sub GenerateFullLog($$$$) } close($LogFile); } + else + { + print "<pre class='log-error'><code>Unable to open '$LogName' for reading: $!</code></pre>\n"; + $IsEmpty = 0; + } # And append the extra errors foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) @@ -535,16 +556,18 @@ EOF { next if ($LogName =~ /^old_/); my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); - next if (!$LogInfo->{ErrCount}); - $LogInfos->{$LogName} = $LogInfo; + if ($LogInfo->{ErrCount} or defined $LogInfo->{BadLog}) + { + $LogInfos->{$LogName} = $LogInfo; + } } my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogInfos) > 1); - my $LogIsEmpty = 1; + my $NoErrors = 1; foreach my $LogName (@{$MoreInfo->{Logs}}) { next if (!$LogInfos->{$LogName}); - $LogIsEmpty = 0; + $NoErrors = 0; if ($ShowLogName) { @@ -554,6 +577,24 @@ EOF } my $LogInfo = $LogInfos->{$LogName}; + if (defined $LogInfo->{BadLog}) + { + my ($_Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + print "<pre class='log-note'>The error summary is not available (<a href='$Url'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { print "<div class='LogDllName'>$GroupName</div>\n" if ($GroupName); @@ -576,9 +617,9 @@ EOF print "</code></pre>\n"; } } - - if ($LogIsEmpty) + if (!@{$MoreInfo->{Logs}}) { + # There is no log file or they are all empty if ($StepTask->Status eq "canceled") { print "No log, task was canceled\n"; @@ -589,9 +630,13 @@ EOF } else { - print "No errors\n"; + print "<pre class='log-note'>No result yet...</pre>\n"; } } + elsif ($NoErrors) + { + print "No errors\n"; + } } } print "</div>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 9a23f5fa82..3fccbd2652 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -395,6 +395,7 @@ pre .userdisabled { color: red; } .userdeleted { color: red; } +.log-note { font-style: italic; color: blue; } .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; } -- 2.20.1

1 0

[tools] testbot/LogUtils: Share code between _SaveLogErrors() and _DumpErrors().
by Francois Gouget Feb. 12, 2020

Feb. 12, 2020

_SaveLogErrors() provides more details about the errors than the old _DumpErrors() code did. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 90 +++++++++++++---------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2128c97986..2104ffa0e0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -696,24 +696,6 @@ sub GetLogLabel($) return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } - -sub _DumpErrors($$) -{ - my ($Label, $LogInfo) = @_; - - print STDERR "$Label: ", join(" ", keys %$LogInfo), "\n"; - my $GroupNames = $LogInfo->{ErrGroupNames}; - print STDERR " Groups=", scalar(@$GroupNames), " [", join(",", @$GroupNames), "]\n"; - my @ErrorKeys = sort keys %{$LogInfo->{Groups}}; - print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; - foreach my $GroupName (@$GroupNames) - { - print STDERR " [$GroupName]\n"; - my $Group = $LogInfo->{Groups}->{$GroupName}; - print STDERR " [$_]\n" for (@{$Group->{Errors}}); - } -} - sub _AddLogGroup($$;$) { my ($LogInfo, $GroupName, $LineNo) = @_; @@ -868,21 +850,7 @@ sub GetLogErrors($) Loads the specified log errors file. -The file contains two types of lines: -* GroupName lines - <GroupName> - Where <GroupName> is a unique string which would typically be the name of a - WineTest dll or program, but may also be empty or be used to specify an - extra group errors. It must not start with a space. - -* Error lines - <Space> <New> <SrcLineNo> <Error> - Where: - - <Space> is a space, as well as the spaces in the line above. - - <New> is either 'n' for new errors, or 'o' for old ones. - - <SrcLineNo> is the 1-base line number of the error in the source log file. - If there is no source line then this should be 0. - - <Error> is the error message. +See _WriteLogErrors() for the format of the errors file. Returns the errors in the same format as TagNewErrors(). @@ -958,11 +926,11 @@ sub LoadLogErrors($) =pod =over 12 -=item C<_SaveLogErrors()> +=item C<_WriteLogErrors()> -Saves the LogInfo structure to <LogName>.errors. +Writes the LogInfo structure in text form to the specified file descriptor. -The file contains lines of the form: +All lines follow are of the following form: <type> <value1> <value2> The values depend on the <type> of the line. <type> and <value1> must not @@ -993,6 +961,27 @@ different type. =back =cut +sub _WriteLogErrors($$) +{ + my ($Fh, $LogInfo) = @_; + + foreach my $Name ("BadRef", "NoRef") + { + next if (!defined $LogInfo->{$Name}); + print $Fh "p $Name $LogInfo->{$Name}\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + print $Fh "g $Group->{LineNo} $GroupName\n"; + foreach my $Index (0..@{$Group->{Errors}} - 1) + { + my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; + print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; + } + } +} + sub _SaveLogErrors($) { my ($LogInfo) = @_; @@ -1000,21 +989,7 @@ sub _SaveLogErrors($) my $ErrorsPath = "$LogInfo->{LogPath}.errors"; if (open(my $ErrorsFile, ">", $ErrorsPath)) { - foreach my $Name ("BadRef", "NoRef") - { - next if (!defined $LogInfo->{$Name}); - print $ErrorsFile "p $Name $LogInfo->{$Name}\n"; - } - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) - { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - print $ErrorsFile "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) - { - my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; - print $ErrorsFile "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; - } - } + _WriteLogErrors($ErrorsFile, $LogInfo); close($ErrorsFile); # Set the mtime so Janitor reaps both at the same time @@ -1024,6 +999,19 @@ sub _SaveLogErrors($) return "Could not open '$LogInfo->{LogName}.errors' for writing: $!"; } +sub _DumpErrors($$) +{ + my ($Label, $LogInfo) = @_; + + print STDERR "$Label:\n"; + foreach my $Key (sort keys %{$LogInfo}) + { + next if ($Key =~ /^(?:ErrGroupNames|ErrGroups|NewCount)$/); + print STDERR "+ $Key $LogInfo->{$Key}\n"; + } + _WriteLogErrors(*STDERR, $LogInfo); +} + # # New error detection -- 2.20.1

1 0