June 2022 - Wine-Devel - list.winehq.org

[PATCH v3 3/3] xmllite/writer: Fix typo in a comment

by David Kahurani

From: David Kahurani <k.kahurani(a)gmail.com> Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 3f5b3527f23..6f455ffcb19 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -949,7 +949,7 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR return S_OK; } - /* Ignore prefix is URI wasn't specified. */ + /* Ignore prefix if URI wasn't specified. */ if (is_xmlns_local && is_empty_string(uri)) { write_output_attribute(This, NULL, 0, L"xmlns", 5, value); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

[PATCH v3 2/3] xmllite/writer: Handle possible memory allocation failures

by David Kahurani

From: David Kahurani <k.kahurani(a)gmail.com> Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 58d9edea059..3f5b3527f23 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -180,6 +180,13 @@ static struct element *alloc_element(xmlwriter *writer, const WCHAR *prefix, con len += lstrlenW(local); ret->qname = writer_alloc(writer, (len + 1)*sizeof(WCHAR)); + + if (!ret->qname) + { + writer_free(writer, ret); + return NULL; + } + ret->len = len; if (prefix) { @@ -249,7 +256,8 @@ static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len size = (len + 1) * sizeof(WCHAR); ret = writer_alloc(writer, size); - memcpy(ret, str, size); + if (ret) memcpy(ret, str, size); + return ret; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

[PATCH v3 1/3] xmllite/reader: Avoid memory leak on error path

by David Kahurani

From: David Kahurani <k.kahurani(a)gmail.com> attr->value should not be freed as it was not allocated attr->localname should instead having just being previously allocated and not freed anywhere else Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4045b4dfcca..d99f121e0cb 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -424,7 +424,7 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn { hr = reader_strvaldup(reader, value, &attr->value); if (hr != S_OK) - reader_free_strvalued(reader, &attr->value); + reader_free_strvalued(reader, &attr->localname); } if (hr != S_OK) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

[PATCH v3 0/3] MR281: A few fixes in xmllite

by David Kahurani (＠kahurani)

-- v3: xmllite/writer: Fix typo in a comment xmllite/writer: Handle possible memory allocation failures xmllite/reader: Avoid memory leak on error path https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

Re: [PATCH v2 1/2] ntdll/tests: Test for setting x86 / x64 EFLAGS register in context.

by Zebediah Figura

On 6/20/22 08:08, Jinoh Kang wrote: > +static DWORD WINAPI signal_and_wait_proc( void *arg ) > +{ > + HANDLE *events = arg; > + /* Atomically signal and wait to put thread in blocking state */ > + return SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); > +} SignalObjectAndWait() is not atomic.

June 20, 2022

[tools] testbot/Engine: Don't schedule jobs until the initialization is done.

by Francois Gouget

On startup the Engine starts processes to check the state of each VM, marking them as dirty in the process. But the VM status change causes ScheduleJobs() to be called through the VMStatusChange notification, potentially before all check processes have been started. So make sure no job is scheduled until the Engine is ready. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 + testbot/lib/WineTestBot/Engine/Scheduler.pm | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 9d836529c3..39577d14ca 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -780,6 +780,7 @@ sub main() # Cleanup starts processes to update the VMs. Run ScheduleJobs() now so it # can detect if these processes get stuck. + StartJobScheduler(); ScheduleJobs(); # Check for patches that arrived while the server was off. diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 1b21ab9742..f91bf3fd03 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -28,7 +28,7 @@ WineTestBot::Engine::Scheduler - Schedules the TestBot tasks =cut use Exporter 'import'; -our @EXPORT = qw(ScheduleJobs CheckJobs); +our @EXPORT = qw(StartJobScheduler ScheduleJobs CheckJobs); use File::Copy; @@ -945,7 +945,24 @@ sub _PowerOffDirtyVMs($) } } -my $_InScheduleJobs; +my $_InScheduleJobs = 1; + +=pod +=over 12 + +=item C<StartJobScheduler()> + +Job scheduling is disabled initially to let the Engine perform its +initialization without interference. + +=back +=cut + +sub StartJobScheduler() +{ + $_InScheduleJobs = undef; +} + my $_LastTaskCounts = ""; =pod -- 2.30.2

June 20, 2022

[tools] testbot/web: Show the web patch id as a tooltip.

by Francois Gouget

This helps cross-reference the TestBot patch list with the jobs and patches website. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/PatchesList.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index fc074ada1a..bf7c52b203 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -53,7 +53,9 @@ sub GenerateDataView($$$) $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; - print "<a href='/JobDetails.pl?Key=$JobId'>Job $JobId</a>"; + my $Title = $Row->{Item}->WebPatchId; + $Title = " title='Web patch $Title'" if ($Title); + print "<a href='/JobDetails.pl?Key=$JobId'$Title>Job $JobId</a>"; } else { -- 2.30.2

June 20, 2022

Re: [PATCH 0/4] MR271: win32u: Move rawinput APIs.

by Francois Gouget (＠fgouget)

On Sat Jun 18 01:39:16 2022 +0000, **** wrote: > Marvin replied on the mailing list: > ``` > Hi, > It looks like your patch introduced the new failures shown below. > Please investigate and fix them before resubmitting your patch. > If they are not new, fixing them anyway would help a lot. Otherwise > please ask for the known failures list to be updated. > The tests also ran into some preexisting test failures. If you know how > to fix them that would be helpful. See the TestBot job for the details: > The full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=117216 > Your paranoid android. > === debian11 (32 bit report) === > user32: > msg.c:6881: Test failed: SetFocus(hwnd) on a button: 6: the msg 0x002b > was expected, but got msg 0x001c instead > msg.c:6881: Test failed: SetFocus(hwnd) on a button: 7: the msg 0x0111 > was expected, but got msg 0x0086 instead > msg.c:6881: Test failed: SetFocus(hwnd) on a button: 8: the msg 0x8000 > was expected, but got msg 0x0006 instead > msg.c:6881: Test failed: SetFocus(hwnd) on a button: 9: the msg sequence > is not complete: expected 0000 - actual 0009 > ``` These are preexisting failures: https://bugs.winehq.org/show_bug.cgi?id=53207 I also added them to the TestBot's list of known failures: https://testbot.winehq.org/FailureDetails.pl?Key=140 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/271#note_2373

June 20, 2022

Re: [PATCH 0/1] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil.

by Paul Gofman (＠gofman)

On Fri Jun 17 19:11:37 2022 +0000, Matteo Bruni wrote: > I have tweaked / extended the tests a little further, see > [gl-depth-stencil.txt](/uploads/4ae59fc98d8067d7babb524984574df7/gl-depth-stencil.txt). > I only tested that on Nvidia for now, curious if they also pass with AMD > with those changes. I run the test on my AMD / Windows and added some traces / additional tests. I am attaching diff to the test (which includes your patch as well) and the output from AMD / Windows. It seems that unfortunately 32/8 tests is a bit inconclusive here as somehow the output pixel format is 32 / 8 (honestly not sure what that means but that's what I see here; see no test failure on line 382 and trace output from line 381). The rests of tests suggest that it prefers 24 bit whenever in doubt, see, e. g., 8x8 test, trace at line 364: it could choose 16x8 but preferred 24x8. From what I see it seems that the pattern is whenever stencil is requested it returns depths >= 24. That's what my current patch is doing. If we prioritize stencil formats when requested over depth match that will probably look more straightforward logic-wise but that would break all those tests if we'd tighten them to what is actually returned on AMD. Also, if specific games depending on the stencil choice are concerned, if we plainly prioritize stencil presence they will get 16 bit depth on Wine while getting 24 on Windows and that difference may matter (even if not break the thing completely like returning no stencil format). What do you think? [diff.txt](/uploads/4355976f66b6decb44d43c5b126e5479/diff.txt) [output.txt](/uploads/13bfe7a03d34c1303f04612c9d809e0e/output.txt) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/132#note_2371

June 20, 2022

Re: [PATCH v4 0/1] MR192: ws2_32: Allow getsockname after AcceptEx

by DavidCurtiss (＠DavidCurtiss)

On Thu Jun 9 18:18:23 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > Can you please make this a single, self-contained commit, instead of > fixing it up with a separate commit? We don't squash anything when > merging, and we want to have a sensible commit history. > ``` Zebediah, since you have reviewed this, can you also Approve it? How do I get this (or any) change moved forward? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/192#note_2370

June 20, 2022