[PATCH v3 2/5] d2d1: Partially implement RegisterEffectFromStream().
Ziqing Hui
zhui at codeweavers.com
Mon Jun 13 23:08:53 CDT 2022
Signed-off-by: Ziqing Hui <zhui at codeweavers.com>
---
v3: Remove goto.
Don't check EndElement name.
dlls/d2d1/Makefile.in | 2 +-
dlls/d2d1/factory.c | 158 +++++++++++++++++++++++++++++++++++++++++-
system_property_count | 0
3 files changed, 157 insertions(+), 3 deletions(-)
create mode 100644 system_property_count
diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in
index 413571338ba..2456c63c336 100644
--- a/dlls/d2d1/Makefile.in
+++ b/dlls/d2d1/Makefile.in
@@ -1,6 +1,6 @@
MODULE = d2d1.dll
IMPORTLIB = d2d1
-IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32
+IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 ole32 xmllite
DELAYIMPORTS = dwrite
C_SRCS = \
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index 01dac8051c0..273b699ef8d 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -18,6 +18,8 @@
#define D2D1_INIT_GUID
#include "d2d1_private.h"
+#include "xmllite.h"
+#include "wine/list.h"
WINE_DECLARE_DEBUG_CHANNEL(winediag);
WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -27,6 +29,17 @@ struct d2d_settings d2d_settings =
~0u, /* No ID2D1Factory version limit by default. */
};
+struct d2d_effect_reg
+{
+ CLSID id;
+ PD2D1_EFFECT_FACTORY factory;
+ UINT32 count;
+
+ UINT32 input_count;
+
+ struct list entry;
+};
+
struct d2d_factory
{
ID2D1Factory3 ID2D1Factory3_iface;
@@ -39,6 +52,8 @@ struct d2d_factory
float dpi_y;
CRITICAL_SECTION cs;
+
+ struct list effect_regs;
};
static inline struct d2d_factory *impl_from_ID2D1Factory3(ID2D1Factory3 *iface)
@@ -51,6 +66,14 @@ static inline struct d2d_factory *impl_from_ID2D1Multithread(ID2D1Multithread *i
return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Multithread_iface);
}
+static void d2d_effect_reg_cleanup(struct d2d_effect_reg *reg)
+{
+ if (!reg)
+ return;
+
+ heap_free(reg);
+}
+
static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory)
{
HDC hdc;
@@ -112,6 +135,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory3 *iface)
{
struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);
ULONG refcount = InterlockedDecrement(&factory->refcount);
+ struct d2d_effect_reg *iter, *iter2;
TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
@@ -120,6 +144,8 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory3 *iface)
if (factory->device)
ID3D10Device1_Release(factory->device);
DeleteCriticalSection(&factory->cs);
+ LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &factory->effect_regs, struct d2d_effect_reg, entry)
+ d2d_effect_reg_cleanup(iter);
heap_free(factory);
}
@@ -564,14 +590,141 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory3 *if
return E_NOTIMPL;
}
+static BOOL next_xml_node(IXmlReader *xml_reader, XmlNodeType *node_type, const WCHAR **node_name)
+{
+ while (IXmlReader_Read(xml_reader, node_type) == S_OK)
+ {
+ if (*node_type == XmlNodeType_Whitespace)
+ continue;
+ if (FAILED(IXmlReader_GetLocalName(xml_reader, node_name, NULL)))
+ return E_INVALIDARG;
+ return S_OK;
+ }
+ return S_FALSE;
+}
+
+static HRESULT parse_property(IXmlReader *xml_reader, struct d2d_effect_reg *reg)
+{
+ /* FIXME: Property parsing is not implemented. */
+ return S_OK;
+}
+
+static HRESULT parse_inputs(IXmlReader *xml_reader, struct d2d_effect_reg *reg)
+{
+ const WCHAR *node_name;
+ XmlNodeType node_type;
+
+ if (IXmlReader_IsEmptyElement(xml_reader))
+ return S_OK;
+
+ while (next_xml_node(xml_reader, &node_type, &node_name) == S_OK)
+ {
+ if (node_type == XmlNodeType_Element && !wcscmp(node_name, L"Input"))
+ {
+ ++reg->input_count;
+ /* FIXME: Name attribute of input is ignored. */
+ }
+ else if (node_type == XmlNodeType_EndElement)
+ {
+ return S_OK;
+ }
+ }
+
+ return E_INVALIDARG;
+}
+
+static HRESULT parse_effect_xml(IStream *property_xml, struct d2d_effect_reg *reg)
+{
+ IXmlReader *xml_reader;
+ const WCHAR *node_name;
+ XmlNodeType node_type;
+ HRESULT hr;
+
+ if (FAILED(hr = CreateXmlReader(&IID_IXmlReader, (void **)&xml_reader, NULL)))
+ return hr;
+ if (FAILED(hr = IXmlReader_SetInput(xml_reader, (IUnknown *)property_xml)))
+ {
+ IXmlReader_Release(xml_reader);
+ return hr;
+ }
+
+ /* Read version node */
+ if (next_xml_node(xml_reader, &node_type, &node_name) != S_OK || node_type != XmlNodeType_XmlDeclaration)
+ {
+ IXmlReader_Release(xml_reader);
+ return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
+ }
+
+ /* Read effect node */
+ if (next_xml_node(xml_reader, &node_type, &node_name) != S_OK
+ || node_type != XmlNodeType_Element || wcscmp(node_name, L"Effect") != 0)
+ {
+ IXmlReader_Release(xml_reader);
+ return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
+ }
+
+ /* Loop inside effect node */
+ while (next_xml_node(xml_reader, &node_type, &node_name) == S_OK)
+ {
+ if (node_type == XmlNodeType_Element)
+ {
+ if (!wcscmp(node_name, L"Property"))
+ hr = parse_property(xml_reader, reg);
+ else if (!wcscmp(node_name, L"Inputs"))
+ hr = parse_inputs(xml_reader, reg);
+
+ if (FAILED(hr))
+ {
+ IXmlReader_Release(xml_reader);
+ return hr;
+ }
+ }
+ else if (node_type == XmlNodeType_EndElement)
+ {
+ IXmlReader_Release(xml_reader);
+ return S_OK;
+ }
+ }
+
+ IXmlReader_Release(xml_reader);
+ return E_INVALIDARG;
+}
+
static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory3 *iface,
REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings,
UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory)
{
- FIXME("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p stub!\n",
+ struct d2d_factory *factory = impl_from_ID2D1Factory3(iface);
+ struct d2d_effect_reg *iter, *entry = NULL;
+ HRESULT hr;
+
+ TRACE("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p.\n",
iface, debugstr_guid(effect_id), property_xml, bindings, binding_count, effect_factory);
- return E_NOTIMPL;
+ LIST_FOR_EACH_ENTRY(iter, &factory->effect_regs, struct d2d_effect_reg, entry)
+ {
+ if (IsEqualGUID(effect_id, &iter->id))
+ {
+ ++iter->count;
+ return S_OK;
+ }
+ }
+
+ if (!(entry = heap_alloc_zero(sizeof(*entry))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = parse_effect_xml(property_xml, entry)))
+ {
+ d2d_effect_reg_cleanup(entry);
+ return hr;
+ }
+
+ entry->count = 1;
+ entry->id = *effect_id;
+ entry->factory = effect_factory;
+ list_add_tail(&factory->effect_regs, &entry->entry);
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory3 *iface,
@@ -743,6 +896,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact
factory->refcount = 1;
d2d_factory_reload_sysmetrics(factory);
InitializeCriticalSection(&factory->cs);
+ list_init(&factory->effect_regs);
}
HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid,
diff --git a/system_property_count b/system_property_count
new file mode 100644
index 00000000000..e69de29bb2d
--
2.25.1
More information about the wine-devel
mailing list