Module: wine Branch: master Commit: b84626bdf04828cc72ec22e030b7d06ab6fd3bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84626bdf04828cc72ec22e030...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Mar 7 12:56:33 2008 +0100
mshtml: Added IHTMLDocument2::write implementation.
---
dlls/mshtml/htmldoc.c | 57 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 7 ++++- 3 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2a04ef3..b93fe95 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -675,8 +675,61 @@ static HRESULT WINAPI HTMLDocument_get_nameProp(IHTMLDocument2 *iface, BSTR *p)
static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarray) { - FIXME("(%p)->(%p)\n", iface, psarray); - return E_NOTIMPL; + HTMLDocument *This = HTMLDOC_THIS(iface); + nsIDOMDocument *domdoc; + nsIDOMHTMLDocument *nsdoc; + nsAString nsstr; + VARIANT *var; + int i; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", iface, psarray); + + if(psarray->cDims != 1) { + FIXME("cDims=%d\n", psarray->cDims); + return E_INVALIDARG; + } + + if(!This->nscontainer) + return S_OK; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &domdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return S_OK; + } + + nsres = nsIDOMDocument_QueryInterface(domdoc, &IID_nsIDOMHTMLDocument, (void**)&nsdoc); + nsIDOMDocument_Release(domdoc); + if(NS_FAILED(nsres)) + return S_OK; + + hres = SafeArrayAccessData(psarray, (void**)&var); + if(FAILED(hres)) { + WARN("SafeArrayAccessData failed: %08x\n", hres); + nsIDOMHTMLDocument_Release(nsdoc); + return hres; + } + + nsAString_Init(&nsstr, NULL); + + for(i=0; i < psarray->rgsabound[0].cElements; i++) { + if(V_VT(var+i) == VT_BSTR) { + nsAString_SetData(&nsstr, V_BSTR(var+i)); + nsres = nsIDOMHTMLDocument_Write(nsdoc, &nsstr); + if(NS_FAILED(nsres)) + ERR("Write failed: %08x\n", nsres); + }else { + FIXME("vt=%d\n", V_VT(var+i)); + } + } + + nsAString_Finish(&nsstr); + SafeArrayUnaccessData(psarray); + nsIDOMHTMLDocument_Release(nsdoc); + + return S_OK; }
static HRESULT WINAPI HTMLDocument_writeln(IHTMLDocument2 *iface, SAFEARRAY *psarray) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b97910d..d26250e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -415,6 +415,7 @@ PRUint32 nsACString_GetData(const nsACString*,const char**); void nsACString_Finish(nsACString*);
void nsAString_Init(nsAString*,const PRUnichar*); +void nsAString_SetData(nsAString*,const PRUnichar*); PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**); void nsAString_Finish(nsAString*);
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 08d13af..37afc6d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -502,7 +502,12 @@ void nsAString_Init(nsAString *str, const PRUnichar *data) { NS_StringContainerInit(str); if(data) - NS_StringSetData(str, data, PR_UINT32_MAX); + nsAString_SetData(str, data); +} + +void nsAString_SetData(nsAString *str, const PRUnichar *data) +{ + NS_StringSetData(str, data, PR_UINT32_MAX); }
PRUint32 nsAString_GetData(const nsAString *str, const PRUnichar **data)