August 2022 - Wine-commits - list.winehq.org

Shaun Ren : webservices: Implement error strings.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: da77cc8cfdcb33dbff53d584ba2378da48da7776 URL: https://gitlab.winehq.org/wine/wine/-/commit/da77cc8cfdcb33dbff53d584ba2378… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Jul 22 13:59:47 2022 -0400 webservices: Implement error strings. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/error.c | 142 +++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 81 +++++++++++++++++++++- dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 216 insertions(+), 10 deletions(-)

1 0

Nikolay Sivov : d2d1/commandlist: Implement FillRectangle() command.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 0e9f8babaff534e2736541354dc65d889ca1c9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e9f8babaff534e2736541354dc65d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 17:10:59 2022 +0300 d2d1/commandlist: Implement FillRectangle() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 32 ++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/device.c | 2 +- dlls/d2d1/tests/d2d1.c | 1 - 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 9399c3e528d..6cc46aa2c32 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -33,6 +33,7 @@ enum d2d_command_type D2D_COMMAND_DRAW_GEOMETRY, D2D_COMMAND_DRAW_RECTANGLE, D2D_COMMAND_FILL_GEOMETRY, + D2D_COMMAND_FILL_RECTANGLE, D2D_COMMAND_PUSH_CLIP, D2D_COMMAND_POP_CLIP, }; @@ -127,6 +128,13 @@ struct d2d_command_fill_geometry ID2D1Brush *opacity_brush; }; +struct d2d_command_fill_rectangle +{ + struct d2d_command c; + D2D1_RECT_F rect; + ID2D1Brush *brush; +}; + static inline struct d2d_command_list *impl_from_ID2D1CommandList(ID2D1CommandList *iface) { return CONTAINING_RECORD(iface, struct d2d_command_list, ID2D1CommandList_iface); @@ -282,6 +290,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface hr = ID2D1CommandSink_FillGeometry(sink, c->geometry, c->brush, c->opacity_brush); break; } + case D2D_COMMAND_FILL_RECTANGLE: + { + const struct d2d_command_fill_rectangle *c = data; + hr = ID2D1CommandSink_FillRectangle(sink, &c->rect, c->brush); + break; + } case D2D_COMMAND_PUSH_CLIP: { const struct d2d_command_push_clip *c = data; @@ -654,3 +668,21 @@ void d2d_command_list_fill_geometry(struct d2d_command_list *command_list, command->brush = brush; command->opacity_brush = opacity_brush; } + +void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list, + const struct d2d_device_context *context, const D2D1_RECT_F *rect, ID2D1Brush *orig_brush) +{ + struct d2d_command_fill_rectangle *command; + ID2D1Brush *brush; + + if (FAILED(d2d_command_list_create_brush(command_list, context, orig_brush, &brush))) + { + command_list->state = D2D_COMMAND_LIST_STATE_ERROR; + return; + } + + command = d2d_command_list_require_space(command_list, sizeof(*command)); + command->c.op = D2D_COMMAND_FILL_RECTANGLE; + command->rect = *rect; + command->brush = brush; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0651e83d9d1..9d0883468b2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -757,6 +757,8 @@ void d2d_command_list_draw_rectangle(struct d2d_command_list *command_list, cons void d2d_command_list_fill_geometry(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Geometry *geometry, ID2D1Brush *orig_brush, ID2D1Brush *orig_opacity_brush) DECLSPEC_HIDDEN; +void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list, + const struct d2d_device_context *context, const D2D1_RECT_F *rect, ID2D1Brush *orig_brush) 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 8e9b236e2af..cb997624e0a 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -641,7 +641,7 @@ static void STDMETHODCALLTYPE d2d_device_context_FillRectangle(ID2D1DeviceContex if (context->target.type == D2D_TARGET_COMMAND_LIST) { - FIXME("Unimplemented for command list target.\n"); + d2d_command_list_fill_rectangle(context->target.command_list, context, rect, brush); return; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3137d5c13c2..f66f3389d3c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9529,7 +9529,6 @@ static void test_command_list(BOOL d3d11) ok(refcount == 0, "Got unexpected refcount %lu.\n", refcount); refcount = ID2D1Bitmap_Release(bitmap); - todo_wine ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); /* Linear gradient brush. */

1 0

Nikolay Sivov : d2d1/commandlist: Implement SetTextRenderingParams() command.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 3aeff98f60f49bcf505b064574ce644322f109d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3aeff98f60f49bcf505b064574ce64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 17:17:44 2022 +0300 d2d1/commandlist: Implement SetTextRenderingParams() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 28 ++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/device.c | 5 +---- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 6cc46aa2c32..a69742a7909 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -25,6 +25,7 @@ enum d2d_command_type D2D_COMMAND_SET_ANTIALIAS_MODE, D2D_COMMAND_SET_TAGS, D2D_COMMAND_SET_TEXT_ANTIALIAS_MODE, + D2D_COMMAND_SET_TEXT_RENDERING_PARAMS, D2D_COMMAND_SET_TRANSFORM, D2D_COMMAND_SET_PRIMITIVE_BLEND, D2D_COMMAND_SET_UNIT_MODE, @@ -62,6 +63,12 @@ struct d2d_command_set_text_antialias_mode D2D1_TEXT_ANTIALIAS_MODE mode; }; +struct d2d_command_set_text_rendering_params +{ + struct d2d_command c; + IDWriteRenderingParams *params; +}; + struct d2d_command_set_transform { struct d2d_command c; @@ -239,6 +246,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface hr = ID2D1CommandSink_SetTextAntialiasMode(sink, c->mode); break; } + case D2D_COMMAND_SET_TEXT_RENDERING_PARAMS: + { + const struct d2d_command_set_text_rendering_params *c = data; + hr = ID2D1CommandSink_SetTextRenderingParams(sink, c->params); + break; + } case D2D_COMMAND_SET_TRANSFORM: { const struct d2d_command_set_transform *c = data; @@ -537,6 +550,7 @@ void d2d_command_list_begin_draw(struct d2d_command_list *command_list, d2d_command_list_set_text_antialias_mode(command_list, context->drawing_state.textAntialiasMode); d2d_command_list_set_tags(command_list, context->drawing_state.tag1, context->drawing_state.tag2); d2d_command_list_set_transform(command_list, &context->drawing_state.transform); + d2d_command_list_set_text_rendering_params(command_list, context->text_rendering_params); command_list->state = D2D_COMMAND_LIST_STATE_OPEN; } @@ -686,3 +700,17 @@ void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list, command->rect = *rect; command->brush = brush; } + +void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command_list, + IDWriteRenderingParams *params) +{ + struct d2d_command_set_text_rendering_params *command; + + if (!params) return; + + d2d_command_list_reference_object(command_list, params); + + command = d2d_command_list_require_space(command_list, sizeof(*command)); + command->c.op = D2D_COMMAND_SET_TEXT_RENDERING_PARAMS; + command->params = params; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9d0883468b2..91fa4cc12d9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -759,6 +759,8 @@ void d2d_command_list_fill_geometry(struct d2d_command_list *command_list, ID2D1Brush *orig_opacity_brush) DECLSPEC_HIDDEN; void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list, const struct d2d_device_context *context, const D2D1_RECT_F *rect, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; +void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command_list, + IDWriteRenderingParams *params) 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 cb997624e0a..0c75e6510a5 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1539,10 +1539,7 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTextRenderingParams(ID2D1Dev TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); if (context->target.type == D2D_TARGET_COMMAND_LIST) - { - FIXME("Unimplemented for command list target.\n"); - return; - } + d2d_command_list_set_text_rendering_params(context->target.command_list, text_rendering_params); if (text_rendering_params) IDWriteRenderingParams_AddRef(text_rendering_params);

1 0

Nikolay Sivov : d2d1/commandlist: Handle recording in RestoreDrawingState().
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: c9d36114e6f46e54e5e1773668f833324c0df06b URL: https://gitlab.winehq.org/wine/wine/-/commit/c9d36114e6f46e54e5e1773668f833… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 17:20:15 2022 +0300 d2d1/commandlist: Handle recording in RestoreDrawingState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0c75e6510a5..f92e5f18d5d 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1625,16 +1625,30 @@ static void STDMETHODCALLTYPE d2d_device_context_RestoreDrawingState(ID2D1Device ID2D1DrawingStateBlock *state_block) { struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, state_block %p.\n", iface, state_block); - render_target->drawing_state = state_block_impl->drawing_state; + if (context->target.type == D2D_TARGET_COMMAND_LIST) + { + struct d2d_command_list *command_list = context->target.command_list; + + if (context->drawing_state.antialiasMode != state_block_impl->drawing_state.antialiasMode) + d2d_command_list_set_antialias_mode(command_list, state_block_impl->drawing_state.antialiasMode); + d2d_command_list_set_text_antialias_mode(command_list, state_block_impl->drawing_state.textAntialiasMode); + d2d_command_list_set_tags(command_list, state_block_impl->drawing_state.tag1, state_block_impl->drawing_state.tag2); + d2d_command_list_set_transform(command_list, &state_block_impl->drawing_state.transform); + d2d_command_list_set_primitive_blend(command_list, state_block_impl->drawing_state.primitiveBlend); + d2d_command_list_set_unit_mode(command_list, state_block_impl->drawing_state.unitMode); + d2d_command_list_set_text_rendering_params(command_list, state_block_impl->text_rendering_params); + } + + context->drawing_state = state_block_impl->drawing_state; if (state_block_impl->text_rendering_params) IDWriteRenderingParams_AddRef(state_block_impl->text_rendering_params); - if (render_target->text_rendering_params) - IDWriteRenderingParams_Release(render_target->text_rendering_params); - render_target->text_rendering_params = state_block_impl->text_rendering_params; + if (context->text_rendering_params) + IDWriteRenderingParams_Release(context->text_rendering_params); + context->text_rendering_params = state_block_impl->text_rendering_params; } static void STDMETHODCALLTYPE d2d_device_context_PushAxisAlignedClip(ID2D1DeviceContext1 *iface,

1 0

Nikolay Sivov : d2d1/commandlist: Implement DrawGlyphRun() command.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 40e353a6a6845fa6ecb8ca5c4b9612d5eda7b462 URL: https://gitlab.winehq.org/wine/wine/-/commit/40e353a6a6845fa6ecb8ca5c4b9612… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 18:35:08 2022 +0300 d2d1/commandlist: Implement DrawGlyphRun() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 4 ++ dlls/d2d1/device.c | 17 +++----- 3 files changed, 114 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index a69742a7909..59059f21f44 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -30,6 +30,7 @@ enum d2d_command_type D2D_COMMAND_SET_PRIMITIVE_BLEND, D2D_COMMAND_SET_UNIT_MODE, D2D_COMMAND_CLEAR, + D2D_COMMAND_DRAW_GLYPH_RUN, D2D_COMMAND_DRAW_LINE, D2D_COMMAND_DRAW_GEOMETRY, D2D_COMMAND_DRAW_RECTANGLE, @@ -142,6 +143,16 @@ struct d2d_command_fill_rectangle ID2D1Brush *brush; }; +struct d2d_command_draw_glyph_run +{ + struct d2d_command c; + D2D1_POINT_2F origin; + DWRITE_MEASURING_MODE measuring_mode; + ID2D1Brush *brush; + DWRITE_GLYPH_RUN run; + DWRITE_GLYPH_RUN_DESCRIPTION *run_desc; +}; + static inline struct d2d_command_list *impl_from_ID2D1CommandList(ID2D1CommandList *iface) { return CONTAINING_RECORD(iface, struct d2d_command_list, ID2D1CommandList_iface); @@ -276,6 +287,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface hr = ID2D1CommandSink_Clear(sink, &c->color); break; } + case D2D_COMMAND_DRAW_GLYPH_RUN: + { + const struct d2d_command_draw_glyph_run *c = data; + hr = ID2D1CommandSink_DrawGlyphRun(sink, c->origin, &c->run, c->run_desc, c->brush, c->measuring_mode); + break; + } case D2D_COMMAND_DRAW_LINE: { const struct d2d_command_draw_line *c = data; @@ -714,3 +731,91 @@ void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command command->c.op = D2D_COMMAND_SET_TEXT_RENDERING_PARAMS; command->params = params; } + +static inline void d2d_command_list_write_field(BYTE **data, void *dst, const void *src, size_t size) +{ + void **ptr = dst; + + if (!src) + { + *ptr = NULL; + return; + } + + *ptr = *data; + memcpy(*data, src, size); + *data = *data + size; +} + +void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, + const struct d2d_device_context *context, D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run, + const DWRITE_GLYPH_RUN_DESCRIPTION *run_desc, ID2D1Brush *orig_brush, + DWRITE_MEASURING_MODE measuring_mode) +{ + struct d2d_command_draw_glyph_run *command; + DWRITE_GLYPH_RUN_DESCRIPTION *d; + DWRITE_GLYPH_RUN *r; + UINT32 glyph_count; + ID2D1Brush *brush; + size_t size; + BYTE *data; + + if (FAILED(d2d_command_list_create_brush(command_list, context, orig_brush, &brush))) + { + command_list->state = D2D_COMMAND_LIST_STATE_ERROR; + return; + } + + /* Get combined size of variable data. */ + + glyph_count = run->glyphCount; + size = sizeof(*command); + if (run->glyphIndices) size += glyph_count * sizeof(*run->glyphIndices); + if (run->glyphAdvances) size += glyph_count * sizeof(*run->glyphAdvances); + if (run->glyphOffsets) size += glyph_count * sizeof(*run->glyphOffsets); + if (run_desc) + { + size += sizeof(*run_desc); + if (run_desc->localeName) size += (wcslen(run_desc->localeName) + 1) * sizeof(*run_desc->localeName); + if (run_desc->string) size += run_desc->stringLength * sizeof(*run_desc->string); + if (run_desc->clusterMap) size += run_desc->stringLength * sizeof(*run_desc->clusterMap); + size += sizeof(run_desc->stringLength); + size += sizeof(run_desc->textPosition); + } + + d2d_command_list_reference_object(command_list, run->fontFace); + + command = d2d_command_list_require_space(command_list, size); + command->c.op = D2D_COMMAND_DRAW_GLYPH_RUN; + r = &command->run; + + r->fontFace = run->fontFace; + r->fontEmSize = run->fontEmSize; + r->glyphCount = run->glyphCount; + r->isSideways = run->isSideways; + r->bidiLevel = run->bidiLevel; + + data = (BYTE *)(command + 1); + + d2d_command_list_write_field(&data, &r->glyphIndices, run->glyphIndices, glyph_count * sizeof(*r->glyphIndices)); + d2d_command_list_write_field(&data, &r->glyphAdvances, run->glyphAdvances, glyph_count * sizeof(*r->glyphAdvances)); + d2d_command_list_write_field(&data, &r->glyphOffsets, run->glyphOffsets, glyph_count * sizeof(*r->glyphOffsets)); + + command->run_desc = NULL; + if (run_desc) + { + d = command->run_desc = (DWRITE_GLYPH_RUN_DESCRIPTION *)data; + memset(d, 0, sizeof(*d)); + data += sizeof(*d); + + d2d_command_list_write_field(&data, &d->localeName, run_desc->localeName, (wcslen(run_desc->localeName) + 1) * sizeof(*run_desc->localeName)); + d2d_command_list_write_field(&data, &d->string, run_desc->string, run_desc->stringLength * sizeof(*run_desc->string)); + d->stringLength = run_desc->stringLength; + d2d_command_list_write_field(&data, &d->clusterMap, run_desc->clusterMap, run_desc->stringLength * sizeof(*run_desc->clusterMap)); + d->textPosition = run_desc->textPosition; + } + + command->brush = brush; + command->origin = origin; + command->measuring_mode = measuring_mode; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 91fa4cc12d9..df25ebfa5b6 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -761,6 +761,10 @@ void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list, const struct d2d_device_context *context, const D2D1_RECT_F *rect, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command_list, IDWriteRenderingParams *params) DECLSPEC_HIDDEN; +void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, + const struct d2d_device_context *context, D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run, + const DWRITE_GLYPH_RUN_DESCRIPTION *run_desc, ID2D1Brush *orig_brush, + DWRITE_MEASURING_MODE measuring_mode) 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 f92e5f18d5d..95d044be7df 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1450,17 +1450,9 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); - TRACE("iface %p, baseline_origin %s, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, brush, measuring_mode); - if (context->target.type == D2D_TARGET_COMMAND_LIST) - { - FIXME("Unimplemented for command list target.\n"); - return; - } - ID2D1DeviceContext1_DrawGlyphRun(iface, baseline_origin, glyph_run, NULL, brush, measuring_mode); } @@ -2373,15 +2365,16 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawGlyphRun TRACE("iface %p, baseline_origin %s, glyph_run %p, glyph_run_desc %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, glyph_run_desc, brush, measuring_mode); + if (FAILED(context->error.code)) + return; + if (context->target.type == D2D_TARGET_COMMAND_LIST) { - FIXME("Unimplemented for command list target.\n"); + d2d_command_list_draw_glyph_run(context->target.command_list, context, baseline_origin, glyph_run, + glyph_run_desc, brush, measuring_mode); return; } - if (FAILED(context->error.code)) - return; - rendering_params = context->text_rendering_params ? context->text_rendering_params : context->default_text_rendering_params;

1 0

Nikolay Sivov : d2d1/commandlist: Implement DrawBitmap() command.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: da9eabd64d758c98f22a9d6299291bdce50adfbb URL: https://gitlab.winehq.org/wine/wine/-/commit/da9eabd64d758c98f22a9d6299291b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 00:07:12 2022 +0300 d2d1/commandlist: Implement DrawBitmap() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/device.c | 24 ++++++++++++++---------- dlls/d2d1/tests/d2d1.c | 1 - 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 59059f21f44..a8faeb01eb8 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -34,6 +34,7 @@ enum d2d_command_type D2D_COMMAND_DRAW_LINE, D2D_COMMAND_DRAW_GEOMETRY, D2D_COMMAND_DRAW_RECTANGLE, + D2D_COMMAND_DRAW_BITMAP, D2D_COMMAND_FILL_GEOMETRY, D2D_COMMAND_FILL_RECTANGLE, D2D_COMMAND_PUSH_CLIP, @@ -153,6 +154,17 @@ struct d2d_command_draw_glyph_run DWRITE_GLYPH_RUN_DESCRIPTION *run_desc; }; +struct d2d_command_draw_bitmap +{ + struct d2d_command c; + float opacity; + D2D1_INTERPOLATION_MODE interpolation_mode; + ID2D1Bitmap *bitmap; + D2D1_RECT_F *dst_rect; + D2D1_RECT_F *src_rect; + D2D1_MATRIX_4X4_F *perspective_transform; +}; + static inline struct d2d_command_list *impl_from_ID2D1CommandList(ID2D1CommandList *iface) { return CONTAINING_RECORD(iface, struct d2d_command_list, ID2D1CommandList_iface); @@ -314,6 +326,13 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface c->stroke_style); break; } + case D2D_COMMAND_DRAW_BITMAP: + { + const struct d2d_command_draw_bitmap *c = data; + hr = ID2D1CommandSink_DrawBitmap(sink, c->bitmap, c->dst_rect, c->opacity, + c->interpolation_mode, c->src_rect, c->perspective_transform); + break; + } case D2D_COMMAND_FILL_GEOMETRY: { const struct d2d_command_fill_geometry *c = data; @@ -819,3 +838,31 @@ void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, command->origin = origin; command->measuring_mode = measuring_mode; } + +void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bitmap *bitmap, + const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, + const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) +{ + struct d2d_command_draw_bitmap *command; + size_t size; + BYTE *data; + + size = sizeof(*command); + if (dst_rect) size += sizeof(*dst_rect); + if (src_rect) size += sizeof(*src_rect); + if (perspective_transform) size += sizeof(*perspective_transform); + + d2d_command_list_reference_object(command_list, bitmap); + + command = d2d_command_list_require_space(command_list, size); + command->c.op = D2D_COMMAND_DRAW_BITMAP; + command->bitmap = bitmap; + command->opacity = opacity; + command->interpolation_mode = interpolation_mode; + + data = (BYTE *)(command + 1); + + d2d_command_list_write_field(&data, &command->dst_rect, dst_rect, sizeof(*dst_rect)); + d2d_command_list_write_field(&data, &command->src_rect, src_rect, sizeof(*src_rect)); + d2d_command_list_write_field(&data, &command->perspective_transform, perspective_transform, sizeof(*perspective_transform)); +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index df25ebfa5b6..5675509d520 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -765,6 +765,9 @@ void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, const struct d2d_device_context *context, D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *run_desc, ID2D1Brush *orig_brush, DWRITE_MEASURING_MODE measuring_mode) DECLSPEC_HIDDEN; +void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bitmap *bitmap, + const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, + const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) 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 95d044be7df..64a4cae9d1b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1181,12 +1181,14 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext1 if (context->target.type == D2D_TARGET_COMMAND_LIST) { - FIXME("Unimplemented for command list target.\n"); - return; + d2d_command_list_draw_bitmap(context->target.command_list, bitmap, dst_rect, opacity, + d2d1_1_interp_mode_from_d2d1(interpolation_mode), src_rect, NULL); + } + else + { + d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, + d2d1_1_interp_mode_from_d2d1(interpolation_mode), src_rect, NULL, NULL); } - - d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, d2d1_1_interp_mode_from_d2d1(interpolation_mode), - src_rect, NULL, NULL); } static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext1 *iface, @@ -2498,12 +2500,14 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawBitmap(I if (context->target.type == D2D_TARGET_COMMAND_LIST) { - FIXME("Unimplemented for command list target.\n"); - return; + d2d_command_list_draw_bitmap(context->target.command_list, bitmap, dst_rect, opacity, interpolation_mode, + src_rect, perspective_transform); + } + else + { + d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, + NULL, perspective_transform); } - - d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, - NULL, perspective_transform); } static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_PushLayer(ID2D1DeviceContext1 *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f66f3389d3c..665c3200e21 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9501,7 +9501,6 @@ static void test_command_list(BOOL d3d11) ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 0.25f, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); refcount = ID2D1Bitmap_Release(bitmap); - todo_wine ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); /* Solid color brush. */

1 0

Nikolay Sivov : d2d1/commandlist: Implement FillMesh() command.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 6722d3ad7f8331d7892c8c0562c74248b07fcccc URL: https://gitlab.winehq.org/wine/wine/-/commit/6722d3ad7f8331d7892c8c0562c742… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 19:31:56 2022 +0300 d2d1/commandlist: Implement FillMesh() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 34 ++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/device.c | 5 +++++ 3 files changed, 41 insertions(+) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index a8faeb01eb8..84170b0efb1 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -35,6 +35,7 @@ enum d2d_command_type D2D_COMMAND_DRAW_GEOMETRY, D2D_COMMAND_DRAW_RECTANGLE, D2D_COMMAND_DRAW_BITMAP, + D2D_COMMAND_FILL_MESH, D2D_COMMAND_FILL_GEOMETRY, D2D_COMMAND_FILL_RECTANGLE, D2D_COMMAND_PUSH_CLIP, @@ -129,6 +130,13 @@ struct d2d_command_draw_rectangle ID2D1StrokeStyle *stroke_style; }; +struct d2d_command_fill_mesh +{ + struct d2d_command c; + ID2D1Mesh *mesh; + ID2D1Brush *brush; +}; + struct d2d_command_fill_geometry { struct d2d_command c; @@ -333,6 +341,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface c->interpolation_mode, c->src_rect, c->perspective_transform); break; } + case D2D_COMMAND_FILL_MESH: + { + const struct d2d_command_fill_mesh *c = data; + hr = ID2D1CommandSink_FillMesh(sink, c->mesh, c->brush); + break; + } case D2D_COMMAND_FILL_GEOMETRY: { const struct d2d_command_fill_geometry *c = data; @@ -866,3 +880,23 @@ void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bi d2d_command_list_write_field(&data, &command->src_rect, src_rect, sizeof(*src_rect)); d2d_command_list_write_field(&data, &command->perspective_transform, perspective_transform, sizeof(*perspective_transform)); } + +void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Mesh *mesh, ID2D1Brush *orig_brush) +{ + struct d2d_command_fill_mesh *command; + ID2D1Brush *brush; + + if (FAILED(d2d_command_list_create_brush(command_list, context, orig_brush, &brush))) + { + command_list->state = D2D_COMMAND_LIST_STATE_ERROR; + return; + } + + d2d_command_list_reference_object(command_list, mesh); + + command = d2d_command_list_require_space(command_list, sizeof(*command)); + command->c.op = D2D_COMMAND_FILL_MESH; + command->mesh = mesh; + command->brush = brush; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5675509d520..a9982fcaeb9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -768,6 +768,8 @@ void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) DECLSPEC_HIDDEN; +void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Mesh *mesh, ID2D1Brush *orig_brush) 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 64a4cae9d1b..576915ea0fd 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1084,7 +1084,12 @@ static void STDMETHODCALLTYPE d2d_device_context_FillGeometry(ID2D1DeviceContext static void STDMETHODCALLTYPE d2d_device_context_FillMesh(ID2D1DeviceContext1 *iface, ID2D1Mesh *mesh, ID2D1Brush *brush) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, mesh %p, brush %p stub!\n", iface, mesh, brush); + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_fill_mesh(context->target.command_list, context, mesh, brush); } static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceContext1 *iface,

1 0

Nikolay Sivov : d2d1: Add a helper for DrawGlyphRun().
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 9a87e7dedd1b7c01e3ec989381a6ec6a6f69b2bd URL: https://gitlab.winehq.org/wine/wine/-/commit/9a87e7dedd1b7c01e3ec989381a6ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 21:42:44 2022 +0300 d2d1: Add a helper for DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 200 ++++++++++++++++++++++++++++------------------------- 1 file changed, 105 insertions(+), 95 deletions(-)

1 0

Nikolay Sivov : d2d1/commandlist: Update text rendering params on DrawGlyphRun().
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 3d54031236d9b463e9041c1c39f79af7370f9749 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d54031236d9b463e9041c1c39f79a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 10:55:38 2022 +0300 d2d1/commandlist: Update text rendering params on DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 35 ++++++++++++++++++++++++++++++++--- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 84170b0efb1..0d40b59b2c1 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -20,6 +20,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +enum d2d_command_list_flags +{ + D2D_COMMAND_LIST_HAS_NULL_TEXT_RENDERING_PARAMS = 0x1, +}; + enum d2d_command_type { D2D_COMMAND_SET_ANTIALIAS_MODE, @@ -751,20 +756,37 @@ void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list, command->brush = brush; } -void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command_list, - IDWriteRenderingParams *params) +static void d2d_command_list_set_text_rendering_params_internal(struct d2d_command_list *command_list, + BOOL allow_null, IDWriteRenderingParams *params) { struct d2d_command_set_text_rendering_params *command; - if (!params) return; + if (!params && !allow_null) return; + + if ((command_list->flags & D2D_COMMAND_LIST_HAS_NULL_TEXT_RENDERING_PARAMS) + && !params) + { + return; + } d2d_command_list_reference_object(command_list, params); + if (params) + command_list->flags &= ~D2D_COMMAND_LIST_HAS_NULL_TEXT_RENDERING_PARAMS; + else + command_list->flags |= D2D_COMMAND_LIST_HAS_NULL_TEXT_RENDERING_PARAMS; + command = d2d_command_list_require_space(command_list, sizeof(*command)); command->c.op = D2D_COMMAND_SET_TEXT_RENDERING_PARAMS; command->params = params; } +void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command_list, + IDWriteRenderingParams *params) +{ + d2d_command_list_set_text_rendering_params_internal(command_list, FALSE, params); +} + static inline void d2d_command_list_write_field(BYTE **data, void *dst, const void *src, size_t size) { void **ptr = dst; @@ -799,6 +821,13 @@ void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, return; } + /* Set rendering parameters automatically. Explicitly set null parameters are not recorded, + either separately or as a part of a restored state block. Forcing parameters update on + DrawGlyphRun() ensures that state is reset correctly. */ + + d2d_command_list_set_text_rendering_params_internal(command_list, TRUE, + context->text_rendering_params); + /* Get combined size of variable data. */ glyph_count = run->glyphCount; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index a9982fcaeb9..eae8801fe4b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -720,6 +720,7 @@ struct d2d_command_list ID2D1Factory *factory; enum d2d_command_list_state state; + unsigned int flags; size_t size; size_t capacity;

1 0

Nikolay Sivov : d2d1/tests: Use test context for command list test.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 56b50f158d4f2236614a28c250cddf512568bcea URL: https://gitlab.winehq.org/wine/wine/-/commit/56b50f158d4f2236614a28c250cddf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 30 23:36:57 2022 +0300 d2d1/tests: Use test context for command list test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 22e020bebb9..53e02bbfc30 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9445,7 +9445,6 @@ static void test_command_list(BOOL d3d11) ID2D1CommandList *command_list; struct d2d1_test_context ctx; ID2D1Geometry *geometry; - ID2D1Factory1 *factory; ID2D1RenderTarget *rt; D2D1_POINT_2F p0, p1; ID2D1Bitmap *bitmap; @@ -9460,23 +9459,20 @@ static void test_command_list(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + if (!ctx.factory1) { - win_skip("ID2D1Factory1 is not supported.\n"); + win_skip("Command lists are not supported.\n"); release_test_context(&ctx); return; } - device_context = create_device_context(factory, ctx.device, d3d11); - ok(device_context != NULL, "Failed to create device context.\n"); + device_context = ctx.context; hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (FAILED(hr)) { - ID2D1DeviceContext_Release(device_context); - ID2D1Factory1_Release(factory); release_test_context(&ctx); return; } @@ -9542,7 +9538,7 @@ static void test_command_list(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); - hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + hr = ID2D1Factory1_CreateRectangleGeometry(ctx.factory1, &rect, (ID2D1RectangleGeometry **)&geometry); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); @@ -9570,7 +9566,7 @@ static void test_command_list(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); - hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + hr = ID2D1Factory1_CreateRectangleGeometry(ctx.factory1, &rect, (ID2D1RectangleGeometry **)&geometry); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); @@ -9586,7 +9582,7 @@ static void test_command_list(BOOL d3d11) /* Geometry. */ set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); - hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + hr = ID2D1Factory1_CreateRectangleGeometry(ctx.factory1, &rect, (ID2D1RectangleGeometry **)&geometry); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); @@ -9610,7 +9606,7 @@ static void test_command_list(BOOL d3d11) stroke_desc.dashStyle = D2D1_DASH_STYLE_DOT; stroke_desc.dashOffset = -1.0f; - hr = ID2D1Factory_CreateStrokeStyle((ID2D1Factory *)factory, &stroke_desc, NULL, 0, &stroke_style); + hr = ID2D1Factory_CreateStrokeStyle((ID2D1Factory *)ctx.factory, &stroke_desc, NULL, 0, &stroke_style); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); @@ -9653,7 +9649,7 @@ static void test_command_list(BOOL d3d11) ID2D1CommandList_Release(command_list); /* List created with different context. */ - device_context2 = create_device_context(factory, ctx.device, d3d11); + device_context2 = create_device_context(ctx.factory1, ctx.device, d3d11); ok(device_context2 != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); @@ -9667,8 +9663,6 @@ static void test_command_list(BOOL d3d11) ID2D1DeviceContext_Release(device_context2); ID2D1RenderTarget_Release(rt); - ID2D1DeviceContext_Release(device_context); - ID2D1Factory1_Release(factory); release_test_context(&ctx); }

1 0