November 2015 - Wine-commits

Henri Verbeet : d2d1: Validate brush types in d2d_d3d_render_target_FillGeometry().
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: 17daa1398e35900aca99a72bb63ea352d2cb1242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17daa1398e35900aca99a72bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 16:10:20 2015 +0100 d2d1: Validate brush types in d2d_d3d_render_target_FillGeometry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 7 +++++++ dlls/d2d1/render_target.c | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5fe5620..e0aee8e 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -52,6 +52,12 @@ struct d2d_clip_stack unsigned int count; }; +struct d2d_error_state +{ + HRESULT code; + D2D1_TAG tag1, tag2; +}; + struct d2d_shape_resources { ID3D10InputLayout *il; @@ -76,6 +82,7 @@ struct d2d_d3d_render_target ID3D10RasterizerState *rs; ID3D10BlendState *bs; + struct d2d_error_state error; D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0ed57c4..6376098 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -682,6 +682,17 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarg TRACE("iface %p, geometry %p, brush %p, opacity_brush %p.\n", iface, geometry, brush, opacity_brush); + if (FAILED(render_target->error.code)) + return; + + if (opacity_brush && brush_impl->type != D2D_BRUSH_TYPE_BITMAP) + { + render_target->error.code = D2DERR_INCOMPATIBLE_BRUSH_TYPES; + render_target->error.tag1 = render_target->drawing_state.tag1; + render_target->error.tag2 = render_target->drawing_state.tag2; + return; + } + if (opacity_brush) FIXME("Ignoring opacity brush %p.\n", opacity_brush); @@ -1226,20 +1237,26 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa static void STDMETHODCALLTYPE d2d_d3d_render_target_BeginDraw(ID2D1RenderTarget *iface) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + TRACE("iface %p.\n", iface); + + memset(&render_target->error, 0, sizeof(render_target->error)); } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); if (tag1) - *tag1 = 0; + *tag1 = render_target->error.tag1; if (tag2) - *tag2 = 0; + *tag1 = render_target->error.tag2; - return S_OK; + return render_target->error.code; } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Add support for opacity brushes.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: e6aa9f50410e7d8d937122a0e55be2f98bedcb1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6aa9f50410e7d8d937122a0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 16:10:21 2015 +0100 d2d1: Add support for opacity brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 219 ++++++++++++++++++++++++++++++---------------- dlls/d2d1/d2d1_private.h | 10 +-- dlls/d2d1/render_target.c | 50 ++++++----- 3 files changed, 175 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6aa9f50410e7d8d93712…

1 0

Henri Verbeet : d2d1: Add a pixel shader for triangle/bitmap/bitmap draws.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: 8446e4530aa671db7571b9d30889aaadeae90526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8446e4530aa671db7571b9d30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 16:10:22 2015 +0100 d2d1: Add a pixel shader for triangle/bitmap/bitmap draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 109 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 88 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 5e8e4a0..132416c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1663,6 +1663,66 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0x00000000, 0x0020800a, 0x00000000, 0x00000002, 0x0020803a, 0x00000000, 0x00000001, 0x0010003a, 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100246, 0x00000000, 0x0100003e, }; + static const DWORD ps_code_triangle_bitmap_bitmap[] = + { +#if 0 + struct brush + { + float3x2 transform; + float opacity; + bool ignore_alpha; + } brush0, brush1; + + SamplerState s0, s1; + Texture2D t0, t1; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 texcoord; + float opacity; + float4 ret; + + texcoord.x = position.x * brush0.transform._11 + position.y * brush0.transform._21 + brush0.transform._31; + texcoord.y = position.x * brush0.transform._12 + position.y * brush0.transform._22 + brush0.transform._32; + ret = t0.Sample(s0, texcoord) * brush0.opacity; + if (brush0.ignore_alpha) + ret.a = brush0.opacity; + + texcoord.x = position.x * brush1.transform._11 + position.y * brush1.transform._21 + brush1.transform._31; + texcoord.y = position.x * brush1.transform._12 + position.y * brush1.transform._22 + brush1.transform._32; + opacity = t1.Sample(s1, texcoord).a * brush1.opacity; + if (brush1.ignore_alpha) + opacity = brush1.opacity; + + return ret * opacity; + } +#endif + 0x43425844, 0x8eee6bfc, 0x57b72708, 0xa0f7c086, 0x867c11ec, 0x00000001, 0x00000310, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000274, 0x00000040, + 0x0000009d, 0x04000059, 0x00208e46, 0x00000000, 0x00000006, 0x0300005a, 0x00106000, 0x00000000, + 0x0300005a, 0x00106000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, + 0x00107000, 0x00000001, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, + 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x0800000f, 0x00100012, 0x00000000, 0x00101046, + 0x00000000, 0x00208046, 0x00000000, 0x00000003, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, + 0x00000000, 0x0020802a, 0x00000000, 0x00000003, 0x0800000f, 0x00100042, 0x00000000, 0x00101046, + 0x00000000, 0x00208046, 0x00000000, 0x00000004, 0x08000000, 0x00100022, 0x00000000, 0x0010002a, + 0x00000000, 0x0020802a, 0x00000000, 0x00000004, 0x09000045, 0x001000f2, 0x00000000, 0x00100046, + 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000001, 0x08000038, 0x00100012, 0x00000000, + 0x0010003a, 0x00000000, 0x0020803a, 0x00000000, 0x00000004, 0x0b000037, 0x00100012, 0x00000000, + 0x0020800a, 0x00000000, 0x00000005, 0x0020803a, 0x00000000, 0x00000004, 0x0010000a, 0x00000000, + 0x0800000f, 0x00100022, 0x00000000, 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000000, + 0x08000000, 0x00100012, 0x00000001, 0x0010001a, 0x00000000, 0x0020802a, 0x00000000, 0x00000000, + 0x0800000f, 0x00100022, 0x00000000, 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000001, + 0x08000000, 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x0020802a, 0x00000000, 0x00000001, + 0x09000045, 0x001000f2, 0x00000001, 0x00100046, 0x00000001, 0x00107e46, 0x00000000, 0x00106000, + 0x00000000, 0x08000038, 0x001000f2, 0x00000001, 0x00100e46, 0x00000001, 0x00208ff6, 0x00000000, + 0x00000001, 0x0b000037, 0x00100082, 0x00000001, 0x0020800a, 0x00000000, 0x00000002, 0x0020803a, + 0x00000000, 0x00000001, 0x0010003a, 0x00000001, 0x07000038, 0x001020f2, 0x00000000, 0x00100006, + 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, + }; /* The basic idea here is to evaluate the implicit form of the curve in * texture space. "t.z" determines which side of the curve is shaded. */ static const DWORD ps_code_bezier_solid[] = @@ -1689,6 +1749,25 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0304000d, 0x0010000a, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; + static const struct brush_shader + { + const void *byte_code; + size_t byte_code_size; + enum d2d_shape_type shape_type; + enum d2d_brush_type brush_type; + enum d2d_brush_type opacity_brush_type; + } + brush_shaders[] = + { + {ps_code_triangle_solid, sizeof(ps_code_triangle_solid), + D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_COUNT}, + {ps_code_triangle_bitmap, sizeof(ps_code_triangle_bitmap), + D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_BITMAP, D2D_BRUSH_TYPE_COUNT}, + {ps_code_triangle_bitmap_bitmap, sizeof(ps_code_triangle_bitmap_bitmap), + D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_BITMAP, D2D_BRUSH_TYPE_BITMAP}, + {ps_code_bezier_solid, sizeof(ps_code_bezier_solid), + D2D_SHAPE_TYPE_BEZIER, D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_COUNT}, + }; static const struct { float x, y; @@ -1784,28 +1863,16 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, goto err; } - if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->device, - ps_code_triangle_solid, sizeof(ps_code_triangle_solid), - &render_target->shape_resources[D2D_SHAPE_TYPE_TRIANGLE].ps[D2D_BRUSH_TYPE_SOLID][D2D_BRUSH_TYPE_COUNT]))) - { - WARN("Failed to create triangle/solid pixel shader, hr %#x.\n", hr); - goto err; - } - - if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->device, - ps_code_triangle_bitmap, sizeof(ps_code_triangle_bitmap), - &render_target->shape_resources[D2D_SHAPE_TYPE_TRIANGLE].ps[D2D_BRUSH_TYPE_BITMAP][D2D_BRUSH_TYPE_COUNT]))) - { - WARN("Failed to create triangle/bitmap pixel shader, hr %#x.\n", hr); - goto err; - } - - if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->device, - ps_code_bezier_solid, sizeof(ps_code_bezier_solid), - &render_target->shape_resources[D2D_SHAPE_TYPE_BEZIER].ps[D2D_BRUSH_TYPE_SOLID][D2D_BRUSH_TYPE_COUNT]))) + for (i = 0; i < sizeof(brush_shaders) / sizeof(*brush_shaders); ++i) { - WARN("Failed to create bezier/solid pixel shader, hr %#x.\n", hr); - goto err; + const struct brush_shader *bs = &brush_shaders[i]; + if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->device, bs->byte_code, bs->byte_code_size, + &render_target->shape_resources[bs->shape_type].ps[bs->brush_type][bs->opacity_brush_type]))) + { + WARN("Failed to create pixel shader for shape type %#x and brush types %#x/%#x.\n", + bs->shape_type, bs->brush_type, bs->opacity_brush_type); + goto err; + } } buffer_desc.ByteWidth = sizeof(indices);

1 0

Henri Verbeet : d2d1: Add a pixel shader for triangle/bitmap/solid draws.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: f1f2d0f5cc591f29496c8652a4f3f580a5a29507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f2d0f5cc591f29496c8652a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 16:10:23 2015 +0100 d2d1: Add a pixel shader for triangle/bitmap/solid draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 132416c..691af5a 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1663,6 +1663,50 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0x00000000, 0x0020800a, 0x00000000, 0x00000002, 0x0020803a, 0x00000000, 0x00000001, 0x0010003a, 0x00000000, 0x05000036, 0x00102072, 0x00000000, 0x00100246, 0x00000000, 0x0100003e, }; + static const DWORD ps_code_triangle_bitmap_solid[] = + { +#if 0 + float3x2 transform; + float opacity; + bool ignore_alpha; + + float4 color; + + SamplerState s; + Texture2D t; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 texcoord; + float4 ret; + + texcoord.x = position.x * transform._11 + position.y * transform._21 + transform._31; + texcoord.y = position.x * transform._12 + position.y * transform._22 + transform._32; + ret = t.Sample(s, texcoord) * opacity; + if (ignore_alpha) + ret.a = opacity; + + return ret * color.a; + } +#endif + 0x43425844, 0x45447736, 0x63a6dd80, 0x1778fc71, 0x1e6d322e, 0x00000001, 0x00000208, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000016c, 0x00000040, + 0x0000005b, 0x04000059, 0x00208e46, 0x00000000, 0x00000004, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800000f, 0x00100012, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x08000000, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x0020802a, 0x00000000, 0x00000000, 0x0800000f, 0x00100042, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000001, 0x08000000, 0x00100022, 0x00000000, + 0x0010002a, 0x00000000, 0x0020802a, 0x00000000, 0x00000001, 0x09000045, 0x001000f2, 0x00000000, + 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x08000038, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00208ff6, 0x00000000, 0x00000001, 0x0b000037, 0x00100082, + 0x00000000, 0x0020800a, 0x00000000, 0x00000002, 0x0020803a, 0x00000000, 0x00000001, 0x0010003a, + 0x00000000, 0x08000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00208ff6, 0x00000000, + 0x00000003, 0x0100003e, + }; static const DWORD ps_code_triangle_bitmap_bitmap[] = { #if 0 @@ -1763,6 +1807,8 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_COUNT}, {ps_code_triangle_bitmap, sizeof(ps_code_triangle_bitmap), D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_BITMAP, D2D_BRUSH_TYPE_COUNT}, + {ps_code_triangle_bitmap_solid, sizeof(ps_code_triangle_bitmap_solid), + D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_BITMAP, D2D_BRUSH_TYPE_SOLID}, {ps_code_triangle_bitmap_bitmap, sizeof(ps_code_triangle_bitmap_bitmap), D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_BITMAP, D2D_BRUSH_TYPE_BITMAP}, {ps_code_bezier_solid, sizeof(ps_code_bezier_solid),

1 0

Henri Verbeet : d2d1/tests: Add some tests for opacity brushes.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: ff6225c16da250d0332871e2d3205de3c28ad433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6225c16da250d0332871e2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 16:10:24 2015 +0100 d2d1/tests: Add some tests for opacity brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 183 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 67901b6..b721c26 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2246,6 +2246,188 @@ static void test_bitmap_updates(void) DestroyWindow(window); } +static void test_opacity_brush(void) +{ + ID2D1BitmapBrush *bitmap_brush, *opacity_brush; + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1RectangleGeometry *geometry; + ID2D1SolidColorBrush *color_brush; + IDXGISwapChain *swapchain; + D2D1_MATRIX_3X2_F matrix; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Factory *factory; + ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; + D2D1_RECT_F rect; + D2D1_SIZE_U size; + ULONG refcount; + HWND window; + HRESULT hr; + BOOL match; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0x40ffff00, 0x4000ff00, 0xff00ffff, + 0x7f0000ff, 0x00ff00ff, 0x00000000, 0x7f7f7f7f, + 0x7fffffff, 0x00ffffff, 0x00ffffff, 0x7f000000, + 0xffffffff, 0x40000000, 0x40000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + ID2D1RenderTarget_GetFactory(rt, &factory); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + set_color(&color, 0.0f, 1.0f, 0.0f, 0.8f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &color_brush); + ok(SUCCEEDED(hr), "Failed to create color brush, hr %#x.\n", hr); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &opacity_brush); + ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr); + ID2D1BitmapBrush_SetInterpolationMode(opacity_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + set_size_u(&size, 1, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, &bitmap_data[2], sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &bitmap_brush); + ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr); + ID2D1BitmapBrush_SetInterpolationMode(bitmap_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_rect(&rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 120.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 120.0f, 120.0f, 200.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)opacity_brush); + + set_rect(&rect, 200.0f, 120.0f, 280.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 360.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 40.0f, 360.0f, 120.0f, 600.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)opacity_brush, (ID2D1Brush *)color_brush); + ID2D1RectangleGeometry_Release(geometry); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 120.0f, 360.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 120.0f, 360.0f, 200.0f, 600.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)color_brush, (ID2D1Brush *)opacity_brush); + ID2D1RectangleGeometry_Release(geometry); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 360.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 200.0f, 360.0f, 280.0f, 600.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)bitmap_brush, (ID2D1Brush *)opacity_brush); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == D2DERR_INCOMPATIBLE_BRUSH_TYPES, "Got unexpected hr %#x.\n", hr); + match = compare_surface(surface, "7141c6c7b3decb91196428efb1856bcbf9872935"); + ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); + + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)bitmap_brush, (ID2D1Brush *)opacity_brush); + ID2D1RectangleGeometry_Release(geometry); + + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.5f); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 600.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 40.0f, 600.0f, 120.0f, 840.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)opacity_brush, (ID2D1Brush *)color_brush); + ID2D1RectangleGeometry_Release(geometry); + + ID2D1BitmapBrush_SetOpacity(opacity_brush, 0.8f); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 120.0f, 600.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 120.0f, 600.0f, 200.0f, 840.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)opacity_brush, (ID2D1Brush *)bitmap_brush); + ID2D1RectangleGeometry_Release(geometry); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 600.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 200.0f, 600.0f, 280.0f, 840.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)bitmap_brush, (ID2D1Brush *)opacity_brush); + ID2D1RectangleGeometry_Release(geometry); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "c3a5802d1750efa3e9122c1a92f6064df3872732"); + ok(match, "Surface does not match.\n"); + + ID2D1BitmapBrush_Release(bitmap_brush); + ID2D1BitmapBrush_Release(opacity_brush); + ID2D1SolidColorBrush_Release(color_brush); + ID2D1RenderTarget_Release(rt); + refcount = ID2D1Factory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -2257,4 +2439,5 @@ START_TEST(d2d1) test_alpha_mode(); test_shared_bitmap(); test_bitmap_updates(); + test_opacity_brush(); }

1 0

André Hentschel : winepulse: Avoid 32-bit calculation with 64-bit result (Coverity).
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: 005ff502524942671d4422de1bf437681bcc3395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005ff502524942671d4422de1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 16 22:36:00 2015 +0100 winepulse: Avoid 32-bit calculation with 64-bit result (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index b2f83c8..7369802 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2239,10 +2239,9 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) pthread_mutex_lock(&pulse_lock); hr = pulse_stream_valid(This); if (SUCCEEDED(hr)) { + *freq = This->ss.rate; if (This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->ss.rate * pa_frame_size(&This->ss); - else - *freq = This->ss.rate; + *freq *= pa_frame_size(&This->ss); } pthread_mutex_unlock(&pulse_lock); return hr;

1 0

André Hentschel : winepulse: Add missing return after default case in a switch (Coverity).
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: 7f6634b2bd916b530e30ef8a850fefbc0dbdf687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6634b2bd916b530e30ef8a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 16 22:36:12 2015 +0100 winepulse: Add missing return after default case in a switch (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7369802..215a53e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -285,6 +285,8 @@ static void pulse_contextcallback(pa_context *c, void *userdata) switch (pa_context_get_state(c)) { default: FIXME("Unhandled state: %i\n", pa_context_get_state(c)); + return; + case PA_CONTEXT_CONNECTING: case PA_CONTEXT_UNCONNECTED: case PA_CONTEXT_AUTHORIZING:

1 0

Andrew Eikum : kernel32: Always uninitialize the terminal for the console shell process.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: df718b8ab8f0451d026c33d81c1c3cddbed04925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df718b8ab8f0451d026c33d81… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 17 09:41:43 2015 -0600 kernel32: Always uninitialize the terminal for the console shell process. The terminal raw IO check and the console shell process check are used separately to initialize the terminal in different ways. However, if either check fails during uninitialization, then no uninitialization will occur at all and modified terminfo settings will remain instead of being restored. We should check each condition individually and uninitialize each part as required. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 363e763..51d6e60 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -211,15 +211,18 @@ static BOOL put_console_into_raw_mode(int fd) static BOOL restore_console_mode(HANDLE hin) { int fd; - BOOL ret; + BOOL ret = TRUE; + + if (S_termios_raw) + { + if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; + ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0; + close(fd); + } + + if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == KERNEL32_CONSOLE_SHELL) + TERM_Exit(); - if (!S_termios_raw || - RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL) - return TRUE; - if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; - ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0; - close(fd); - TERM_Exit(); return ret; }

1 0

Dmitry Timoshkov : user32/tests: Add more tests for mixed menu with strings and bitmaps.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: 5ef96fd5bccd5adcbb5f934fe58de8c429e8a5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef96fd5bccd5adcbb5f934fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 18 08:46:04 2015 +0800 user32/tests: Add more tests for mixed menu with strings and bitmaps. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 357 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef96fd5bccd5adcbb5f9…

1 0

Dmitry Timoshkov : user32: Menu item with a "magic" bitmap should not have MFT_BITMAP type set.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: c0de7f8641f61e8e48ce8a2fa4c6e7921eb1f313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0de7f8641f61e8e48ce8a2fa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 18 08:46:09 2015 +0800 user32: Menu item with a "magic" bitmap should not have MFT_BITMAP type set. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 5 +++-- dlls/user32/tests/menu.c | 12 ------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index c07a8cb..bf4be62 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4566,7 +4566,7 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return FALSE; } - + if( lpmii->fMask & MIIM_TYPE) { if( lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) { WARN("invalid combination of fMask bits used\n"); @@ -4575,7 +4575,8 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, return FALSE; } lpmii->fType = menu->fType & MENUITEMINFO_TYPE_MASK; - if( menu->hbmpItem) lpmii->fType |= MFT_BITMAP; + if (menu->hbmpItem && !IS_MAGIC_BITMAP(menu->hbmpItem)) + lpmii->fType |= MFT_BITMAP; lpmii->hbmpItem = menu->hbmpItem; /* not on Win9x/ME */ if( lpmii->fType & MFT_BITMAP) { lpmii->dwTypeData = (LPWSTR) menu->hbmpItem; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 9855d38..7599431 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -856,13 +856,11 @@ static void test_menu_bmp_and_string(void) mii.dwItemData = 0x81818181; got = GetMenuItemInfoA(hsysmenu, SC_RESTORE, FALSE, &mii); ok(got, "GetMenuItemInfo failed\n"); -todo_wine ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); ok(mii.fState == MF_ENABLED, "expected MF_ENABLED, got %#x\n", mii.fState); ok(mii.wID == SC_RESTORE, "expected SC_RESTORE, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); ok(mii.dwItemData == 0, "expected 0, got %#lx\n", mii.dwItemData); -todo_wine ok(mii.dwTypeData == (LPSTR)bmfill, "expected %p, got %p\n", bmfill, mii.dwTypeData); ok(mii.cch != 0, "cch should not be 0\n"); ok(mii.hbmpItem == HBMMENU_POPUP_RESTORE, "expected HBMMENU_POPUP_RESTORE, got %p\n", mii.hbmpItem); @@ -872,13 +870,11 @@ todo_wine mii.hbmpItem = (HBITMAP)0x81818181; got = GetMenuItemInfoA(hsysmenu, SC_CLOSE, FALSE, &mii); ok(got, "GetMenuItemInfo failed\n"); -todo_wine ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); ok(mii.fState == MF_ENABLED, "expected MF_ENABLED, got %#x\n", mii.fState); ok(mii.wID == SC_RESTORE, "expected SC_RESTORE, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); ok(mii.dwItemData == 0, "expected 0, got %#lx\n", mii.dwItemData); -todo_wine ok(mii.dwTypeData == (LPSTR)bmfill, "expected %p, got %p\n", bmfill, mii.dwTypeData); ok(mii.cch != 0, "cch should not be 0\n"); ok(mii.hbmpItem == HBMMENU_POPUP_CLOSE, "expected HBMMENU_POPUP_CLOSE, got %p\n", mii.hbmpItem); @@ -3917,13 +3913,11 @@ if (0) /* FIXME: uncomment once Wine is fixed */ mii.dwItemData = 0x81818181; ret = GetMenuItemInfoA(hmenu, 0, TRUE, &mii); ok(ret, "GetMenuItemInfo failed\n"); -todo_wine ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); ok(mii.fState == 0x81818181, "expected 0x81818181, got %#x\n", mii.fState); ok(mii.wID == 0x81818181, "expected 0x81818181, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); ok(mii.dwItemData == 0x81818181, "expected 0x81818181, got %#lx\n", mii.dwItemData); -todo_wine ok(mii.dwTypeData == buf, "expected %p, got %p\n", buf, mii.dwTypeData); ok(mii.cch == 6, "expected 6, got %u\n", mii.cch); ok(!strcmp(buf, string), "expected %s, got %s\n", string, buf); @@ -3938,16 +3932,13 @@ todo_wine mii.dwItemData = 0x81818181; ret = GetMenuItemInfoA(hmenu, 0, TRUE, &mii); ok(ret, "GetMenuItemInfo failed\n"); -todo_wine ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); ok(mii.fState == MF_ENABLED, "expected MF_ENABLED, got %#x\n", mii.fState); ok(mii.wID == 0, "expected 0, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); ok(mii.dwItemData == 0, "expected 0, got %#lx\n", mii.dwItemData); -todo_wine ok(mii.dwTypeData == buf, "expected %p, got %p\n", buf, mii.dwTypeData); ok(mii.cch == 6, "expected 6, got %u\n", mii.cch); -todo_wine ok(!strcmp(buf, string), "expected %s, got %s\n", string, buf); ok(mii.hbmpItem == HBMMENU_POPUP_RESTORE, "expected HBMMENU_POPUP_RESTORE, got %p\n", mii.hbmpItem); @@ -4071,16 +4062,13 @@ todo_wine mii.dwItemData = 0x81818181; ret = GetMenuItemInfoA(hmenu, 0, TRUE, &mii); ok(ret, "GetMenuItemInfo failed\n"); -todo_wine ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); ok(mii.fState == 0x81818181, "expected 0x81818181, got %#x\n", mii.fState); ok(mii.wID == 0x81818181, "expected 0x81818181, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); ok(mii.dwItemData == 0x81818181, "expected 0x81818181, got %#lx\n", mii.dwItemData); -todo_wine ok(mii.dwTypeData == buf, "expected %p, got %p\n", buf, mii.dwTypeData); ok(mii.cch == 6, "expected 6, got %u\n", mii.cch); -todo_wine ok(!strcmp(buf, string), "expected %s, got %s\n", string, buf); ok(mii.hbmpItem == HBMMENU_POPUP_RESTORE, "expected HBMMENU_POPUP_RESTORE, got %p\n", mii.hbmpItem);

1 0