[PATCH 0/5] MR11409: msxml3: Add entities as children of a DTD.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11409
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/node.c | 82 +++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 9 +++-- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7e0c8e10e01..63f8d6964ba 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -3633,6 +3633,7 @@ struct parse_context ISAXContentHandler content_handler; ISAXLexicalHandler lexical_handler; ISAXDTDHandler dtd_handler; + ISAXDeclHandler decl_handler; ISAXXMLReaderExtension *reader_extension; ISAXXMLReader *reader; @@ -3770,6 +3771,11 @@ static struct parse_context *impl_from_ISAXDTDHandler(ISAXDTDHandler *iface) return CONTAINING_RECORD(iface, struct parse_context, dtd_handler); } +static struct parse_context *impl_from_ISAXDeclHandler(ISAXDeclHandler *iface) +{ + return CONTAINING_RECORD(iface, struct parse_context, decl_handler); +} + static HRESULT WINAPI parse_content_handler_QueryInterface(ISAXContentHandler *iface, REFIID riid, void **obj) { if (IsEqualGUID(riid, &IID_ISAXContentHandler) @@ -3971,7 +3977,13 @@ static HRESULT WINAPI parse_dtd_handler_unparsedEntityDecl(ISAXDTDHandler *iface int name_len, const WCHAR *pubid, int pubid_len, const WCHAR *sysid, int sysid_len, const WCHAR *notation_name, int notation_name_len) { - return S_OK; + struct parse_context *c = impl_from_ISAXDTDHandler(iface); + struct domnode *node; + + parse_context_node_create(c, NODE_ENTITY, name, name_len, NULL, 0, c->root, &node); + parse_context_append_child(c, c->node, node); + + return c->status; } static const ISAXDTDHandlerVtbl parse_dtd_handler_vtbl = @@ -3983,6 +3995,73 @@ static const ISAXDTDHandlerVtbl parse_dtd_handler_vtbl = parse_dtd_handler_unparsedEntityDecl, }; +static HRESULT WINAPI parse_decl_handler_QueryInterface(ISAXDeclHandler *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_ISAXDeclHandler) + || IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + ISAXDeclHandler_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI parse_decl_handler_AddRef(ISAXDeclHandler *iface) +{ + return 2; +} + +static ULONG WINAPI parse_decl_handler_Release(ISAXDeclHandler *iface) +{ + return 1; +} + +static HRESULT WINAPI parse_decl_handler_elementDecl(ISAXDeclHandler *iface, const WCHAR *name, + int name_len, const WCHAR *model, int model_len) +{ + return S_OK; +} + +static HRESULT WINAPI parse_decl_handler_attributeDecl(ISAXDeclHandler *iface, const WCHAR *element_name, + int element_name_len, const WCHAR *attribute_name, int attribute_name_len, + const WCHAR *type, int type_len, const WCHAR *value_default, int value_default_len, + const WCHAR *value, int value_len) +{ + return S_OK; +} + +static HRESULT WINAPI parse_decl_handler_internalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, + int name_len, const WCHAR *value, int value_len) +{ + struct parse_context *c = impl_from_ISAXDeclHandler(iface); + struct domnode *node; + + parse_context_node_create(c, NODE_ENTITY, name, name_len, NULL, 0, c->root, &node); + parse_context_append_child(c, c->node, node); + + return c->status; +} + +static HRESULT WINAPI parse_decl_handler_externalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, + int name_len, const WCHAR *pubid, int pubid_len, const WCHAR *sysid, int sysid_len) +{ + return S_OK; +} + +static const ISAXDeclHandlerVtbl parse_decl_handler_vtbl = +{ + parse_decl_handler_QueryInterface, + parse_decl_handler_AddRef, + parse_decl_handler_Release, + parse_decl_handler_elementDecl, + parse_decl_handler_attributeDecl, + parse_decl_handler_internalEntityDecl, + parse_decl_handler_externalEntityDecl, +}; + static HRESULT WINAPI parse_extension_handler_QueryInterface(ISAXExtensionHandler *iface, REFIID riid, void **obj) { if (IsEqualGUID(riid, &IID_ISAXExtensionHandler) @@ -4179,6 +4258,7 @@ static HRESULT parse_context_init(struct parse_context *c, const struct domdoc_p c->extension_handler.lpVtbl = &parse_extension_handler_vtbl; c->lexical_handler.lpVtbl = &parse_lexical_handler_vtbl; c->dtd_handler.lpVtbl = &parse_dtd_handler_vtbl; + c->decl_handler.lpVtbl = &parse_decl_handler_vtbl; c->buffer.status = &c->status; c->max_depth = properties->max_element_depth; c->version = properties->version; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8719f7f3ebc..b557f88f33f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -17870,7 +17870,6 @@ if (!winetest_platform_is_wine) hr = IXMLDOMNodeList_get_length(list, &len); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(len == 3, "Unexpected length %ld.\n", len); hr = IXMLDOMNodeList_nextNode(list, &node); @@ -17879,15 +17878,17 @@ if (!winetest_platform_is_wine) IXMLDOMNode_Release(node); hr = IXMLDOMNodeList_nextNode(list, &node); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -if (!winetest_platform_is_wine) +if (hr == S_OK) +{ expect_node(node, "EN2.DT2.D1"); IXMLDOMNode_Release(node); +} hr = IXMLDOMNodeList_nextNode(list, &node); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -if (hr == S_OK) +if (!winetest_platform_is_wine) { expect_node(node, "N3.DT2.D1"); IXMLDOMNode_Release(node); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11409
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/dispex.c | 1 + dlls/msxml3/entity.c | 513 ++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_dispex.h | 1 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 4 +- dlls/msxml3/tests/domdoc.c | 8 - 7 files changed, 519 insertions(+), 10 deletions(-) create mode 100644 dlls/msxml3/entity.c diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index b1c1847492e..b769ad65c9c 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ domdoc.c \ domimpl.c \ element.c \ + entity.c \ entityref.c \ factory.c \ httprequest.c \ diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 2ff9e899d80..d3128356166 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -91,6 +91,7 @@ static tid_id_t tid_ids[] = { { &IID_IXMLDOMDocumentFragment, LibXml2 }, { &IID_IXMLDOMDocumentType, LibXml2 }, { &IID_IXMLDOMElement, LibXml2 }, + { &IID_IXMLDOMEntity, LibXml2 }, { &IID_IXMLDOMEntityReference, LibXml2 }, { &IID_IXMLDOMImplementation, LibXml2 }, { &IID_IXMLDOMNamedNodeMap, LibXml2 }, diff --git a/dlls/msxml3/entity.c b/dlls/msxml3/entity.c new file mode 100644 index 00000000000..17c140f7798 --- /dev/null +++ b/dlls/msxml3/entity.c @@ -0,0 +1,513 @@ +/* + * Copyright 2026 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" +#include "ole2.h" +#include "msxml6.h" + +#include "msxml_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +struct domentity +{ + DispatchEx dispex; + IXMLDOMEntity IXMLDOMEntity_iface; + LONG refcount; + struct domnode *node; +}; + +static const tid_t notation_se_tids[] = +{ + IXMLDOMNode_tid, + IXMLDOMEntity_tid, + NULL_tid +}; + +static inline struct domentity *impl_from_IXMLDOMEntity(IXMLDOMEntity *iface) +{ + return CONTAINING_RECORD(iface, struct domentity, IXMLDOMEntity_iface); +} + +static HRESULT WINAPI domentity_QueryInterface(IXMLDOMEntity *iface, REFIID riid, void **obj) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IXMLDOMEntity) || + IsEqualGUID(riid, &IID_IXMLDOMNode) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = ¬ation->IXMLDOMEntity_iface; + } + else if (dispex_query_interface(¬ation->dispex, riid, obj)) + { + return *obj ? S_OK : E_NOINTERFACE; + } + else if (node_query_interface(notation->node, riid, obj)) + { + return *obj ? S_OK : E_NOINTERFACE; + } + else if (IsEqualGUID(riid, &IID_ISupportErrorInfo)) + { + return node_create_supporterrorinfo(notation_se_tids, obj); + } + else + { + TRACE("interface %s not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef( (IUnknown*)*obj ); + return S_OK; +} + +static ULONG WINAPI domentity_AddRef(IXMLDOMEntity *iface) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + LONG refcount = InterlockedIncrement(¬ation->refcount); + + TRACE("%p, refcount %ld.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI domentity_Release(IXMLDOMEntity *iface) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + ULONG refcount = InterlockedDecrement(¬ation->refcount); + + TRACE("%p, refcount %ld.\n", iface, refcount); + + if (!refcount) + { + domnode_release(notation->node); + free(notation); + } + + return refcount; +} + +static HRESULT WINAPI domentity_GetTypeInfoCount(IXMLDOMEntity *iface, UINT *count) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + return IDispatchEx_GetTypeInfoCount(¬ation->dispex.IDispatchEx_iface, count); +} + +static HRESULT WINAPI domentity_GetTypeInfo(IXMLDOMEntity *iface, UINT index, LCID lcid, ITypeInfo **ti) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + return IDispatchEx_GetTypeInfo(¬ation->dispex.IDispatchEx_iface, index, lcid, ti); +} + +static HRESULT WINAPI domentity_GetIDsOfNames(IXMLDOMEntity *iface, REFIID riid, LPOLESTR* rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + return IDispatchEx_GetIDsOfNames(¬ation->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI domentity_Invoke(IXMLDOMEntity *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *ei, UINT *puArgErr) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + return IDispatchEx_Invoke(¬ation->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, flags, params, + result, ei, puArgErr); +} + +static HRESULT WINAPI domentity_get_nodeName(IXMLDOMEntity *iface, BSTR *p) +{ + FIXME("%p, %p: stub\n", iface, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_nodeValue(IXMLDOMEntity *iface, VARIANT *v) +{ + FIXME("%p, %p: stub\n", iface, v); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_put_nodeValue(IXMLDOMEntity *iface, VARIANT v) +{ + FIXME("%p, %s: stub\n", iface, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_nodeType(IXMLDOMEntity *iface, DOMNodeType *type) +{ + TRACE("%p, %p.\n", iface, type); + + *type = NODE_ENTITY; + return S_OK; +} + +static HRESULT WINAPI domentity_get_parentNode(IXMLDOMEntity *iface, IXMLDOMNode **parent) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + + TRACE("%p, %p.\n", iface, parent); + + return node_get_parent(notation->node, parent); +} + +static HRESULT WINAPI domentity_get_childNodes(IXMLDOMEntity *iface, IXMLDOMNodeList **list) +{ + FIXME("%p, %p: stub\n", iface, list); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_firstChild(IXMLDOMEntity *iface, IXMLDOMNode **node) +{ + FIXME("%p, %p: stub\n", iface, node); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_lastChild(IXMLDOMEntity *iface, IXMLDOMNode **node) +{ + FIXME("%p, %p: stub\n", iface, node); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_previousSibling(IXMLDOMEntity *iface, IXMLDOMNode **node) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + + TRACE("%p, %p.\n", iface, node); + + return node_get_previous_sibling(notation->node, node); +} + +static HRESULT WINAPI domentity_get_nextSibling(IXMLDOMEntity *iface, IXMLDOMNode **node) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + + TRACE("%p, %p.\n", iface, node); + + return node_get_next_sibling(notation->node, node); +} + +static HRESULT WINAPI domentity_get_attributes(IXMLDOMEntity *iface, IXMLDOMNamedNodeMap **map) +{ + FIXME("%p, %p: stub\n", iface, map); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_insertBefore(IXMLDOMEntity *iface, IXMLDOMNode *node, + VARIANT refChild, IXMLDOMNode **out_node) +{ + FIXME("%p, %p, %s, %p: stub\n", iface, node, debugstr_variant(&refChild), out_node); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_replaceChild(IXMLDOMEntity *iface, IXMLDOMNode *newNode, + IXMLDOMNode *oldNode, IXMLDOMNode **outOldNode) +{ + FIXME("%p, %p, %p, %p: stub\n", iface, newNode, oldNode, outOldNode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_removeChild(IXMLDOMEntity *iface, IXMLDOMNode *node, + IXMLDOMNode **oldNode) +{ + FIXME("%p, %p, %p: stub\n", iface, node, oldNode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_appendChild(IXMLDOMEntity *iface, IXMLDOMNode *newNode, + IXMLDOMNode **outNewNode) +{ + FIXME("%p, %p, %p: stub\n", iface, newNode, outNewNode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_hasChildNodes(IXMLDOMEntity *iface, VARIANT_BOOL *v) +{ + FIXME("%p, %p: stub\n", iface, v); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_ownerDocument(IXMLDOMEntity *iface, IXMLDOMDocument **doc) +{ + struct domentity *notation = impl_from_IXMLDOMEntity(iface); + + TRACE("%p, %p.\n", iface, doc); + + return node_get_owner_document(notation->node, doc); +} + +static HRESULT WINAPI domentity_cloneNode(IXMLDOMEntity *iface, VARIANT_BOOL deep, IXMLDOMNode **node) +{ + FIXME("%p, %d, %p: stub\n", iface, deep, node); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_nodeTypeString(IXMLDOMEntity *iface, BSTR *p) +{ + FIXME("%p, %p: stub\n", iface, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_text(IXMLDOMEntity *iface, BSTR *p) +{ + FIXME("%p, %p: stub\n", iface, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_put_text(IXMLDOMEntity *iface, BSTR p) +{ + FIXME("%p, %s: stub\n", iface, debugstr_w(p)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_specified(IXMLDOMEntity *iface, VARIANT_BOOL *v) +{ + FIXME("%p, %p: stub\n", iface, v); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_definition(IXMLDOMEntity *iface, IXMLDOMNode **node) +{ + FIXME("%p, %p: stub\n", iface, node); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_nodeTypedValue(IXMLDOMEntity *iface, VARIANT *v) +{ + FIXME("%p, %p: stub\n", iface, v); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_put_nodeTypedValue(IXMLDOMEntity *iface, VARIANT value) +{ + FIXME("%p, %s: stub\n", iface, debugstr_variant(&value)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_dataType(IXMLDOMEntity *iface, VARIANT *v) +{ + FIXME("%p, %p: stub\n", iface, v); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_put_dataType(IXMLDOMEntity *iface, BSTR p) +{ + FIXME("%p, %s: stub\n", iface, debugstr_w(p)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_xml(IXMLDOMEntity *iface, BSTR *p) +{ + FIXME("%p, %p.\n", iface, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_transformNode(IXMLDOMEntity *iface, IXMLDOMNode *node, BSTR *p) +{ + FIXME("%p, %p, %p: stub\n", iface, node, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_selectNodes(IXMLDOMEntity *iface, BSTR p, IXMLDOMNodeList **list) +{ + FIXME("%p, %s, %p: stub\n", iface, debugstr_w(p), list); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_selectSingleNode(IXMLDOMEntity *iface, BSTR p, IXMLDOMNode **node) +{ + FIXME("%p, %s, %p: stub\n", iface, debugstr_w(p), node); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_parsed(IXMLDOMEntity *iface, VARIANT_BOOL *v) +{ + FIXME("%p, %p: stub\n", iface, v); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_namespaceURI(IXMLDOMEntity *iface, BSTR *p) +{ + FIXME("%p, %p: stub\n", iface, p); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_prefix(IXMLDOMEntity *iface, BSTR *prefix) +{ + FIXME("%p, %p: stub\n", iface, prefix); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_baseName(IXMLDOMEntity *iface, BSTR *name) +{ + FIXME("%p, %p: stub\n", iface, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_transformNodeToObject(IXMLDOMEntity *iface, IXMLDOMNode *node, VARIANT var1) +{ + FIXME("%p, %p, %s: stub\n", iface, node, debugstr_variant(&var1)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_publicId(IXMLDOMEntity *iface, VARIANT *id) +{ + FIXME("%p, %p: stub\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_systemId(IXMLDOMEntity *iface, VARIANT *id) +{ + FIXME("%p, %p: stub\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI domentity_get_notationName(IXMLDOMEntity *iface, BSTR *p) +{ + FIXME("%p, %p: stub\n", iface, p); + + return E_NOTIMPL; +} + +static const struct IXMLDOMEntityVtbl domentity_vtbl = +{ + domentity_QueryInterface, + domentity_AddRef, + domentity_Release, + domentity_GetTypeInfoCount, + domentity_GetTypeInfo, + domentity_GetIDsOfNames, + domentity_Invoke, + domentity_get_nodeName, + domentity_get_nodeValue, + domentity_put_nodeValue, + domentity_get_nodeType, + domentity_get_parentNode, + domentity_get_childNodes, + domentity_get_firstChild, + domentity_get_lastChild, + domentity_get_previousSibling, + domentity_get_nextSibling, + domentity_get_attributes, + domentity_insertBefore, + domentity_replaceChild, + domentity_removeChild, + domentity_appendChild, + domentity_hasChildNodes, + domentity_get_ownerDocument, + domentity_cloneNode, + domentity_get_nodeTypeString, + domentity_get_text, + domentity_put_text, + domentity_get_specified, + domentity_get_definition, + domentity_get_nodeTypedValue, + domentity_put_nodeTypedValue, + domentity_get_dataType, + domentity_put_dataType, + domentity_get_xml, + domentity_transformNode, + domentity_selectNodes, + domentity_selectSingleNode, + domentity_get_parsed, + domentity_get_namespaceURI, + domentity_get_prefix, + domentity_get_baseName, + domentity_transformNodeToObject, + domentity_get_publicId, + domentity_get_systemId, + domentity_get_notationName, +}; + +static const tid_t domentity_iface_tids[] = +{ + IXMLDOMEntity_tid, + 0 +}; + +static dispex_static_data_t domentity_dispex = +{ + NULL, + IXMLDOMEntity_tid, + NULL, + domentity_iface_tids +}; + +HRESULT create_entity(struct domnode *node, IUnknown **obj) +{ + struct domentity *object; + + *obj = NULL; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IXMLDOMEntity_iface.lpVtbl = &domentity_vtbl; + object->refcount = 1; + object->node = domnode_addref(node); + + init_dispex(&object->dispex, (IUnknown *)&object->IXMLDOMEntity_iface, &domentity_dispex); + + *obj = (IUnknown *)&object->IXMLDOMEntity_iface; + + return S_OK; +} diff --git a/dlls/msxml3/msxml_dispex.h b/dlls/msxml3/msxml_dispex.h index 504e7ffc772..e907e9ba56c 100644 --- a/dlls/msxml3/msxml_dispex.h +++ b/dlls/msxml3/msxml_dispex.h @@ -47,6 +47,7 @@ typedef enum tid_t IXMLDOMDocumentFragment_tid, IXMLDOMDocumentType_tid, IXMLDOMElement_tid, + IXMLDOMEntity_tid, IXMLDOMEntityReference_tid, IXMLDOMImplementation_tid, IXMLDOMNamedNodeMap_tid, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 4c13b5e688f..391504d3ddf 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -322,6 +322,7 @@ extern HRESULT create_cdata(struct domnode *, IUnknown **); extern HRESULT create_children_nodelist(struct domnode *, IXMLDOMNodeList **); extern HRESULT create_nodemap(struct domnode *, const struct nodemap_funcs *, IXMLDOMNamedNodeMap **); extern HRESULT create_doc_fragment(struct domnode *, IUnknown **); +extern HRESULT create_entity(struct domnode *, IUnknown **); extern HRESULT create_entity_ref(struct domnode *, IUnknown **); extern HRESULT create_doc_type(struct domnode *, IUnknown **); extern HRESULT create_selection(struct domnode *, BSTR, bool xpath, IXMLDOMNodeList** ); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 63f8d6964ba..03e958e1060 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -3608,8 +3608,8 @@ HRESULT create_node(struct domnode *node, IXMLDOMNode **ret) hr = create_doc_type(node, &obj); break; case NODE_ENTITY: - FIXME("Unsupported node type %d.\n", node->type); - return E_NOTIMPL; + hr = create_entity(node, &obj); + break; case NODE_NOTATION: hr = create_notation(node, &obj); break; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b557f88f33f..0e24932db1a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -17861,7 +17861,6 @@ static void test_dtd_children(void) hr = IXMLDOMDocumentType_get_lastChild(doctype, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -if (!winetest_platform_is_wine) expect_node(node, "N3.DT2.D1"); IXMLDOMNode_Release(node); @@ -17878,21 +17877,14 @@ if (!winetest_platform_is_wine) IXMLDOMNode_Release(node); hr = IXMLDOMNodeList_nextNode(list, &node); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -if (hr == S_OK) -{ expect_node(node, "EN2.DT2.D1"); IXMLDOMNode_Release(node); -} hr = IXMLDOMNodeList_nextNode(list, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -if (!winetest_platform_is_wine) -{ expect_node(node, "N3.DT2.D1"); IXMLDOMNode_Release(node); -} IXMLDOMNodeList_Release(list); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11409
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/notation.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/notation.c b/dlls/msxml3/notation.c index a185a779fd5..e2a6eb13f1a 100644 --- a/dlls/msxml3/notation.c +++ b/dlls/msxml3/notation.c @@ -283,9 +283,9 @@ static HRESULT WINAPI domnotation_cloneNode(IXMLDOMNotation *iface, VARIANT_BOOL static HRESULT WINAPI domnotation_get_nodeTypeString(IXMLDOMNotation *iface, BSTR *p) { - FIXME("%p, %p: stub\n", iface, p); + TRACE("%p, %p.\n", iface, p); - return E_NOTIMPL; + return return_bstr(L"notation", p); } static HRESULT WINAPI domnotation_get_text(IXMLDOMNotation *iface, BSTR *p) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0e24932db1a..cf8a9504907 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -17853,6 +17853,13 @@ static void test_dtd_children(void) hr = IXMLDOMDocumentType_get_firstChild(doctype, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IXMLDOMNode_get_nodeTypeString(node, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = IXMLDOMNode_get_nodeTypeString(node, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp(str, L"notation"), "Unexpected type %s.\n", debugstr_w(str)); + SysFreeString(str); + expect_node(node, "N1.DT2.D1"); hr = IXMLDOMDocumentType_removeChild(doctype, node, &node2); todo_wine -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11409
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/entity.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/entity.c b/dlls/msxml3/entity.c index 17c140f7798..a6929f2a3c3 100644 --- a/dlls/msxml3/entity.c +++ b/dlls/msxml3/entity.c @@ -283,9 +283,9 @@ static HRESULT WINAPI domentity_cloneNode(IXMLDOMEntity *iface, VARIANT_BOOL dee static HRESULT WINAPI domentity_get_nodeTypeString(IXMLDOMEntity *iface, BSTR *p) { - FIXME("%p, %p: stub\n", iface, p); + TRACE("%p, %p.\n", iface, p); - return E_NOTIMPL; + return return_bstr(L"entity", p); } static HRESULT WINAPI domentity_get_text(IXMLDOMEntity *iface, BSTR *p) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cf8a9504907..63706fb5ac0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -17885,6 +17885,13 @@ static void test_dtd_children(void) hr = IXMLDOMNodeList_nextNode(list, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IXMLDOMNode_get_nodeTypeString(node, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = IXMLDOMNode_get_nodeTypeString(node, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp(str, L"entity"), "Unexpected type %s.\n", debugstr_w(str)); + SysFreeString(str); + expect_node(node, "EN2.DT2.D1"); IXMLDOMNode_Release(node); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11409
From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/msxml3/notation.c | 8 ++++---- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/notation.c b/dlls/msxml3/notation.c index e2a6eb13f1a..4210401f1b0 100644 --- a/dlls/msxml3/notation.c +++ b/dlls/msxml3/notation.c @@ -290,16 +290,16 @@ static HRESULT WINAPI domnotation_get_nodeTypeString(IXMLDOMNotation *iface, BST static HRESULT WINAPI domnotation_get_text(IXMLDOMNotation *iface, BSTR *p) { - FIXME("%p, %p: stub\n", iface, p); + TRACE("%p, %p.\n", iface, p); - return E_NOTIMPL; + return return_bstr(L"", p); } static HRESULT WINAPI domnotation_put_text(IXMLDOMNotation *iface, BSTR p) { - FIXME("%p, %s: stub\n", iface, debugstr_w(p)); + TRACE("%p, %s.\n", iface, debugstr_w(p)); - return E_NOTIMPL; + return E_FAIL; } static HRESULT WINAPI domnotation_get_specified(IXMLDOMNotation *iface, VARIANT_BOOL *v) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 63706fb5ac0..7df00f0a2a2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -17859,6 +17859,16 @@ static void test_dtd_children(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!wcscmp(str, L"notation"), "Unexpected type %s.\n", debugstr_w(str)); SysFreeString(str); + hr = IXMLDOMNode_get_text(node, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = IXMLDOMNode_get_text(node, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!*str, "Unexpected text %s.\n", debugstr_w(str)); + SysFreeString(str); + hr = IXMLDOMNode_put_text(node, NULL); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + hr = IXMLDOMNode_put_text(node, _bstr_("text")); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); expect_node(node, "N1.DT2.D1"); hr = IXMLDOMDocumentType_removeChild(doctype, node, &node2); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11409
participants (2)
-
Nikolay Sivov -
Nikolay Sivov (＠nsivov)