[PATCH] d2d1: Implement ID2D1Factory2::CreateStrokeStyle1().
Dmitry Timoshkov
dmitry at baikal.ru
Mon Dec 6 07:29:00 CST 2021
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
dlls/d2d1/d2d1_private.h | 6 ++--
dlls/d2d1/factory.c | 35 ++++++++++++++++---
dlls/d2d1/stroke.c | 75 +++++++++++++++++++++++-----------------
3 files changed, 78 insertions(+), 38 deletions(-)
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index e823b2092bf..de5e986f7f2 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -337,17 +337,17 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN
struct d2d_stroke_style
{
- ID2D1StrokeStyle ID2D1StrokeStyle_iface;
+ ID2D1StrokeStyle1 ID2D1StrokeStyle1_iface;
LONG refcount;
ID2D1Factory *factory;
- D2D1_STROKE_STYLE_PROPERTIES desc;
+ D2D1_STROKE_STYLE_PROPERTIES1 desc;
float *dashes;
UINT32 dash_count;
};
HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory,
- const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN;
+ const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN;
struct d2d_layer
{
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index 5f081a1c12d..7ddd6bbc87c 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -283,6 +283,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if
ID2D1StrokeStyle **stroke_style)
{
struct d2d_stroke_style *object;
+ D2D1_STROKE_STYLE_PROPERTIES1 desc1;
HRESULT hr;
TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n",
@@ -291,7 +292,16 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if
if (!(object = heap_alloc_zero(sizeof(*object))))
return E_OUTOFMEMORY;
- if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count)))
+ desc1.startCap = desc->startCap;
+ desc1.endCap = desc->endCap;
+ desc1.dashCap = desc->dashCap;
+ desc1.lineJoin = desc->lineJoin;
+ desc1.miterLimit = desc->miterLimit;
+ desc1.dashStyle = desc->dashStyle;
+ desc1.dashOffset = desc->dashOffset;
+ desc1.transformType = D2D1_STROKE_TRANSFORM_TYPE_NORMAL;
+
+ if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, &desc1, dashes, dash_count)))
{
WARN("Failed to initialize stroke style, hr %#x.\n", hr);
heap_free(object);
@@ -299,7 +309,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if
}
TRACE("Created stroke style %p.\n", object);
- *stroke_style = &object->ID2D1StrokeStyle_iface;
+ *stroke_style = (ID2D1StrokeStyle *)&object->ID2D1StrokeStyle1_iface;
return S_OK;
}
@@ -485,10 +495,27 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *i
const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count,
ID2D1StrokeStyle1 **stroke_style)
{
- FIXME("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p stub!\n",
+ struct d2d_stroke_style *object;
+ HRESULT hr;
+
+ TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n",
iface, desc, dashes, dash_count, stroke_style);
- return E_NOTIMPL;
+ if (!(object = heap_alloc_zero(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface,
+ desc, dashes, dash_count)))
+ {
+ WARN("Failed to initialize stroke style, hr %#x.\n", hr);
+ heap_free(object);
+ return hr;
+ }
+
+ TRACE("Created stroke style %p.\n", object);
+ *stroke_style = &object->ID2D1StrokeStyle1_iface;
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory2 *iface, ID2D1PathGeometry1 **geometry)
diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c
index 0ba44e0b1d0..da412540753 100644
--- a/dlls/d2d1/stroke.c
+++ b/dlls/d2d1/stroke.c
@@ -20,12 +20,12 @@
WINE_DEFAULT_DEBUG_CHANNEL(d2d);
-static inline struct d2d_stroke_style *impl_from_ID2D1StrokeStyle(ID2D1StrokeStyle *iface)
+static inline struct d2d_stroke_style *impl_from_ID2D1StrokeStyle1(ID2D1StrokeStyle1 *iface)
{
- return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle_iface);
+ return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle1_iface);
}
-static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyle *iface, REFIID iid, void **out)
+static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyle1 *iface, REFIID iid, void **out)
{
TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
@@ -33,7 +33,7 @@ static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyl
|| IsEqualGUID(iid, &IID_ID2D1Resource)
|| IsEqualGUID(iid, &IID_IUnknown))
{
- ID2D1StrokeStyle_AddRef(iface);
+ ID2D1StrokeStyle1_AddRef(iface);
*out = iface;
return S_OK;
}
@@ -44,9 +44,9 @@ static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyl
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle *iface)
+static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
ULONG refcount = InterlockedIncrement(&style->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
@@ -54,9 +54,9 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle *iface)
return refcount;
}
-static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface)
+static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
ULONG refcount = InterlockedDecrement(&style->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
@@ -72,90 +72,90 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface)
return refcount;
}
-static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *iface, ID2D1Factory **factory)
+static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle1 *iface, ID2D1Factory **factory)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p, factory %p.\n", iface, factory);
ID2D1Factory_AddRef(*factory = style->factory);
}
-static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface)
+static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->desc.startCap;
}
-static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle *iface)
+static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->desc.endCap;
}
-static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle *iface)
+static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->desc.dashCap;
}
-static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle *iface)
+static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->desc.miterLimit;
}
-static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle *iface)
+static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->desc.lineJoin;
}
-static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle *iface)
+static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->desc.dashOffset;
}
-static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle *iface)
+static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->desc.dashStyle;
}
-static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle *iface)
+static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle1 *iface)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p.\n", iface);
return style->dash_count;
}
-static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface, float *dashes, UINT32 dash_count)
+static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle1 *iface, float *dashes, UINT32 dash_count)
{
- struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface);
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
TRACE("iface %p, dashes %p, count %u.\n", iface, dashes, dash_count);
@@ -164,7 +164,16 @@ static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface
memset(dashes + style->dash_count, 0, (dash_count - style->dash_count) * sizeof(*dashes));
}
-static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl =
+static D2D1_STROKE_TRANSFORM_TYPE STDMETHODCALLTYPE d2d_stroke_style_GetStrokeTransformType(ID2D1StrokeStyle1 *iface)
+{
+ struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return style->desc.transformType;
+}
+
+static const struct ID2D1StrokeStyle1Vtbl d2d_stroke_style_vtbl =
{
d2d_stroke_style_QueryInterface,
d2d_stroke_style_AddRef,
@@ -179,10 +188,11 @@ static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl =
d2d_stroke_style_GetDashStyle,
d2d_stroke_style_GetDashesCount,
d2d_stroke_style_GetDashes,
+ d2d_stroke_style_GetStrokeTransformType
};
HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory,
- const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count)
+ const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count)
{
static const struct
{
@@ -201,7 +211,10 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact
if (desc->dashStyle > D2D1_DASH_STYLE_CUSTOM)
return E_INVALIDARG;
- style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl;
+ if (desc->transformType != D2D1_STROKE_TRANSFORM_TYPE_NORMAL)
+ FIXME("transformType %d is not supported\n", desc->transformType);
+
+ style->ID2D1StrokeStyle1_iface.lpVtbl = &d2d_stroke_style_vtbl;
style->refcount = 1;
if (desc->dashStyle == D2D1_DASH_STYLE_CUSTOM)
--
2.34.1
More information about the wine-devel
mailing list