January 2018 - Wine-commits

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

25 Jan '18

Module: wine Branch: master Commit: c4e12ca71edd091c2c0e68af08bf9d7cb044a2ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e12ca71edd091c2c0e68af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 25 11:33:44 2018 +0800 kerberos: Implement SpSealMessage. 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 | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 43bbbae..75003cc 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -194,8 +194,10 @@ MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); +MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); MAKE_FUNCPTR(gss_verify_mic); +MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,8 +223,10 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) + LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) LOAD_FUNCPTR(gss_verify_mic) + LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR return TRUE; @@ -815,13 +819,69 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont #endif } +static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) + { + FIXME( "flags %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + 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; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[3].buffer.length = 0; + iov[3].buffer.value = NULL; + + ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); + message->pBuffers[token_idx].cbBuffer = iov[3].buffer.length; + pgss_release_iov_buffer( &minor_status, iov, 4 ); + } + + 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 */ kerberos_SpMakeSignature, kerberos_SpVerifySignature, - NULL, /* SpSealMessage */ + kerberos_SpSealMessage, NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */

1 0

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

25 Jan '18

Module: wine Branch: master Commit: 7919b53a30aa0e5b6655cc23e65e520a5c33a93d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7919b53a30aa0e5b6655cc23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 25 11:33:48 2018 +0800 kerberos: Implement SpUnsealMessage. 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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 75003cc..ba89806 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -196,6 +196,7 @@ MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_unwrap_iov); MAKE_FUNCPTR(gss_verify_mic); MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR @@ -225,6 +226,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_unwrap_iov) LOAD_FUNCPTR(gss_verify_mic) LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR @@ -875,6 +877,52 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual #endif } +static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, 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 ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER; + iov[3].buffer.length = message->pBuffers[token_idx].cbBuffer; + iov[3].buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_unwrap_iov( &minor_status, ctxt_handle, &conf_state, NULL, iov, 4 ); + TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + + return status_gss_to_sspi( ret ); + +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, @@ -882,7 +930,7 @@ static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = kerberos_SpMakeSignature, kerberos_SpVerifySignature, kerberos_SpSealMessage, - NULL, /* SpUnsealMessage */ + kerberos_SpUnsealMessage, NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ NULL, /* SpCompleteAuthToken */

1 0

Dmitry Timoshkov : kerberos: Don' t fail InitializeSecurityContext if there are unsupported flags.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: 1cf6624f91a5e05da673f040449abfdd204d6cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf6624f91a5e05da673f040… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 25 11:34:08 2018 +0800 kerberos: Don't fail InitializeSecurityContext if there are unsupported flags. 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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ba89806..2d3b601 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -471,10 +471,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, mapped_context, context_data ); if (context_req & ~supported) - { FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); - return SEC_E_UNSUPPORTED_FUNCTION; - } if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; cred_handle = credhandle_sspi_to_gss( credential );

1 0

Kimmo Myllyvirta : dxgi: Add stub implementation for DXGI_PRESENT_TEST.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: 89a50c8e0e2d18688dc6a4a2b7d578acaf294d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a50c8e0e2d18688dc6a4a2… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Thu Jan 25 10:33:26 2018 +0100 dxgi: Add stub implementation for DXGI_PRESENT_TEST. 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/swapchain.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8e7dccb..2983ec5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -532,10 +532,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present1(IDXGISwapChain1 *iface, TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + if (sync_interval) FIXME("Unimplemented sync interval %u.\n", sync_interval); - if (flags) - FIXME("Unimplemented flags %#x.\n", flags); if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters);

1 0

Józef Kucia : wined3d: Add buffer usage to wined3d_swapchain_desc.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: 4701425f3c9f5c62a06b631227e7be8717cc9461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4701425f3c9f5c62a06b6312… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 25 10:33:27 2018 +0100 wined3d: Add buffer usage to wined3d_swapchain_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/d3d8/device.c | 1 + dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 1 + dlls/dxgi/factory.c | 1 + dlls/wined3d/device.c | 3 +++ dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.h | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 506961a..e7577d7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -207,6 +207,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); swapchain_desc->backbuffer_count = max(1, present_parameters->BackBufferCount); + swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = 0; /* d3d9 only */ swapchain_desc->swap_effect = present_parameters->SwapEffect; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 51b4896..0a76227 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -229,6 +229,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); swapchain_desc->backbuffer_count = max(1, present_parameters->BackBufferCount); + swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; swapchain_desc->swap_effect = present_parameters->SwapEffect; @@ -817,7 +818,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, struct wined3d_display_mode wined3d_mode; HRESULT hr; - if (!extended && device->device_state == D3D9_DEVICE_STATE_LOST) { WARN("App not active, returning D3DERR_DEVICELOST.\n"); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 27be401..5d1db80 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -630,6 +630,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; + swapchain_desc.backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; swapchain_desc.device_window = window; swapchain_desc.windowed = windowed; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index f38d67c..0020917 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -313,6 +313,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor wined3d_desc.backbuffer_height = swapchain_desc->Height; wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; + wined3d_desc.backbuffer_usage = WINED3DUSAGE_RENDERTARGET; wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a25b98d..5bd8804 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4732,6 +4732,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("swap_interval %u\n", swapchain_desc->swap_interval); TRACE("auto_restore_display_mode %#x\n", swapchain_desc->auto_restore_display_mode); + if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) + FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); + /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd3655f..f739313 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -920,7 +920,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } - texture_desc.usage |= WINED3DUSAGE_RENDERTARGET; + texture_desc.usage = swapchain->desc.backbuffer_usage; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a519e94..8c27492 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1712,6 +1712,7 @@ struct wined3d_swapchain_desc UINT backbuffer_height; enum wined3d_format_id backbuffer_format; UINT backbuffer_count; + DWORD backbuffer_usage; enum wined3d_multisample_type multisample_type; DWORD multisample_quality; enum wined3d_swap_effect swap_effect;

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

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

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 : 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

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 213bd4cffaef2fc255398d915aea71808e54d196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=213bd4cffaef2fc255398d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 24 21:30:18 2018 +0100 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/opengl_ext.c | 44 ++++++++++++++++++++++---------------------- dlls/opengl32/opengl_norm.c | 4 ++-- include/wine/wgl.h | 9 +++++++++ include/wine/wgl_driver.h | 6 +++--- 4 files changed, 36 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=213bd4cffaef2fc25539…

1 0