[PATCH 0/2] MR595: d2d1/commandlist: Implement FillOpacityMask() command.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

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

[PATCH 1/2] d2d1: Add parameter validation to FillOpacityMask().

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/d2d1/device.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index c502c5dc4e4..7bed9245d75 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1096,8 +1096,25 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont
         ID2D1Bitmap *mask, ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content,
         const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect)
 {
+    struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+
     FIXME("iface %p, mask %p, brush %p, content %#x, dst_rect %s, src_rect %s stub!\n",
             iface, mask, brush, content, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect));
+
+    if (FAILED(context->error.code))
+        return;
+
+    if (context->drawing_state.antialiasMode != D2D1_ANTIALIAS_MODE_ALIASED)
+    {
+        d2d_device_context_set_error(context, D2DERR_WRONG_STATE);
+        return;
+    }
+
+    if ((unsigned int)content > D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE)
+    {
+        d2d_device_context_set_error(context, E_INVALIDARG);
+        return;
+    }
 }
 
 static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap,
@@ -2584,8 +2601,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectRequiredInputRectan
 static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_FillOpacityMask(ID2D1DeviceContext1 *iface,
         ID2D1Bitmap *mask, ID2D1Brush *brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect)
 {
+    struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+
     FIXME("iface %p, mask %p, brush %p, dst_rect %s, src_rect %s stub!\n",
             iface, mask, brush, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect));
+
+    if (FAILED(context->error.code))
+        return;
+
+    if (context->drawing_state.antialiasMode != D2D1_ANTIALIAS_MODE_ALIASED)
+    {
+        d2d_device_context_set_error(context, D2DERR_WRONG_STATE);
+        return;
+    }
 }
 
 static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateFilledGeometryRealization(ID2D1DeviceContext1 *iface,
-- 
GitLab


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

[PATCH 2/2] d2d1/commandlist: Implement FillOpacityMask() command.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/d2d1/command_list.c | 47 ++++++++++++++++++++++++++++++++++++++++
 dlls/d2d1/d2d1_private.h |  2 ++
 dlls/d2d1/device.c       |  6 +++++
 3 files changed, 55 insertions(+)

diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c
index 664b2f1a412..8e5654adac8 100644
--- a/dlls/d2d1/command_list.c
+++ b/dlls/d2d1/command_list.c
@@ -41,6 +41,7 @@ enum d2d_command_type
     D2D_COMMAND_DRAW_RECTANGLE,
     D2D_COMMAND_DRAW_BITMAP,
     D2D_COMMAND_FILL_MESH,
+    D2D_COMMAND_FILL_OPACITY_MASK,
     D2D_COMMAND_FILL_GEOMETRY,
     D2D_COMMAND_FILL_RECTANGLE,
     D2D_COMMAND_PUSH_CLIP,
@@ -142,6 +143,15 @@ struct d2d_command_fill_mesh
     ID2D1Brush *brush;
 };
 
+struct d2d_command_fill_opacity_mask
+{
+    struct d2d_command c;
+    ID2D1Bitmap *bitmap;
+    ID2D1Brush *brush;
+    D2D1_RECT_F *dst_rect;
+    D2D1_RECT_F *src_rect;
+};
+
 struct d2d_command_fill_geometry
 {
     struct d2d_command c;
@@ -383,6 +393,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface
                 hr = ID2D1CommandSink_FillMesh(sink, c->mesh, c->brush);
                 break;
             }
+            case D2D_COMMAND_FILL_OPACITY_MASK:
+            {
+                const struct d2d_command_fill_opacity_mask *c = data;
+                hr = ID2D1CommandSink_FillOpacityMask(sink, c->bitmap, c->brush, c->dst_rect, c->src_rect);
+                break;
+            }
             case D2D_COMMAND_FILL_GEOMETRY:
             {
                 const struct d2d_command_fill_geometry *c = data;
@@ -960,3 +976,34 @@ void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const str
     command->mesh = mesh;
     command->brush = brush;
 }
+
+void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context,
+        ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect)
+{
+    struct d2d_command_fill_opacity_mask *command;
+    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;
+    }
+
+    size = sizeof(*command);
+    if (dst_rect) size += sizeof(*dst_rect);
+    if (src_rect) size += sizeof(*src_rect);
+
+    d2d_command_list_reference_object(command_list, bitmap);
+
+    command = d2d_command_list_require_space(command_list, size);
+    command->c.op = D2D_COMMAND_FILL_OPACITY_MASK;
+    command->bitmap = bitmap;
+    command->brush = brush;
+
+    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));
+}
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index eae8801fe4b..4cc77079e0f 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -771,6 +771,8 @@ void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bi
         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;
+void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context,
+        ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) 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 7bed9245d75..796d837c3d9 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1115,6 +1115,9 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont
         d2d_device_context_set_error(context, E_INVALIDARG);
         return;
     }
+
+    if (context->target.type == D2D_TARGET_COMMAND_LIST)
+        d2d_command_list_fill_opacity_mask(context->target.command_list, context, mask, brush, dst_rect, src_rect);
 }
 
 static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap,
@@ -2614,6 +2617,9 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_FillOpacityM
         d2d_device_context_set_error(context, D2DERR_WRONG_STATE);
         return;
     }
+
+    if (context->target.type == D2D_TARGET_COMMAND_LIST)
+        d2d_command_list_fill_opacity_mask(context->target.command_list, context, mask, brush, dst_rect, src_rect);
 }
 
 static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateFilledGeometryRealization(ID2D1DeviceContext1 *iface,
-- 
GitLab

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