February 2018 - Wine-Commits

Henri Verbeet : d3d8: Use wined3d_buffer_create() in vertexbuffer_init().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

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 : d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_vertex_buffer().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

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 : ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

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

Henri Verbeet : d3d9: Use wined3d_buffer_create() in vertexbuffer_init().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

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 the global memory allocation helpers.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

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

Józef Kucia : libs/vkd3d: Add remaining helper functions for CPU descriptor handles.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

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 Feb. 8, 2018

Feb. 8, 2018

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 Feb. 8, 2018

Feb. 8, 2018

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 Feb. 8, 2018

Feb. 8, 2018

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

Jacek Caban : mshtml: Added IHTMLKeyboardEvent:: location property implementation.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: d3cd6a3691a7f976927578201b09a2e9ba904ee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3cd6a3691a7f97692757820… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 16:25:51 2018 +0100 mshtml: Added IHTMLKeyboardEvent::location property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.js | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a46a0cd..ea20baf 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -209,6 +209,7 @@ HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) CASE_VT(VT_I2, INT16, V_I2); \ CASE_VT(VT_UI2, UINT16, V_UI2); \ CASE_VT(VT_I4, INT32, V_I4); \ + CASE_VT(VT_UI4, UINT32, V_UI4); \ CASE_VT(VT_R4, float, V_R4); \ CASE_VT(VT_BSTR, BSTR, V_BSTR); \ CASE_VT(VT_BOOL, VARIANT_BOOL, V_BOOL) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9f115a8..2931318 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1675,8 +1675,17 @@ static HRESULT WINAPI DOMKeyboardEvent_get_key(IDOMKeyboardEvent *iface, BSTR *p static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, ULONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetLocation(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_ctrlKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index bf37b3f..4560d93 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -698,6 +698,7 @@ function test_keyboard_event() { ok(e.altKey === false, "altKey = " + e.altKey); ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); ok(e.metaKey === false, "metaKey = " + e.metaKey); + ok(e.location === 0, "location = " + e.location); ok(e.detail === 0, "detail = " + e.detail); next_test();

1 0

Fabian Maurer : cmd.exe: Parse parameters in "FOR /F" properly.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

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(a)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(a)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(a)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(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o +------ parameter splitting +:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ +:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

Andrey Gusev : cdosys: Add stub dll.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 35af567d0b5459ad6edc25d5a26b020fe0ee2deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=35af567d0b5459ad6edc25d5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 6 15:24:32 2018 +0200 cdosys: Add stub dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/cdosys/Makefile.in | 5 ++++ dlls/cdosys/cdosys.spec | 4 +++ dlls/cdosys/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/configure b/configure index c7c7e40..6b7f7d8 100755 --- a/configure +++ b/configure @@ -1101,6 +1101,7 @@ enable_bthprops_cpl enable_cabinet enable_capi2032 enable_cards +enable_cdosys enable_cfgmgr32 enable_clusapi enable_combase @@ -18541,6 +18542,7 @@ wine_fn_config_dll cabinet enable_cabinet implib wine_fn_config_test dlls/cabinet/tests cabinet_test wine_fn_config_dll capi2032 enable_capi2032 implib wine_fn_config_dll cards enable_cards implib +wine_fn_config_dll cdosys enable_cdosys wine_fn_config_dll cfgmgr32 enable_cfgmgr32 implib wine_fn_config_dll clusapi enable_clusapi implib wine_fn_config_dll combase enable_combase diff --git a/configure.ac b/configure.ac index 23f297b..016b9bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3023,6 +3023,7 @@ WINE_CONFIG_DLL(cabinet,,[implib]) WINE_CONFIG_TEST(dlls/cabinet/tests) WINE_CONFIG_DLL(capi2032,,[implib]) WINE_CONFIG_DLL(cards,,[implib]) +WINE_CONFIG_DLL(cdosys) WINE_CONFIG_DLL(cfgmgr32,,[implib]) WINE_CONFIG_DLL(clusapi,,[implib]) WINE_CONFIG_DLL(combase) diff --git a/dlls/cdosys/Makefile.in b/dlls/cdosys/Makefile.in new file mode 100644 index 0000000..d1ce780 --- /dev/null +++ b/dlls/cdosys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = cdosys.dll +IMPORTS = uuid ole32 + +C_SRCS = \ + main.c diff --git a/dlls/cdosys/cdosys.spec b/dlls/cdosys/cdosys.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/cdosys/cdosys.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/cdosys/main.c b/dlls/cdosys/main.c new file mode 100644 index 0000000..1a9affe --- /dev/null +++ b/dlls/cdosys/main.c @@ -0,0 +1,72 @@ +/* + * Copyright 2018 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cdosys); + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hInstDLL; + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_guid(rclsid), debugstr_guid(riid), obj); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +}

1 0

Aric Stewart : winebus.sys: Implement get_string for linux event devices.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: f6cb73856df7b8f391040cb193c6e7ca0237ffea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6cb73856df7b8f391040cb1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:25 2018 -0600 winebus.sys: Implement get_string for linux event devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 52f5c4f..4e5f80c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -862,7 +862,27 @@ static NTSTATUS lnxev_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, static NTSTATUS lnxev_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - return STATUS_NOT_IMPLEMENTED; + struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); + char str[255]; + + str[0] = 0; + switch (index) + { + case HID_STRING_ID_IPRODUCT: + ioctl(ext->base.device_fd, EVIOCGNAME(sizeof(str)), str); + break; + case HID_STRING_ID_IMANUFACTURER: + strcpy(str,"evdev"); + break; + case HID_STRING_ID_ISERIALNUMBER: + ioctl(ext->base.device_fd, EVIOCGUNIQ(sizeof(str)), str); + break; + default: + ERR("Unhandled string index %i\n", index); + } + + MultiByteToWideChar(CP_ACP, 0, str, -1, buffer, length); + return STATUS_SUCCESS; } static NTSTATUS lnxev_begin_report_processing(DEVICE_OBJECT *device)

1 0

Aric Stewart : winebus.sys: Build device reports for linux event devices.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 890107e3138f328e132b41aa36f9fe094e53e205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=890107e3138f328e132b41aa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:16 2018 -0600 winebus.sys: Build device reports for linux event devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 471 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 469 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=890107e3138f328e132b…

1 0

Aric Stewart : winebus.sys: Handle linux input event device via udev.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 41d46f7461674e7af1013956d76e6c9b0bc05f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41d46f7461674e7af1013956… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:04 2018 -0600 winebus.sys: Handle linux input event device via udev. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 6 ++ dlls/winebus.sys/bus_udev.c | 173 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/main.c | 48 ++++++++++++ 3 files changed, 219 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41d46f7461674e7af101…

1 0

Nikolay Sivov : comctl32/button: Fix dialog code for new button types.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: bf152cb0cc7b3ee73c4a81835761d52de42d90e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf152cb0cc7b3ee73c4a8183… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 7 16:13:09 2018 +0300 comctl32/button: Fix dialog code for new button types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++++ dlls/comctl32/tests/button.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b0eea99..a39a64c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -237,12 +237,16 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_GETDLGCODE: switch(btn_type) { + case BS_COMMANDLINK: case BS_USERBUTTON: case BS_PUSHBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON; + case BS_DEFCOMMANDLINK: case BS_DEFPUSHBUTTON: return DLGC_BUTTON | DLGC_DEFPUSHBUTTON; case BS_RADIOBUTTON: case BS_AUTORADIOBUTTON: return DLGC_BUTTON | DLGC_RADIOBUTTON; case BS_GROUPBOX: return DLGC_STATIC; + case BS_SPLITBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON | DLGC_WANTARROWS; + case BS_DEFSPLITBUTTON: return DLGC_BUTTON | DLGC_DEFPUSHBUTTON | DLGC_WANTARROWS; default: return DLGC_BUTTON; } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 38e55c8..425e145 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -511,6 +511,18 @@ static void test_button_messages(void) { BS_OWNERDRAW, DLGC_BUTTON, setfocus_ownerdraw_seq, killfocus_ownerdraw_seq, setstyle_ownerdraw_seq, setstate_ownerdraw_seq, clearstate_ownerdraw_seq, setcheck_ignored_seq }, + { BS_SPLITBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON | DLGC_WANTARROWS, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_DEFSPLITBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON | DLGC_WANTARROWS, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_COMMANDLINK, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_DEFCOMMANDLINK, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, }; const struct message *seq; unsigned int i; @@ -550,7 +562,15 @@ static void test_button_messages(void) ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); - ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); + if (button[i].style == BS_SPLITBUTTON || + button[i].style == BS_DEFSPLITBUTTON || + button[i].style == BS_COMMANDLINK || + button[i].style == BS_DEFCOMMANDLINK) + { + ok(dlg_code == button[i].dlg_code || broken(dlg_code == DLGC_BUTTON) /* WinXP */, "%u: wrong dlg_code %08x\n", i, dlg_code); + } + else + ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); @@ -650,7 +670,11 @@ static void test_button_messages(void) button[i].style == BS_DEFPUSHBUTTON || button[i].style == BS_GROUPBOX || button[i].style == BS_USERBUTTON || - button[i].style == BS_OWNERDRAW) + button[i].style == BS_OWNERDRAW || + button[i].style == BS_SPLITBUTTON || + button[i].style == BS_DEFSPLITBUTTON || + button[i].style == BS_COMMANDLINK || + button[i].style == BS_DEFCOMMANDLINK) { ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); state = SendMessageA(hwnd, BM_GETCHECK, 0, 0);

1 0

Huw Davies : winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 13fec030e73abe3a54e23288900f6ca528cf6cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13fec030e73abe3a54e23288… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 7 12:47:10 2018 +0000 winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 01a418f..5e5866c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -943,24 +943,32 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output( "\tsubq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 88" ); - output( "\tmovq %%rdx,80(%%rsp)\n" ); - output( "\tmovq %%rcx,72(%%rsp)\n" ); - output( "\tmovq %%r8,64(%%rsp)\n" ); - output( "\tmovq %%r9,56(%%rsp)\n" ); - output( "\tmovq %%r10,48(%%rsp)\n" ); - output( "\tmovq %%r11,40(%%rsp)\n" ); + output( "\tsubq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 0x98" ); + output( "\tmovq %%rdx,0x88(%%rsp)\n" ); + output( "\tmovq %%rcx,0x80(%%rsp)\n" ); + output( "\tmovq %%r8,0x78(%%rsp)\n" ); + output( "\tmovq %%r9,0x70(%%rsp)\n" ); + output( "\tmovq %%r10,0x68(%%rsp)\n" ); + output( "\tmovq %%r11,0x60(%%rsp)\n" ); + output( "\tmovups %%xmm0,0x50(%%rsp)\n" ); + output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); + output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); + output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); output( "\tmovq %%rax,%%rcx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmovq 40(%%rsp),%%r11\n" ); - output( "\tmovq 48(%%rsp),%%r10\n" ); - output( "\tmovq 56(%%rsp),%%r9\n" ); - output( "\tmovq 64(%%rsp),%%r8\n" ); - output( "\tmovq 72(%%rsp),%%rcx\n" ); - output( "\tmovq 80(%%rsp),%%rdx\n" ); - output( "\taddq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -88" ); + output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); + output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); + output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); + output( "\tmovups 0x50(%%rsp),%%xmm0\n" ); + output( "\tmovq 0x60(%%rsp),%%r11\n" ); + output( "\tmovq 0x68(%%rsp),%%r10\n" ); + output( "\tmovq 0x70(%%rsp),%%r9\n" ); + output( "\tmovq 0x78(%%rsp),%%r8\n" ); + output( "\tmovq 0x80(%%rsp),%%rcx\n" ); + output( "\tmovq 0x88(%%rsp),%%rdx\n" ); + output( "\taddq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -0x98" ); output( "\tjmp *%%rax\n" ); break; case CPU_ARM:

1 0

Vladimir Bespalov : winedbg: Fix enum value compilation warning.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 57ccf8221fdabfb90c4117b34478919e21e72858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57ccf8221fdabfb90c4117b3… Author: Vladimir Bespalov <vlad.botanic(a)gmail.com> Date: Fri Feb 2 04:11:26 2018 -0800 winedbg: Fix enum value compilation warning. Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_cpu.h | 2 +- programs/winedbg/gdbproxy.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 889f638..d62b517 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -20,7 +20,7 @@ enum be_cpu_addr {be_cpu_addr_pc, be_cpu_addr_stack, be_cpu_addr_frame}; enum be_xpoint_type {be_xpoint_break, be_xpoint_watch_exec, be_xpoint_watch_read, - be_xpoint_watch_write}; + be_xpoint_watch_write, be_xpoint_free=-1}; struct backend_cpu { const DWORD machine; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 7b9a476..5fa4883 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -74,7 +74,7 @@ struct gdb_ctx_Xpoint { - enum be_xpoint_type type; /* -1 means free */ + enum be_xpoint_type type; /* (-1) == be_xpoint_free means free */ void* addr; unsigned long val; }; @@ -1583,7 +1583,7 @@ static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SI { char *xpt_addr = xpt->addr; - if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + if (xpt->type != be_xpoint_free && xpt_addr >= addr && xpt_addr < addr + blk_len) buffer[xpt_addr - addr] = xpt->val; } } @@ -2192,7 +2192,7 @@ static enum packet_return packet_remove_breakpoint(struct gdb_context* gdbctx) gdbctx->process->process_io, &gdbctx->context, t, xpt->addr, xpt->val, len)) { - xpt->type = -1; + xpt->type = be_xpoint_free; return packet_ok; } break; @@ -2233,7 +2233,7 @@ static enum packet_return packet_set_breakpoint(struct gdb_context* gdbctx) /* really set the Xpoint */ for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) { - if (xpt->type == -1) + if (xpt->type == be_xpoint_free) { if (be_cpu->insert_Xpoint(gdbctx->process->handle, gdbctx->process->process_io, &gdbctx->context,

1 0

Huw Davies : kernel32: Save xmm0 - 3 to work around a Delphi bug on x86_64.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 1e945155f906bde15c5d70ec5ed253c1d7ce5148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e945155f906bde15c5d70ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 6 10:26:13 2018 +0000 kernel32: Save xmm0 - 3 to work around a Delphi bug on x86_64. When delay loading a symbol, Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls GetProcAddress(), pops the saved registers and calls the function. This works fine if all of the parameters are ints. However, since it does not save xmm0 - 3, it relies on GetProcAddress() preserving these registers if the function takes floating point parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b97c79b..a5346db 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1363,7 +1363,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) * Success: A pointer to the symbol in the process address space. * Failure: NULL. Use GetLastError() to determine the cause. */ -FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) +FARPROC get_proc_address( HMODULE hModule, LPCSTR function ) { NTSTATUS nts; FARPROC fp; @@ -1387,6 +1387,54 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) return fp; } +#ifdef __x86_64__ +/* + * Work around a Delphi bug on x86_64. When delay loading a symbol, + * Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls + * GetProcAddress(), pops the saved registers and calls the function. + * This works fine if all of the parameters are ints. However, since + * it does not save xmm0 - 3, it relies on GetProcAddress() preserving + * these registers if the function takes floating point parameters. + * This wrapper saves xmm0 - 3 to the stack. + */ +extern FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ); + +__ASM_GLOBAL_FUNC( get_proc_address_wrapper, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "subq $0x40,%rsp\n\t" + "movaps %xmm0,-0x10(%rbp)\n\t" + "movaps %xmm1,-0x20(%rbp)\n\t" + "movaps %xmm2,-0x30(%rbp)\n\t" + "movaps %xmm3,-0x40(%rbp)\n\t" + "call " __ASM_NAME("get_proc_address") "\n\t" + "movaps -0x40(%rbp), %xmm3\n\t" + "movaps -0x30(%rbp), %xmm2\n\t" + "movaps -0x20(%rbp), %xmm1\n\t" + "movaps -0x10(%rbp), %xmm0\n\t" + "movq %rbp,%rsp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret" ) +#else /* __x86_64__ */ + +static inline FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ) +{ + return get_proc_address( module, function ); +} + +#endif /* __x86_64__ */ + +FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) +{ + return get_proc_address_wrapper( hModule, function ); +} + /*********************************************************************** * DelayLoadFailureHook (KERNEL32.@) */

1 0

Michael Stefaniuc : wmvcore: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 06a3a32294e270f4dcbc4f96c9ad17aebe24188c URL: https://source.winehq.org/git/wine.git/?a=commit;h=06a3a32294e270f4dcbc4f96… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:05 2018 +0100 wmvcore: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.h | 10 ---------- dlls/wmvcore/wmvcore_main.c | 1 + dlls/wmvcore/writer.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wmvcore/wmvcore.h b/dlls/wmvcore/wmvcore.h index ca06e0a..e175470 100644 --- a/dlls/wmvcore/wmvcore.h +++ b/dlls/wmvcore/wmvcore.h @@ -24,13 +24,3 @@ #include "windef.h" #include "winbase.h" - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index ae8b486..1b45288 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "wmsdk.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index c1c30be..717984d 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -20,6 +20,7 @@ #include "wmsdkidl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);

1 0

Michael Stefaniuc : wmp: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: b3a24b58d4b431b48548583be5563713cc9d15c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a24b58d4b431b48548583b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:04 2018 +0100 wmp: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 1 + dlls/wmp/wmp_private.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index acf38f3..4799712 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -20,6 +20,7 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 7b7f51c..04173f3 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -46,18 +46,3 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0

Alexandre Julliard : server: Add a macro to define SIDs.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 6b758dd1dc5231b55684e17a5bb64cc42f8ab641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b758dd1dc5231b55684e17a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 10:25:07 2018 +0100 server: Add a macro to define SIDs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/server/token.c b/server/token.c index 85aab73..7deddc4 100644 --- a/server/token.c +++ b/server/token.c @@ -64,6 +64,14 @@ const LUID SeManageVolumePrivilege = { 28, 0 }; const LUID SeImpersonatePrivilege = { 29, 0 }; const LUID SeCreateGlobalPrivilege = { 30, 0 }; +#define SID_N(n) struct /* same fields as struct SID */ \ + { \ + BYTE Revision; \ + BYTE SubAuthorityCount; \ + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; \ + DWORD SubAuthority[n]; \ + } + static const SID world_sid = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } }; static const SID local_sid = { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } }; static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } }; @@ -71,34 +79,10 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[5]; -} local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[2]; -} builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[2]; -} builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[SECURITY_LOGON_IDS_RID_COUNT]; -} builtin_logon_sid = { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, {SECURITY_NT_AUTHORITY}, {SECURITY_LOGON_IDS_RID, 0, 0} }; +static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; +static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; +static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; +static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid;

1 0

Aric Stewart : loader: Add LNXEV to the critical event database.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 3e276f7e39fa0fabb8250c1f0dcbf180cd43247a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e276f7e39fa0fabb8250c1f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:44 2018 -0600 loader: Add LNXEV to the critical event database. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a991319..c03fc26 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -472,6 +472,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CriticalDevice] HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\HIDRAW,"Service",,"WineHID" HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\IOHID,"Service",,"WineHID" +HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\LNXEV,"Service",,"WineHID" [CurrentVersion] HKCU,%CurrentVersion%\Run,,16

1 0

Hans Leidekker : msi: Don' t mark uncompressed global assembly files as installed until they are in the assembly cache.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: ff754f4edef05ab967ace9dc61400b32187de699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff754f4edef05ab967ace9dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 7 10:46:09 2018 +0100 msi: Don't mark uncompressed global assembly files as installed until they are in the assembly cache. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/files.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 02ff8ec..adffcaf 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -200,8 +200,6 @@ static UINT copy_file(MSIFILE *file, LPWSTR source) return GetLastError(); SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); - - file->state = msifs_installed; return ERROR_SUCCESS; } @@ -249,7 +247,6 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) MoveFileExW(file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) { - file->state = msifs_installed; package->need_reboot_at_end = 1; gle = ERROR_SUCCESS; } @@ -365,6 +362,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + BOOL is_global_assembly = msi_is_global_assembly( file->Component ); + msi_file_update_ui( package, file, szInstallFiles ); rc = msi_load_media_info( package, file->Sequence, mi ); @@ -412,7 +411,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); - if (!msi_is_global_assembly( file->Component )) + if (!is_global_assembly) { msi_create_directory(package, file->Component->Directory); } @@ -424,10 +423,11 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_free(source); goto done; } + if (!is_global_assembly) file->state = msifs_installed; msi_free(source); } - else if (!msi_is_global_assembly( file->Component ) && - file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) + else if (!is_global_assembly && file->state != msifs_installed && + !(file->Attributes & msidbFileAttributesPatchAdded)) { ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->File)); rc = ERROR_INSTALL_FAILURE;

1 0

Henri Verbeet : winedbg: Handle byte-sized registers in cpu_register() and cpu_register_hex_from().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: fc3ea7d1ef6860ab04fcfaa24353c5a8d06ff8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3ea7d1ef6860ab04fcfaa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 17:09:17 2018 +0330 winedbg: Handle byte-sized registers in cpu_register() and cpu_register_hex_from(). Like for example the recently added floating-point TagWord on AMD64. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 5fa4883..618c5df 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -517,6 +517,7 @@ static inline DWORD64 cpu_register(CONTEXT* ctx, unsigned idx) { switch (cpu_register_map[idx].ctx_length) { + case 1: return *(BYTE*)cpu_register_ptr(ctx, idx); case 2: return *(WORD*)cpu_register_ptr(ctx, idx); case 4: return *(DWORD*)cpu_register_ptr(ctx, idx); case 8: return *(DWORD64*)cpu_register_ptr(ctx, idx); @@ -545,6 +546,7 @@ static inline void cpu_register_hex_from(CONTEXT* ctx, unsigned idx, const } switch (cpu_register_map[idx].ctx_length) { + case 1: *(BYTE*)cpu_register_ptr(ctx, idx) = (BYTE)val; break; case 2: *(WORD*)cpu_register_ptr(ctx, idx) = (WORD)val; break; case 4: *(DWORD*)cpu_register_ptr(ctx, idx) = (DWORD)val; break; case 8: *(DWORD64*)cpu_register_ptr(ctx, idx) = val; break;

1 0

Aric Stewart : winebus.sys: Process device reports for linux event devices.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 52cafe87133c9a88b5cba071de60ecd536f82266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52cafe87133c9a88b5cba071… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:35 2018 -0600 winebus.sys: Process device reports for linux event devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 233 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 227 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52cafe87133c9a88b5cb…

1 0

Henri Verbeet : ddraw: Avoid using WINED3DUSAGE_DYNAMIC without WINED3D_RESOURCE_ACCESS_GPU in d3d_execute_buffer_SetExecuteData ().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: c8dd71bbc4617631a986bce404b8efbc56ef300c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8dd71bbc4617631a986bce4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:31 2018 +0330 ddraw: Avoid using WINED3DUSAGE_DYNAMIC without WINED3D_RESOURCE_ACCESS_GPU in d3d_execute_buffer_SetExecuteData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b1afcf5..d710b34 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -620,7 +620,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * struct wined3d_buffer_desc desc; desc.byte_width = new_size * sizeof(D3DVERTEX); - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.usage = 0; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; @@ -660,9 +660,8 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * { box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, - &map_desc, &box, buffer->src_vertex_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + if (FAILED(hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), + 0, &map_desc, &box, 0))) return hr; memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset,

1 0

Henri Verbeet : d3d9: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 31250d6d4daa6a907aa4d595a13f7a1c142d5097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31250d6d4daa6a907aa4d595… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:32 2018 +0330 d3d9: 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/d3d9/buffer.c | 4 +-- dlls/d3d9/d3d9_main.c | 8 ++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 84 ++++++++++++++++++------------------------- dlls/d3d9/directx.c | 12 +++---- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 6 ++-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexdeclaration.c | 28 +++++++-------- dlls/d3d9/volume.c | 2 +- 13 files changed, 70 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31250d6d4daa6a907aa4…

1 0

Michael Stefaniuc : regedit: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 505a9e0283bb7acc6d3647dd602c1c1df8a0c4a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=505a9e0283bb7acc6d3647dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:07 2018 +0100 regedit: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 3 ++- programs/regedit/edit.c | 1 + programs/regedit/framewnd.c | 1 + programs/regedit/hexedit.c | 1 + programs/regedit/listview.c | 1 + programs/regedit/regedit.c | 1 + programs/regedit/regproc.c | 15 +++------------ programs/regedit/regproc.h | 1 - programs/regedit/treeview.c | 1 + 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 7a5633f..0c6d895 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -27,8 +27,9 @@ #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" - + WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 6ccce00..c8b77bd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -29,6 +29,7 @@ #include <shellapi.h> #include <shlwapi.h> +#include "wine/heap.h" #include "wine/unicode.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c6fcee4..94da217 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -31,6 +31,7 @@ #include "main.h" #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 3f05aa6..fc6c3a3 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -35,6 +35,7 @@ #include "winnls.h" #include "commctrl.h" +#include "wine/heap.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4c2ec36..0934e03 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -27,6 +27,7 @@ #include "main.h" #include "regproc.h" +#include "wine/heap.h" #include "wine/unicode.h" static INT Image_String; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index fe0163c..a69e929 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -24,6 +24,7 @@ #include <shellapi.h> #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0911b50..35b0322 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -29,6 +29,7 @@ #include <windows.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); @@ -46,7 +47,7 @@ static HKEY reg_class_keys[] = { void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -57,12 +58,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -73,11 +69,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 9364fde..bfb0cba 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -30,7 +30,6 @@ void WINAPIV error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name); BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 77befb5..4bbec40 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -30,6 +30,7 @@ #include <wine/debug.h> #include <shlwapi.h> +#include "wine/heap.h" #include "main.h" #include "regproc.h"

1 0

Michael Stefaniuc : wscript: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: e68620c044848b2bc5251238ac23b322d6a5ea14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68620c044848b2bc5251238… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:08 2018 +0100 wscript: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 1 + programs/wscript/wscript.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 3c30c3c..fb95c0c 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -28,6 +28,7 @@ #include "wscript.h" #include <wine/debug.h> +#include <wine/heap.h> #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 2a64b34..d624a2d 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -33,18 +33,3 @@ extern WCHAR **argums; extern int numOfArgs; extern VARIANT_BOOL wshInteractive; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0

Francois Gouget : msvcp120/tests: A spelling fix in a comment.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 8ce7f782cc3db048e553cd53c2d53b7348da55f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce7f782cc3db048e553cd53… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 09:31:04 2018 +0100 msvcp120/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 5ae858d..dfd2d06 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2496,7 +2496,7 @@ static void test_queue_base_v4(void) ok(b, "pop returned false\n"); ok(c == (char)('a'+i), "got '%c', expected '%c'\n", c, 'a'+i); - /* destructor does't clear the memory, _Internal_finish_clear needs to be called */ + /* destructor doesn't clear the memory, _Internal_finish_clear needs to be called */ SET_EXPECT(queue_char__Deallocate_page); call_func1(p_queue_base_v4__Internal_finish_clear, &queue); CHECK_CALLED(queue_char__Deallocate_page);

1 0

Alistair Leslie-Hughes : ntdll: Support TokenLogonSid in NtQueryInformationToken.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 4bbbc261d1298210ec3eaf49b783defc6988da83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bbbc261d1298210ec3eaf49… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 6 04:19:37 2018 +0000 ntdll: Support TokenLogonSid in NtQueryInformationToken. Based on a patch by Andrew Wesie. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/ntdll/nt.c | 21 +++++++++++++++++++++ server/token.c | 10 ++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 57889dc..bc14a80 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1843,11 +1843,11 @@ static void test_token_attr(void) todo_wine win_skip("TokenLogonSid not supported. Skipping tests\n"); else { - todo_wine ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); Groups = HeapAlloc(GetProcessHeap(), 0, Size); ret = GetTokenInformation(Token, TokenLogonSid, Groups, Size, &Size); - todo_wine ok(ret, + ok(ret, "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); if (ret) { diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8938d5d..8995c36 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -552,6 +552,27 @@ NTSTATUS WINAPI NtQueryInformationToken( *(DWORD*)tokeninfo = 0; break; } + case TokenLogonSid: + SERVER_START_REQ( get_token_sid ) + { + TOKEN_GROUPS * groups = tokeninfo; + PSID sid = groups + 1; + DWORD sid_len = tokeninfolength < sizeof(TOKEN_GROUPS) ? 0 : tokeninfolength - sizeof(TOKEN_GROUPS); + + req->handle = wine_server_obj_handle( token ); + req->which_sid = tokeninfoclass; + wine_server_set_reply( req, sid, sid_len ); + status = wine_server_call( req ); + if (retlen) *retlen = reply->sid_len + sizeof(TOKEN_GROUPS); + if (status == STATUS_SUCCESS) + { + groups->GroupCount = 1; + groups->Groups[0].Sid = sid; + groups->Groups[0].Attributes = 0; + } + } + SERVER_END_REQ; + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/server/token.c b/server/token.c index 532d7b7..85aab73 100644 --- a/server/token.c +++ b/server/token.c @@ -92,6 +92,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[2]; } builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[SECURITY_LOGON_IDS_RID_COUNT]; +} builtin_logon_sid = { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, {SECURITY_NT_AUTHORITY}, {SECURITY_LOGON_IDS_RID, 0, 0} }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -1436,6 +1443,9 @@ DECL_HANDLER(get_token_sid) } break; } + case TokenLogonSid: + sid = (const SID *)&builtin_logon_sid; + break; default: set_error( STATUS_INVALID_PARAMETER ); break;

1 0

Nikolay Sivov : user32: Automatically load the module implementing redirected class.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 0de689f41560208bbc14fb1a6b9f7dfe154326c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de689f41560208bbc14fb1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 7 18:08:52 2018 +0300 user32: Automatically load the module implementing redirected class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 5 ++ dlls/user32/tests/class.c | 223 +++++++++++++++++++++++++++++++++------------- 2 files changed, 167 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0de689f41560208bbc14…

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_SetExecuteData().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: cbd1aaafa0ff096b037f026a0900337bcb9a45f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd1aaafa0ff096b037f026a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:30 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_SetExecuteData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 6ce77e3..b1afcf5 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -617,17 +617,25 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * { unsigned int new_size = max(data->dwVertexCount, buffer->vertex_size * 2); struct wined3d_buffer *src_buffer, *dst_buffer; + struct wined3d_buffer_desc desc; - hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DVERTEX), - WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_SYSTEM_MEM, - NULL, &ddraw_null_wined3d_parent_ops, &src_buffer); - if (FAILED(hr)) + desc.byte_width = new_size * sizeof(D3DVERTEX); + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &src_buffer))) return hr; - hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DTLVERTEX), - WINED3DUSAGE_STATICDECL, WINED3D_POOL_DEFAULT, - NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer); - if (FAILED(hr)) + desc.byte_width = new_size * sizeof(D3DTLVERTEX); + desc.usage = WINED3DUSAGE_STATICDECL; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + + if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) { wined3d_buffer_decref(src_buffer); return hr;

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_device_prepare_vertex_buffer().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 3aafba2b6907e31ac2a6b3a782d5f59024e8f004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aafba2b6907e31ac2a6b3a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:29 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_device_prepare_vertex_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 75fd6c4..c052dc2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3465,15 +3465,22 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT 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, &ddraw_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, &ddraw_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 : d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_index_buffer().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: f181da61a0285dd151926b56c83de062d5006a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f181da61a0285dd151926b56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:28 2018 +0330 d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_index_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 15 +++++++++++---- dlls/wined3d/buffer.c | 18 ------------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 3 --- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 954f3fa..8f992ba 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2646,15 +2646,22 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes.\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_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, &d3d9_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x.\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 593d886..f1b4556 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1487,21 +1487,3 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); } - -HRESULT CDECL wined3d_buffer_create_ib(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) -{ - struct wined3d_buffer_desc desc; - - TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", - device, size, usage, pool, parent, parent_ops, buffer); - - desc.byte_width = size; - desc.usage = usage | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = resource_access_from_pool(pool); - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 74e61ea..606ba0b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -23,7 +23,6 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_buffer_create_ib(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_decref(ptr) @ cdecl wined3d_buffer_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 72168e5..2a79602 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2189,9 +2189,6 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -HRESULT __cdecl wined3d_buffer_create_ib(struct wined3d_device *device, UINT length, DWORD usage, - enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_buffer **buffer); HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer);

1 0

Francois Gouget : testbot/web: Fix an indentation in the Stats code.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: tools Branch: master Commit: 93cea25fc124c258726bc0af985532512e1fe3d6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=93cea25fc124c258726bc0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 7 05:29:59 2018 +0100 testbot/web: Fix an indentation in the Stats code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index d9a3ce5..9db2ad3 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -82,8 +82,8 @@ sub _AddRate($$;$) $RateKey =~ s/(?:\.time)?\.count$/.rate/; $AllStats ||= $Stats; $Stats->{$RateKey} = $AllStats->{elapsed} ? - 3600 * $Stats->{$StatKey} / $AllStats->{elapsed} : - "n/a"; + 3600 * $Stats->{$StatKey} / $AllStats->{elapsed} : + "n/a"; } sub _GetAverage($$)

1 0

Francois Gouget : testbot: Use the same 'now' for all activity values.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: tools Branch: master Commit: c10d1f8818a445ddd047814c316098eeaa6193fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=c10d1f8818a445ddd047814… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 7 05:30:55 2018 +0100 testbot: Use the same 'now' for all activity values. The code was calling time() in various places which could result in different notions of when 'now' is depending on the place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index a2bd1b0..8c22e01 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -106,12 +106,13 @@ sub GetActivity($;$) { my ($VMs, $Seconds) = @_; my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); + $Counters->{now} = time(); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); if ($Seconds) { - $RecordGroups->AddFilter("Timestamp", [time() - $Seconds], ">="); + $RecordGroups->AddFilter("Timestamp", [$Counters->{now} - $Seconds], ">="); } my $MinId; $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); @@ -302,13 +303,13 @@ sub GetActivity($;$) $LastStatusVMs{$VM->Name} = $StatusVMs; } } - $LastGroup->{end} = time() if ($LastGroup); + $LastGroup->{end} = $Counters->{now} if ($LastGroup); foreach my $VM (@{$VMs->GetItems()}) { my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name}; next if (!$LastVMStatus); - $LastVMStatus->{end} = time(); + $LastVMStatus->{end} = $Counters->{now}; if ($LastVMStatus->{status} eq "unknown") { $LastVMStatus->{status} = $VM->Status;

1 0

Józef Kucia : wined3d: Add support for multisample texture views.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 7cdf7f56096b97cc4a1e2c5265bf540b845a9e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cdf7f56096b97cc4a1e2c52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:05 2018 +0100 wined3d: Add support for multisample texture views. 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/wined3d/view.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8e0259..b06dacc 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -44,15 +44,21 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, } view_types[] = { - {GL_TEXTURE_CUBE_MAP, 0, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_RECTANGLE, 0, GL_TEXTURE_RECTANGLE}, - {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY}, - {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + {GL_TEXTURE_CUBE_MAP, 0, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_RECTANGLE, 0, GL_TEXTURE_RECTANGLE}, + {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + + {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY}, + + {GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_2D_MULTISAMPLE}, + {GL_TEXTURE_2D_MULTISAMPLE, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY}, + {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 0, GL_TEXTURE_2D_MULTISAMPLE}, + {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY}, }; unsigned int i;

1 0

Daniel Lehman : oleaut32/tests: Fix leak (Valgrind).
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: ff4a02fe3cf2eb096508ac7d553986c3e4830372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4a02fe3cf2eb096508ac7d… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 5 22:48:14 2018 -0800 oleaut32/tests: Fix leak (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 6348fee..9be2eb2 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6074,6 +6074,7 @@ static void test_recinfo(void) IRecordInfo_Release(recinfo); ITypeInfo_Release(typeinfo); + ITypeLib_Release(typelib2); ITypeLib_Release(typelib); DeleteFileW(filenameW); DeleteFileW(filename2W);

1 0

Józef Kucia : wined3d: Factor out wined3d_texture_get_gl_sample_count() function.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b5f1d3085f49b57b2d145c04522258bc428133eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f1d3085f49b57b2d145c04… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:06 2018 +0100 wined3d: Factor out wined3d_texture_get_gl_sample_count() function. For creating multisample textures. 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/wined3d/texture.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 29c4963..ed1ca21 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -456,6 +456,31 @@ static void gltexture_delete(struct wined3d_device *device, const struct wined3d tex->name = 0; } +static unsigned int wined3d_texture_get_gl_sample_count(const struct wined3d_texture *texture) +{ + const struct wined3d_format *format = texture->resource.format; + + /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality + * levels as the count of advertised multisample types for the texture + * format. */ + if (texture->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) + { + unsigned int i, count = 0; + + for (i = 0; i < sizeof(format->multisample_types) * CHAR_BIT; ++i) + { + if (format->multisample_types & 1u << i) + { + if (texture->resource.multisample_quality == count++) + break; + } + } + return i + 1; + } + + return texture->resource.multisample_type; +} + /* Context activation is done by the caller. */ /* The caller is responsible for binding the correct texture. */ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture *texture, @@ -1484,27 +1509,7 @@ static void wined3d_texture_prepare_rb(struct wined3d_texture *texture, * AMD have a similar feature called Enhanced Quality Anti-Aliasing * (EQAA), but it does not have an equivalent OpenGL extension. */ - /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality - * levels as the count of advertised multisample types for the texture - * format. */ - if (texture->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - { - unsigned int i, count = 0; - - for (i = 0; i < sizeof(format->multisample_types) * 8; ++i) - { - if (format->multisample_types & 1u << i) - { - if (texture->resource.multisample_quality == count++) - break; - } - } - samples = i + 1; - } - else - { - samples = texture->resource.multisample_type; - } + samples = wined3d_texture_get_gl_sample_count(texture); gl_info->fbo_ops.glGenRenderbuffers(1, &texture->rb_multisample); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture->rb_multisample);

1 0

Piotr Caban : msvcr110: Add Concurrency::_Trace_agents function stub.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 475fa2c749e7ca5b648f456b8ecf47fe3d1b4964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=475fa2c749e7ca5b648f456b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 15:38:05 2018 +0100 msvcr110: Add Concurrency::_Trace_agents function stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 6 ++++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index b388c29..ebc35bd 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -455,7 +455,7 @@ @ stub -arch=win64 ?_Start(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=i386 ?_Stop(a)_Timer@details(a)Concurrency@@IAEXXZ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) msvcr120.?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0e3b0f3..a6664a5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -657,7 +657,7 @@ @ stub -arch=arm ?_Tidy(a)exception@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index aebb12c..0748ccf 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -639,7 +639,7 @@ @ stub -arch=arm ?_Tidy(a)exception@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6ffc308..c1d2e4b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -635,7 +635,7 @@ @ stub -arch=arm ?_Tidy(a)exception@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) msvcr120.?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 8f18aa4..c197d69 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -561,6 +561,12 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } + +/* ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ */ +void WINAPIV _Trace_agents(/*enum Concurrency::Agents_EventType*/int type, __int64 id, ...) +{ + FIXME("(%d %s)\n", type, wine_dbgstr_longlong(id)); +} #endif #if _MSVCR_VER>=120

1 0

Andrew Eikum : xaudio2: Fix ClassFactory ref counting.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 45babd780f586eb8d0a93205d0998d6ce3f8396d URL: https://source.winehq.org/git/wine.git/?a=commit;h=45babd780f586eb8d0a93205… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 6 10:52:19 2018 -0600 xaudio2: Fix ClassFactory ref counting. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapofx.c | 27 ++++++++++++++++++++------- dlls/xaudio2_7/xaudio_dll.c | 38 ++++++++++++++++++++------------------ dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 44dfb47..c39b428 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -764,7 +764,8 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; } @@ -777,13 +778,17 @@ static const IClassFactoryVtbl xapo_Vtbl = xapocf_LockServer }; -IClassFactory *make_xapo_factory(REFCLSID clsid) +HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) { + HRESULT hr; struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; ret->class = clsid; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; } #if XAUDIO2_VER >= 8 @@ -792,7 +797,9 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_AudioVolumeMeter27); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -806,7 +813,9 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_FXReverb); + hr = make_xapo_factory(&CLSID_FXReverb, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -832,7 +841,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in class = &CLSID_FXEQ; if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); @@ -890,7 +901,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) /* TODO FXECHO, FXMasteringLimiter, */ if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 9b7a07f..0682a5f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2121,7 +2121,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xaudio2_cf *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; } @@ -2134,18 +2135,20 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = XAudio2CF_LockServer }; -static IClassFactory *make_xaudio2_factory(void) +static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) { + HRESULT hr; struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); ret->IClassFactory_iface.lpVtbl = &XAudio2CF_Vtbl; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; } HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - IClassFactory *factory = NULL; - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(rclsid, &CLSID_XAudio20) || @@ -2155,33 +2158,30 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_XAudio24) || IsEqualGUID(rclsid, &CLSID_XAudio25) || IsEqualGUID(rclsid, &CLSID_XAudio26) || - IsEqualGUID(rclsid, &CLSID_XAudio27)){ - factory = make_xaudio2_factory(); + IsEqualGUID(rclsid, &CLSID_XAudio27)) + return make_xaudio2_factory(riid, ppv); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || + if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26) || - IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27); + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)) + return make_xapo_factory(&CLSID_AudioVolumeMeter27, riid, ppv); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || + if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || IsEqualGUID(rclsid, &CLSID_AudioReverb21) || IsEqualGUID(rclsid, &CLSID_AudioReverb22) || IsEqualGUID(rclsid, &CLSID_AudioReverb23) || IsEqualGUID(rclsid, &CLSID_AudioReverb24) || IsEqualGUID(rclsid, &CLSID_AudioReverb25) || IsEqualGUID(rclsid, &CLSID_AudioReverb26) || - IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ - factory = make_xapo_factory(&CLSID_FXReverb); - } - - if(!factory) return CLASS_E_CLASSNOTAVAILABLE; + IsEqualGUID(rclsid, &CLSID_AudioReverb27)) + return make_xapo_factory(&CLSID_FXReverb, riid, ppv); - return IClassFactory_QueryInterface(factory, riid, ppv); + return CLASS_E_CLASSNOTAVAILABLE; } HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) @@ -2200,7 +2200,9 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p TRACE("%p 0x%x 0x%x\n", ppxa2, flags, proc); - cf = make_xaudio2_factory(); + hr = make_xaudio2_factory(&IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IXAudio2, (void**)&xa2); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 1a4aa08..5d3814f 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -181,5 +181,5 @@ extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif -extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN; +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : advapi32: Also wait on services without a control thread during shutdown.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e5294a7414ca81c4761c00421cd7d59d9b83caa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5294a7414ca81c4761c0042… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 6 10:43:57 2018 -0600 advapi32: Also wait on services without a control thread during shutdown. Tested service messages during OS shutdown manually on Windows 7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 94 +++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7d66326..70907e1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -529,6 +529,63 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) return 1; } +/* wait for services which accept this type of message to become STOPPED */ +static void handle_shutdown_msg(DWORD msg, DWORD accept) +{ + SERVICE_STATUS st; + SERVICE_PRESHUTDOWN_INFO spi; + DWORD i, n = 0, sz, timeout = 2000; + ULONGLONG stop_time; + BOOL res, done = TRUE; + SC_HANDLE *wait_handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SC_HANDLE) * nb_services ); + + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + res = QueryServiceStatus( services[i]->full_access_handle, &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED || !(st.dwControlsAccepted & accept)) + continue; + + done = FALSE; + + if (accept == SERVICE_ACCEPT_PRESHUTDOWN) + { + res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&spi, sizeof(spi), &sz ); + if (res) + { + FIXME( "service should be able to delay shutdown\n" ); + timeout = max( spi.dwPreshutdownTimeout, timeout ); + } + } + + service_handle_control( services[i], msg, NULL, 0 ); + wait_handles[n++] = services[i]->full_access_handle; + } + LeaveCriticalSection( &service_cs ); + + /* FIXME: these timeouts should be more generous, but we can't currently delay prefix shutdown */ + timeout = min( timeout, 3000 ); + stop_time = GetTickCount64() + timeout; + + while (!done && GetTickCount64() < stop_time) + { + done = TRUE; + for (i = 0; i < n; i++) + { + res = QueryServiceStatus( wait_handles[i], &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED) + continue; + + done = FALSE; + Sleep( 100 ); + break; + } + } + + HeapFree( GetProcessHeap(), 0, wait_handles ); +} + /****************************************************************************** * service_run_main_thread */ @@ -583,41 +640,8 @@ static BOOL service_run_main_thread(void) ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); if (!ret) /* system process event */ { - SERVICE_STATUS st; - SERVICE_PRESHUTDOWN_INFO spi; - DWORD timeout = 5000; - BOOL res; - - EnterCriticalSection( &service_cs ); - n = 0; - for (i = 0; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) - { - if (!services[i]->thread) continue; - - res = QueryServiceStatus(services[i]->full_access_handle, &st); - ret = ERROR_SUCCESS; - if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_PRESHUTDOWN)) - { - res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, - (LPBYTE)&spi, sizeof(spi), &i ); - if (res) - { - FIXME("service should be able to delay shutdown\n"); - timeout += spi.dwPreshutdownTimeout; - ret = service_handle_control( services[i], SERVICE_CONTROL_PRESHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - else if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN)) - { - ret = service_handle_control( services[i], SERVICE_CONTROL_SHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - LeaveCriticalSection( &service_cs ); - - TRACE("last user process exited, shutting down (timeout: %d)\n", timeout); - WaitForMultipleObjects( n, wait_handles, TRUE, timeout ); + handle_shutdown_msg(SERVICE_CONTROL_PRESHUTDOWN, SERVICE_ACCEPT_PRESHUTDOWN); + handle_shutdown_msg(SERVICE_CONTROL_SHUTDOWN, SERVICE_ACCEPT_SHUTDOWN); ExitProcess(0); } else if (ret == 1)

1 0

Piotr Caban : msvcr100: Add _ReentrantPPLLock:: _Scoped_lock class implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 19ef182c81bbc92aba1f73179d77f376af1d8b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19ef182c81bbc92aba1f7317… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 17:03:59 2018 +0100 msvcr100: Add _ReentrantPPLLock::_Scoped_lock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/lock.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19ef182c81bbc92aba1f…

1 0

Józef Kucia : wined3d: Introduce wined3d_bit_scan().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e8d2febaad934ba64b63dcb46f7257b6a088ec01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d2febaad934ba64b63dcb4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:02 2018 +0100 wined3d: Introduce wined3d_bit_scan(). 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/wined3d/wined3d_private.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05576cd..3347245 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4352,6 +4352,13 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } +static inline int wined3d_bit_scan(unsigned int *x) +{ + int bit_offset = ffs(*x) - 1; + *x ^= 1u << bit_offset; + return bit_offset; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) {

1 0

Michael Stefaniuc : urlmon/tests: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 6ec880993b98800b4cd790cde72ae785e6c60241 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ec880993b98800b4cd790cd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:13 2018 +0100 urlmon/tests: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 6 +----- dlls/urlmon/tests/sec_mgr.c | 6 +----- dlls/urlmon/tests/uri.c | 11 +---------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index dc8b179..73c6374 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -31,6 +31,7 @@ #include "urlmon.h" #include "initguid.h" +#include "wine/heap.h" DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); @@ -88,11 +89,6 @@ static int strcmp_wa(const WCHAR *strw, const char *stra) return lstrcmpW(strw, buf); } -static void heap_free(void *mem) -{ - HeapFree(GetProcessHeap(), 0, mem); -} - static WCHAR *a2w(const char *str) { WCHAR *ret; diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 33e295a..411a3b7 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -35,6 +35,7 @@ #include "urlmon.h" #include "initguid.h" +#include <wine/heap.h> #define URLZONE_CUSTOM URLZONE_USER_MIN+1 #define URLZONE_CUSTOM2 URLZONE_CUSTOM+1 @@ -176,11 +177,6 @@ static int strcmp_w(const WCHAR *str1, const WCHAR *str2) return memcmp(str1, str2, len1*sizeof(WCHAR)); } -static inline void heap_free(void *mem) -{ - HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR a2w(LPCSTR str) { LPWSTR ret = NULL; diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a0e3f61..796e4d3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -33,6 +33,7 @@ #include "wininet.h" #include "strsafe.h" #include "initguid.h" +#include <wine/heap.h> DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); @@ -7436,16 +7437,6 @@ static inline LPWSTR a2w(LPCSTR str) { return ret; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { LPWSTR strAW = a2w(strA); DWORD ret = lstrcmpW(strAW, strB);

1 0

Michael Stefaniuc : urlmon: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 3c1356888a6f16d3cd6e3169f8733386200f2976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1356888a6f16d3cd6e3169… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:14 2018 +0100 urlmon: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon_main.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ee26bed..a4a1c78 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -32,6 +32,7 @@ #include "wininet.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; @@ -234,31 +235,11 @@ void release_notif_hwnd(HWND) DECLSPEC_HIDDEN; const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : shdocvw: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 373d32efa67a7f0562f0f6562b81f56a5b9a936c URL: https://source.winehq.org/git/wine.git/?a=commit;h=373d32efa67a7f0562f0f656… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:57 2018 +0100 shdocvw: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index a2736d8..8cac507 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -35,6 +35,7 @@ #include "exdisp.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" /********************************************************************** @@ -50,17 +51,4 @@ extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } - -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_SHDOCVW_H */

1 0

Huw Davies : user32: Add a heuristic to find the mouse message's window.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 0d9ce8a02502981fdbb7fd7a772e719b67f03d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d9ce8a02502981fdbb7fd7a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 6 10:08:25 2018 +0000 user32: Add a heuristic to find the mouse message's window. This can't be done properly without support from the native windowing system. However, it's a good bet to try the next window in the z-order if it's the owner of the original window and it's in the same thread. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 172d659..6b7f918 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2502,7 +2502,16 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H } else { + HWND orig = msg->hwnd; + msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + if (!msg->hwnd) /* As a heuristic, try the next window if it's the owner of orig */ + { + HWND next = GetWindow( orig, GW_HWNDNEXT ); + + if (next && GetWindow( orig, GW_OWNER ) == next && WIN_IsCurrentThread( next )) + msg->hwnd = WINPOS_WindowFromPoint( next, msg->pt, &hittest ); + } } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd ))

1 0