- Wine-Devel - list.winehq.org

Interest in integrating with HarfBuzz shaper?
by Behdad Esfahbod June 27, 2022

June 27, 2022

Hi, I've been looking at the internal Wine implementation of usp10.dll, and wondering if there is an interest to integrate with HarfBuzz instead / optionally. The main hindrance is that HarfBuzz does NOT currently provide separate substitution vs positioning steps ala ScriptShape() and ScriptPosition(). But I've been thinking about how to make that possibly happen, at least enough for Wine's needs. Regards, behdad http://behdad.org/

2 1

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

June 27, 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 67cf8954c36..6ad667a7404 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 17

[tools] testbot/web: Use GetErrMessage() instead of direct field access.
by Francois Gouget June 27, 2022

June 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 2 +- testbot/web/admin/Log.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 773fe3bb99..ec2eaba7e2 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -49,7 +49,7 @@ sub _initialize($$$) if (!$self->GetParam("Days") or !$self->Validate() or !int($self->GetParam("Days"))) # 00 case! { - $self->SetParam("Days", $DAYS_DEFAULT) if (!defined $self->{ErrMessage}); + $self->SetParam("Days", $DAYS_DEFAULT) if (!defined $self->GetErrMessage()); $self->{NoStats} = 1; } # The action is a no-op so unset it to not need to redefine OnAction() diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 9c18c375e2..74711df5f3 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -43,7 +43,7 @@ sub _initialize($$$) if (!$self->GetParam("Hours") or !$self->Validate() or !int($self->GetParam("Hours"))) # 00 case! { - $self->SetParam("Hours", $HOURS_DEFAULT) if (!defined $self->{ErrMessage}); + $self->SetParam("Hours", $HOURS_DEFAULT) if (!defined $self->GetErrMessage()); $self->SetParam("Action", undef); } } -- 2.30.2

1 0

[tools] testbot/web: Show the VM name for failure matches.
by Francois Gouget June 27, 2022

June 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index ae4ccb4041..02803ed27a 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -45,7 +45,9 @@ sub GetPropertyDescriptors($) push @PropertyDescriptors, $PropertyDescriptor; if ($PropertyName eq "TaskLog") { - push @PropertyDescriptors, CreateBasicPropertyDescriptor("Date", "Date", !1, !1, "DT", 19); + push @PropertyDescriptors, + CreateBasicPropertyDescriptor("VM", "VM", !1, !1, "A", 20), + CreateBasicPropertyDescriptor("Date", "Date", !1, !1, "DT", 19); } } push @PropertyDescriptors, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128); @@ -89,6 +91,10 @@ sub GenerateDataView($$$) print "<a href='", $self->escapeHTML($URL), "'>", $self->escapeHTML($Row->{Item}->TaskLog), "</a>"; } + elsif ($PropertyName eq "VM") + { + print $self->escapeHTML($Row->{Item}->Task->VMName); + } elsif ($PropertyName eq "Date") { # The enclosing page already pulled in the datetime JavaScript code -- 2.30.2

1 0

[tools] testbot: Better track VM status changes.
by Francois Gouget June 27, 2022

June 27, 2022

Only set OldStatus once to avoid issues in case the status is changed multiple times before the VM is saved. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This matches the recent job status tracking change. --- testbot/lib/WineTestBot/VMs.pm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f0c16d19ec..2f736c636e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -157,15 +157,6 @@ use WineTestBot::TestAgent; use WineTestBot::Utils; -sub _initialize($$) -{ - my ($self, $VMs) = @_; - - $self->SUPER::_initialize($VMs); - - $self->{OldStatus} = undef; -} - sub InitializeNew($$) { my ($self, $Collection) = @_; @@ -270,8 +261,8 @@ sub Status($;$) if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { + $self->{OldStatus} ||= $CurrentStatus; $self->SUPER::Status($NewStatus); - $self->{OldStatus} = $CurrentStatus; } return $NewStatus; @@ -424,15 +415,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}) - { - VMStatusChange($self->GetKey(), $self->{OldStatus}, $NewStatus); - } + VMStatusChange($self->GetKey(), $self->{OldStatus}, $self->Status); } + delete $self->{OldStatus}; } sub Run($$$$$$) -- 2.30.2

1 0

[tools] testbot/Janitor: Clean up obsolete failures.
by Francois Gouget June 27, 2022

June 27, 2022

Delete failures that have been marked for deletion once they are no longer referenced. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 618c31d022..839e1a942c 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -43,6 +43,7 @@ $Name0 =~ s+^.*/++; use File::Path; use WineTestBot::Config; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -193,6 +194,22 @@ if ($JobPurgeDays != 0) } } +# And also failures marked for deletion +my $Failures = CreateFailures(); +$Failures->AddFilter("BugStatus", ["deleted"]); +foreach my $Failure (@{$Failures->GetItems()}) +{ + if ($Failure->TaskFailures->IsEmpty()) + { + $Failures->DeleteItem($Failure); + } + else + { + my $TaskFailure = @{$Failure->TaskFailures->GetItems()}[0]; + Trace "Keeping failure ", $Failure->Id, " for task log ", join("/", $TaskFailure->JobId, $TaskFailure->StepNo, $TaskFailure->TaskNo, $TaskFailure->TaskLog), "\n"; + } +} + # Purge the deleted VMs if they are not referenced anymore my $VMs = CreateVMs(); $VMs->AddFilter("Role", ["deleted"]); -- 2.30.2

1 0

[PATCH 0/1] MR315: windowscodecs: Fix non-zero alpha detection in ImagingFactory_CreateBitmapFromHICON.
by Jinoh Kang (＠iamahuman) June 27, 2022

June 27, 2022

Increment pixel pointer for every *pixel*, not every *stride*. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/315

3 2

Re: [PATCH v6 0/5] MR310: mf: Fix several reference leaks.
by Rémi Bernon June 27, 2022

June 27, 2022

v6: Restore temporary todo_wine in PATCH 2, lost in the split. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2800

1 0

[PATCH v5 0/5] MR310: mf: Fix several reference leaks.
by Rémi Bernon June 27, 2022

June 27, 2022

So that the mf tests pass again on 32bit on the testbot, though they still fail locally with `LIBGL_ALWAYS_SOFTWARE=true GALLIUM_DRIVER=softpipe`. -- v5: mf: Uninitialize renderer before creating mixer and presenter. mf: Release video renderer services before re-initializing. mf: Avoid leaking nodes in IMFTopoLoader_Load. mf/tests: Add some missing IMFActivate_Shutdown calls. mf/tests: Add more consistent reference count checks. https://gitlab.winehq.org/wine/wine/-/merge_requests/310

2 9

[PATCH v4 0/5] MR310: mf: Fix several reference leaks.
by Rémi Bernon June 27, 2022

June 27, 2022

So that the mf tests pass again on 32bit on the testbot, though they still fail locally with `LIBGL_ALWAYS_SOFTWARE=true GALLIUM_DRIVER=softpipe`. -- v4: mf: Uninitialize renderer before creating mixer and presenter. mf: Release video renderer services before re-initializing. mf: Avoid leaking nodes in IMFTopoLoader_Load. mf/tests: Add some missing IMFActivate_Shutdown calls. mf/tests: And more consistent reference count checks. https://gitlab.winehq.org/wine/wine/-/merge_requests/310

2 8