- Wine-devel - list.winehq.org

[PATCH] cryptnet: Resolve object id to algorithm id when verifying OCSP response.
by Torge Matthies 06 Jun '22

06 Jun '22

From: Torge Matthies <tmatthies(a)codeweavers.com> Instead of only allowing the SHA256RSA algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53102 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e8c17407a9b..ac282f5aa82 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1918,6 +1918,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ HCRYPTPROV prov = 0; HCRYPTHASH hash = 0; HCRYPTKEY key = 0; + DWORD algid; if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); @@ -1925,7 +1926,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; alg = &info->SignatureInfo.SignatureAlgorithm; - if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA)) + if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId))) { FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId)); error = CRYPT_E_NO_REVOCATION_CHECK; @@ -1933,7 +1934,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ } if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done; - if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done; + if (!CryptCreateHash(prov, algid, 0, 0, &hash)) goto done; if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done; sig = &info->SignatureInfo.Signature; -- 2.36.1

2 1

[PATCH 0/1] MR186: secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity).
by Nikolay Sivov (＠nsivov) 06 Jun '22

06 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/186

3 2

[PATCH v2] include: Define atomic read/write helpers for 32-bit integers.
by Jinoh Kang 06 Jun '22

06 Jun '22

Based on the corresponding functions from Windows SDK header files. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- v1 -> v2: Remove *ULong* wrappers (not needed immediately) include/winnt.h | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..370ed3adce6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6475,6 +6475,61 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __i386__ */ +/* Since Visual Studio 2012, volatile accesses do not always imply acquire and + * release semantics. We explicitly use ISO volatile semantics, manually + * placing barriers as appropriate. + */ +#if _MSC_VER >= 1700 +#pragma intrinsic(__iso_volatile_load32) +#pragma intrinsic(__iso_volatile_store32) +#define __WINE_ISO_VOLATILE_LOAD_32(src) (__iso_volatile_load32(src)) +#define __WINE_ISO_VOLATILE_STORE_32(dest, value) (__iso_volatile_store32(dest, value)) +#else /* _MSC_VER >= 1700 */ +#define __WINE_ISO_VOLATILE_LOAD_32(src) (*(src)) +#define __WINE_ISO_VOLATILE_STORE_32(dest, value) ((void)(*(dest) = (value))) +#endif /* _MSC_VER >= 1700 */ + +#if defined(__i386__) || defined(__x86_64__) +#pragma intrinsic(_ReadWriteBarrier) +void _ReadWriteBarrier(void); +#endif /* defined(__i386__) || defined(__x86_64__) */ + +static void __wine_memory_barrier_acq_rel(void) +{ +#if defined(__i386__) || defined(__x86_64__) +#pragma warning(suppress:4996) + _ReadWriteBarrier(); +#elif defined(__arm__) + __dmb(_ARM_BARRIER_ISH); +#elif defined(__aarch64__) + __dmb(_ARM64_BARRIER_ISH); +#endif /* defined(__i386__) || defined(__x86_64__) */ +} + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = __WINE_ISO_VOLATILE_LOAD_32( (int const volatile *)src ); + __wine_memory_barrier_acq_rel(); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = __WINE_ISO_VOLATILE_LOAD_32( (int const volatile *)src ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __wine_memory_barrier_acq_rel(); + __WINE_ISO_VOLATILE_STORE_32( (int volatile *)dest, value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_ISO_VOLATILE_STORE_32( (int volatile *)dest, value ); +} + #elif defined(__GNUC__) static FORCEINLINE BOOLEAN WINAPI BitScanForward(DWORD *index, DWORD mask) @@ -6588,6 +6643,43 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +#if defined(__x86_64__) || defined(__i386__) +/* On x86, Support old GCC with either no or buggy (GCC BZ#81316) __atomic_* support */ +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) do { *(ret) = *(ptr); __asm__ __volatile__( "" ::: "memory" ); } while (0) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) do { *(ret) = *(ptr); } while (0) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) do { __asm__ __volatile__( "" ::: "memory" ); *(ptr) = *(val); } while (0) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) do { *(ptr) = *(val); } while (0) +#else +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_ACQUIRE) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_RELAXED) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELEASE) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELAXED) +#endif /* defined(__x86_64__) || defined(__i386__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_ACQUIRE( src, &value ); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_RELAXED( src, &value ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELEASE( dest, &value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELAXED( dest, &value ); +} + static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) { #if defined(__x86_64__) || defined(__i386__) -- 2.35.3

1 0

[PATCH 0/6] MR179: winegstreamer: Use the wg_sample structure to wrap and read media samples.
by Rémi Bernon 06 Jun '22

06 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/179

2 8

[tools] winetest: Apply a couple of spelling fixes.
by Francois Gouget 06 Jun '22

06 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 0bad35120..0bab17180 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1477,7 +1477,7 @@ EOF <li>Related bugs should have the source and testcase keywords, and their description should contain module:unit, module/unit or module/tests/unit. </ul> -The patterns are grouped according to the likelyhood that they contain new failures: +The patterns are grouped according to the likelihood that they contain new failures: <ul>"; my @listids = ("summary", "recent", "newmode", "regular", "old", @@ -1499,7 +1499,7 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { - my @table = ("<details><summary>Page cutomization</summary> + my @table = ("<details><summary>Page customization</summary> <div class='detailsbox'>This section lets you select the reports to show on this page. <label><input id='reruns' type='checkbox' checked> Hide WineTest reruns</label> "); if (!$subpage or $subpage eq "-tb-win") -- 2.30.2

1 0

[tools] testbot/cgi: Tweak the CollectionBlock master columns iterations.
by Francois Gouget 06 Jun '22

06 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 336c7cd05..e8156a1bf 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -243,7 +243,7 @@ sub GetDetailsLink($$) my ($MasterColNames, $MasterColValues) = $Row->{Item}->GetMasterCols(); if (defined $MasterColNames) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Row->{DetailsLink} .= "&". $MasterColNames->[$ColIndex] ."=". uri_escape($MasterColValues->[$ColIndex]); @@ -385,7 +385,7 @@ sub GenerateFormStart($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0..scalar @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), @@ -684,7 +684,7 @@ sub OnAction($$) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . "=" . uri_escape($MasterColValues->[$ColIndex]); -- 2.30.2

1 0

[tools] testbot: Simplify building a slash-separated Item identifiers.
by Francois Gouget 06 Jun '22

06 Jun '22

This also fixes the task id in the GetReportNames() error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ testbot/lib/WineTestBot/Steps.pm | 3 +-- testbot/lib/WineTestBot/Tasks.pm | 13 +++++-------- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index ab72ac1b6..af1123aed 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -205,7 +205,7 @@ if (%DeletedVMs) { if (exists $DeletedVMs{$Task->VM->Name}) { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", $Task->GetSlashKey(), "\n"; delete $DeletedVMs{$Task->VM->Name}; last if (!%DeletedVMs); } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 0b1da92a2..39c80cc89 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -350,6 +350,25 @@ sub GetMasterKey($) return (\@MasterColNames, \@MasterColValues); } +=pod +=over 12 + +=item C<GetSlashKey()> + +Returns a string containing all the slash-separated key components. + +This can be used to display the key in the GUI or to build file paths (assuming +the key components can be trusted). + +=back +=cut + +sub GetSlashKey($) +{ + my ($self) = @_; + return join("/", @{$self->GetMasterKey()}); # drops the column names +} + sub ResetModified($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 860dc4920..cd585e9db 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -128,8 +128,7 @@ sub Validate($) sub GetDir($) { my ($self) = @_; - my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/$StepNo"; + return "$DataDir/jobs/". $self->GetSlashKey(); } sub CreateDir($) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 50ce9604a..8c9f89ce8 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -91,8 +91,7 @@ sub InitializeNew($$) sub GetDir($) { my ($self) = @_; - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; + return "$DataDir/jobs/". $self->GetSlashKey(); } sub CreateDir($) @@ -118,13 +117,11 @@ sub GetReportNames($) return ($ErrMessage, undef, undef) if (defined $ErrMessage); if (!@$Missions) { - my @TaskKey = $self->GetMasterKey(); - return ("Task @TaskKey has no mission", undef, undef); + return ("Task ". $self->GetSlashKey() ." has no mission", undef, undef); } if (@$Missions > 1) { - my @TaskKey = $self->GetMasterKey(); - return ("Task @TaskKey should not have missions for multiple tasks\n", undef); + return ("Task ". $self->GetSlashKey() ." should not have missions for multiple tasks\n", undef); } my $TaskMissions = $Missions->[0]; @@ -277,7 +274,6 @@ sub UpdateStatus($$) if ($Status eq "running" and ($VM->Status ne "running" or !$VM->HasRunningChild())) { - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); if (open TASKLOG, ">>", "$TaskDir/testbot.log") @@ -288,7 +284,8 @@ sub UpdateStatus($$) umask($OldUMask); require WineTestBot::Log; - WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); + WineTestBot::Log::LogMsg("Child process for task ", $self->GetSlashKey(), + " died unexpectedly\n"); # A crash probably indicates a bug in the task script but getting stuck # could happen due to network issues. So requeue the task like its script -- 2.30.2

1 0

[tools] testbot/orm: Simplify CombineKey() and SplitKey() a bit.
by Francois Gouget 06 Jun '22

06 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 63d470bbc..1a48eec35 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -462,18 +462,14 @@ sub IsEmpty($) sub CombineKey($@) { - my $self = shift; - - my $CombinedKey = join("#@#", @_); - return $CombinedKey; + my $_self = shift; + return join("#@#", @_); } sub SplitKey($$) { - my ($self, $CombinedKey) = @_; - - my @KeyComponents = split /#@#/, $CombinedKey; - return @KeyComponents; + my ($_self, $CombinedKey) = @_; + return split /#@#/, $CombinedKey; } =pod -- 2.30.2

1 0

[tools] testbot: Access the master columns directly instead of going through GetMasterKey().
by Francois Gouget 06 Jun '22

06 Jun '22

We now have read-only access to them. This makes the code more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Steps.pm | 5 ++--- testbot/lib/WineTestBot/StepsTasks.pm | 6 ++---- testbot/lib/WineTestBot/Tasks.pm | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index cd585e9db..48d020949 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -153,9 +153,8 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; - foreach my $StepNo ($StepNo, $self->PreviousNo) + my $Path = "$DataDir/jobs/". $self->JobId ."/"; + foreach my $StepNo ($self->No, $self->PreviousNo) { next if (!$StepNo); my $Full = "$Path$StepNo/$FileName"; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 0b1655a37..5970c872e 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -37,8 +37,7 @@ use WineTestBot::Missions; sub GetStepDir($) { my ($self) = @_; - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/". $self->StepNo; + return "$DataDir/jobs/". $self->JobId ."/". $self->StepNo; } # Keep in sync with WineTestBot::Step::GetFullFileName() @@ -49,8 +48,7 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; + my $Path = "$DataDir/jobs/". $self->JobId ."/"; foreach my $StepNo ($self->StepNo, $self->PreviousNo) { next if (!$StepNo); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 8c9f89ce8..a7d9e820e 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -139,8 +139,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - my ($JobId, $_StepNo, $_TaskNo) = @{$self->GetMasterKey()}; - return sprintf("%s-job%06d-%s", $self->VM->Name, $JobId, $ReportName); + return sprintf("%s-job%06d-%s", $self->VM->Name, $self->JobId, $ReportName); } sub GetRefReportPaths($$;$$) @@ -237,13 +236,12 @@ sub Run($$) { my ($self, $Step) = @_; - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $Script = $Step->Type eq "reconfig" ? "Reconfig" : $self->VM->Type eq "wine" ? "WineTest" : $Step->Type eq "build" ? "Build" : "Task"; my $Args = ["$BinDir/${ProjectName}Run$Script.pl", "--log-only", - $JobId, $StepNo, $TaskNo]; + $self->JobId, $self->StepNo, $self->No]; my $ErrMessage = $self->VM->Run("running", $Args, $self->Timeout + $TimeoutMargin, -- 2.30.2

1 0

[tools] testbot: Slightly simplify $Job->Restart().
by Francois Gouget 06 Jun '22

06 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 778a0f4df..1eb7bb7eb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -417,11 +417,9 @@ sub Restart($) return "This job is already " . $self->Status; } - my $Steps = $self->Steps; - foreach my $Step (@{$Steps->GetSortedItems()}) + foreach my $Step (@{$self->Steps->GetSortedItems()}) { - my $Tasks = $Step->Tasks; - foreach my $Task (@{$Tasks->GetItems()}) + foreach my $Task (@{$Step->Tasks->GetItems()}) { $Task->Status("queued"); $Task->Started(undef); -- 2.30.2

1 0