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

[PATCH v3] d2d1: Make ID2D1Device::CreateImageBrush() accept only bitmap as a source image.
by Dmitry Timoshkov 07 Jun '22

07 Jun '22

ID2D1Bitmap derives from ID2D1Image, which in turn derives from ID2D1Resource. That means that ID2D1Device::CreateImageBrush() can't be really passed anything but a ID2D1Bitmap* represented as a ID2D1Image*. I've added QueryInterface+FIXME just in case, probably it could be dropped. v2: Fix test crashes with image == NULL. v3: Add a QueryInterface() check to SetImage(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/brush.c | 27 ++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 1 - 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..99aaedeb43f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1209,7 +1209,19 @@ static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, I TRACE("iface %p, image %p.\n", iface, image); if (image) + { + ID2D1Bitmap *bitmap; + + if (FAILED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return; + } + + ID2D1Bitmap_Release(bitmap); ID2D1Image_AddRef(image); + } + if (brush->u.image.image) ID2D1Image_Release(brush->u.image.image); brush->u.image.image = image; @@ -1327,7 +1339,20 @@ HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; - d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE, + if (image) + { + ID2D1Bitmap *bitmap; + + if (FAILED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return E_FAIL; + } + + ID2D1Bitmap_Release(bitmap); + } + + d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl); if (((*brush)->u.image.image = image)) ID2D1Image_AddRef((*brush)->u.image.image); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 29469f5142e..6183d9d4c99 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -42,7 +42,6 @@ enum d2d_brush_type D2D_BRUSH_TYPE_LINEAR, D2D_BRUSH_TYPE_RADIAL, D2D_BRUSH_TYPE_BITMAP, - D2D_BRUSH_TYPE_IMAGE, D2D_BRUSH_TYPE_COUNT, }; -- 2.36.1

2 15

[PATCH 0/11] MR193: wineandroid: PE conversion
by Jacek Caban (＠jacek) 07 Jun '22

07 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/193

3 12

[PATCH vkd3d v4 1/9] vkd3d-shader/hlsl: Split matrices into multiple variables in append_output_copy().
by Giovanni Mascellani 07 Jun '22

07 Jun '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 47 +++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 78b22910..b4fcfd27 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -21,6 +21,22 @@ #include "hlsl.h" #include <stdio.h> +static unsigned int minor_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimx; + else + return type->dimy; +} + +static unsigned int major_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimy; + else + return type->dimx; +} + /* Split uniforms into two variables representing the constant and temp * registers, and copy the former to the latter, so that writes to uniforms * work. */ @@ -141,6 +157,21 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_ir_var *output; struct hlsl_ir_load *load; + if (type->type == HLSL_CLASS_MATRIX) + { + struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + struct hlsl_semantic vector_semantic = *semantic; + unsigned int i; + + for (i = 0; i < major_size(type); ++i) + { + append_output_copy(ctx, instrs, var, vector_type, 4 * i, modifiers, &vector_semantic); + ++vector_semantic.index; + } + + return; + } + if (!(name = hlsl_get_string_buffer(ctx))) return; vkd3d_string_buffer_printf(name, "<output-%s%u>", semantic->name, semantic->index); @@ -847,22 +878,6 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } -static unsigned int minor_size(const struct hlsl_type *type) -{ - if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) - return type->dimx; - else - return type->dimy; -} - -static unsigned int major_size(const struct hlsl_type *type) -{ - if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) - return type->dimy; - else - return type->dimx; -} - static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { const struct hlsl_ir_node *rhs; -- 2.36.1

1 8

[PATCH 1/5] d2d1/tests: Add more test xml.
by Ziqing Hui 07 Jun '22

07 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..3e385b2b05f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -170,6 +170,29 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_wrong_type = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='uint32' value='32'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_duplicate_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + static const DWORD test_vs[] = { #if 0 @@ -10615,6 +10638,8 @@ static void test_effect_register(BOOL d3d11) {effect_xml_without_category, E_INVALIDARG}, {effect_xml_without_description, E_INVALIDARG}, {effect_xml_without_type, E_INVALIDARG}, + {effect_xml_wrong_type, E_INVALIDARG}, + {effect_xml_duplicate_property, E_INVALIDARG}, }; const D2D1_PROPERTY_BINDING binding[] = -- 2.25.1

3 17

[PATCH 0/7] MR191: wineandroid: PE conversion preparation
by Jacek Caban (＠jacek) 07 Jun '22

07 Jun '22

This MR removes Android audio driver. It was considered not worth the effort. If we ever need it, we may restore that from git history (maybe on top of future audio drivers interface unification). For the rest of the rest of driver, the conversion is rather straightforward, so I went ahead and just did it. The tricky part is that I could only build test it... Luckily, most of changes are sed or copy&paste. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/191

6 12

Re: [PATCH v2 0/7] MR191: wineandroid: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 06 Jun '22

06 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/191

1 0

Re: [PATCH v3 0/6] MR173: preparation for sharing code in d3dx10/d3dx11 - approved
by Alexandre Julliard (＠julliard) 06 Jun '22

06 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/173

1 0

Re: [PATCH v2 0/1] MR185: d2d1: Use d3d11 constants for constant buffer description. - approved
by Alexandre Julliard (＠julliard) 06 Jun '22

06 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/185

1 0

Re: [PATCH v3 0/4] MR183: kernelbase: Implement VirtualAlloc2FromApp(). - approved
by Alexandre Julliard (＠julliard) 06 Jun '22

06 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/183

1 0

Re: [PATCH v2 0/1] MR186: secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity). - approved
by Alexandre Julliard (＠julliard) 06 Jun '22

06 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/186

1 0