June 2022 - Wine-Commits - list.winehq.org

Ziqing Hui : d2d1: Implement property parsing for RegisterEffectFromStream().
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 967bd3120d5ddc0a5534c7c89ad173ddbfbc901f URL: https://source.winehq.org/git/wine.git/?a=commit;h=967bd3120d5ddc0a5534c7c8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jun 18 19:35:29 2022 +0300 d2d1: Implement property parsing for RegisterEffectFromStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 193 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 4a08a0cf76d..b3875f28209 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,6 +30,15 @@ struct d2d_settings d2d_settings = ~0u, /* No ID2D1Factory version limit by default. */ }; +struct d2d_effect_property +{ + WCHAR *name; + D2D1_PROPERTY_TYPE type; + BYTE *value; + PD2D1_PROPERTY_SET_FUNCTION set_function; + PD2D1_PROPERTY_GET_FUNCTION get_function; +}; + struct d2d_effect_registration { struct list entry; @@ -38,10 +47,22 @@ struct d2d_effect_registration CLSID id; UINT32 input_count; + + struct d2d_effect_property *properties; + size_t property_size; + size_t property_count; }; static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) { + size_t i; + + for (i = 0; i < reg->property_count; ++i) + { + free(reg->properties[i].name); + free(reg->properties[i].value); + } + free(reg->properties); free(reg); } @@ -643,7 +664,146 @@ static HRESULT parse_effect_skip_element(IXmlReader *reader, unsigned int elemen return hr; } -static HRESULT parse_effect_xml(IXmlReader *reader) +static HRESULT parse_effect_get_attribute(IXmlReader *reader, const WCHAR *name, WCHAR **ret) +{ + const WCHAR *value; + + *ret = NULL; + + if (IXmlReader_MoveToAttributeByName(reader, name, NULL) != S_OK) + return E_INVALIDARG; + if (IXmlReader_GetValue(reader, &value, NULL) != S_OK) + return E_INVALIDARG; + if (!(*ret = wcsdup(value))) + return E_OUTOFMEMORY; + + return S_OK; +} + +static HRESULT parse_effect_get_property_type(IXmlReader *reader, D2D1_PROPERTY_TYPE *type) +{ + static const WCHAR *types[] = + { + L"", /* D2D1_PROPERTY_TYPE_UNKNOWN */ + L"string", /* D2D1_PROPERTY_TYPE_STRING */ + L"bool", /* D2D1_PROPERTY_TYPE_BOOL */ + L"uint32", /* D2D1_PROPERTY_TYPE_UINT32 */ + L"int32", /* D2D1_PROPERTY_TYPE_INT32 */ + L"float", /* D2D1_PROPERTY_TYPE_FLOAT */ + L"vector2", /* D2D1_PROPERTY_TYPE_VECTOR2 */ + L"vector3", /* D2D1_PROPERTY_TYPE_VECTOR3 */ + L"vector4", /* D2D1_PROPERTY_TYPE_VECTOR4 */ + L"blob", /* D2D1_PROPERTY_TYPE_BLOB */ + L"iunknown", /* D2D1_PROPERTY_TYPE_IUNKNOWN */ + L"enum", /* D2D1_PROPERTY_TYPE_ENUM */ + L"array", /* D2D1_PROPERTY_TYPE_ARRAY */ + L"clsid", /* D2D1_PROPERTY_TYPE_CLSID */ + L"matrix3x2", /* D2D1_PROPERTY_TYPE_MATRIX_3X2 */ + L"matrix4x3", /* D2D1_PROPERTY_TYPE_MATRIX_4X3 */ + L"matrix4x4", /* D2D1_PROPERTY_TYPE_MATRIX_4X4 */ + L"matrix5x4", /* D2D1_PROPERTY_TYPE_MATRIX_5X4 */ + L"colorcontext", /* D2D1_PROPERTY_TYPE_COLOR_CONTEXT */ + }; + unsigned int i; + WCHAR *value; + HRESULT hr; + + if (FAILED(hr = parse_effect_get_attribute(reader, L"type", &value))) return hr; + + *type = D2D1_PROPERTY_TYPE_UNKNOWN; + + for (i = 0; i < ARRAY_SIZE(types); ++i) + { + if (!wcscmp(value, types[i])) + { + *type = i; + break; + } + } + + free(value); + + return *type == D2D1_PROPERTY_TYPE_UNKNOWN ? E_INVALIDARG : S_OK; +} + +static struct d2d_effect_property * parse_effect_get_property(const struct d2d_effect_registration *effect, + const WCHAR *name) +{ + unsigned int i; + + for (i = 0; i < effect->property_count; ++i) + { + if (!wcscmp(name, effect->properties[i].name)) + return &effect->properties[i]; + } + + return NULL; +} + +static HRESULT parse_effect_add_property(struct d2d_effect_registration *effect, WCHAR *name, + D2D1_PROPERTY_TYPE type, BYTE *value) +{ + struct d2d_effect_property *property; + + if (!d2d_array_reserve((void **)&effect->properties, &effect->property_size, + effect->property_count + 1, sizeof(*effect->properties))) + { + return E_OUTOFMEMORY; + } + + property = &effect->properties[effect->property_count++]; + property->name = name; + property->type = type; + property->value = value; + property->set_function = NULL; + property->get_function = NULL; + + return S_OK; +} + +static HRESULT parse_effect_property(IXmlReader *reader, struct d2d_effect_registration *effect) +{ + WCHAR *name = NULL, *value = NULL; + D2D1_PROPERTY_TYPE type; + unsigned int depth; + HRESULT hr; + + if (FAILED(hr = parse_effect_get_attribute(reader, L"name", &name))) + return hr; + + if (FAILED(hr = parse_effect_get_property_type(reader, &type))) + { + free(name); + return hr; + } + + /* Check for duplicates. */ + if (parse_effect_get_property(effect, name)) + hr = E_INVALIDARG; + + parse_effect_get_attribute(reader, L"value", &value); + + if (SUCCEEDED(hr)) + { + /* FIXME: sub properties are ignored */ + IXmlReader_MoveToElement(reader); + IXmlReader_GetDepth(reader, &depth); + hr = parse_effect_skip_element(reader, depth); + } + + if (SUCCEEDED(hr)) + hr = parse_effect_add_property(effect, name, type, (BYTE *)value); + + if (FAILED(hr)) + { + free(value); + free(name); + } + + return hr; +} + +static HRESULT parse_effect_xml(IXmlReader *reader, struct d2d_effect_registration *effect) { const WCHAR *node_name; XmlNodeType node_type; @@ -666,11 +826,10 @@ static HRESULT parse_effect_xml(IXmlReader *reader) if (FAILED(hr = IXmlReader_GetLocalName(reader, &node_name, NULL))) return hr; if (node_type == XmlNodeType_EndElement) break; - if (!wcscmp(node_name, L"Property") - || !wcscmp(node_name, L"Inputs")) - { + if (!wcscmp(node_name, L"Property")) + hr = parse_effect_property(reader, effect); + else if (!wcscmp(node_name, L"Inputs")) hr = parse_effect_skip_element(reader, depth); - } else { WARN("Unexpected element %s.\n", debugstr_w(node_name)); @@ -691,6 +850,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto struct d2d_factory *factory = impl_from_ID2D1Factory3(iface); struct d2d_effect_registration *effect; IXmlReader *reader; + unsigned int i; HRESULT hr; TRACE("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p.\n", @@ -720,7 +880,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto return E_OUTOFMEMORY; } - hr = parse_effect_xml(reader); + hr = parse_effect_xml(reader, effect); IXmlReader_Release(reader); if (FAILED(hr)) { @@ -729,6 +889,33 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto return hr; } + /* Check required properties. */ + if (!parse_effect_get_property(effect, L"DisplayName") + || !parse_effect_get_property(effect, L"Author") + || !parse_effect_get_property(effect, L"Category") + || !parse_effect_get_property(effect, L"Description")) + { + WARN("Missing required properties.\n"); + d2d_effect_registration_cleanup(effect); + return E_INVALIDARG; + } + + /* Bind getter and setter. */ + for (i = 0; i < binding_count; ++i) + { + struct d2d_effect_property *property; + + if (!(property = parse_effect_get_property(effect, bindings[i].propertyName))) + { + WARN("Failed to bind to missing property.\n"); + d2d_effect_registration_cleanup(effect); + return D2DERR_INVALID_PROPERTY; + } + + property->get_function = bindings[i].getFunction; + property->set_function = bindings[i].setFunction; + } + effect->registration_count = 1; effect->id = *effect_id; effect->factory = effect_factory;

1 0

Ziqing Hui : d2d1: Implement UnregisterEffect().
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: fd9f1e44a7e14a02826e12e9b1eec1540120fec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd9f1e44a7e14a02826e12e9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jun 18 19:53:57 2022 +0300 d2d1: Implement UnregisterEffect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 20 ++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 28 +++++++++++++--------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b3875f28209..5c79d1791ff 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -953,9 +953,25 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Facto static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory3 *iface, REFCLSID effect_id) { - FIXME("iface %p, effect_id %s stub!\n", iface, debugstr_guid(effect_id)); + struct d2d_factory *factory = impl_from_ID2D1Factory3(iface); + struct d2d_effect_registration *effect; - return E_NOTIMPL; + TRACE("iface %p, effect_id %s.\n", iface, debugstr_guid(effect_id)); + + LIST_FOR_EACH_ENTRY(effect, &factory->effects, struct d2d_effect_registration, entry) + { + if (IsEqualGUID(effect_id, &effect->id)) + { + if (!--effect->registration_count) + { + list_remove(&effect->entry); + d2d_effect_registration_cleanup(effect); + } + return S_OK; + } + } + + return D2DERR_EFFECT_IS_NOT_REGISTERED; } static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory3 *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 752e34bf4da..f1cec1d7a0b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10715,7 +10715,7 @@ static void test_effect_register(BOOL d3d11) winetest_push_context("Test %u", i); hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create); - todo_wine_if(test->hr != S_OK) + todo_wine_if(i == 5) ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); if (hr == S_OK) { @@ -10723,9 +10723,9 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); if (effect) ID2D1Effect_Release(effect); } @@ -10748,11 +10748,11 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); winetest_pop_context(); } @@ -10787,9 +10787,9 @@ static void test_effect_register(BOOL d3d11) } hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Register effect with property binding */ for (i = 0; i < ARRAY_SIZE(binding_tests); ++i) @@ -10799,7 +10799,6 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->effect_xml, test->binding, test->binding_count, effect_impl_create); - todo_wine_if(test->hr != S_OK) ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); @@ -10848,13 +10847,13 @@ static void test_effect_register(BOOL d3d11) } hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Unregister builtin effect */ hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_D2D1Composite); - todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); release_test_context(&ctx); } @@ -10932,7 +10931,6 @@ done: if (effect) ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); release_test_context(&ctx); } @@ -11089,7 +11087,7 @@ static void test_effect_properties(BOOL d3d11) if (effect) ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); winetest_pop_context(); } @@ -11182,7 +11180,7 @@ done: if (effect) ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); release_test_context(&ctx); }

1 0

Nikolay Sivov : d2d1/effect: Add LoadComputeShader().
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 89e1a7614e17c63781585af5662654a16320f995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89e1a7614e17c63781585af5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 19 20:11:26 2022 +0300 d2d1/effect: Add LoadComputeShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 2da655b00d8..d298985c020 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -247,10 +247,27 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface, REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) { - FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ID3D11ComputeShader *shader; + HRESULT hr; + + TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - return E_NOTIMPL; + if (ID2D1EffectContext_IsShaderLoaded(iface, shader_id)) + return S_OK; + + if (FAILED(hr = ID3D11Device1_CreateComputeShader(effect_context->device_context->d3d_device, + buffer, buffer_size, NULL, &shader))) + { + WARN("Failed to create a compute shader, hr %#lx.\n", hr); + return hr; + } + + hr = d2d_effect_context_add_shader(effect_context, shader_id, shader); + ID3D11ComputeShader_Release(shader); + + return hr; } static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id)

1 0

Nikolay Sivov : d2d1: Use CRT memory allocation functions.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 9e47b64c67c8643fabdd0b8ae8e47c5067774c54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e47b64c67c8643fabdd0b8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 18 20:26:28 2022 +0300 d2d1: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 14 ++++----- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 26 +++++++-------- dlls/d2d1/d2d1_private.h | 3 +- dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/device.c | 28 ++++++++--------- dlls/d2d1/effect.c | 12 +++---- dlls/d2d1/factory.c | 54 +++++++++++++++---------------- dlls/d2d1/geometry.c | 68 ++++++++++++++++++++-------------------- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/layer.c | 4 +-- dlls/d2d1/mesh.c | 4 +-- dlls/d2d1/state_block.c | 2 +- dlls/d2d1/stroke.c | 6 ++-- dlls/d2d1/wic_render_target.c | 2 +- 15 files changed, 114 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e47b64c67c8643fabdd…

1 0

Nikolay Sivov : d2d1/effect: Forward color context methods to corresponding device context.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 38e6653489c51979f2228c79aeaeaf25269a6040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38e6653489c51979f2228c79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 19 00:41:22 2022 +0300 d2d1/effect: Forward color context methods to corresponding device context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index fb5e26273f6..8345a5aa7d7 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -291,26 +291,35 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1Effect static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface, D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) { - FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + + TRACE("iface %p, space %#x, profile %p, profile_size %u, color_context %p.\n", iface, space, profile, profile_size, color_context); - return E_NOTIMPL; + return ID2D1DeviceContext1_CreateColorContext(&effect_context->device_context->ID2D1DeviceContext1_iface, + space, profile, profile_size, color_context); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface, const WCHAR *filename, ID2D1ColorContext **color_context) { - FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - return E_NOTIMPL; + TRACE("iface %p, filename %s, color_context %p.\n", iface, debugstr_w(filename), color_context); + + return ID2D1DeviceContext1_CreateColorContextFromFilename(&effect_context->device_context->ID2D1DeviceContext1_iface, + filename, color_context); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface, IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) { - FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - return E_NOTIMPL; + TRACE("iface %p, wic_color_context %p, color_context %p.\n", iface, wic_color_context, color_context); + + return ID2D1DeviceContext1_CreateColorContextFromWicColorContext(&effect_context->device_context->ID2D1DeviceContext1_iface, + wic_color_context, color_context); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface,

1 0

Brendan Shanks : ntdll: Add zero_bits parameter to virtual_map_builtin_module.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 9bed3adc7240f3a51504ef54dddae46d76e3dfbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bed3adc7240f3a51504ef54… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 17 14:56:28 2022 -0700 ntdll: Add zero_bits parameter to virtual_map_builtin_module. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 4 ++-- dlls/ntdll/unix/virtual.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7f85582adf3..ef66d76e610 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1486,7 +1486,7 @@ static NTSTATUS open_builtin_pe_file( const char *name, OBJECT_ATTRIBUTES *attr, status = open_dll_file( name, attr, &mapping ); if (!status) { - status = virtual_map_builtin_module( mapping, module, size, image_info, machine, prefer_native ); + status = virtual_map_builtin_module( mapping, module, size, image_info, 0, machine, prefer_native ); NtClose( mapping ); } return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 795fc148479..8a213bdc65f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -195,8 +195,8 @@ extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size, - SECTION_IMAGE_INFORMATION *info, WORD machine, BOOL prefer_native ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size, SECTION_IMAGE_INFORMATION *info, + ULONG_PTR zero_bits, WORD machine, BOOL prefer_native ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_name, pe_image_info_t *info, void *so_handle ) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6ecca9cb98a..0f65db69fbb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2756,8 +2756,8 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) /*********************************************************************** * virtual_map_builtin_module */ -NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size, - SECTION_IMAGE_INFORMATION *info, WORD machine, BOOL prefer_native ) +NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size, SECTION_IMAGE_INFORMATION *info, + ULONG_PTR zero_bits, WORD machine, BOOL prefer_native ) { mem_size_t full_size; unsigned int sec_flags; @@ -2794,7 +2794,7 @@ NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size else { status = virtual_map_image( mapping, SECTION_MAP_READ | SECTION_MAP_EXECUTE, - module, size, 0, shared_file, 0, image_info, filename, TRUE ); + module, size, zero_bits, shared_file, 0, image_info, filename, TRUE ); virtual_fill_image_information( image_info, info ); }

1 0

Brendan Shanks : ntdll: Add zero_bits parameter to open_builtin_pe_file.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 6d22775b65af35a936449b26cbd2c2d02e76ed35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d22775b65af35a936449b26… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 17 14:59:49 2022 -0700 ntdll: Add zero_bits parameter to open_builtin_pe_file. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ef66d76e610..cd8b79e2d52 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1477,7 +1477,7 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, HANDLE */ static NTSTATUS open_builtin_pe_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, SIZE_T *size, SECTION_IMAGE_INFORMATION *image_info, - WORD machine, BOOL prefer_native ) + ULONG_PTR zero_bits, WORD machine, BOOL prefer_native ) { NTSTATUS status; HANDLE mapping; @@ -1486,7 +1486,7 @@ static NTSTATUS open_builtin_pe_file( const char *name, OBJECT_ATTRIBUTES *attr, status = open_dll_file( name, attr, &mapping ); if (!status) { - status = virtual_map_builtin_module( mapping, module, size, image_info, 0, machine, prefer_native ); + status = virtual_map_builtin_module( mapping, module, size, image_info, zero_bits, machine, prefer_native ); NtClose( mapping ); } return status; @@ -1572,7 +1572,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); @@ -1586,7 +1586,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); @@ -1599,7 +1599,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T file[pos + len + 1] = 0; ptr = prepend( ptr, pe_dir, strlen(pe_dir) ); ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); /* use so dir for unix lib */ ptr = file + pos; ptr = prepend( ptr, so_dir, strlen(so_dir) ); @@ -1610,7 +1610,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T if (status != STATUS_DLL_NOT_FOUND) goto done; file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) { found_image = TRUE; @@ -1981,7 +1981,7 @@ static void load_ntdll(void) name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); if (build_dir) sprintf( name, "%s/ntdll.dll", ntdll_dir ); else sprintf( name, "%s%s/ntdll.dll", dll_dir, pe_dir ); - status = open_builtin_pe_file( name, &attr, &module, &size, &info, current_machine, FALSE ); + status = open_builtin_pe_file( name, &attr, &module, &size, &info, 0, current_machine, FALSE ); if (status == STATUS_DLL_NOT_FOUND) { sprintf( name, "%s/ntdll.dll.so", ntdll_dir );

1 0

Brendan Shanks : ntdll: Add zero_bits parameter to load_builtin.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: f99cb3297fca270c2be594475200da247a1506fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99cb3297fca270c2be59447… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 17 15:05:39 2022 -0700 ntdll: Add zero_bits parameter to load_builtin. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a69bf49b705..2fd4acc06b9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1644,7 +1644,7 @@ done: * Return STATUS_IMAGE_ALREADY_LOADED if we should keep the native one that we have found. */ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, - void **module, SIZE_T *size ) + void **module, SIZE_T *size, ULONG_PTR zero_bits ) { WORD machine = image_info->machine; /* request same machine as the native one */ NTSTATUS status; @@ -1675,9 +1675,9 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, case LO_NATIVE_BUILTIN: return STATUS_IMAGE_ALREADY_LOADED; case LO_BUILTIN: - return find_builtin_dll( &nt_name, module, size, &info, 0, machine, FALSE ); + return find_builtin_dll( &nt_name, module, size, &info, zero_bits, machine, FALSE ); default: - status = find_builtin_dll( &nt_name, module, size, &info, 0, machine, (loadorder == LO_DEFAULT) ); + status = find_builtin_dll( &nt_name, module, size, &info, zero_bits, machine, (loadorder == LO_DEFAULT) ); if (status == STATUS_DLL_NOT_FOUND || status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) return STATUS_IMAGE_ALREADY_LOADED; return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 8a213bdc65f..39b667ddd4a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -150,7 +150,7 @@ extern void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; extern NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, - void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; + void **addr_ptr, SIZE_T *size_ptr, ULONG_PTR zero_bits ) DECLSPEC_HIDDEN; extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) DECLSPEC_HIDDEN; extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0f65db69fbb..a93d5b4174a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2539,7 +2539,7 @@ static NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_PTR z { filename = (WCHAR *)(image_info + 1); /* check if we can replace that mapping with the builtin */ - res = load_builtin( image_info, filename, addr_ptr, size_ptr ); + res = load_builtin( image_info, filename, addr_ptr, size_ptr, zero_bits ); if (res == STATUS_IMAGE_ALREADY_LOADED) res = virtual_map_image( handle, access, addr_ptr, size_ptr, zero_bits, shared_file, alloc_type, image_info, filename, FALSE );

1 0

Brendan Shanks : ntdll: Add zero_bits parameter to find_builtin_dll.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 20abf39d86c75b98eec4446dd7d78655aaedcb81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20abf39d86c75b98eec4446d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 17 15:02:44 2022 -0700 ntdll: Add zero_bits parameter to find_builtin_dll. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cd8b79e2d52..a69bf49b705 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1530,7 +1530,8 @@ static NTSTATUS open_builtin_so_file( const char *name, OBJECT_ATTRIBUTES *attr, * find_builtin_dll */ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T *size_ptr, - SECTION_IMAGE_INFORMATION *image_info, WORD machine, BOOL prefer_native ) + SECTION_IMAGE_INFORMATION *image_info, + ULONG_PTR zero_bits, WORD machine, BOOL prefer_native ) { unsigned int i, pos, namepos, namelen, maxlen = 0; unsigned int len = nt_name->Length / sizeof(WCHAR); @@ -1572,7 +1573,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, zero_bits, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); @@ -1586,7 +1587,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, zero_bits, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); @@ -1599,7 +1600,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T file[pos + len + 1] = 0; ptr = prepend( ptr, pe_dir, strlen(pe_dir) ); ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, zero_bits, machine, prefer_native ); /* use so dir for unix lib */ ptr = file + pos; ptr = prepend( ptr, so_dir, strlen(so_dir) ); @@ -1610,7 +1611,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T if (status != STATUS_DLL_NOT_FOUND) goto done; file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, 0, machine, prefer_native ); + status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, zero_bits, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) { found_image = TRUE; @@ -1674,9 +1675,9 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, case LO_NATIVE_BUILTIN: return STATUS_IMAGE_ALREADY_LOADED; case LO_BUILTIN: - return find_builtin_dll( &nt_name, module, size, &info, machine, FALSE ); + return find_builtin_dll( &nt_name, module, size, &info, 0, machine, FALSE ); default: - status = find_builtin_dll( &nt_name, module, size, &info, machine, (loadorder == LO_DEFAULT) ); + status = find_builtin_dll( &nt_name, module, size, &info, 0, machine, (loadorder == LO_DEFAULT) ); if (status == STATUS_DLL_NOT_FOUND || status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) return STATUS_IMAGE_ALREADY_LOADED; return status; @@ -1839,7 +1840,7 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA /* if path is in system dir, we can load the builtin even if the file itself doesn't exist */ if (loadorder != LO_NATIVE && is_builtin_path( &nt_name, &machine )) { - status = find_builtin_dll( &nt_name, module, &size, &main_image_info, machine, FALSE ); + status = find_builtin_dll( &nt_name, module, &size, &main_image_info, 0, machine, FALSE ); if (status != STATUS_DLL_NOT_FOUND) return status; } if (!contains_path) return STATUS_DLL_NOT_FOUND; @@ -1868,7 +1869,7 @@ NTSTATUS load_start_exe( WCHAR **image, void **module ) wcscpy( *image, get_machine_wow64_dir( current_machine )); wcscat( *image, startW ); init_unicode_string( &nt_name, *image ); - status = find_builtin_dll( &nt_name, module, &size, &main_image_info, current_machine, FALSE ); + status = find_builtin_dll( &nt_name, module, &size, &main_image_info, 0, current_machine, FALSE ); if (status) { MESSAGE( "wine: failed to load start.exe: %x\n", status ); @@ -2082,7 +2083,7 @@ static void load_wow64_ntdll( USHORT machine ) wcscpy( path, get_machine_wow64_dir( machine )); wcscat( path, ntdllW ); init_unicode_string( &nt_name, path ); - status = find_builtin_dll( &nt_name, &module, &size, &info, machine, FALSE ); + status = find_builtin_dll( &nt_name, &module, &size, &info, 0, machine, FALSE ); switch (status) { case STATUS_IMAGE_NOT_AT_BASE:

1 0

Alexandre Julliard : Wine release 7.11
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: website Branch: master Commit: f8c84a14b4c6d6ef5de8059d0d6589acece1bb18 URL: https://source.winehq.org/git/website.git/?a=commit;h=f8c84a14b4c6d6ef5de80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 21:55:09 2022 +0200 Wine release 7.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022061701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022061701.xml b/news/en/2022061701.xml new file mode 100644 index 00000000..926a22cc --- /dev/null +++ b/news/en/2022061701.xml @@ -0,0 +1,16 @@ +<news> +<date>June 17, 2022</date> +<title>Wine 7.11 Released</title> +<body> + The Wine development release 7.11 is now available. + <a href="{$root}/announce/7.11">What's new</a> in this release: +<ul> + <li>Android driver converted to PE.</li> + <li>Zero-copy support with GStreamer.</li> + <li>High Unicode planes support in case mappings.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0