June 2016 - Wine-commits - list.winehq.org

Józef Kucia : d3d11: Implement d3d11_immediate_context_IAGetIndexBuffer().
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: master Commit: 9a686f666a8fba523085bdbcb587b1c94a58d3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a686f666a8fba523085bdbcb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:45:57 2016 +0200 d3d11: Implement d3d11_immediate_context_IAGetIndexBuffer(). 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/d3d11/device.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0fc8eb5..13d079e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1344,7 +1344,26 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11DeviceContext *iface, ID3D11Buffer **buffer, DXGI_FORMAT *format, UINT *offset) { - FIXME("iface %p, buffer %p, format %p, offset %p stub!\n", iface, buffer, format, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + enum wined3d_format_id wined3d_format; + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + TRACE("iface %p, buffer %p, format %p, offset %p.\n", iface, buffer, format, offset); + + wined3d_mutex_lock(); + wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, offset); + *format = dxgi_format_from_wined3dformat(wined3d_format); + if (!wined3d_buffer) + { + wined3d_mutex_unlock(); + *buffer = NULL; + return; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + wined3d_mutex_unlock(); + ID3D11Buffer_AddRef(*buffer = &buffer_impl->ID3D11Buffer_iface); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IAGetVertexBuffers().
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: master Commit: 636ad1fd8434309d80a43c9fde5651f250afbc2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=636ad1fd8434309d80a43c9fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:45:58 2016 +0200 d3d11: Implement d3d11_immediate_context_IAGetVertexBuffers(). 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/d3d11/device.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 13d079e..dfdd0d2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1337,8 +1337,32 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11Dev static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers, UINT *strides, UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i, + &wined3d_buffer, &offsets[i], &strides[i]))) + ERR("Failed to get vertex buffer %u.\n", start_slot + i); + + if (!wined3d_buffer) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Partially implement d3d11_device_CheckFeatureSupport().
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: master Commit: 60a799f422551f941a421887e3dc9e6a71eb0f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a799f422551f941a421887e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:46:01 2016 +0200 d3d11: Partially implement d3d11_device_CheckFeatureSupport(). 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/d3d11/device.c | 23 +++++++++++++++++++++-- dlls/d3d11/tests/d3d11.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d3d11.idl | 6 ++++++ 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dfdd0d2..03fafc6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2689,10 +2689,29 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device *iface, D3D11_FEATURE feature, void *feature_support_data, UINT feature_support_data_size) { - FIXME("iface %p, feature %u, feature_support_data %p, feature_support_data_size %u stub!\n", + TRACE("iface %p, feature %u, feature_support_data %p, feature_support_data_size %u.\n", iface, feature, feature_support_data, feature_support_data_size); - return E_NOTIMPL; + switch (feature) + { + case D3D11_FEATURE_THREADING: + { + D3D11_FEATURE_DATA_THREADING *threading_data = feature_support_data; + if (feature_support_data_size != sizeof(*threading_data)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + threading_data->DriverConcurrentCreates = FALSE; + threading_data->DriverCommandLists = FALSE; + return S_OK; + } + + default: + FIXME("Unhandled feature %#x.\n", feature); + return E_NOTIMPL; + } } static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device *iface, REFGUID guid, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8626b68..62c119a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8468,6 +8468,54 @@ static void test_null_sampler(void) release_test_context(&test_context); } +static void test_check_feature_support(void) +{ + D3D11_FEATURE_DATA_THREADING threading[2]; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + memset(threading, 0xef, sizeof(threading)); + + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, NULL, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) / 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) * 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ok(threading[0].DriverConcurrentCreates == 0xefefefef, + "Got unexpected concurrent creates %#x.\n", threading[0].DriverConcurrentCreates); + ok(threading[0].DriverCommandLists == 0xefefefef, + "Got unexpected command lists %#x.\n", threading[0].DriverCommandLists); + ok(threading[1].DriverConcurrentCreates == 0xefefefef, + "Got unexpected concurrent creates %#x.\n", threading[1].DriverConcurrentCreates); + ok(threading[1].DriverCommandLists == 0xefefefef, + "Got unexpected command lists %#x.\n", threading[1].DriverCommandLists); + + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(threading->DriverConcurrentCreates == TRUE || threading->DriverConcurrentCreates == FALSE, + "Got unexpected concurrent creates %#x.\n", threading->DriverConcurrentCreates); + ok(threading->DriverCommandLists == TRUE || threading->DriverCommandLists == FALSE, + "Got unexpected command lists %#x.\n", threading->DriverCommandLists); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -8513,4 +8561,5 @@ START_TEST(d3d11) test_sm4_breakc_instruction(); test_input_assembler(); test_null_sampler(); + test_check_feature_support(); } diff --git a/include/d3d11.idl b/include/d3d11.idl index 9d4d8fd..cd177c2 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -439,6 +439,12 @@ typedef enum D3D11_FEATURE D3D11_FEATURE_D3D9_SHADOW_SUPPORT } D3D11_FEATURE; +typedef struct D3D11_FEATURE_DATA_THREADING +{ + BOOL DriverConcurrentCreates; + BOOL DriverCommandLists; +} D3D11_FEATURE_DATA_THREADING; + typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS { BOOL OutputMergerLogicOp;

1 0

Józef Kucia : wined3d: Introduce wined3d_unordered_access_view.
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: master Commit: 2f47a73c37e1549100e3dd69a6e567d0b58f5314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f47a73c37e1549100e3dd69a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:46:02 2016 +0200 wined3d: Introduce wined3d_unordered_access_view. 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 | 106 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 5 ++ dlls/wined3d/wined3d_private.h | 11 +++++ include/wine/wined3d.h | 28 +++++++++++ 4 files changed, 150 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e9e62d1..e39f6f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -415,3 +415,109 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view texture = wined3d_texture_from_resource(view->resource); wined3d_texture_bind(texture, context, FALSE); } + +ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) +{ + ULONG refcount = InterlockedIncrement(&view->refcount); + + TRACE("%p increasing refcount to %u.\n", view, refcount); + + return refcount; +} + +static void wined3d_unordered_access_view_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + +ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view) +{ + ULONG refcount = InterlockedDecrement(&view->refcount); + + TRACE("%p decreasing refcount to %u.\n", view, refcount); + + if (!refcount) + { + struct wined3d_device *device = view->resource->device; + + /* Call wined3d_object_destroyed() before releasing the resource, + * since releasing the resource may end up destroying the parent. */ + view->parent_ops->wined3d_object_destroyed(view->parent); + wined3d_resource_decref(view->resource); + wined3d_cs_emit_destroy_object(device->cs, wined3d_unordered_access_view_destroy_object, view); + } + + return refcount; +} + +void * CDECL wined3d_unordered_access_view_get_parent(const struct wined3d_unordered_access_view *view) +{ + TRACE("view %p.\n", view); + + return view->parent; +} + +static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view, + const struct wined3d_unordered_access_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + + view->refcount = 1; + view->parent = parent; + view->parent_ops = parent_ops; + + view->format = wined3d_get_format(gl_info, desc->format_id); + + if (wined3d_format_is_typeless(view->format)) + { + WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + return E_INVALIDARG; + } + + if (resource->type != WINED3D_RTYPE_BUFFER) + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (desc->u.texture.level_idx >= texture->level_count + || desc->u.texture.layer_idx >= depth_or_layer_count + || !desc->u.texture.layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) + return E_INVALIDARG; + } + wined3d_resource_incref(view->resource = resource); + + return WINED3D_OK; +} + +HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_unordered_access_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view) +{ + struct wined3d_unordered_access_view *object; + HRESULT hr; + + TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", + desc, resource, parent, parent_ops, view); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_unordered_access_view_init(object, desc, resource, parent, parent_ops))) + { + HeapFree(GetProcessHeap(), 0, object); + WARN("Failed to initialise view, hr %#x.\n", hr); + return hr; + } + + TRACE("Created unordered access view %p.\n", object); + *view = object; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8d1d8dc..87fdb81 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -267,6 +267,11 @@ @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) +@ cdecl wined3d_unordered_access_view_create(ptr ptr ptr ptr ptr) +@ cdecl wined3d_unordered_access_view_decref(ptr) +@ cdecl wined3d_unordered_access_view_get_parent(ptr) +@ cdecl wined3d_unordered_access_view_incref(ptr) + @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_create_from_fvf(ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_decref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8fb6f4d..b82ec3d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3145,6 +3145,17 @@ struct wined3d_shader_resource_view void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, struct wined3d_context *context) DECLSPEC_HIDDEN; +struct wined3d_unordered_access_view +{ + LONG refcount; + + struct wined3d_resource *resource; + void *parent; + const struct wined3d_parent_ops *parent_ops; + + const struct wined3d_format *format; +}; + struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index da102c6..1c0a61b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1970,6 +1970,26 @@ struct wined3d_shader_resource_view_desc } u; }; +struct wined3d_unordered_access_view_desc +{ + enum wined3d_format_id format_id; + unsigned int flags; + union + { + struct + { + unsigned int start_idx; + unsigned int count; + } buffer; + struct + { + unsigned int level_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } u; +}; + struct wined3d_output_desc { WCHAR device_name[CCHDEVICENAME]; @@ -1997,6 +2017,7 @@ struct wined3d_shader_resource_view; struct wined3d_stateblock; struct wined3d_swapchain; struct wined3d_texture; +struct wined3d_unordered_access_view; struct wined3d_vertex_declaration; struct wined3d_device_parent @@ -2533,6 +2554,13 @@ HRESULT __cdecl wined3d_texture_update_overlay(struct wined3d_texture *texture, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect, DWORD flags); +HRESULT __cdecl wined3d_unordered_access_view_create(const struct wined3d_unordered_access_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view); +ULONG __cdecl wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view); +void * __cdecl wined3d_unordered_access_view_get_parent(const struct wined3d_unordered_access_view *view); +ULONG __cdecl wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view); + HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device, const struct wined3d_vertex_element *elements, UINT element_count, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration);

1 0

Józef Kucia : d3d10core/tests: Fix test table in test_create_rendertarget_view().
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: master Commit: e201dcac87782b9edb4258a2fd06379457683a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e201dcac87782b9edb4258a2f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:46:05 2016 +0200 d3d10core/tests: Fix test table in test_create_rendertarget_view(). 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/d3d10core/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1f70e22..24b7b50 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1887,8 +1887,8 @@ static void test_create_rendertarget_view(void) {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 1}, {RGBA8_UNORM, TEX_2D, 1}}, {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 9}, {RGBA8_UNORM, TEX_2D, 9}}, - {{ 1, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0, -1}, {RGBA8_UNORM, TEX_2D, 0}}, - {{10, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0, -1}, {RGBA8_UNORM, TEX_2D, 0}}, + {{ 1, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, + {{10, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, {{ 1, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, -1}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}},

1 0

Michael Stefaniuc : comctl32: Avoid using CopyRect() on RECT structs.
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: master Commit: 65a2e59a78cd35af8df4d0e8cde0755e696a9924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a2e59a78cd35af8df4d0e8c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 24 13:11:04 2016 +0200 comctl32: Avoid using CopyRect() on RECT structs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/draglist.c | 2 +- dlls/comctl32/listview.c | 5 ++--- dlls/comctl32/progress.c | 2 +- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/theme_combo.c | 5 ++--- dlls/comctl32/toolbar.c | 12 ++++++------ 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c index 2097edb..ed52e5e 100644 --- a/dlls/comctl32/draglist.c +++ b/dlls/comctl32/draglist.c @@ -264,7 +264,7 @@ VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem) RedrawWindow(hwndParent, &data->last_drag_icon_rect, NULL, RDW_INTERNALPAINT | RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); - CopyRect(&data->last_drag_icon_rect, &rcDragIcon); + data->last_drag_icon_rect = rcDragIcon; if (nItem >= 0) { diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 784ca7b..cfdb7de 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3856,9 +3856,8 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord iterator_frameditems_absolute(&old_elems, infoPtr, &infoPtr->marqueeRect); - CopyRect(&infoPtr->marqueeRect, &rect); - - CopyRect(&infoPtr->marqueeDrawRect, &rect); + infoPtr->marqueeRect = rect; + infoPtr->marqueeDrawRect = rect; OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 98c803c..4638ffc 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -355,7 +355,7 @@ static LRESULT PROGRESS_Draw (PROGRESS_INFO *infoPtr, HDC hdc) DrawThemeParentBackground (infoPtr->Self, hdc, NULL); DrawThemeBackground (pdi.theme, hdc, part, 0, &pdi.rect, NULL); SelectClipRgn (hdc, NULL); - CopyRect (&pdi.rect, &cntRect); + pdi.rect = cntRect; } /* compute some drawing parameters */ diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3b56853..8600844 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3219,7 +3219,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) { hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); - CopyRect(&r, &rzone); + r = rzone; if (bm.bmWidth < r.right) { r.left = bm.bmWidth; diff --git a/dlls/comctl32/theme_combo.c b/dlls/comctl32/theme_combo.c index 9482a3b..3ee1d92 100644 --- a/dlls/comctl32/theme_combo.c +++ b/dlls/comctl32/theme_combo.c @@ -80,7 +80,7 @@ static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, const COMBOBOXINFO *c /* * Give ourselves some space. */ - CopyRect (&rectEdit, &cbi->rcItem); + rectEdit = cbi->rcItem; InflateRect( &rectEdit, -1, -1 ); if(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) @@ -187,8 +187,7 @@ static LRESULT paint (HTHEME theme, HWND hwnd, HDC hParamDC, ULONG state) GetClientRect (hwnd, &frameRect); else { - CopyRect (&frameRect, &cbi.rcItem); - + frameRect = cbi.rcItem; InflateRect(&frameRect, EDIT_CONTROL_PADDING + COMBO_XBORDERSIZE, EDIT_CONTROL_PADDING + COMBO_YBORDERSIZE); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9307fd4..3b32e91 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -876,7 +876,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); rc = btnPtr->rect; - CopyRect (&rcArrow, &rc); + rcArrow = rc; /* separator - doesn't send NM_CUSTOMDRAW */ if (btnPtr->fsStyle & BTNS_SEP) { @@ -929,8 +929,8 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, /* copy text & bitmap rects after adjusting for drop-down arrow * so that text & bitmap is centered in the rectangle not containing * the arrow */ - CopyRect(&rcText, &rc); - CopyRect(&rcBitmap, &rc); + rcText = rc; + rcBitmap = rc; /* Center the bitmap horizontally and vertically */ if (dwStyle & TBSTYLE_LIST) @@ -2648,9 +2648,9 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) lpdis->rcItem.right, lpdis->rcItem.bottom); /* calculate button and text rectangles */ - CopyRect (&rcButton, &lpdis->rcItem); + rcButton = lpdis->rcItem; InflateRect (&rcButton, -1, -1); - CopyRect (&rcText, &rcButton); + rcText = rcButton; rcButton.right = rcButton.left + custInfo->tbInfo->nBitmapWidth + 6; rcText.left = rcButton.right + 2; @@ -5550,7 +5550,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) RECT arrowRect; infoPtr->nOldHit = nHit; - CopyRect(&arrowRect, &btnPtr->rect); + arrowRect = btnPtr->rect; arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH); /* for EX_DRAWDDARROWS style, click must be in the drop-down arrow rect */

1 0

Alexandre Julliard : Release 1.9.13.
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: master Commit: af6f8ca4136ad937f8743494a8d3cea0b52d71cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6f8ca4136ad937f8743494a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 22:31:52 2016 +0900 Release 1.9.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 746 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 430 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af6f8ca4136ad937f8743…

1 0

Tag wine-1.9.13 : Alexandre Julliard : Release 1.9.13
by Alexandre Julliard 24 Jun '16

24 Jun '16

Module: wine Branch: refs/tags/wine-1.9.13 Tag: 40dab850e2651ea457a460db585962176de0bf75 URL: http://source.winehq.org/git/wine.git/?a=tag;h=40dab850e2651ea457a460db5859… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 22:31:52 2016 +0900 Release 1.9.13

1 0

Alistair Leslie-Hughes : inetcomm: Implement IMimeBody GetPropInfo.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 79762537a70f522f3f5e2cc21c62284ca4e1a9fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=79762537a70f522f3f5e2cc21… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 23 08:51:01 2016 +0000 inetcomm: Implement IMimeBody GetPropInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 38 +++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 91 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8dfba6f..766503d 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -711,8 +711,42 @@ static HRESULT WINAPI MimeBody_GetPropInfo( LPMIMEPROPINFO pInfo) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%s, %p) stub\n", This, debugstr_a(pszName), pInfo); - return E_NOTIMPL; + header_t *header; + HRESULT hr; + DWORD supported = PIM_PROPID | PIM_VTDEFAULT; + + TRACE("(%p)->(%s, %p) semi-stub\n", This, debugstr_a(pszName), pInfo); + + if(!pszName || !pInfo) + return E_INVALIDARG; + + TRACE("mask 0x%04x\n", pInfo->dwMask); + + if(pInfo->dwMask & ~supported) + FIXME("Unsupported mask flags 0x%04x\n", pInfo->dwMask & ~supported); + + hr = find_prop(This, pszName, &header); + if(hr == S_OK) + { + if(pInfo->dwMask & PIM_CHARSET) + pInfo->hCharset = 0; + if(pInfo->dwMask & PIM_FLAGS) + pInfo->dwFlags = 0x00000000; + if(pInfo->dwMask & PIM_ROWNUMBER) + pInfo->dwRowNumber = 0; + if(pInfo->dwMask & PIM_ENCODINGTYPE) + pInfo->ietEncoding = 0; + if(pInfo->dwMask & PIM_VALUES) + pInfo->cValues = 0; + if(pInfo->dwMask & PIM_PROPID) + pInfo->dwPropId = header->prop->id; + if(pInfo->dwMask & PIM_VTDEFAULT) + pInfo->vtDefault = header->prop->default_vt; + if(pInfo->dwMask & PIM_VTCURRENT) + pInfo->vtCurrent = 0; + } + + return hr; } static HRESULT WINAPI MimeBody_SetPropInfo( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 29ab6d8..8063b86 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -424,6 +424,96 @@ static void test_MessageSetProp(void) IMimeMessage_Release(msg); } +static void test_MessageGetPropInfo(void) +{ + static const char topic[] = "wine topic"; + static const char subject[] = "wine testing"; + HRESULT hr; + IMimeMessage *msg; + IMimeBody *body; + PROPVARIANT prop; + MIMEPROPINFO info; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + PropVariantInit(&prop); + + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, "Thread-Topic", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(subject)+1); + strcpy(prop.u.pszVal, subject); + hr = IMimeBody_SetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + memset(&info, 0, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, NULL, &info); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + memset(&info, 0, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, "Subject", NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + memset(&info, 0xfe, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, "Subject", &info); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(info.dwMask & (PIM_ENCODINGTYPE | PIM_FLAGS| PIM_PROPID), "Invalid mask 0x%08x\n", info.dwFlags); + todo_wine ok(info.dwFlags & 0x10000000, "Invalid flags 0x%08x\n", info.dwFlags); + ok(info.ietEncoding == 0, "Invalid encoding %d\n", info.ietEncoding); + ok(info.dwPropId == PID_HDR_SUBJECT, "Invalid propid %d\n", info.dwPropId); + ok(info.cValues == 0xfefefefe, "Invalid cValues %d\n", info.cValues); + } + + memset(&info, 0xfe, sizeof(info)); + info.dwMask = 0; + hr = IMimeBody_GetPropInfo(body, "Subject", &info); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(info.dwMask == 0, "Invalid mask 0x%08x\n", info.dwFlags); + ok(info.dwFlags == 0xfefefefe, "Invalid flags 0x%08x\n", info.dwFlags); + ok(info.ietEncoding == -16843010, "Invalid encoding %d\n", info.ietEncoding); + ok(info.dwPropId == -16843010, "Invalid propid %d\n", info.dwPropId); + } + + memset(&info, 0xfe, sizeof(info)); + info.dwMask = 0; + info.dwPropId = 1024; + info.ietEncoding = 99; + hr = IMimeBody_GetPropInfo(body, "Subject", &info); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(info.dwMask == 0, "Invalid mask 0x%08x\n", info.dwFlags); + ok(info.dwFlags == 0xfefefefe, "Invalid flags 0x%08x\n", info.dwFlags); + ok(info.ietEncoding == 99, "Invalid encoding %d\n", info.ietEncoding); + ok(info.dwPropId == 1024, "Invalid propid %d\n", info.dwPropId); + } + + memset(&info, 0, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, "Invalid Property", &info); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + + IMimeBody_Release(body); + IMimeMessage_Release(msg); +} + static void test_MessageOptions(void) { static const char string[] = "XXXXX"; @@ -534,6 +624,7 @@ START_TEST(mimeole) test_Allocator(); test_CreateMessage(); test_MessageSetProp(); + test_MessageGetPropInfo(); test_MessageOptions(); test_BindToObject(); test_MimeOleGetPropertySchema();

1 0

Andrey Gusev : winemac.drv: Fix a typo in WARN() message.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 82f3446c5d09aba0aa0cffcf7ece54d44d3b86ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f3446c5d09aba0aa0cffcf7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:37:38 2016 +0300 winemac.drv: Fix a typo in WARN() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index a4b8e34..e1953dd 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4058,7 +4058,7 @@ static BOOL macdrv_wglSetPbufferAttribARB(struct wgl_pbuffer *pbuffer, const int } break; default: - WARN("invalide attribute 0x%x\n", attr); + WARN("invalid attribute 0x%x\n", attr); SetLastError(ERROR_INVALID_DATA); return GL_FALSE; }

1 0