wine-devel

wine-devel@winehq.org

7 participants
84404 discussions

[PATCH] msvcrt: SSE2 implementation of memcmp for x86_64.
by Jan Sikorski 07 Apr '22

07 Apr '22

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- It's about 13x faster on my machine than the byte version. memcmp performance is important to wined3d, where it's used to find pipelines in the cache, and the keys are pretty big. --- dlls/msvcrt/string.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3b352ac0bf2..66761e7a282 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -34,6 +34,10 @@ #include "wine/asm.h" #include "wine/debug.h" +#ifdef __x86_64__ +#include <immintrin.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* @@ -2675,11 +2679,52 @@ int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU } #undef I10_OUTPUT_MAX_PREC +#ifdef __x86_64__ +static int sse2_memcmp(const void *p1, const void *p2, size_t size) +{ + const unsigned char *first = p1, *second = p2; + size_t remainder = size & 0xf; + size_t size_16 = size / 16; + uint16_t mask; + DWORD index; + + while (size_16-- > 0) + { + __m128i value_1 = _mm_loadu_si128((__m128i *)first); + __m128i value_2 = _mm_loadu_si128((__m128i *)second); + __m128i compare = _mm_cmpeq_epi8(value_1, value_2); + if ((mask = ~_mm_movemask_epi8(compare))) + { + _BitScanForward(&index, mask); + if (first[index] < second[index]) return -1; + else return 1; + } + + first += 16; + second += 16; + } + + while (remainder-- > 0) + { + if (*first < *second) return -1; + if (*first > *second) return 1; + + first++; + second++; + } + + return 0; +} +#endif + /********************************************************************* * memcmp (MSVCRT.@) */ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) { +#ifdef __x86_64__ + return sse2_memcmp(ptr1, ptr2, n); +#else const unsigned char *p1, *p2; for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) @@ -2688,6 +2733,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) if (*p1 > *p2) return 1; } return 0; +#endif } #if defined(__i386__) || defined(__x86_64__) -- 2.32.0

7 16

[PATCH v4 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Mohamad Al-Jaf 07 Apr '22

07 Apr '22

Microsoft Edge calls this function expecting an implementation. With this, Internet browsing works. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Retrieve a list using bitwise operation in BCryptEnumAlgorithms. - Use proper NTSTATUS. v4: - Return NTE_NOT_SUPPORTED for BCRYPT_RSA_SIGN_ALGORITHM after checking for bad flags. Sorry, I only realized to test this behavior after submitting the patch. I thought there would be no point in checking if the flags are bad if the algorithm isn't even supported to begin with. --- dlls/ncrypt/main.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index e12284e0867..10cec633269 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -416,8 +416,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ + BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION |\ + BCRYPT_SIGNATURE_OPERATION |\ + BCRYPT_SECRET_AGREEMENT_OPERATION; + BCRYPT_ALGORITHM_IDENTIFIER *list; + ULONG i, count; + NTSTATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + WARN("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + if (!lstrcmpiW(BCRYPT_RSA_SIGN_ALGORITHM, algid)) return NTE_NOT_SUPPORTED; + + status = BCryptEnumAlgorithms(supported, &count, &list, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error retrieving algorithm list %#lx\n", status); + return map_ntstatus(status); + } + + status = STATUS_NOT_SUPPORTED; + for (i = 0; i < count; i++) + { + if (!lstrcmpiW(list[i].pszName, algid)) + { + status = STATUS_SUCCESS; + break; + } + } + + BCryptFreeBuffer(list); + return map_ntstatus(status); } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.35.1

1 1

[PATCH v3 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Mohamad Al-Jaf 07 Apr '22

07 Apr '22

Microsoft Edge calls this function expecting an implementation. With this, Internet browsing works. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Retrieve a list using bitwise operation in BCryptEnumAlgorithms. - Use proper NTSTATUS. --- dlls/ncrypt/main.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index e12284e0867..85bf8cb7206 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -416,8 +416,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ + BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION |\ + BCRYPT_SIGNATURE_OPERATION |\ + BCRYPT_SECRET_AGREEMENT_OPERATION; + BCRYPT_ALGORITHM_IDENTIFIER *list; + ULONG i, count; + NTSTATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (!lstrcmpiW(BCRYPT_RSA_SIGN_ALGORITHM, algid)) return NTE_NOT_SUPPORTED; + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + WARN("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + + status = BCryptEnumAlgorithms(supported, &count, &list, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error retrieving algorithm list %#lx\n", status); + return map_ntstatus(status); + } + + status = STATUS_NOT_SUPPORTED; + for (i = 0; i < count; i++) + { + if (!lstrcmpiW(list[i].pszName, algid)) + { + status = STATUS_SUCCESS; + break; + } + } + + BCryptFreeBuffer(list); + return map_ntstatus(status); } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.35.1

1 1

[tools] testbot/cgi: Clean up FormPage's property handling.
by Francois Gouget 06 Apr '22

06 Apr '22

Separate getting the value used by the form, from generating the HTML to display or edit it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 191 +++++++++++++++--------- testbot/web/Submit.pl | 2 +- 2 files changed, 124 insertions(+), 69 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c6a8c6bf1..c41924433 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -222,6 +222,17 @@ sub GetPropertyValue($$) # Form field support # +=pod +=over 12 + +=item C<GetDisplayName()> + +Returns the unescaped property's label / description / user-friendly name. +Escaping the name for HTML is the responsibility of the caller. + +=back +=cut + sub GetDisplayName($$) { my ($self, $PropertyDescriptor) = @_; @@ -229,17 +240,54 @@ sub GetDisplayName($$) return $PropertyDescriptor->GetDisplayName(); } -sub GetDisplayValue($$) +=pod +=over 12 + +=item C<GetFormValue()> + +Returns the value to be used for this form's property. + +This is either the value received through the HTTP parameters, or if it was +not specified there, the underlying property value (see GetPropertyValue()). + +Converting that value into a form suitable for viewing (including escaping it +for HTML) or editing is the responsibility of GenerateValueView() and +GenerateValueInput() respectively. + +=back +=cut + +sub GetFormValue($$) { my ($self, $PropertyDescriptor) = @_; my $Value = $self->GetParam($PropertyDescriptor->GetName()); - if (!defined $Value) + return defined $Value ? $Value : + $self->GetPropertyValue($PropertyDescriptor); +} + +=pod +=over 12 + +=item C<GenerateValueView()> + +Generates an HTML snippet representing the value in a user-readable form. + +=back +=cut + +sub GenerateValueView($$$) +{ + my ($self, $PropertyDescriptor, $Value) = @_; + + if ($PropertyDescriptor->GetClass() eq "Basic") { - $Value = $self->GetPropertyValue($PropertyDescriptor); + if ($PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + } } - - return $Value; + print defined $Value ? $self->escapeHTML($Value) : " "; } sub GetInputType($$) @@ -276,85 +324,69 @@ sub GenerateRequired($$) } } -sub GenerateField($$$) -{ - my ($self, $PropertyDescriptor, $Display) = @_; +=pod +=over 12 - print "<div class='ItemProperty'><label>", - $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), - "</label>"; +=item C<GenerateValueInput()> - my $Value = $self->GetDisplayValue($PropertyDescriptor); - if ($Display eq "rw") +Generates an HTML snippet allowing the specified value to be edited. + +=back +=cut + +sub GenerateValueInput($$$) +{ + my ($self, $PropertyDescriptor, $Value) = @_; + + my $InputType = $self->GetInputType($PropertyDescriptor); + if ($InputType eq "checkbox") { - my $InputType = $self->GetInputType($PropertyDescriptor); - print "<div class='ItemValue'>"; - if ($InputType eq "checkbox") - { - print "<input type='checkbox' name='", $PropertyDescriptor->GetName(), - "' "; - if ($Value) - { - print "checked='checked' "; - } - print "/>"; - } - elsif ($InputType eq "select") + my $Checked = $Value ? " checked" : ""; + print "<input type='checkbox' name='", $PropertyDescriptor->GetName(), + "'$Checked/>"; + } + elsif ($InputType eq "select") + { + print "<select name='", $PropertyDescriptor->GetName(), "'>\n"; + foreach my $V (@{$PropertyDescriptor->GetValues()}) { - print "<select name='", $PropertyDescriptor->GetName(), "'>\n"; - foreach my $V (@{$PropertyDescriptor->GetValues()}) - { - print " <option value='", $self->escapeHTML($V), "'"; - print " selected='selected'" if ($Value eq $V); - print ">", $self->escapeHTML($V), "</option>\n"; - } - print "</select>"; + print " <option value='", $self->escapeHTML($V), "'"; + print " selected" if ($Value eq $V); + print ">", $self->escapeHTML($V), "</option>\n"; } - elsif ($InputType eq "textarea") + print "</select>"; + # No need to add a 'required' label since checkboxes always have a value + } + elsif ($InputType eq "textarea") + { + my $MaxLength = $PropertyDescriptor->GetMaxLength(); + print "<textarea name='", $PropertyDescriptor->GetName(), "' cols='"; + if ($MaxLength < 50) { - my $MaxLength = $PropertyDescriptor->GetMaxLength(); - print "<textarea name='", $PropertyDescriptor->GetName(), "' cols='"; - if ($MaxLength < 50) - { - print "$MaxLength' rows='1"; - } - else - { - print "50' rows='", int(($MaxLength + 49) / 50); - } - print "'>"; - print $self->escapeHTML($Value) if (defined $Value); - print "</textarea>"; - $self->GenerateRequired($PropertyDescriptor); + print "$MaxLength' rows='1'>"; } else { - my $Size=$PropertyDescriptor->GetMaxLength(); - $Size=45 if ($Size > 45); - print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), - "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; - if (defined $Value && $InputType ne "password") - { - print " value='", $self->escapeHTML($Value), "'"; - } - print " />"; - $self->GenerateRequired($PropertyDescriptor); + print "50' rows='", int(($MaxLength + 49) / 50), "'>"; } - print "</div>"; + print $self->escapeHTML($Value) if (defined $Value); + print "</textarea>"; + $self->GenerateRequired($PropertyDescriptor); } else { - if ($Value) - { - print $self->escapeHTML($Value); - } - else + my $Size=$PropertyDescriptor->GetMaxLength(); + $Size=45 if ($Size > 45); + print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), + "' maxlength='", $PropertyDescriptor->GetMaxLength(), + "' size='$Size'"; + if (defined $Value and $InputType ne "password") { - print " "; + print " value='", $self->escapeHTML($Value), "'"; } + print "/>"; + $self->GenerateRequired($PropertyDescriptor); } - - print "</div>\n"; } @@ -392,6 +424,29 @@ sub GenerateFormStart($) "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } +sub GenerateField($$$) +{ + my ($self, $PropertyDescriptor, $Display) = @_; + + print "<div class='ItemProperty'><label>", + $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), + "</label>"; + + my $Value = $self->GetFormValue($PropertyDescriptor); + if ($Display eq "rw") + { + print "<div class='ItemValue'>"; + $self->GenerateValueInput($PropertyDescriptor, $Value); + print "</div>"; + } + else + { + $self->GenerateValueView($PropertyDescriptor, $Value); + } + + print "</div>\n"; +} + sub GenerateFields($) { my ($self) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 8323b9ab7..1ad94e4a4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -947,7 +947,7 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } -sub GetDisplayValue($$) +sub GetPropertyValue($$) { my ($self, $PropertyDescriptor) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Simplify link handling in CollectionBlock::GenerateDataCell().
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 736c3f8a3..23825d757 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -278,13 +278,6 @@ sub GenerateDataCell($$$$) if ($PropertyDescriptor->GetIsKey() && $DetailsPage) { $NeedLink = 1; - } - else - { - $NeedLink = !1; - } - if ($NeedLink) - { my $Query = "$DetailsPage?Key=" . uri_escape($Item->GetKey()); my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); if (defined($MasterColNames)) @@ -298,10 +291,7 @@ sub GenerateDataCell($$$$) print "<a href='", $self->escapeHTML($Query), "'>"; } print $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); - if ($NeedLink) - { - print "</a>"; - } + print "</a>" if ($NeedLink); print "</td>\n"; } -- 2.30.2

1 0

[tools] testbot/cgi: Improve the Add button label for multi-word item class names.
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 13c2a62bd..736c3f8a3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -570,6 +570,15 @@ sub OnItemAction($$$) # Actions handling # +sub GetAddButtonLabel($) +{ + my ($self) = @_; + + my $Label = $self->{Collection}->GetItemName(); + $Label =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Label"; +} + =pod =over 12 @@ -587,9 +596,7 @@ sub GetActions($) { my ($self) = @_; - return $self->GetDetailsPage() ? - ["Add ". $self->{Collection}->GetItemName()] : - []; + return $self->GetDetailsPage() ? [$self->GetAddButtonLabel()] : []; } =pod @@ -614,7 +621,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($self->{RW} and $Action eq "Add ". $self->{Collection}->GetItemName()) + if ($self->{RW} and $Action eq $self->GetAddButtonLabel()) { my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); -- 2.30.2

1 0

[tools] testbot/Engine: Optimize sorting the jobs for scheduling.
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index f606c0d07..cc2ea1f18 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -44,8 +44,9 @@ use WineTestBot::VMs; sub CompareJobPriority { # Process Jobs with a higher Priority value last (it's a niceness in fact), - # and older Jobs first. - return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; + # and older Jobs first. And use GetColValue() for performance. + return $a->GetColValue("Priority") <=> $b->GetColValue("Priority") || + $a->GetColValue("Id") <=> $b->GetColValue("Id"); } =pod -- 2.30.2

1 0

[tools] testbot: Optimize the VM comparison method.
by Francois Gouget 06 Apr '22

06 Apr '22

Using Item::GetColValue() is faster than relying on Item::AUTOLOAD. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index ee0c1be24..2e475b722 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -177,16 +177,17 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +# Sort retired and deleted VMs last +my %_CmpRole = ("retired" => 1, "deleted" => 2); + sub Compare($$) { my ($self, $B) = @_; - # Sort retired and deleted VMs last - my %RoleOrders = ("retired" => 1, "deleted" => 2); - - return ($RoleOrders{$self->Role} || 0) <=> ($RoleOrders{$B->Role} || 0) || - $self->SortOrder <=> $B->SortOrder || - $self->Name <=> $B->Name; + # Use GetColValue() for performance. + return ($_CmpRole{$self->GetColValue("Role")} || 0) <=> ($_CmpRole{$B->GetColValue("Role")} || 0) || + $self->GetColValue("SortOrder") <=> $B->GetColValue("SortOrder") || + $self->GetColValue("Name") <=> $B->GetColValue("Name"); } sub HasEnabledRole($) -- 2.30.2

1 0

[tools] testbot/web: Use Collection::GetSortedItems() to sort record groups.
by Francois Gouget 06 Apr '22

06 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 2 +- testbot/lib/WineTestBot/RecordGroups.pm | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 2a1e21f0b..b82d265f8 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -111,7 +111,7 @@ sub GetActivity($;$) } my $MinId; $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); - foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) + foreach my $RecordGroup (@{$RecordGroups->GetSortedItems()}) { my $Group = { id => $RecordGroup->Id, start => $RecordGroup->Timestamp }; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index f0945434c..c3022ae5b 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -43,6 +43,16 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # The Timestamps have a 1 second granularity and may have duplicates. + # So use the Id to break ties. And use GetColValue() for performance. + return $self->GetColValue("Timestamp") <=> $B->GetColValue("Timestamp") || + $self->GetColValue("Id") <=> $B->GetColValue("Id"); +} + package WineTestBot::RecordGroups; @@ -57,7 +67,7 @@ use WineTestBot::WineTestBotObjects; BEGIN { our @ISA = qw(WineTestBot::WineTestBotCollection); - our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); + our @EXPORT = qw(CreateRecordGroups SaveRecord); } use ObjectModel::BasicPropertyDescriptor; @@ -96,16 +106,6 @@ sub CreateRecordGroups(;$) \@PropertyDescriptors, $ScopeObject); } -sub CompareRecordGroups($$) -{ - my ($RecordGroup1, $RecordGroup2) = @_; - - # The Timestamps have a 1 second granularity and may have duplicates. - # So use the Id to break ties. - return $RecordGroup1->Timestamp <=> $RecordGroup2->Timestamp || - $RecordGroup1->Id <=> $RecordGroup2->Id; -} - =pod =over 12 -- 2.30.2

1 0

[PATCH 1/3] winegstreamer: Support dynamic wg_transform output format change.
by Rémi Bernon 06 Apr '22

06 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- (This need to come first, before 231660-231665 as the spurious todo_wine is caused by the H264 format being synchronously rejected when libav plugins are used) In this patch I assumed that sink callbacks are always called from the same thread, and then do not require any locking around sink_caps accesses. The output samples will each hold their own ref on the caps, eventually different ones as the stream format changes, and wg_transform_read_data will only read the caps from the sample it unqueued. dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_transform.c | 89 ++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index f4e2ea4966b..7a31020fb87 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -122,6 +122,7 @@ struct wg_sample UINT32 max_size; UINT32 size; BYTE *data; + struct wg_format *format; }; struct wg_parser_buffer diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0327b92ce8e..ddf86de13ae 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -51,40 +51,73 @@ struct wg_transform GstBufferList *input; guint input_max_length; GstAtomicQueue *output_queue; - GstBuffer *output_buffer; + GstSample *output_sample; + GstCaps *sink_caps; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct wg_transform *transform = gst_pad_get_element_private(pad); + GstSample *sample; GST_LOG("transform %p, buffer %p.", transform, buffer); - gst_atomic_queue_push(transform->output_queue, buffer); + if ((sample = gst_sample_new(buffer, transform->sink_caps, NULL, NULL))) + gst_atomic_queue_push(transform->output_queue, sample); - return GST_FLOW_OK; + gst_buffer_unref(buffer); + + return sample ? GST_FLOW_OK : GST_FLOW_ERROR; +} + +static gboolean transform_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct wg_transform *transform = gst_pad_get_element_private(pad); + + GST_LOG("transform %p, type \"%s\".", transform, GST_EVENT_TYPE_NAME(event)); + + switch (event->type) + { + case GST_EVENT_CAPS: + { + GstCaps *caps; + + gst_event_parse_caps(event, &caps); + + gst_caps_unref(transform->sink_caps); + transform->sink_caps = gst_caps_ref(caps); + break; + } + default: + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); + break; + } + + gst_event_unref(event); + return TRUE; } NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; - GstBuffer *buffer; + GstSample *sample; if (transform->input) gst_buffer_list_unref(transform->input); gst_element_set_state(transform->container, GST_STATE_NULL); - if (transform->output_buffer) - gst_buffer_unref(transform->output_buffer); - while ((buffer = gst_atomic_queue_pop(transform->output_queue))) - gst_buffer_unref(buffer); + if (transform->output_sample) + gst_sample_unref(transform->output_sample); + while ((sample = gst_atomic_queue_pop(transform->output_queue))) + gst_sample_unref(sample); g_object_unref(transform->their_sink); g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); + gst_caps_unref(transform->sink_caps); gst_atomic_queue_unref(transform->output_queue); free(transform); @@ -162,10 +195,10 @@ static bool transform_append_element(struct wg_transform *transform, GstElement NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; - GstCaps *raw_caps = NULL, *src_caps = NULL, *sink_caps = NULL; struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; GstElement *first = NULL, *last = NULL, *element; + GstCaps *raw_caps = NULL, *src_caps = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; @@ -194,9 +227,9 @@ NTSTATUS wg_transform_create(void *args) if (!transform->my_src) goto out; - if (!(sink_caps = wg_format_to_caps(&output_format))) + if (!(transform->sink_caps = wg_format_to_caps(&output_format))) goto out; - if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) + if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, transform->sink_caps))) goto out; transform->my_sink = gst_pad_new_from_template(template, "sink"); g_object_unref(template); @@ -204,13 +237,14 @@ NTSTATUS wg_transform_create(void *args) goto out; gst_pad_set_element_private(transform->my_sink, transform); + gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); /* Since we append conversion elements, we don't want to filter decoders * based on the actual output caps now. Matching decoders with the * raw output media type should be enough. */ - media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); + media_type = gst_structure_get_name(gst_caps_get_structure(transform->sink_caps, 0)); if (!(raw_caps = gst_caps_new_empty_simple(media_type))) goto out; @@ -264,6 +298,11 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_VIDEO: + if (!(element = create_element("videoconvert", "base")) + || !transform_append_element(transform, element, &first, &last)) + goto out; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); break; case WG_MAJOR_TYPE_H264: @@ -306,7 +345,6 @@ NTSTATUS wg_transform_create(void *args) || !gst_pad_push_event(transform->my_src, event)) goto out; - gst_caps_unref(sink_caps); gst_caps_unref(src_caps); GST_INFO("Created winegstreamer transform %p.", transform); @@ -320,8 +358,8 @@ out: gst_object_unref(transform->their_src); if (transform->my_sink) gst_object_unref(transform->my_sink); - if (sink_caps) - gst_caps_unref(sink_caps); + if (transform->sink_caps) + gst_caps_unref(transform->sink_caps); if (transform->my_src) gst_object_unref(transform->my_src); if (src_caps) @@ -401,8 +439,10 @@ NTSTATUS wg_transform_read_data(void *args) struct wg_transform *transform = params->transform; struct wg_sample *sample = params->sample; GstBufferList *input = transform->input; + struct wg_format format; GstFlowReturn ret; NTSTATUS status; + GstCaps *caps; if (!gst_buffer_list_length(transform->input)) GST_DEBUG("Not input buffer queued"); @@ -417,7 +457,7 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_UNSUCCESSFUL; } - if (!transform->output_buffer && !(transform->output_buffer = gst_atomic_queue_pop(transform->output_queue))) + if (!transform->output_sample && !(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) { sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT; @@ -425,7 +465,18 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_SUCCESS; } - if ((status = read_transform_output_data(transform->output_buffer, sample))) + if (sample->format && (caps = gst_sample_get_caps(transform->output_sample))) + { + wg_format_from_caps(&format, caps); + if (!wg_format_compare(&format, sample->format)) + { + *sample->format = format; + params->result = MF_E_TRANSFORM_STREAM_CHANGE; + return STATUS_SUCCESS; + } + } + + if ((status = read_transform_output_data(gst_sample_get_buffer(transform->output_sample), sample))) { sample->size = 0; return status; @@ -433,8 +484,8 @@ NTSTATUS wg_transform_read_data(void *args) if (!(sample->flags & WG_SAMPLE_FLAG_INCOMPLETE)) { - gst_buffer_unref(transform->output_buffer); - transform->output_buffer = NULL; + gst_sample_unref(transform->output_sample); + transform->output_sample = NULL; } params->result = S_OK; -- 2.35.1

3 12

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel