wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Hans Leidekker : kerberos: Implement SpMakeSignature.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: 9a8df0050334e5a0a4e569f6794be436e9d56961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a8df0050334e5a0a4e569f6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 25 11:33:26 2018 +0800 kerberos: Implement SpMakeSignature. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index dcf3386..451e085 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); @@ -214,6 +215,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) @@ -736,11 +738,52 @@ static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTION return STATUS_SUCCESS; } +static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + message->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ - NULL, /* SpMakeSignature */ + kerberos_SpMakeSignature, NULL, /* SpVerifySignature */ NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */

1 0

Dmitry Timoshkov : kerberos: Add SpInstanceInit stub.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: ea9e8c54d67776e02a3a15cdde87f85d4aa83981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9e8c54d67776e02a3a15cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 25 11:33:11 2018 +0800 kerberos: Add SpInstanceInit stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 4667205..dcf3386 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -729,9 +729,16 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } +static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) +{ + FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + + return STATUS_SUCCESS; +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { - NULL, /* SpInstanceInit */ + kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ NULL, /* SpMakeSignature */ NULL, /* SpVerifySignature */

1 0

Dmitry Timoshkov : kerberos: Add SpUserModeInitialize implementation.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: 83ea13d6d796166d68668139f7e635f1615173f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83ea13d6d796166d68668139… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 25 11:33:05 2018 +0800 kerberos: Add SpUserModeInitialize implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/kerberos.spec | 2 +- dlls/kerberos/krb5_ap.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/kerberos.spec b/dlls/kerberos/kerberos.spec index c41b830..7f765b1 100644 --- a/dlls/kerberos/kerberos.spec +++ b/dlls/kerberos/kerberos.spec @@ -1,7 +1,7 @@ 1 stub SpInitialize 2 stub KerbDomainChangeCallback 3 stdcall SpLsaModeInitialize(long ptr ptr ptr) -4 stub SpUserModeInitialize +4 stdcall SpUserModeInitialize(long ptr ptr ptr) 32 stub SpInstanceInit @ stdcall -private DllMain(long long ptr) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ca4bf0a..4667205 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -728,3 +728,33 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } + +static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = +{ + NULL, /* SpInstanceInit */ + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, + PSECPKG_USER_FUNCTION_TABLE *table, PULONG table_count) +{ + TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &kerberos_user_table; + *table_count = 1; + + return STATUS_SUCCESS; +}

1 0

Hans Leidekker : kerberos: Implement SpQueryContextAttributes.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: 301419ed2156f106702ff9f5b9873adf8cae27a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=301419ed2156f106702ff9f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 25 11:32:52 2018 +0800 kerberos: Implement SpQueryContextAttributes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b467119..ca4bf0a 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -67,6 +67,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(kerberos); | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) +static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; +static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static const SecPkgInfoW infoW = +{ + KERBEROS_CAPS, + 1, + RPC_C_AUTHN_GSS_KERBEROS, + KERBEROS_MAX_BUF, + kerberos_name_W, + kerberos_comment_W +}; + static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; @@ -158,18 +170,6 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { - static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; - static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; - static const SecPkgInfoW infoW = - { - KERBEROS_CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W - }; - TRACE("%p\n", info); /* LSA will make a copy before forwarding the structure, so @@ -608,6 +608,52 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) #endif } +static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) +{ + TRACE( "(%lx %u %p)\n", context, attribute, buffer ); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buffer; + sizes->cbMaxToken = KERBEROS_MAX_BUF; + sizes->cbMaxSignature = 37; + sizes->cbBlockSize = 1; + sizes->cbSecurityTrailer = 49; + return SEC_E_OK; + } + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buffer; + info->PackageInfo = (SecPkgInfoW *)&infoW; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -657,7 +703,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ - NULL, /* SpQueryContextAttributes */ + kerberos_SpQueryContextAttributes, NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */

1 0

Huw Davies : ole32: Allow caching of icon aspects for static class caches.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: c140cf115b876321242497757612905303d5ea7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c140cf115b87632124249775… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 25 11:04:30 2018 +0000 ole32: Allow caching of icon aspects for static class caches. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c07633d..325a98b 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2398,7 +2398,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - if (This->clsid_static) return DV_E_FORMATETC; + if (This->clsid_static && fmt_cpy.dwAspect != DVASPECT_ICON) return DV_E_FORMATETC; hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 1a4fce5..3bd4acc 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2441,13 +2441,24 @@ static void test_data_cache_cache(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( FAILED(hr), "got %08x\n", hr ); + fmt.dwAspect = DVASPECT_DOCPRINT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + /* try caching another clip format */ - fmt.dwAspect = DVASPECT_CONTENT; fmt.cfFormat = CF_METAFILEPICT; + fmt.dwAspect = DVASPECT_CONTENT; fmt.tymed = TYMED_MFPICT; hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( FAILED(hr), "got %08x\n", hr ); + /* As an exception, it's possible to add an icon aspect */ + fmt.cfFormat = CF_METAFILEPICT; + fmt.dwAspect = DVASPECT_ICON; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + IOleCache2_Release( cache ); }

1 0

Francois Gouget : testbot/Janitor: Use filters to get old Jobs, Patches and RecordGroups.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: tools Branch: master Commit: de408a9199fbfd97dffcbae7ada3c1e97c60e044 URL: https://source.winehq.org/git/tools.git/?a=commit;h=de408a9199fbfd97dffcbae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 25 03:44:03 2018 +0100 testbot/Janitor: Use filters to get old Jobs, Patches and RecordGroups. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 0f126e8..382408d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -57,19 +57,16 @@ delete $ENV{ENV}; # Delete obsolete Jobs if ($JobPurgeDays != 0) { - my $DeleteBefore = time() - $JobPurgeDays * 86400; my $Jobs = CreateJobs(); + $Jobs->AddFilter("Submitted", [time() - $JobPurgeDays * 86400], "<"); foreach my $Job (@{$Jobs->GetItems()}) { - if ($Job->Submitted < $DeleteBefore) + LogMsg "Deleting job ", $Job->Id, "\n"; + $Job->RmTree(); + my $ErrMessage = $Jobs->DeleteItem($Job); + if (defined($ErrMessage)) { - LogMsg "Deleting job ", $Job->Id, "\n"; - $Job->RmTree(); - my $ErrMessage = $Jobs->DeleteItem($Job); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } @@ -102,23 +99,20 @@ foreach my $Set (@{$Sets->GetItems()}) # Delete obsolete Patches now that no Job references them if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $JobPurgeDays * 86400; my $Patches = CreatePatches(); + $Patches->AddFilter("Received", [time() - $JobPurgeDays * 86400], "<"); foreach my $Patch (@{$Patches->GetItems()}) { - if ($Patch->Received < $DeleteBefore) + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Patch", [$Patch]); + if ($Jobs->IsEmpty()) { - my $Jobs = CreateJobs(); - $Jobs->AddFilter("Patch", [$Patch]); - if ($Jobs->IsEmpty()) + LogMsg "Deleting patch ", $Patch->Id, "\n"; + unlink("$DataDir/patches/" . $Patch->Id); + my $ErrMessage = $Patches->DeleteItem($Patch); + if (defined($ErrMessage)) { - LogMsg "Deleting patch ", $Patch->Id, "\n"; - unlink("$DataDir/patches/" . $Patch->Id); - my $ErrMessage = $Patches->DeleteItem($Patch); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } @@ -270,17 +264,14 @@ else # Delete obsolete record groups if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $JobPurgeDays * 86400; my $RecordGroups = CreateRecordGroups(); + $RecordGroups->AddFilter("Timestamp", [time() - $JobPurgeDays * 86400], "<"); foreach my $RecordGroup (@{$RecordGroups->GetItems()}) { - if ($RecordGroup->Timestamp < $DeleteBefore) + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + if (defined($ErrMessage)) { - my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } }

1 0

Francois Gouget : testbot: Link statistics to the corresponding activity page row.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: tools Branch: master Commit: 69b93426e810e20a36c95c98de83f9069fd79521 URL: https://source.winehq.org/git/tools.git/?a=commit;h=69b93426e810e20a36c95c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 25 03:43:38 2018 +0100 testbot: Link statistics to the corresponding activity page row. More specifically, this makes it possible to see where the maximum revert times and others come from, and what else was happening at that time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 25 ++++++++++++++----------- testbot/web/Activity.pl | 3 ++- testbot/web/Stats.pl | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index fb2cee5..2c21d9f 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -51,6 +51,7 @@ Each entry contains a structure grouping all the state and event information for the specified timestamp. Entries have the following structure: { + id => <RecordGroupId>, start => <StartTimestamp>, end => <EndTimestamp>, runnable => <RunnableTasksCount>, @@ -105,7 +106,8 @@ sub GetActivity($;$) $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { - my $Group = { start => $RecordGroup->Timestamp }; + my $Group = { id => $RecordGroup->Id, + start => $RecordGroup->Timestamp }; $ActivityHash->{$RecordGroup->Id} = $Group; push @$Activity, $Group; $MinId = $RecordGroup->Id if (!defined $MinId or $RecordGroup->Id < $MinId); @@ -305,9 +307,9 @@ sub GetActivity($;$) return ($Activity, $Counters); } -sub _AddFullStat($$$;$) +sub _AddFullStat($$$$;$) { - my ($Stats, $StatKey, $Value, $Source) = @_; + my ($Stats, $StatKey, $Value, $GroupId, $Source) = @_; $Stats->{"$StatKey.count"}++; $Stats->{$StatKey} += $Value; @@ -315,6 +317,7 @@ sub _AddFullStat($$$;$) if (!exists $Stats->{$MaxKey} or $Stats->{$MaxKey} < $Value) { $Stats->{$MaxKey} = $Value; + $Stats->{"$MaxKey.groupid"} = $GroupId if (defined $GroupId); $Stats->{"$MaxKey.source"} = $Source if ($Source); } } @@ -346,7 +349,7 @@ sub GetStatistics($) $Task->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Task->Ended - $Task->Started; - _AddFullStat($GlobalStats, "$StepType.time", $Time, $Task); + _AddFullStat($GlobalStats, "$StepType.time", $Time, undef, $Task); } if ($IsSpecialJob) { @@ -354,11 +357,11 @@ sub GetStatistics($) if (-f $ReportFileName) { my $ReportSize = -s $ReportFileName; - _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, $Task); + _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, undef, $Task); if ($VMs->ItemExists($Task->VM->GetKey())) { my $VMStats = ($VMsStats->{items}->{$Task->VM->Name} ||= {}); - _AddFullStat($VMStats, "report.size", $ReportSize, $Task); + _AddFullStat($VMStats, "report.size", $ReportSize, undef, $Task); } } } @@ -369,7 +372,7 @@ sub GetStatistics($) $Job->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Job->Ended - $Job->Submitted; - _AddFullStat($GlobalStats, "jobs.time", $Time, $Job); + _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; if (!exists $GlobalStats->{start} or $GlobalStats->{start} > $Job->Submitted) @@ -421,8 +424,8 @@ sub GetStatistics($) my $Status = $VMStatus->{status}; my $Time = $VMStatus->{end} - $VMStatus->{start}; - _AddFullStat($VMStats, "$Status.time", $Time); - _AddFullStat($HostStats, "$Status.time", $Time); + _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); + _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/) { $VMStats->{"busy.elapsed"} += $Time; @@ -439,8 +442,8 @@ sub GetStatistics($) $VMStatus->{result} eq "failed")) { my $StepType = $VMStatus->{step}->Type; - _AddFullStat($VMStats, "$StepType.time", $Time, $VMStatus->{task}); - _AddFullStat($HostStats, "$StepType.time", $Time, $VMStatus->{task}); + _AddFullStat($VMStats, "$StepType.time", $Time, $Group->{id}, $VMStatus->{task}); + _AddFullStat($HostStats, "$StepType.time", $Time, $Group->{id}, $VMStatus->{task}); } } diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 0b92299..6ca3199 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -153,7 +153,8 @@ EOF my $Group = $Activity->[$Index]; next if (!$Group->{statusvms}); - print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>"; + my $GroupId = $Group->{id}; + print "<tr><td id='g$GroupId'>", _GetHtmlTime($Group->{start}), "</td>"; if ($Group->{engine}) { print "<td class='Record RecordEngine'>$Group->{engine}</td>\n"; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index d9f4381..d9a3ce5 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -140,16 +140,23 @@ sub _GetStatHtml($$;$$) my ($Stats, $StatKey, $AllStats, $Flags) = @_; my $Value = _GetStatStr($Stats, $StatKey, $AllStats, $Flags); - return $Value if (!$Stats->{"$StatKey.source"}); my $SrcObj = $Stats->{"$StatKey.source"}; - my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); - if (defined $TaskNo) + if ($SrcObj) { - my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); - return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); + if (defined $TaskNo) + { + my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); + return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + } + return "<a href='/index.pl#job$JobId'>$Value</a>"; } - return "<a href='/index.pl#job$JobId'>$Value</a>"; + + my $GroupId = $Stats->{"$StatKey.groupid"}; + return "<a href='/Activity.pl?Hours=0#g$GroupId'>$Value</a>" if ($GroupId); + + return $Value; } sub _GenGlobalLine($$$;$$)

1 0

Józef Kucia : libs/vkd3d-shader: Use GLSL.std450 NMin , NMax and NClamp opcodes.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: vkd3d Branch: master Commit: b1fc5039c8231e0d3c98e7772a2cc8df81f8c213 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b1fc5039c8231e0d3c98e77… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 25 12:04:27 2018 +0100 libs/vkd3d-shader: Use GLSL.std450 NMin, NMax and NClamp opcodes. This reverts commit 70f5b24f92f5ae2270f37c6f7f519c4c3f26aec0. The bug is fixed in Nvidia drivers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 50803af..d92b7b1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1423,9 +1423,8 @@ static uint32_t vkd3d_spirv_build_op_glsl_std450_nclamp(struct vkd3d_spirv_build { uint32_t glsl_std450_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); uint32_t operands[] = {x, min, max}; - /* XXX: We would prefer to use NClamp but NClamp crashes the Nvidia driver. */ return vkd3d_spirv_build_op_ext_inst(builder, result_type, glsl_std450_id, - GLSLstd450FClamp, operands, ARRAY_SIZE(operands)); + GLSLstd450NClamp, operands, ARRAY_SIZE(operands)); } static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, @@ -3733,11 +3732,8 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( {VKD3DSIH_IMIN, GLSLstd450SMin}, {VKD3DSIH_LOG, GLSLstd450Log2}, {VKD3DSIH_MAD, GLSLstd450Fma}, - /* XXX: We would prefer to use NMax/NMin but these opcodes lead to - * a crash in the Nvidia driver. - */ - {VKD3DSIH_MAX, GLSLstd450FMax}, - {VKD3DSIH_MIN, GLSLstd450FMin}, + {VKD3DSIH_MAX, GLSLstd450NMax}, + {VKD3DSIH_MIN, GLSLstd450NMin}, {VKD3DSIH_ROUND_NI, GLSLstd450Floor}, {VKD3DSIH_ROUND_PI, GLSLstd450Ceil}, {VKD3DSIH_ROUND_Z, GLSLstd450Trunc},

1 0

Józef Kucia : libs/vkd3d-shader: Adjust barrier emission.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: vkd3d Branch: master Commit: daebeb3e1169f9779ea629d6db40794e48bb0b9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=daebeb3e1169f9779ea629d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 25 12:04:26 2018 +0100 libs/vkd3d-shader: Adjust barrier emission. Aligns with glsang changes which are based on Khronos recommendations. https://github.com/KhronosGroup/glslang/commit/8297936dd6eb32163991899c31dd… https://github.com/KhronosGroup/glslang/commit/838d7afc61c0f5909514c20cd0ed… https://github.com/KhronosGroup/glslang/commit/2505057af8f446981afc63768a97… Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 202c18d..50803af 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5393,7 +5393,9 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, unsigned int flags = instruction->flags; SpvScope execution_scope = SpvScopeMax; SpvScope memory_scope = SpvScopeDevice; - unsigned int memory_semantics = 0; + unsigned int memory_semantics; + + memory_semantics = SpvMemorySemanticsAcquireReleaseMask; if (flags & VKD3DSSF_GROUP_SHARED_MEMORY) { @@ -5413,8 +5415,7 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, FIXME("Unhandled sync flags %#x.\n", flags); memory_scope = SpvScopeDevice; execution_scope = SpvScopeWorkgroup; - memory_semantics |= SpvMemorySemanticsSequentiallyConsistentMask - | SpvMemorySemanticsUniformMemoryMask + memory_semantics |= SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsSubgroupMemoryMask | SpvMemorySemanticsWorkgroupMemoryMask | SpvMemorySemanticsCrossWorkgroupMemoryMask

1 0

Józef Kucia : dxgi/tests: Fix crash in test_output_desc().
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: f65f1a939aaace9d65ddba90c29f5c8a3b9f7413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65f1a939aaace9d65ddba90… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 18:15:19 2018 +0100 dxgi/tests: Fix crash in test_output_desc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 714798f..f7b3ba0 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3343,8 +3343,6 @@ static void test_output_desc(void) refcount = get_refcount((IUnknown *)output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); - hr = IDXGIOutput_GetDesc(output, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for output %u on adapter %u.\n", hr, j, i); hr = IDXGIOutput_GetDesc(output, &desc); ok(SUCCEEDED(hr), "Failed to get desc for output %u on adapter %u, hr %#x.\n", j, i, hr);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
64
Older →

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-commits January 2018