October 2008 - Wine-Commits

Alexandre Julliard : ws2_32: Allow arbitrary-sized iovecs again in WSASendTo and WSARecvFrom.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: fe7c5d86e7d9e06872c2fb6ddf7ebe8d92525d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7c5d86e7d9e06872c2fb6dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 9 12:57:33 2008 +0200 ws2_32: Allow arbitrary-sized iovecs again in WSASendTo and WSARecvFrom. --- dlls/ws2_32/socket.c | 159 +++++++++++++++++++++---------------------------- 1 files changed, 68 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe7c5d86e7d9e06872c2f…

1 0

Juan Lang : crypt32: Fix error handling for cyclic chains.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: cb341f37175b4a79d3a2f3fc5709a43d11d08d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb341f37175b4a79d3a2f3fc5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 14:18:55 2008 -0700 crypt32: Fix error handling for cyclic chains. --- dlls/crypt32/chain.c | 11 ++++++++++- dlls/crypt32/tests/chain.c | 5 ++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 534d6ae..d086fe6 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -251,7 +251,7 @@ static void CRYPT_CheckSimpleChainForCycles(PCERT_SIMPLE_CHAIN chain) if (cyclicCertIndex) { chain->rgpElement[cyclicCertIndex]->TrustStatus.dwErrorStatus - |= CERT_TRUST_IS_CYCLIC; + |= CERT_TRUST_IS_CYCLIC | CERT_TRUST_INVALID_BASIC_CONSTRAINTS; /* Release remaining certs */ for (i = cyclicCertIndex + 1; i < chain->cElement; i++) CRYPT_FreeChainElement(chain->rgpElement[i]); @@ -766,6 +766,15 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, constraints.dwPathLenConstraint--; } } + if (CRYPT_IsSimpleChainCyclic(chain)) + { + /* If the chain is cyclic, then the path length constraints + * are violated, because the chain is infinitely long. + */ + pathLengthConstraintViolated = TRUE; + chain->TrustStatus.dwErrorStatus |= + CERT_TRUST_INVALID_BASIC_CONSTRAINTS; + } /* FIXME: check valid usages */ CRYPT_CombineTrustStatus(&chain->TrustStatus, &chain->rgpElement[i]->TrustStatus); diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 1a10702..eb8db2c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1521,7 +1521,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, 1, simpleStatus9 }, - TODO_ERROR | TODO_INFO }, + TODO_INFO }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 }, @@ -1743,8 +1743,7 @@ static ChainPolicyCheck basicConstraintsPolicyCheck[] = { { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, TODO_ERROR | TODO_CHAINS | TODO_ELEMENTS }, { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, - { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, - TODO_ERROR | TODO_CHAINS | TODO_ELEMENTS }, + { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, 0 }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain11) / sizeof(chain11[0]), chain11 },

1 0

Juan Lang : crypt32: Remove an error that no longer fails.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 742c1a37f30d0e14b81f0d5834333f703345d84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=742c1a37f30d0e14b81f0d583… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 13:57:00 2008 -0700 crypt32: Remove an error that no longer fails. --- dlls/crypt32/tests/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ad3a071..1a10702 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1560,7 +1560,7 @@ static ChainCheck chainCheckNoStore[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, selfSignedSimpleStatus }, - TODO_ERROR }, + 0 }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT |

1 0

Juan Lang : crypt32: Fix some chain failures on Win9x/NT4.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: dd74ac0ce5d401775c24d5bcbab603b127debbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd74ac0ce5d401775c24d5bcb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 13:29:01 2008 -0700 crypt32: Fix some chain failures on Win9x/NT4. --- dlls/crypt32/tests/chain.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 45d45b8..ad3a071 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1472,28 +1472,30 @@ static const SimpleChainStatusCheck iTunesSimpleStatus[] = { }; static ChainCheck chainCheck[] = { /* Windows XP erroneously sets CERT_TRUST_HAS_PREFERRED_ISSUER on all - * elements, so ignore it + * elements, so ignore it. + * Windows 98/NT4 also set CERT_TRUST_IS_NOT_TIME_NESTED on chains they + * shouldn't, so ignore those too. */ { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus0 }, 0 }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_SIGNATURE_VALID | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus1 }, 0 }, { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus2 }, 0 }, { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus3 }, 0 }, { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus4 }, 0 }, @@ -1509,13 +1511,13 @@ static ChainCheck chainCheck[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus7 }, 0 }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus8 }, TODO_ERROR }, { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, 1, simpleStatus9 }, @@ -1530,7 +1532,7 @@ static ChainCheck chainCheck[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, 0 }, { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus13 }, 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain },

1 0

Juan Lang : crypt32: Fix test failures on NT4.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 5fc947e0b6f501487cda8368d6b39bda59479df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc947e0b6f501487cda8368d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 13:12:11 2008 -0700 crypt32: Fix test failures on NT4. --- dlls/crypt32/tests/encode.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 0b16488..9d3635d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -6426,6 +6426,11 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(!ret, "Expected failure, got %d\n", ret); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("no CMS_SIGNER_INFO encode support\n"); + return; + } ok(GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* To be encoded, a signer must have a valid cert ID, where a valid ID may

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLTxtRange::put_text.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: e5604b7ba38e0831692b04cbbe330c3bcdf694ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5604b7ba38e0831692b04cbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:30:10 2008 -0500 mshtml: Use stored nsdoc in IHTMLTxtRange::put_text. --- dlls/mshtml/txtrange.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index b146437..c35834f 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1093,7 +1093,6 @@ static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - nsIDOMDocument *nsdoc; nsIDOMText *text_node; nsAString text_str; nsresult nsres; @@ -1103,15 +1102,8 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) if(!This->doc) return MSHTML_E_NODOC; - nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return S_OK; - } - nsAString_Init(&text_str, v); - nsres = nsIDOMDocument_CreateTextNode(nsdoc, &text_str, &text_node); - nsIDOMDocument_Release(nsdoc); + nsres = nsIDOMHTMLDocument_CreateTextNode(This->doc->nsdoc, &text_str, &text_node); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { ERR("CreateTextNode failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Use stored nsdoc in prev_node.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 16f2965eb9570e9e1cfe9881806344f1e2ed654c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f2965eb9570e9e1cfe98818… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:30:03 2008 -0500 mshtml: Use stored nsdoc in prev_node. --- dlls/mshtml/txtrange.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 9d96405..b146437 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -325,16 +325,9 @@ static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter) nsresult nsres; if(!iter) { - nsIDOMHTMLDocument *nshtmldoc; nsIDOMHTMLElement *nselem; - nsIDOMDocument *nsdoc; - - nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); - nsIDOMHTMLDocument_GetBody(nshtmldoc, &nselem); - nsIDOMHTMLDocument_Release(nshtmldoc); + nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nselem); nsIDOMElement_GetLastChild(nselem, &tmp); if(!tmp) return (nsIDOMNode*)nselem;

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLDocument3::getElementById.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: f1ff6b0993d81aa1296f8f55ba9b7f3c2d743e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ff6b0993d81aa1296f8f55b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:29:56 2008 -0500 mshtml: Use stored nsdoc in IHTMLDocument3::getElementById. --- dlls/mshtml/htmldoc3.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index d636834..b0efb7c 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -421,37 +421,36 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v IHTMLElement **pel) { HTMLDocument *This = HTMLDOC3_THIS(iface); - nsIDOMDocument *nsdoc = NULL; - nsIDOMElement *nselem = NULL; + nsIDOMElement *nselem; HTMLDOMNode *node; nsAString id_str; nsresult nsres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - *pel = NULL; - - if(!This->nscontainer) - return S_OK; - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres) || !nsdoc) - return S_OK; + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } nsAString_Init(&id_str, v); - nsIDOMDocument_GetElementById(nsdoc, &id_str, &nselem); - nsIDOMDocument_Release(nsdoc); + nsres = nsIDOMHTMLDocument_GetElementById(This->nsdoc, &id_str, &nselem); nsAString_Finish(&id_str); + if(FAILED(nsres)) { + ERR("GetElementById failed: %08x\n", nsres); + return E_FAIL; + } + + if(nselem) { + node = get_node(This, (nsIDOMNode*)nselem, TRUE); + nsIDOMElement_Release(nselem); - if(!nselem) { + IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel); + }else { *pel = NULL; - return S_OK; } - node = get_node(This, (nsIDOMNode*)nselem, TRUE); - nsIDOMElement_Release(nselem); - - return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel); + return S_OK; }

1 0

Jacek Caban : mshtml: Use stored nselem in get_documentElement.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 08257acea2ce942692822d8b6849ba3d44c46906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08257acea2ce942692822d8b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:29:47 2008 -0500 mshtml: Use stored nselem in get_documentElement. --- dlls/mshtml/htmldoc3.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 2dc5a58..d636834 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -134,31 +134,26 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, IHTMLElement **p) { HTMLDocument *This = HTMLDOC3_THIS(iface); - nsIDOMDocument *nsdoc; - HTMLDOMNode *node; nsIDOMElement *nselem = NULL; + HTMLDOMNode *node; 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) { node = get_node(This, (nsIDOMNode *)nselem, TRUE); - nsIDOMDocument_Release(nsdoc); - + nsIDOMElement_Release(nselem); IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); }else { *p = NULL;

1 0

Jacek Caban : mshtml: Use stored nsdoc in createTextNode.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

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