wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Henri Verbeet : d3d8: Use the global memory allocation helpers.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 4b08687757bf036f45aa18e41c6b72345f089d7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b08687757bf036f45aa18e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:51 2018 +0330 d3d8: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 +-- dlls/d3d8/d3d8_main.c | 4 +-- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 82 +++++++++++++++++++------------------------ dlls/d3d8/directx.c | 7 ++-- dlls/d3d8/shader.c | 9 +++-- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 6 ++-- dlls/d3d8/texture.c | 2 +- dlls/d3d8/vertexdeclaration.c | 15 ++++---- dlls/d3d8/volume.c | 2 +- 11 files changed, 61 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b08687757bf036f45aa…

1 0

Henri Verbeet : d3d9: Use wined3d_buffer_create() in vertexbuffer_init().
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 6187de0143d4f27fad330ada8be1196bbda1d654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6187de0143d4f27fad330ada… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:50 2018 +0330 d3d9: Use wined3d_buffer_create() in vertexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 795164c..30e86f8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -274,25 +274,29 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, UINT size, UINT usage, DWORD fvf, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; d3d9_resource_init(&buffer->resource); + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_vertex_buffer().
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 74490bd9c67a53efcfc3083506b5d52a1d7a01eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=74490bd9c67a53efcfc30835… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:49 2018 +0330 d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_vertex_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 590ab45..3ce0460 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2108,15 +2108,22 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; }

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in vertexbuffer_init().
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 5fc8b43c8a2da3408ecdc3010d53c3b6b521ea04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc8b43c8a2da3408ecdc301… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:48 2018 +0330 d3d8: Use wined3d_buffer_create() in vertexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 10ba302..14a2fb6 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -273,25 +273,29 @@ static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer().
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 0b92a6fba7a6e60c6ff1a3729a3b21019c2df0ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b92a6fba7a6e60c6ff1a372… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:47 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 6a9544b..df8531d 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -115,22 +115,24 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer *buffer, BOOL dynamic, struct wined3d_buffer **wined3d_buffer) { - DWORD usage = WINED3DUSAGE_STATICDECL; - enum wined3d_pool pool; - - if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) - pool = WINED3D_POOL_SYSTEM_MEM; - else - pool = WINED3D_POOL_DEFAULT; + struct wined3d_buffer_desc desc; + desc.byte_width = buffer->size; + desc.usage = WINED3DUSAGE_STATICDECL; if (buffer->Caps & D3DVBCAPS_WRITEONLY) - usage |= WINED3DUSAGE_WRITEONLY; + desc.usage |= WINED3DUSAGE_WRITEONLY; if (dynamic) - usage |= WINED3DUSAGE_DYNAMIC; + desc.usage |= WINED3DUSAGE_DYNAMIC; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + else + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device, - buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops, - wined3d_buffer); + return wined3d_buffer_create(buffer->ddraw->wined3d_device, &desc, + NULL, buffer, &ddraw_null_wined3d_parent_ops, wined3d_buffer); } /*****************************************************************************

1 0

Józef Kucia : libs/vkd3d: Add remaining helper functions for CPU descriptor handles.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: vkd3d Branch: master Commit: dd6dedd9d199bb0c03e9fd34ded813a422838861 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dd6dedd9d199bb0c03e9fd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 7 21:27:09 2018 +0100 libs/vkd3d: Add remaining helper functions for CPU descriptor handles. 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/command.c | 8 ++++---- libs/vkd3d/device.c | 12 ++++++------ libs/vkd3d/vkd3d_private.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3b7d2ee..4273a66 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3390,7 +3390,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_height = 0; for (i = 0; i < render_target_descriptor_count; ++i) { - const struct d3d12_rtv_desc *rtv_desc = (const struct d3d12_rtv_desc *)render_target_descriptors[i].ptr; + const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -3403,7 +3403,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - const struct d3d12_dsv_desc *dsv_desc = (const struct d3d12_dsv_desc *)depth_stencil_descriptor->ptr; + const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor); d3d12_command_list_track_resource_usage(list, dsv_desc->resource); @@ -3523,7 +3523,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra { const union VkClearValue clear_value = {.depthStencil = {depth, stencil}}; struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - struct d3d12_dsv_desc *dsv_desc = (struct d3d12_dsv_desc *)dsv.ptr; + const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(dsv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference ds_reference; @@ -3570,7 +3570,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra { const union VkClearValue clear_value = {{{color[0], color[1], color[2], color[3]}}}; struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - struct d3d12_rtv_desc *rtv_desc = (struct d3d12_rtv_desc *)rtv.ptr; + const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(rtv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference color_reference; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 31fee8a..54b3d0e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1605,7 +1605,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device { TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); - d3d12_desc_create_cbv((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_cbv(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), desc); } @@ -1616,7 +1616,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_desc_create_srv((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_srv(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1627,7 +1627,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Devic TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n", iface, resource, counter_resource, desc, descriptor.ptr); - d3d12_desc_create_uav((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_uav(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), unsafe_impl_from_ID3D12Resource(counter_resource), desc); } @@ -1639,7 +1639,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device * TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_rtv_desc_create_rtv((struct d3d12_rtv_desc *)descriptor.ptr, + d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1650,7 +1650,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device * TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_dsv_desc_create_dsv((struct d3d12_dsv_desc *)descriptor.ptr, + d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1659,7 +1659,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device *iface, { TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); - d3d12_desc_create_sampler((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_sampler(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), desc); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f222871..89e4f23 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -286,6 +286,11 @@ struct d3d12_rtv_desc struct d3d12_resource *resource; }; +static inline struct d3d12_rtv_desc *d3d12_rtv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) +{ + return (struct d3d12_rtv_desc *)cpu_handle.ptr; +} + void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; @@ -299,6 +304,11 @@ struct d3d12_dsv_desc struct d3d12_resource *resource; }; +static inline struct d3d12_dsv_desc *d3d12_dsv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) +{ + return (struct d3d12_dsv_desc *)cpu_handle.ptr; +} + void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot: Don' t include incomplete VM operations in statistics.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: tools Branch: master Commit: 31ba0abf4f232c8dd174824c469408634d459ba4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=31ba0abf4f232c8dd174824… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 8 12:10:03 2018 +0100 testbot: Don't include incomplete VM operations in statistics. Including a revert operation that started a couple of seconds ago but has not yet completed in the average revert time would distort the result (particularly if restricting the analysis to the recent past). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index c04a1e4..5122dc3 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -311,6 +311,7 @@ sub GetActivity($;$) my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name}; next if (!$LastVMStatus); $LastVMStatus->{end} = $Counters->{now}; + $LastVMStatus->{ongoing} = 1; if ($LastVMStatus->{status} eq "unknown") { $LastVMStatus->{status} = $VM->Status; @@ -422,8 +423,11 @@ sub GetStatistics($) my $Status = $VMStatus->{status}; my $Time = $VMStatus->{end} - $VMStatus->{start}; - _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); - _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); + if (!$VMStatus->{ongoing}) + { + _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); + _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); + } if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/) { $VMStats->{"busy.elapsed"} += $Time;

1 0

Francois Gouget : testbot: Fix the duration of some VM operations.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: tools Branch: master Commit: 0d8799b58d9d22eaa4ee48c474d5fc7949b0f36a URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d8799b58d9d22eaa4ee48c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 8 12:09:53 2018 +0100 testbot: Fix the duration of some VM operations. Sometimes a RecordGroup containing VM status information is followed by a RecordGroup containing only VM result information. This typically happens when a VM is running a task which ends in the 'boterror' state. However this VM result RecordGroup does not mean the VM is no longer in the 'running' state so it should not be used to set the previous group's 'end' time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5d8ee5f..c04a1e4 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -226,19 +226,25 @@ sub GetActivity($;$) { my $StatusVMs = $Group->{statusvms}; my $ResultVMs = $Group->{resultvms}; - next if (!$StatusVMs and !$ResultVMs); - if ($LastGroup) + if ($StatusVMs) { - $LastGroup->{end} = $Group->{start}; - foreach my $Counter ('runnable', 'queued') + if ($LastGroup) { - if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) + $LastGroup->{end} = $Group->{start}; + foreach my $Counter ('runnable', 'queued') { - $Group->{$Counter} = $LastGroup->{$Counter}; + if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) + { + $Group->{$Counter} = $LastGroup->{$Counter}; + } } } + $LastGroup = $Group; + } + elsif (!$ResultVMs) + { + next; } - $LastGroup = $Group; foreach my $VM (@{$VMs->GetItems()}) {

1 0

Francois Gouget : testbot: Fix the activity start and end times.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: tools Branch: master Commit: 2939680d831e6fd954a7455faf38c32a9405acec URL: https://source.winehq.org/git/tools.git/?a=commit;h=2939680d831e6fd954a7455… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 8 12:09:44 2018 +0100 testbot: Fix the activity start and end times. Even if the last job completed hours ago, the period covered by the data we have in the jobs table always goes all the way up to now. Also it starts with when the oldest job on record was submitted, whether that job completed successfully or not. Similarly the data in our activity records always covers everything up until the present. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 8c22e01..5d8ee5f 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,11 +43,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub _UpdateMax($$) -{ - $_[0] = $_[1] if (!defined $_[0] or $_[0] < $_[1]); -} - =pod =over 12 @@ -345,6 +340,7 @@ sub GetStatistics($) foreach my $Job (@{$Jobs->GetItems()}) { $GlobalStats->{"jobs.count"}++; + _UpdateMin($GlobalStats->{start}, $Job->Submitted); my $IsSpecialJob; my $Steps = $Job->Steps; @@ -386,9 +382,6 @@ sub GetStatistics($) my $Time = $Job->Ended - $Job->Submitted; _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; - - _UpdateMin($GlobalStats->{start}, $Job->Submitted); - _UpdateMax($GlobalStats->{end}, $Job->Ended); } } @@ -408,7 +401,6 @@ sub GetStatistics($) foreach my $Group (@$Activity) { _UpdateMin($VMsStats->{start}, $Group->{start}); - _UpdateMax($VMsStats->{end}, $Group->{end}); next if (!$Group->{statusvms}); my ($IsGroupBusy, %IsHostBusy); @@ -464,6 +456,9 @@ sub GetStatistics($) $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; } } + + # The end is now! + $GlobalStats->{end} = $VMsStats->{end} = $Counters->{now}; $GlobalStats->{elapsed} = $GlobalStats->{end} - $GlobalStats->{start}; $HostsStats->{elapsed} = $VMsStats->{elapsed} = $VMsStats->{end} - $VMsStats->{start};

1 0

Fabian Maurer : cmd.exe: Parse parameters in "FOR /F" properly.
by Alexandre Julliard 07 Feb '18

07 Feb '18

Module: wine Branch: master Commit: e62000c5c0ba17be6d3c6397e04604407cfb7601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62000c5c0ba17be6d3c6397… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 3 17:13:11 2018 +0100 cmd.exe: Parse parameters in "FOR /F" properly. We must not remove the quotes from parameters, or strings like "param=value" will get parsed incorrectly. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 10 ++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 14961d7..ec66cd5 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1978,7 +1978,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, anyduplicates |= thisduplicate; /* Extract the token number requested and set into the next variable context */ - parm = WCMD_parameter_with_delims(buffer, (nexttoken-1), NULL, FALSE, FALSE, forf_delims); + parm = WCMD_parameter_with_delims(buffer, (nexttoken-1), NULL, TRUE, FALSE, forf_delims); WINE_TRACE("Parsed token %d(%d) as parameter %s\n", nexttoken, varidx + varoffset, wine_dbgstr_w(parm)); if (varidx >=0) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 62334b1..f684628 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1696,6 +1696,16 @@ for /f "tokens=2,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k for /f "tokens=3,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o cd .. rd /s/q foobar +echo ------ parameter splitting +echo forFParameterSplittingFunc "myparam1=myvalue1 myparam2=myparam2" mytest> foo +for /f "tokens=1 delims=;" %%i in (foo) do (call :%%i) +del foo +for /f "tokens=1 delims=;" %%i in ("forFParameterSplittingFunc "myparam1^=myvalue1 myparam2^=myparam2" mytest") do (call :%%i) +goto :forFParameterSplittingEnd +:forFParameterSplittingFunc +echo %~0 %~1 %~2 %~3 %~4 %~5 +goto :eof +:forFParameterSplittingEnd echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 796550e..4663c86 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1222,6 +1222,9 @@ h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o@or_broken@h=%h i=a j=b k=c l=d e f g m h=%h i=a j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=a j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o +------ parameter splitting +:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest@space@@space@@space@ +:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest@space@@space@@space@ ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
81
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 February 2018