- Wine-Devel - list.winehq.org

[PATCH 2/4 v2] msvcrt: Introduce fenv_decode helper in all runtime versions.
by Piotr Caban July 21, 2021

July 21, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4 v2] msvcrt: Use _MCW_RC rounding mask in fesetround and fegetround.
by Piotr Caban July 21, 2021

July 21, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] include: Add structure padding for aarch64 in dbghelp.h.
by Biswapriyo Nath July 21, 2021

July 21, 2021

1 0

Wine staging 6.13 release
by Alistair Leslie-Hughes July 21, 2021

July 21, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.13 (608 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * mfplat: Fix copy/paste error * server: Explicitly forbid connecting a listening or connected socket. Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] mfmediaengine: Handle shutdown state in SetSource().
by Nikolay Sivov July 20, 2021

July 20, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 46 +++++++++++++----------- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index e4263febe5e..36365f2a3cc 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1352,29 +1352,35 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) EnterCriticalSection(&engine->cs); - SysFreeString(engine->current_source); - engine->current_source = NULL; - if (url) - engine->current_source = SysAllocString(url); - - engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; - - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - - if (url) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - IPropertyStore *props = NULL; - unsigned int flags; + SysFreeString(engine->current_source); + engine->current_source = NULL; + if (url) + engine->current_source = SysAllocString(url); + + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; - flags = MF_RESOLUTION_MEDIASOURCE; - if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) - flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, - &IID_IPropertyStore, (void **)&props); - hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, &engine->load_handler, NULL); - if (props) - IPropertyStore_Release(props); + if (url) + { + IPropertyStore *props = NULL; + unsigned int flags; + + flags = MF_RESOLUTION_MEDIASOURCE; + if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) + flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; + + IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, + &IID_IPropertyStore, (void **)&props); + hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, + &engine->load_handler, NULL); + if (props) + IPropertyStore_Release(props); + } } LeaveCriticalSection(&engine->cs); diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 66984595d3b..096f6e3f2a5 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -253,7 +253,6 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_SetSource(media_engine, NULL); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); -- 2.30.2

1 1

[PATCH] msvcrt: Don't set x87 control word in x86_64 fesetenv.
by Piotr Caban July 20, 2021

July 20, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51215 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH 1/6] wined3d: Implement constant buffer offsetting for Vulkan.
by Zebediah Figura July 20, 2021

July 20, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 14 +++------- dlls/wined3d/context_vk.c | 49 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..2dbff2310ad 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1431,17 +1431,11 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf return TRUE; } -const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) +void wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk, VkDescriptorBufferInfo *buffer_info) { - if (buffer_vk->bo_user.valid) - return &buffer_vk->buffer_info; - - buffer_vk->buffer_info.buffer = buffer_vk->bo.vk_buffer; - buffer_vk->buffer_info.offset = buffer_vk->bo.buffer_offset; - buffer_vk->buffer_info.range = buffer_vk->b.resource.size; - buffer_vk->bo_user.valid = true; - - return &buffer_vk->buffer_info; + buffer_info->buffer = buffer_vk->bo.vk_buffer; + buffer_info->offset = buffer_vk->bo.buffer_offset; + buffer_info->range = buffer_vk->b.resource.size; } static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index d1a113d1f81..7a2a9d2bfb3 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2418,8 +2418,8 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co VkDeviceSize offsets[ARRAY_SIZE(state->streams)] = {0}; VkBuffer buffers[ARRAY_SIZE(state->streams)]; const struct wined3d_stream_state *stream; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_buffer_vk *buffer_vk; + VkDescriptorBufferInfo buffer_info; struct wined3d_buffer *buffer; unsigned int i, first, count; @@ -2432,10 +2432,10 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co if ((buffer = stream->buffer)) { buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, &buffer_info); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - buffers[count] = buffer_info->buffer; - offsets[count] = buffer_info->offset + stream->offset; + buffers[count] = buffer_info.buffer; + offsets[count] = buffer_info.offset + stream->offset; ++count; continue; } @@ -2457,8 +2457,8 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context VkDeviceSize sizes[ARRAY_SIZE(state->stream_output)]; VkBuffer buffers[ARRAY_SIZE(state->stream_output)]; const struct wined3d_stream_output *stream; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_buffer_vk *buffer_vk; + VkDescriptorBufferInfo buffer_info; struct wined3d_buffer *buffer; unsigned int i, first, count; @@ -2471,16 +2471,16 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context if ((buffer = stream->buffer)) { buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, &buffer_info); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - buffers[count] = buffer_info->buffer; + buffers[count] = buffer_info.buffer; if ((offsets[count] = stream->offset) == ~0u) { FIXME("Appending to stream output buffers not implemented.\n"); offsets[count] = 0; } - sizes[count] = buffer_info->range - offsets[count]; - offsets[count] += buffer_info->offset; + sizes[count] = buffer_info.range - offsets[count]; + offsets[count] += buffer_info.offset; ++count; continue; } @@ -2654,6 +2654,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, enum wined3d_pipeline pipeline) { struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; + VkDescriptorBufferInfo buffers[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; @@ -2661,7 +2662,6 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_unordered_access_view *uav; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; const VkDescriptorImageInfo *image_info; struct wined3d_buffer_vk *buffer_vk; @@ -2713,7 +2713,13 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con switch (binding->shader_descriptor_type) { case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: - if (!(buffer = state->cb[binding->shader_type][binding->resource_idx].buffer)) + { + enum wined3d_shader_type shader_type = binding->shader_type; + size_t resource_idx = binding->resource_idx; + const struct wined3d_constant_buffer_state *cb_state = &state->cb[shader_type][resource_idx]; + VkDescriptorBufferInfo *buffer_info = &buffers[shader_type][resource_idx]; + + if (!(buffer = cb_state->buffer)) { if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, @@ -2722,12 +2728,16 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con break; } buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, buffer_info); + buffer_info->offset += cb_state->offset; + buffer_info->range = cb_state->size; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) return false; wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); break; + } case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) @@ -2988,7 +2998,11 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * switch (binding->shader_descriptor_type) { case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: - if (!(buffer = state->cb[binding->shader_type][binding->resource_idx].buffer)) + { + const struct wined3d_constant_buffer_state *cb_state + = &state->cb[binding->shader_type][binding->resource_idx]; + + if (!(buffer = cb_state->buffer)) break; buffer_vk = wined3d_buffer_vk(buffer); @@ -3002,6 +3016,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * } wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_CONSTANT_BUFFER); break; + } case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) @@ -3250,7 +3265,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer) { - const VkDescriptorBufferInfo *buffer_info; + VkDescriptorBufferInfo buffer_info; VkIndexType idx_type; if (state->index_format == WINED3DFMT_R16_UINT) @@ -3258,10 +3273,10 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c else idx_type = VK_INDEX_TYPE_UINT32; buffer_vk = wined3d_buffer_vk(state->index_buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, &buffer_info); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info->buffer, - buffer_info->offset + state->index_offset, idx_type)); + VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info.buffer, + buffer_info.offset + state->index_offset, idx_type)); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2048fc6ea6..ca85f811673 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4971,7 +4971,6 @@ struct wined3d_buffer_vk struct wined3d_bo_vk bo; struct wined3d_bo_user bo_user; - VkDescriptorBufferInfo buffer_info; uint32_t bind_mask; }; @@ -4982,7 +4981,8 @@ static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN; -const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN; +void wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk, + VkDescriptorBufferInfo *buffer_info) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, 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) DECLSPEC_HIDDEN; -- 2.32.0

2 7

WoW64 on Catalina
by Theodore Dubois July 20, 2021

July 20, 2021

The latest I've found is that Alexandre's favorite solution is to insert thunks between 32-bit PE libraries and 64 bit host interface libraries. At the time PE libraries weren't really a thing yet, but they seem to be now. Is the PE work in a state where it would be possible to start generating thunks? Is anyone working on this? ~Theodore

2 1

[PATCH 4/4] d2d1: Implement d2d_effect_GetOutput().
by Henri Verbeet July 20, 2021

July 20, 2021

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 209629. dlls/d2d1/effect.c | 6 +++++- dlls/d2d1/tests/d2d1.c | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 7487c4c4539..40dd2187953 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -190,7 +190,11 @@ static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + + TRACE("iface %p, output %p.\n", iface, output); + + ID2D1Image_AddRef(*output = &effect->ID2D1Image_iface); } static const ID2D1EffectVtbl d2d_effect_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5ac4aed7c4c..1ee4941da99 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,7 +9680,7 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - ID2D1Image *image_a, *image_b = NULL; + ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; @@ -9705,9 +9705,8 @@ static void test_effect(BOOL d3d11) hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); - todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); - if (image_b) - ID2D1Image_Release(image_b); + ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); ID2D1Effect_Release(effect); -- 2.20.1

1 0

[PATCH 3/4] d2d1: Add a ID2D1Image interface for effects.
by Henri Verbeet July 20, 2021

July 20, 2021

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 209630. dlls/d2d1/d2d1_private.h | 5 +++- dlls/d2d1/device.c | 3 +- dlls/d2d1/effect.c | 65 +++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 5 +--- 4 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f25a7809b17..ce99e7c3432 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -568,10 +568,13 @@ void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDev struct d2d_effect { ID2D1Effect ID2D1Effect_iface; + ID2D1Image ID2D1Image_iface; LONG refcount; + + ID2D1Factory *factory; }; -void d2d_effect_init(struct d2d_effect *effect) DECLSPEC_HIDDEN; +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 44840f0010f..0647bc57fc3 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1885,6 +1885,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, REFCLSID effect_id, ID2D1Effect **effect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); @@ -1892,7 +1893,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object); + d2d_effect_init(object, context->factory); TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index fb1e66a3d9b..7487c4c4539 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -27,6 +27,7 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_ID2D1Effect) @@ -38,6 +39,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, R return S_OK; } + if (IsEqualGUID(iid, &IID_ID2D1Image) + || IsEqualGUID(iid, &IID_ID2D1Resource)) + { + ID2D1Image_AddRef(&effect->ID2D1Image_iface); + *out = &effect->ID2D1Image_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; @@ -62,7 +71,10 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(effect->factory); heap_free(effect); + } return refcount; } @@ -204,8 +216,59 @@ static const ID2D1EffectVtbl d2d_effect_vtbl = d2d_effect_GetOutput, }; -void d2d_effect_init(struct d2d_effect *effect) +static inline struct d2d_effect *impl_from_ID2D1Image(ID2D1Image *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Image_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_image_QueryInterface(ID2D1Image *iface, REFIID iid, void **out) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d2d_effect_QueryInterface(&effect->ID2D1Effect_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_AddRef(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_AddRef(&effect->ID2D1Effect_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_Release(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_Release(&effect->ID2D1Effect_iface); +} + +static void STDMETHODCALLTYPE d2d_effect_image_GetFactory(ID2D1Image *iface, ID2D1Factory **factory) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = effect->factory); +} + +static const ID2D1ImageVtbl d2d_effect_image_vtbl = +{ + d2d_effect_image_QueryInterface, + d2d_effect_image_AddRef, + d2d_effect_image_Release, + d2d_effect_image_GetFactory, +}; + +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; + effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + ID2D1Factory_AddRef(effect->factory = factory); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 41203f85019..5ac4aed7c4c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9703,16 +9703,13 @@ static void test_effect(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr != S_OK) - goto done; + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); if (image_b) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); -done: ID2D1Effect_Release(effect); ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); -- 2.20.1

1 0