From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/htmltextnode.c | 188 +++++++++++++++++++++------ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 27 ++++ 3 files changed, 173 insertions(+), 43 deletions(-)
diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index a0ccf710518..c9149ac54c8 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -33,10 +33,17 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
+struct CharacterData { + IWineHTMLCharacterData IWineHTMLCharacterData_iface; + HTMLDOMNode *node; + nsIDOMCharacterData *nschardata; +}; + struct HTMLDOMTextNode { HTMLDOMNode node; IHTMLDOMTextNode IHTMLDOMTextNode_iface; IHTMLDOMTextNode2 IHTMLDOMTextNode2_iface; + struct CharacterData character_data;
nsIDOMText *nstext; }; @@ -46,41 +53,160 @@ struct HTMLCommentElement { IHTMLCommentElement IHTMLCommentElement_iface; };
-static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode(IHTMLDOMTextNode *iface) +static inline struct CharacterData *impl_from_IWineHTMLCharacterData(IWineHTMLCharacterData *iface) { - return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode_iface); + return CONTAINING_RECORD(iface, struct CharacterData, IWineHTMLCharacterData_iface); }
-DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode, IHTMLDOMTextNode, - impl_from_IHTMLDOMTextNode(iface)->node.event_target.dispex) +DISPEX_IDISPATCH_IMPL(CharacterData, IWineHTMLCharacterData, + impl_from_IWineHTMLCharacterData(iface)->node->event_target.dispex)
-static HRESULT WINAPI HTMLDOMTextNode_put_data(IHTMLDOMTextNode *iface, BSTR v) +static HRESULT WINAPI CharacterData_put_data(IWineHTMLCharacterData *iface, BSTR v) { - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); nsAString nsstr; nsresult nsres;
TRACE("(%p)->(%s)\n", This, debugstr_w(v));
nsAString_InitDepend(&nsstr, v); - nsres = nsIDOMText_SetData(This->nstext, &nsstr); + nsres = nsIDOMCharacterData_SetData(This->nschardata, &nsstr); nsAString_Finish(&nsstr); return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; }
-static HRESULT WINAPI HTMLDOMTextNode_get_data(IHTMLDOMTextNode *iface, BSTR *p) +static HRESULT WINAPI CharacterData_get_data(IWineHTMLCharacterData *iface, BSTR *p) { - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); nsAString nsstr; nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
nsAString_Init(&nsstr, NULL); - nsres = nsIDOMText_GetData(This->nstext, &nsstr); + nsres = nsIDOMCharacterData_GetData(This->nschardata, &nsstr); return return_nsstr(nsres, &nsstr, p); }
+static HRESULT WINAPI CharacterData_get_length(IWineHTMLCharacterData *iface, LONG *p) +{ + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); + UINT32 length = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMCharacterData_GetLength(This->nschardata, &length); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + *p = length; + return S_OK; +} + +static HRESULT WINAPI CharacterData_substringData(IWineHTMLCharacterData *iface, LONG offset, LONG count, BSTR *string) +{ + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); + + FIXME("(%p)->(%ld %ld %p)\n", This, offset, count, string); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CharacterData_appendData(IWineHTMLCharacterData *iface, BSTR string) +{ + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(string)); + + nsAString_InitDepend(&nsstr, string); + nsres = nsIDOMCharacterData_AppendData(This->nschardata, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + return S_OK; +} + +static HRESULT WINAPI CharacterData_insertData(IWineHTMLCharacterData *iface, LONG offset, BSTR string) +{ + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); + + FIXME("(%p)->(%ld %s)\n", This, offset, debugstr_w(string)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CharacterData_deleteData(IWineHTMLCharacterData *iface, LONG offset, LONG count) +{ + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); + + FIXME("(%p)->(%ld %ld)\n", This, offset, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CharacterData_replaceData(IWineHTMLCharacterData *iface, LONG offset, LONG count, BSTR string) +{ + struct CharacterData *This = impl_from_IWineHTMLCharacterData(iface); + + FIXME("(%p)->(%ld %ld %s)\n", This, offset, count, debugstr_w(string)); + + return E_NOTIMPL; +} + +static const IWineHTMLCharacterDataVtbl CharacterDataVtbl = { + CharacterData_QueryInterface, + CharacterData_AddRef, + CharacterData_Release, + CharacterData_GetTypeInfoCount, + CharacterData_GetTypeInfo, + CharacterData_GetIDsOfNames, + CharacterData_Invoke, + CharacterData_put_data, + CharacterData_get_data, + CharacterData_get_length, + CharacterData_substringData, + CharacterData_appendData, + CharacterData_insertData, + CharacterData_deleteData, + CharacterData_replaceData +}; + +static void init_char_data(HTMLDOMNode *node, struct CharacterData *ret) +{ + nsresult nsres = nsIDOMNode_QueryInterface(node->nsnode, &IID_nsIDOMCharacterData, (void**)&ret->nschardata); + assert(nsres == NS_OK && (nsIDOMNode*)ret->nschardata == node->nsnode); + + /* Share reference with nsnode */ + nsIDOMCharacterData_Release(ret->nschardata); + + ret->IWineHTMLCharacterData_iface.lpVtbl = &CharacterDataVtbl; + ret->node = node; +} + +static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode(IHTMLDOMTextNode *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode_iface); +} + +DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode, IHTMLDOMTextNode, + impl_from_IHTMLDOMTextNode(iface)->node.event_target.dispex) + +static HRESULT WINAPI HTMLDOMTextNode_put_data(IHTMLDOMTextNode *iface, BSTR v) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); + return CharacterData_put_data(&This->character_data.IWineHTMLCharacterData_iface, v); +} + +static HRESULT WINAPI HTMLDOMTextNode_get_data(IHTMLDOMTextNode *iface, BSTR *p) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); + return CharacterData_get_data(&This->character_data.IWineHTMLCharacterData_iface, p); +} + static HRESULT WINAPI HTMLDOMTextNode_toString(IHTMLDOMTextNode *iface, BSTR *String) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); @@ -99,17 +225,7 @@ static HRESULT WINAPI HTMLDOMTextNode_toString(IHTMLDOMTextNode *iface, BSTR *St static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG *p) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - UINT32 length = 0; - nsresult nsres; - - TRACE("(%p)->(%p)\n", This, p); - - nsres = nsIDOMText_GetLength(This->nstext, &length); - if(NS_FAILED(nsres)) - ERR("GetLength failed: %08lx\n", nsres); - - *p = length; - return S_OK; + return CharacterData_get_length(&This->character_data.IWineHTMLCharacterData_iface, p); }
static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG offset, IHTMLDOMNode **pRetNode) @@ -168,48 +284,31 @@ DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode2, IHTMLDOMTextNode2, static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - FIXME("(%p)->(%ld %ld %p)\n", This, offset, count, string); - return E_NOTIMPL; + return CharacterData_substringData(&This->character_data.IWineHTMLCharacterData_iface, offset, count, string); }
static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR string) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - nsAString nsstr; - nsresult nsres; - - TRACE("(%p)->(%s)\n", This, debugstr_w(string)); - - nsAString_InitDepend(&nsstr, string); - nsres = nsIDOMText_AppendData(This->nstext, &nsstr); - nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) { - ERR("AppendData failed: %08lx\n", nsres); - return E_FAIL; - } - - return S_OK; + return CharacterData_appendData(&This->character_data.IWineHTMLCharacterData_iface, string); }
static HRESULT WINAPI HTMLDOMTextNode2_insertData(IHTMLDOMTextNode2 *iface, LONG offset, BSTR string) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - FIXME("(%p)->(%ld %s)\n", This, offset, debugstr_w(string)); - return E_NOTIMPL; + return CharacterData_insertData(&This->character_data.IWineHTMLCharacterData_iface, offset, string); }
static HRESULT WINAPI HTMLDOMTextNode2_deleteData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - FIXME("(%p)->(%ld %ld)\n", This, offset, count); - return E_NOTIMPL; + return CharacterData_deleteData(&This->character_data.IWineHTMLCharacterData_iface, offset, count); }
static HRESULT WINAPI HTMLDOMTextNode2_replaceData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR string) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - FIXME("(%p)->(%ld %ld %s)\n", This, offset, count, debugstr_w(string)); - return E_NOTIMPL; + return CharacterData_replaceData(&This->character_data.IWineHTMLCharacterData_iface, offset, count, string); }
static const IHTMLDOMTextNode2Vtbl HTMLDOMTextNode2Vtbl = { @@ -252,6 +351,8 @@ static void *HTMLDOMTextNode_query_interface(DispatchEx *dispex, REFIID riid) return &This->IHTMLDOMTextNode_iface; if(IsEqualGUID(&IID_IHTMLDOMTextNode2, riid)) return &This->IHTMLDOMTextNode2_iface; + if(IsEqualGUID(&IID_IWineHTMLCharacterData, riid)) + return &This->character_data.IWineHTMLCharacterData_iface;
return HTMLDOMNode_query_interface(&This->node.event_target.dispex, riid); } @@ -305,6 +406,7 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->IHTMLDOMTextNode2_iface.lpVtbl = &HTMLDOMTextNode2Vtbl;
HTMLDOMNode_Init(doc, &ret->node, nsnode, &Text_dispex); + init_char_data(&ret->node, &ret->character_data);
nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); assert(nsres == NS_OK && (nsIDOMNode*)ret->nstext == ret->node.nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f4c6ae4b65..881049c6cd3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -299,6 +299,7 @@ typedef struct ScriptHost ScriptHost;
#define PRIVATE_TID_LIST \ XIID(IWineDOMTokenList) \ + XIID(IWineHTMLCharacterData) \ XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineHTMLWindowCompatPrivate) \ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 7be013bcc32..e32687329f9 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -149,6 +149,33 @@ interface IWineHTMLWindowCompatPrivate : IDispatch HRESULT performance([out, retval] VARIANT *p); }
+[ + odl, + oleautomation, + dual, + hidden, + uuid(465908fd-f394-489f-b7a3-4c00fbbe9eeb) +] +interface IWineHTMLCharacterData : IDispatch +{ + [propput, id(32)] + HRESULT data([in] BSTR v); + [propget, id(32)] + HRESULT data([out, retval] BSTR *p); + [propget, id(33)] + HRESULT length([out, retval] LONG *p); + [id(34)] + HRESULT substringData([in] LONG offset, [in] LONG count, [out, retval] BSTR *p); + [id(35)] + HRESULT appendData([in] BSTR string); + [id(36)] + HRESULT insertData([in] LONG offset, [in] BSTR string); + [id(37)] + HRESULT deleteData([in] LONG offset, [in] LONG count); + [id(38)] + HRESULT replaceData([in] LONG offset, [in] LONG count, [in] BSTR string); +} + [ odl, oleautomation,