- Wine-Devel - list.winehq.org

[PATCH v2 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) June 14, 2022

June 14, 2022

Opened the previous merge request before the testbot had updated, so it failed to run the tests. Should be updated by now :) -- v2: uiautomationcore: Implement NavigateDirection_{Previous/Next}Sibling for MSAA providers. uiautomationcore: Implement NavigateDirection_{First/Last}Child for MSAA Providers. https://gitlab.winehq.org/wine/wine/-/merge_requests/241

3 5

[tools] testbot/web: Tweak GenerateFullLog() in the job details page.
by Francois Gouget June 14, 2022

June 14, 2022

Rename %ErrLineNos to %ErrCategory since it contains the error's category indexed by the full log line number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 36bba0d04..7860a4c9d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -400,16 +400,14 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %ErrLineNos; + my %ErrCategory; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - my $ErrCount = @{$Group->{Errors}}; - next if (!$ErrCount); - for my $ErrIndex (0..$ErrCount-1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { - $ErrLineNos{$Group->{LineNos}->[$ErrIndex]} = \ - $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; } } @@ -432,7 +430,7 @@ sub GenerateFullLog($$$$) } my $Html = $self->escapeHTML($Line); - my $Category = $ErrLineNos{$LineNo} || $GetCategory->($Line); + my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; -- 2.30.2

1 0

[tools] testbot/web: Fix hiding the branch column on the main page.
by Francois Gouget June 14, 2022

June 14, 2022

It is hidden when only one branch exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Branches are not really supported: there is a table for them, they are referenced by the jobs, but they have never been used in any of the scripts or in the TestBot code. In particular the Reconfig scripts only update and rebuild one Wine tree. But support for multiple branches may work by having one Wine source tree and set of build trees per branch. So I'm keeping what branch support we have around for the day we need it. --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 2073b1e6f..a3b26ea91 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -41,7 +41,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : $PropertyName eq "Submitted" ? ("ro", "timetipdate") : - ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : + ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); } -- 2.30.2

1 0

[tools] testbot: Include the filename in LoadLogErrors() error messages.
by Francois Gouget June 14, 2022

June 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Otherwise there is no way to know which file was bad in case of errors, for instance in UpdateTaskLogs. --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17cfc3525..2e3de83b8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1016,6 +1016,10 @@ sub LoadLogErrors($) if (open(my $ErrorsFile, "<", "$LogPath.errors")) { LoadLogErrorsFromFh($LogInfo, $ErrorsFile); + if ($LogInfo->{BadLog}) + { + $LogInfo->{BadLog} = "$LogInfo->{LogName}.errors: $LogInfo->{BadLog}"; + } delete $LogInfo->{CurGroup}; close($ErrorsFile); } -- 2.30.2

1 0

[PATCH 0/1] MR243: winhttp: Fix default port corner cases in WinHttpCrackUrl().
by Hans Leidekker (＠hans) June 14, 2022

June 14, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/243

2 1

[PATCH 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) June 14, 2022

June 14, 2022

Opened the previous merge request before the testbot had updated, so it failed to run the tests. Should be updated by now :) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/241

3 6

Welcome to the GitLab community
by Bryan G. Behrenshausen June 14, 2022

June 14, 2022

Hello Wine team, I was delighted to read the news [1] that your recent experiment with GitLab has gone well and GitLab will become the primary development platform for Wine. I'm Senior Open Source Program Manager at GitLab [2], and I want to extend my warmest welcome to out community. Should you need anything during your migration, please don't hesitate to reach out. Additionally, please note our GitLab for Open Source [3] and GitLab Open Source Partners programs [4]. If participating in those would add value to your work, I'd be happy to discuss them further. Again, welcome! Sincerely, Bryan [1] https://www.phoronix.com/scan.php?page=news_item&px=Wine-GitLab-Main-Workfl… [2] https://gitlab.com/bbehr [3] https://about.gitlab.com/solutions/open-source/join/ [4] https://about.gitlab.com/solutions/open-source/partners/

1 0

[PATCH v2 1/8] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani June 14, 2022

June 14, 2022

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

2 15

[PATCH 1/5] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani June 14, 2022

June 14, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 22 +++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 9 ++------- 2 files changed, 21 insertions(+), 10 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..8fddef8fd40 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5736,9 +5736,11 @@ static void test_MFCreate2DMediaBuffer(void) { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 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 }, @@ -5998,13 +6000,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 15

Gitlab experiment status
by Alexandre Julliard June 14, 2022

June 14, 2022

Folks, The Gitlab experiment seems to be going well. For the last release, more than half the patches were submitted as Gitlab merge requests, so that seems to be working well for us. There are still improvements we can make, and of course many more Gitlab features that we could start using, but before investing more effort we need to decide whether we want to use it going forward. So now that you have had a chance to try it, what do you people think? Should we adopt Gitlab as our development platform? -- Alexandre Julliard julliard(a)winehq.org

13 21