October 2008 - Wine-commits

Jacek Caban : mshtml: Use stored nsdoc in IHTMLDocument2::get_styleSheets.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 9f1d3b21da88c89facefd36cad4d38e00dab348b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1d3b21da88c89facefd36ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:29:24 2008 -0500 mshtml: Use stored nsdoc in IHTMLDocument2::get_styleSheets. --- dlls/mshtml/htmldoc.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e48e1df..b757a80 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1188,30 +1188,24 @@ static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, HTMLDocument *This = HTMLDOC_THIS(iface); nsIDOMStyleSheetList *nsstylelist; nsIDOMDocumentStyle *nsdocstyle; - nsIDOMDocument *nsdoc; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); *p = NULL; - if(!This->nscontainer) - return S_OK; - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return S_OK; + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - if(NS_FAILED(nsres) || !nsdoc) - return S_OK; - - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentStyle, (void**)&nsdocstyle); - nsIDOMDocument_Release(nsdoc); - - nsIDOMDocumentStyle_GetStyleSheets(nsdocstyle, &nsstylelist); + nsIDOMHTMLDocument_QueryInterface(This->nsdoc, &IID_nsIDOMDocumentStyle, (void**)&nsdocstyle); + nsres = nsIDOMDocumentStyle_GetStyleSheets(nsdocstyle, &nsstylelist); nsIDOMDocumentStyle_Release(nsdocstyle); + if(NS_FAILED(nsres)) { + ERR("GetStyleSheets failed: %08x\n", nsres); + return E_FAIL; + } *p = HTMLStyleSheetsCollection_Create(nsstylelist); nsIDOMDocumentStyle_Release(nsstylelist);

1 0

Jacek Caban : mshtml: Use stored nsdoc in createTextNode.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 4f08c4f09b7a772ef1c79d8e7d0d83f13c3fb4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f08c4f09b7a772ef1c79d8e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:29:39 2008 -0500 mshtml: Use stored nsdoc in createTextNode. --- dlls/mshtml/htmldoc3.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 8c60290..2dc5a58 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -103,7 +103,6 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t IHTMLDOMNode **newTextNode) { HTMLDocument *This = HTMLDOC3_THIS(iface); - nsIDOMDocument *nsdoc; nsIDOMText *nstext; HTMLDOMNode *node; nsAString text_str; @@ -111,12 +110,14 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t TRACE("(%p)->(%s %p)\n", This, debugstr_w(text), newTextNode); - nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } nsAString_Init(&text_str, text); - nsres = nsIDOMDocument_CreateTextNode(nsdoc, &text_str, &nstext); + nsres = nsIDOMHTMLDocument_CreateTextNode(This->nsdoc, &text_str, &nstext); nsAString_Finish(&text_str); - nsIDOMDocument_Release(nsdoc); if(NS_FAILED(nsres)) { ERR("CreateTextNode failed: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLDocument2::put_title.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 0a79d9c690bc9c1935088ddb704ef867934c72e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a79d9c690bc9c1935088ddb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:28:51 2008 -0500 mshtml: Use stored nsdoc in IHTMLDocument2::put_title. --- dlls/mshtml/htmldoc.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c5bcdb9..d31c9ce 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -369,28 +369,18 @@ static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLEleme static HRESULT WINAPI HTMLDocument_put_title(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = HTMLDOC_THIS(iface); - nsIDOMHTMLDocument *nshtmldoc; - nsIDOMDocument *nsdoc; nsAString nsstr; nsresult nsres; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->nscontainer) - return E_FAIL; - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres) || !nsdoc) { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); - nsAString_Init(&nsstr, v); - nsres = nsIDOMHTMLDocument_SetTitle(nshtmldoc, &nsstr); - nsIDOMHTMLDocument_Release(nshtmldoc); + nsres = nsIDOMHTMLDocument_SetTitle(This->nsdoc, &nsstr); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) ERR("SetTitle failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLDocument2::get_title.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: c5adad12fefe0d50f1dd647e234b0e2095825416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5adad12fefe0d50f1dd647e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:28:59 2008 -0500 mshtml: Use stored nsdoc in IHTMLDocument2::get_title. --- dlls/mshtml/htmldoc.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d31c9ce..a3d68c6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -391,36 +391,30 @@ static HRESULT WINAPI HTMLDocument_put_title(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_title(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - nsIDOMHTMLDocument *nshtmldoc; - nsIDOMDocument *nsdoc; const PRUnichar *ret; nsAString nsstr; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->nscontainer) - return E_FAIL; - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres) || !nsdoc) { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetTitle(This->nsdoc, &nsstr); + if (NS_SUCCEEDED(nsres)) { + nsAString_GetData(&nsstr, &ret); + *p = SysAllocString(ret); + } + nsAString_Finish(&nsstr); - nsres = nsIDOMHTMLDocument_GetTitle(nshtmldoc, &nsstr); - nsIDOMHTMLDocument_Release(nshtmldoc); - if (NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { ERR("GetTitle failed: %08x\n", nsres); - - nsAString_GetData(&nsstr, &ret); - *p = SysAllocString(ret); - nsAString_Finish(&nsstr); + return E_FAIL; + } return S_OK; }

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLDocument2::write.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: c451ac27f2e23fc83734aac2e451a0cb753de66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c451ac27f2e23fc83734aac2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:29:08 2008 -0500 mshtml: Use stored nsdoc in IHTMLDocument2::write. --- dlls/mshtml/htmldoc.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a3d68c6..07602d9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -757,8 +757,6 @@ static HRESULT WINAPI HTMLDocument_get_nameProp(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarray) { HTMLDocument *This = HTMLDOC_THIS(iface); - nsIDOMDocument *domdoc; - nsIDOMHTMLDocument *nsdoc; nsAString nsstr; VARIANT *var; int i; @@ -767,29 +765,19 @@ static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarr TRACE("(%p)->(%p)\n", iface, psarray); + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + 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; } @@ -798,7 +786,7 @@ static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarr 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); + nsres = nsIDOMHTMLDocument_Write(This->nsdoc, &nsstr); if(NS_FAILED(nsres)) ERR("Write failed: %08x\n", nsres); }else { @@ -808,7 +796,6 @@ static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarr nsAString_Finish(&nsstr); SafeArrayUnaccessData(psarray); - nsIDOMHTMLDocument_Release(nsdoc); return S_OK; }

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMDocument2::get_all.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 5629945cb7f8945a6b42dea534d164e4f5115fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5629945cb7f8945a6b42dea53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:29:32 2008 -0500 mshtml: Use stored nsdoc in IHTMDocument2::get_all. --- dlls/mshtml/htmldoc.c | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9ac6f2e..57a9cfd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -265,35 +265,29 @@ static HRESULT WINAPI HTMLDocument_get_Script(IHTMLDocument2 *iface, IDispatch * static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - nsIDOMDocument *nsdoc = NULL; nsIDOMElement *nselem = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->nscontainer) { - *p = NULL; - return S_OK; + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) - ERR("GetDocument failed: %08x\n", nsres); - - if(nsdoc) { - nsres = nsIDOMHTMLDocument_GetDocumentElement(nsdoc, &nselem); - if(NS_FAILED(nsres)) - ERR("GetDocumentElement failed: %08x\n", nsres); + nsres = nsIDOMHTMLDocument_GetDocumentElement(This->nsdoc, &nselem); + if(NS_FAILED(nsres)) { + ERR("GetDocumentElement failed: %08x\n", nsres); + return E_FAIL; } - if(!nselem) { + if(nselem) { + *p = create_all_collection(get_node(This, (nsIDOMNode*)nselem, TRUE), TRUE); + nsIDOMElement_Release(nselem); + }else { *p = NULL; - return S_OK; } - *p = create_all_collection(get_node(This, (nsIDOMNode*)nselem, TRUE), TRUE); - - nsIDOMElement_Release(nselem); return S_OK; }

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLDocument2::get_body.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 567fbd5d367b7e4ddca16dfecda07e4ff8a3d177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567fbd5d367b7e4ddca16dfec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:28:43 2008 -0500 mshtml: Use stored nsdoc in IHTMLDocument2::get_body. --- dlls/mshtml/htmldoc.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57a9cfd..c5bcdb9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -294,43 +294,31 @@ static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCo static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - nsIDOMDocument *nsdoc; - nsIDOMHTMLDocument *nshtmldoc; nsIDOMHTMLElement *nsbody = NULL; HTMLDOMNode *node; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - - if(!This->nscontainer) - return S_OK; - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return S_OK; + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - if(NS_FAILED(nsres) || !nsdoc) - return S_OK; - - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); - - nsres = nsIDOMHTMLDocument_GetBody(nshtmldoc, &nsbody); - nsIDOMHTMLDocument_Release(nshtmldoc); - - if(NS_FAILED(nsres) || !nsbody) { + nsres = nsIDOMHTMLDocument_GetBody(This->nsdoc, &nsbody); + if(NS_FAILED(nsres)) { TRACE("Could not get body: %08x\n", nsres); - return S_OK; + return E_UNEXPECTED; } - node = get_node(This, (nsIDOMNode*)nsbody, TRUE); - nsIDOMHTMLElement_Release(nsbody); + if(nsbody) { + node = get_node(This, (nsIDOMNode*)nsbody, TRUE); + nsIDOMHTMLElement_Release(nsbody); - IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); + IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); + }else { + *p = NULL; + } TRACE("*p = %p\n", *p); return S_OK;

1 0

Jacek Caban : mshtml: Use stored nsdoc in set_font_size.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 23937c47049450a637e4a11aee6f93e93fdc17f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23937c47049450a637e4a11ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:28:08 2008 -0500 mshtml: Use stored nsdoc in set_font_size. --- dlls/mshtml/editor.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 5929603..bba9e40 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -341,17 +341,19 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) { nsISelection *nsselection; PRBool collapsed; - nsIDOMDocument *nsdoc; nsIDOMElement *elem; nsIDOMRange *range; PRInt32 range_cnt = 0; nsAString font_str; nsAString size_str; nsAString val_str; - nsresult nsres; - nsselection = get_ns_selection(This); + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return; + } + nsselection = get_ns_selection(This); if(!nsselection) return; @@ -364,15 +366,11 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) } } - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) - return; - nsAString_Init(&font_str, wszFont); nsAString_Init(&size_str, wszSize); nsAString_Init(&val_str, size); - nsIDOMDocument_CreateElement(nsdoc, &font_str, &elem); + nsIDOMDocument_CreateElement(This->nsdoc, &font_str, &elem); nsIDOMElement_SetAttribute(elem, &size_str, &val_str); nsISelection_GetRangeAt(nsselection, 0, &range); @@ -389,6 +387,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)elem); } + nsISelection_Release(nsselection); nsIDOMRange_Release(range); nsIDOMElement_Release(elem); @@ -396,9 +395,6 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsAString_Finish(&size_str); nsAString_Finish(&val_str); - nsISelection_Release(nsselection); - nsIDOMDocument_Release(nsdoc); - set_dirty(This, VARIANT_TRUE); }

1 0

Jacek Caban : mshtml: Use stored nsdoc in createTextRange.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 408024a2d16311bb6f12961362b1ce30e69b0180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408024a2d16311bb6f1296136… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:28:27 2008 -0500 mshtml: Use stored nsdoc in createTextRange. --- dlls/mshtml/htmlbody.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index efe5df8..623d83d 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -544,31 +544,35 @@ static HRESULT WINAPI HTMLBodyElement_get_onbeforeunload(IHTMLBodyElement *iface static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, IHTMLTxtRange **range) { HTMLBodyElement *This = HTMLBODY_THIS(iface); + nsIDOMDocumentRange *nsdocrange; nsIDOMRange *nsrange = NULL; + nsresult nsres; TRACE("(%p)->(%p)\n", This, range); - if(This->textcont.element.node.doc->nscontainer) { - nsIDOMDocument *nsdoc; - nsIDOMDocumentRange *nsdocrange; - nsresult nsres; - - nsIWebNavigation_GetDocument(This->textcont.element.node.doc->nscontainer->navigation, &nsdoc); - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); - nsIDOMDocument_Release(nsdoc); - - nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &nsrange); - if(NS_SUCCEEDED(nsres)) { - nsres = nsIDOMRange_SelectNodeContents(nsrange, This->textcont.element.node.nsnode); - if(NS_FAILED(nsres)) - ERR("SelectNodeContents failed: %08x\n", nsres); - }else { - ERR("CreateRange failed: %08x\n", nsres); - } - - nsIDOMDocumentRange_Release(nsdocrange); + if(!This->textcont.element.node.doc->nsdoc) { + WARN("No nsdoc\n"); + return E_UNEXPECTED; + } + + nsres = nsIDOMDocument_QueryInterface(This->textcont.element.node.doc->nsdoc, &IID_nsIDOMDocumentRange, + (void**)&nsdocrange); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMDocumentRabge iface: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &nsrange); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMRange_SelectNodeContents(nsrange, This->textcont.element.node.nsnode); + if(NS_FAILED(nsres)) + ERR("SelectNodeContents failed: %08x\n", nsres); + }else { + ERR("CreateRange failed: %08x\n", nsres); } + nsIDOMDocumentRange_Release(nsdocrange); + *range = HTMLTxtRange_Create(This->textcont.element.node.doc, nsrange); return S_OK; }

1 0

Jacek Caban : mshtml: Use stored nsdoc in exec_hyperlink.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 7c7b7f0ae7afe76462d61de7c5daebf4532a588c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7b7f0ae7afe76462d61de7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:28:19 2008 -0500 mshtml: Use stored nsdoc in exec_hyperlink. --- dlls/mshtml/editor.c | 105 +++++++++++++++++++++++-------------------------- 1 files changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index bba9e40..4e02155 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1146,13 +1146,18 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + nsAString a_str, href_str, ns_url; + nsIHTMLEditor *html_editor; + nsIDOMElement *anchor_elem; + PRBool insert_link_at_caret; + nsISelection *nsselection; BSTR url = NULL; INT ret; - nsISelection *nsselection; - nsIDOMDocument *nsdoc; - nsresult nsres; HRESULT hres = E_FAIL; + static const WCHAR wszA[] = {'a',0}; + static const WCHAR wszHref[] = {'h','r','e','f',0}; + TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out); if (cmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER) @@ -1171,76 +1176,64 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return OLECMDERR_E_CANCELED; } + if(This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + nsselection = get_ns_selection(This); if (!nsselection) return E_FAIL; - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_SUCCEEDED(nsres)) - { - static const WCHAR wszA[] = {'a',0}; - static const WCHAR wszHref[] = {'h','r','e','f',0}; - nsIHTMLEditor *html_editor; - nsIDOMNode *text_node; - nsIDOMElement *anchor_elem; - nsIDOMNode *unused_node; - nsAString a_str; - nsAString href_str; - nsAString ns_url; - PRBool insert_link_at_caret; - - nsAString_Init(&a_str, wszA); - nsAString_Init(&href_str, wszHref); - nsAString_Init(&ns_url, url); - - /* create an element for the link */ - nsIDOMDocument_CreateElement(nsdoc, &a_str, &anchor_elem); - nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); - - nsAString_Finish(&href_str); - nsAString_Finish(&a_str); - - nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); - - /* create an element with text of URL */ - if (insert_link_at_caret) - { - nsIDOMDocument_CreateTextNode(nsdoc, &ns_url, (nsIDOMText **)&text_node); + nsAString_Init(&a_str, wszA); + nsAString_Init(&href_str, wszHref); + nsAString_Init(&ns_url, url); - /* wrap the <a> tags around the text element */ - nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node); - nsIDOMNode_Release(text_node); - nsIDOMNode_Release(unused_node); - } + /* create an element for the link */ + nsIDOMDocument_CreateElement(This->nsdoc, &a_str, &anchor_elem); + nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); - nsAString_Finish(&ns_url); + nsAString_Finish(&href_str); + nsAString_Finish(&a_str); - nsIEditor_QueryInterface(This->nscontainer->editor, &IID_nsIHTMLEditor, (void **)&html_editor); - if (html_editor) - { - if (insert_link_at_caret) - { - /* add them to the document at the caret position */ - nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); - nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); - } - else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ - nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); - nsIHTMLEditor_Release(html_editor); - } + nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); + + /* create an element with text of URL */ + if (insert_link_at_caret) { + nsIDOMNode *text_node, *unused_node; + + nsIDOMDocument_CreateTextNode(This->nsdoc, &ns_url, (nsIDOMText **)&text_node); + + /* wrap the <a> tags around the text element */ + nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node); + nsIDOMNode_Release(text_node); + nsIDOMNode_Release(unused_node); + } + + nsAString_Finish(&ns_url); + + nsIEditor_QueryInterface(This->nscontainer->editor, &IID_nsIHTMLEditor, (void **)&html_editor); + if (html_editor) { + nsresult nsres; - nsIDOMElement_Release(anchor_elem); - nsIDOMDocument_Release(nsdoc); + if (insert_link_at_caret) { + /* add them to the document at the caret position */ + nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); + nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); + }else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ + nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); + nsIHTMLEditor_Release(html_editor); hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } nsISelection_Release(nsselection); + nsIDOMElement_Release(anchor_elem); if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER) SysFreeString(url); - TRACE("-- 0x%08x\n", nsres); + TRACE("-- 0x%08x\n", hres); return hres; }

1 0