October 2008 - Wine-commits

Michael Karcher : msxml3: Use the _private element of xmlDoc as pointer.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 0f8950d6464eaa8e8d17e7f8ab9df694a40b39ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8950d6464eaa8e8d17e7f8a… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:59:12 2008 +0200 msxml3: Use the _private element of xmlDoc as pointer. --- dlls/msxml3/domdoc.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c944623..77ad06f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -81,6 +81,26 @@ typedef struct _domdoc DispatchEx dispex; } domdoc; +typedef struct _xmldoc_priv { + LONG refs; +} xmldoc_priv; + +static inline xmldoc_priv * priv_from_xmlDocPtr(xmlDocPtr doc) +{ + return doc->_private; +} + +static xmldoc_priv * create_priv(void) +{ + xmldoc_priv *priv; + priv = HeapAlloc( GetProcessHeap(), 0, sizeof (*priv) ); + + if(priv) + priv->refs = 0; + + return priv; +} + static xmlDocPtr doparse( char *ptr, int len ) { #ifdef HAVE_XMLREADMEMORY @@ -97,18 +117,21 @@ static xmlDocPtr doparse( char *ptr, int len ) LONG xmldoc_add_ref(xmlDocPtr doc) { - LONG ref = InterlockedIncrement((LONG*)&doc->_private); + LONG ref = InterlockedIncrement(&priv_from_xmlDocPtr(doc)->refs); TRACE("%d\n", ref); return ref; } LONG xmldoc_release(xmlDocPtr doc) { - LONG ref = InterlockedDecrement((LONG*)&doc->_private); + xmldoc_priv *priv = priv_from_xmlDocPtr(doc); + LONG ref = InterlockedDecrement(&priv->refs); TRACE("%d\n", ref); if(ref == 0) { TRACE("freeing docptr %p\n", doc); + HeapFree(GetProcessHeap(), 0, doc->_private); + xmlFreeDoc(doc); } @@ -1194,7 +1217,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) xmldoc = doparse( ptr, len ); if(xmldoc) { - xmldoc->_private = 0; + xmldoc->_private = create_priv(); attach_xmlnode(This->node, (xmlNodePtr) xmldoc); } @@ -1310,7 +1333,7 @@ static HRESULT WINAPI domdoc_load( if(!filename || FAILED(hr)) { xmldoc = xmlNewDoc(NULL); - xmldoc->_private = 0; + xmldoc->_private = create_priv(); attach_xmlnode(This->node, (xmlNodePtr) xmldoc); hr = S_FALSE; } @@ -1442,7 +1465,7 @@ static HRESULT WINAPI domdoc_loadXML( if(!xmldoc) xmldoc = xmlNewDoc(NULL); - xmldoc->_private = 0; + xmldoc->_private = create_priv(); attach_xmlnode( This->node, (xmlNodePtr) xmldoc ); return hr; @@ -2060,7 +2083,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) if(!xmldoc) return E_OUTOFMEMORY; - xmldoc->_private = 0; + xmldoc->_private = create_priv(); hr = DOMDocument_create_from_xmldoc(xmldoc, (IXMLDOMDocument2**)ppObj); if(FAILED(hr))

1 0

Michael Karcher : msxml3: Fix memory leaks in node.c.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 19d635f9a3f5f3ef71d8ca370e0c8f9b1d505438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d635f9a3f5f3ef71d8ca370… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:58:59 2008 +0200 msxml3: Fix memory leaks in node.c. --- dlls/msxml3/node.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index cecabe8..94df283 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1303,8 +1303,13 @@ static HRESULT WINAPI xmlnode_transformNode( } } } + xmlFreeDoc(result); } + /* libxslt "helpfully" frees the XML document the stylesheet was + generated from, too */ + xsltSS->doc = NULL; + xsltFreeStylesheet(xsltSS); IXMLDOMNode_Release(ssNew); } @@ -1379,6 +1384,7 @@ static HRESULT WINAPI xmlnode_get_namespaceURI( { *namespaceURI = bstr_from_xmlChar( pNSList[0]->href ); + xmlFree( pNSList ); hr = S_OK; } @@ -1405,6 +1411,7 @@ static HRESULT WINAPI xmlnode_get_prefix( { *prefixString = bstr_from_xmlChar( pNSList[0]->prefix ); + xmlFree(pNSList); hr = S_OK; }

1 0

Michael Karcher : msxml3: Remove unneeded code.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 2cde9f52dae11aa1383b82f1209c3b17affbabae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cde9f52dae11aa1383b82f12… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:59:05 2008 +0200 msxml3: Remove unneeded code. xmlNewDocFragment has already set xmlNode->doc, no need to do that again. --- dlls/msxml3/domdoc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 41cd856..c944623 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -890,8 +890,6 @@ static HRESULT WINAPI domdoc_createDocumentFragment( if(!xmlnode) return E_FAIL; - xmlnode->doc = get_doc( This ); - *docFrag = (IXMLDOMDocumentFragment*)create_doc_fragment(xmlnode); return S_OK;

1 0

Michael Karcher : msxml3: Fix leaking the BindStatusCallback if bind_url fails.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 352dc0fc0de8f25609b3f478ee2c980110c4e82f URL: http://source.winehq.org/git/wine.git/?a=commit;h=352dc0fc0de8f25609b3f478e… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:58:43 2008 +0200 msxml3: Fix leaking the BindStatusCallback if bind_url fails. --- dlls/msxml3/bsc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 5dc9d18..bc1202a 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -296,6 +296,12 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi IBindCtx_Release(pbc); } + if(FAILED(hr)) + { + IBindStatusCallback_Release((IBindStatusCallback*)&bsc->lpVtbl); + bsc = NULL; + } + *ret = bsc; return hr; }

1 0

Michael Karcher : msxml3/tests: Fix assorted memory leaks.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: f5ac0f3277951aa1e707d1ec81fb230187ca98d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ac0f3277951aa1e707d1ec8… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Oct 12 00:03:07 2008 +0200 msxml3/tests: Fix assorted memory leaks. --- dlls/msxml3/tests/domdoc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fa82a8a..578738f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1410,14 +1410,12 @@ static void test_create(void) V_VT(&var) = VT_R4; V_R4(&var) = NODE_ELEMENT; - str = SysAllocString( szlc ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString( szOne ); - str = SysAllocString( szlc ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -1425,7 +1423,6 @@ static void test_create(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString( szOneGarbage ); - str = SysAllocString( szlc ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == E_INVALIDARG, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -1433,7 +1430,6 @@ static void test_create(void) V_VT(&var) = VT_I4; V_I4(&var) = NODE_ELEMENT; - str = SysAllocString( szlc ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); r = IXMLDOMDocument_appendChild( doc, node, &root ); @@ -1453,6 +1449,7 @@ static void test_create(void) str = SysAllocString( szbs ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); + SysFreeString( str ); ref = IXMLDOMNode_AddRef( node ); ok(ref == 2, "ref = %d\n", ref); @@ -2142,6 +2139,8 @@ static void test_XMLHTTP(void) ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), "bstrResponse differs from what was expected\n"); SysFreeString(bstrResponse); } + + IXMLHttpRequest_Release(pXMLHttpRequest); } static void test_IXMLDOMDocument2(void) @@ -3675,6 +3674,7 @@ static void test_testTransforms(void) hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut); ok(hr == S_OK, "ret %08x\n", hr ); ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n"); + SysFreeString(bOut); IXMLDOMNode_Release(pNode); }

1 0

Michael Karcher : msxml3: Use right COM invocation macro.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: adab2e5701a24cd16a5568d03599de0d8ea7bd17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adab2e5701a24cd16a5568d03… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:58:19 2008 +0200 msxml3: Use right COM invocation macro. --- dlls/msxml3/bsc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index bd29c31..5dc9d18 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -114,7 +114,7 @@ static HRESULT WINAPI bsc_OnStartBinding( TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); This->binding = pib; - IBindStatusCallback_AddRef(pib); + IBinding_AddRef(pib); hr = CreateStreamOnHGlobal(NULL, TRUE, &This->memstream); if(FAILED(hr))

1 0

Michael Karcher : msxml3: Remove superflous re-conversion from wide chars to utf8.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 0803167ff0b3fc0f6f26a3a20d5987099cfd6fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0803167ff0b3fc0f6f26a3a20… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:58:27 2008 +0200 msxml3: Remove superflous re-conversion from wide chars to utf8. --- dlls/msxml3/comment.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 1870b3b..ec6355f 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -601,25 +601,17 @@ static HRESULT WINAPI domcomment_appendData( /* Older versions of libxml < 2.6.27 didn't correctly support xmlTextConcat on Comment nodes. Fallback to setting the contents directly if xmlTextConcat fails. - - NOTE: if xmlTextConcat fails, pContent is destroyed. */ if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else { xmlChar *pNew; - pContent = xmlChar_from_wchar( (WCHAR*)p ); - if(pContent) + pNew = xmlStrcat(xmlNodeGetContent(pDOMNode->node), pContent); + if(pNew) { - pNew = xmlStrcat(xmlNodeGetContent(pDOMNode->node), pContent); - if(pNew) - { - xmlNodeSetContent(pDOMNode->node, pNew); - hr = S_OK; - } - else - hr = E_FAIL; + xmlNodeSetContent(pDOMNode->node, pNew); + hr = S_OK; } else hr = E_FAIL;

1 0

Michael Karcher : msxml3: Fix leaks in callers of xmlChar_from_wchar.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: ae2017a9844d40051ad98c4361ca4b42d7e66771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2017a9844d40051ad98c436… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:58:35 2008 +0200 msxml3: Fix leaks in callers of xmlChar_from_wchar. --- dlls/msxml3/cdata.c | 2 ++ dlls/msxml3/comment.c | 2 ++ dlls/msxml3/node.c | 14 +++++++++----- dlls/msxml3/text.c | 2 ++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 8cf3940..368b731 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -606,6 +606,7 @@ static HRESULT WINAPI domcdata_appendData( } else hr = E_FAIL; + HeapFree(GetProcessHeap(), 0, pContent); return hr; } @@ -667,6 +668,7 @@ static HRESULT WINAPI domcdata_insertData( xmlNodeSetContent(pDOMNode->node, str); hr = S_OK; } + HeapFree(GetProcessHeap(), 0, str); SysFreeString(sNewString); } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index ec6355f..20781a1 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -616,6 +616,7 @@ static HRESULT WINAPI domcomment_appendData( else hr = E_FAIL; } + HeapFree( GetProcessHeap(), 0, pContent ); } else hr = E_FAIL; @@ -680,6 +681,7 @@ static HRESULT WINAPI domcomment_insertData( xmlNodeSetContent(pDOMNode->node, str); hr = S_OK; } + HeapFree( GetProcessHeap(), 0, str ); SysFreeString(sNewString); } diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d7eb675..cecabe8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -372,6 +372,7 @@ static HRESULT WINAPI xmlnode_put_nodeValue( { str = xmlChar_from_wchar((WCHAR*)V_BSTR(&string_value)); xmlNodeSetContent(This->node, str); + HeapFree(GetProcessHeap(),0,str); hr = S_OK; break; } @@ -919,7 +920,7 @@ static HRESULT WINAPI xmlnode_put_text( BSTR text) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlChar *str = NULL; + xmlChar *str, *str2, *str3; TRACE("%p\n", This); @@ -934,11 +935,13 @@ static HRESULT WINAPI xmlnode_put_text( str = xmlChar_from_wchar((WCHAR*)text); /* Escape the string. */ - str = xmlEncodeEntitiesReentrant(This->node->doc, str); - str = xmlEncodeSpecialChars(This->node->doc, str); + str2 = xmlEncodeEntitiesReentrant(This->node->doc, str); + HeapFree(GetProcessHeap(), 0, str); + str3 = xmlEncodeSpecialChars(This->node->doc, str2); + xmlFree(str2); - xmlNodeSetContent(This->node, str); - xmlFree(str); + xmlNodeSetContent(This->node, str3); + xmlFree(str3); return S_OK; } @@ -1091,6 +1094,7 @@ static HRESULT WINAPI xmlnode_put_dataType( else ERR("Failed to Create Namepsace\n"); } + HeapFree( GetProcessHeap(), 0, str ); } return hr; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 7cb1d42..f8e1fc4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -603,6 +603,7 @@ static HRESULT WINAPI domtext_appendData( hr = S_OK; else hr = E_FAIL; + HeapFree( GetProcessHeap(), 0, pContent ); } else hr = E_FAIL; @@ -667,6 +668,7 @@ static HRESULT WINAPI domtext_insertData( xmlNodeSetContent(pDOMNode->node, str); hr = S_OK; } + HeapFree(GetProcessHeap(), 0, str); SysFreeString(sNewString); }

1 0

Michael Karcher : msxml3: Correct handling of listLength == NULL in IXMLDOMNamedNodeMap::get_length.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: c7293055119afa3945154713c4b947eba501f966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7293055119afa3945154713c… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:58:02 2008 +0200 msxml3: Correct handling of listLength == NULL in IXMLDOMNamedNodeMap::get_length. --- dlls/msxml3/nodemap.c | 3 +++ dlls/msxml3/tests/domdoc.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index ae52a4d..b2b1b33 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -364,6 +364,9 @@ static HRESULT WINAPI xmlnodemap_get_length( TRACE("%p\n", This); + if( !listLength ) + return E_INVALIDARG; + node = xmlNodePtr_from_domnode( This->node, 0 ); if ( !node ) return E_FAIL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 653475e..dda9fbb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1003,6 +1003,9 @@ todo_wine SysFreeString( str ); /* test indexed access of attributes */ + r = IXMLDOMNamedNodeMap_get_length( map, NULL ); + ok ( r == E_INVALIDARG, "get_length should return E_INVALIDARG\n"); + r = IXMLDOMNamedNodeMap_get_length( map, &count ); ok ( r == S_OK, "get_length wrong code\n"); ok ( count == 1, "get_length != 1\n");

1 0

Michael Karcher : msxml3: IXMLDOMNode_put_nodeValue: Use variant coercion.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: b7ac3bde6810757aae100eb451835be1aa541fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ac3bde6810757aae100eb45… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:58:11 2008 +0200 msxml3: IXMLDOMNode_put_nodeValue: Use variant coercion. --- dlls/msxml3/node.c | 18 +++++++++++++++--- dlls/msxml3/tests/domdoc.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7056ca3..d7eb675 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -344,11 +344,22 @@ static HRESULT WINAPI xmlnode_put_nodeValue( VARIANT value) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT hr = S_FALSE; + HRESULT hr; xmlChar *str = NULL; + VARIANT string_value; TRACE("%p type(%d)\n", This, This->node->type); + VariantInit(&string_value); + hr = VariantChangeType(&string_value, &value, 0, VT_BSTR); + if(FAILED(hr)) + { + VariantClear(&string_value); + WARN("Couldn't convert to VT_BSTR\n"); + return hr; + } + + hr = S_FALSE; /* Document, Document Fragment, Document Type, Element, Entity, Entity Reference, Notation aren't supported. */ switch ( This->node->type ) @@ -359,8 +370,7 @@ static HRESULT WINAPI xmlnode_put_nodeValue( case XML_PI_NODE: case XML_TEXT_NODE: { - str = xmlChar_from_wchar((WCHAR*)V_BSTR(&value)); - + str = xmlChar_from_wchar((WCHAR*)V_BSTR(&string_value)); xmlNodeSetContent(This->node, str); hr = S_OK; break; @@ -370,6 +380,8 @@ static HRESULT WINAPI xmlnode_put_nodeValue( break; } + VariantClear(&string_value); + return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dda9fbb..fa82a8a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -724,6 +724,30 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); SysFreeString(str); + /* test put_data */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(szstr1); + r = IXMLDOMText_put_nodeValue(nodetext, var); + ok(r == S_OK, "ret %08x\n", r ); + VariantClear(&var); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, szstr1 ), "incorrect get_text string\n"); + SysFreeString(str); + + /* test put_data */ + V_VT(&var) = VT_I4; + V_I4(&var) = 99; + r = IXMLDOMText_put_nodeValue(nodetext, var); + ok(r == S_OK, "ret %08x\n", r ); + VariantClear(&var); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("99") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMText_Release( nodetext ); }

1 0