winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1216 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
← Newer
1
...
64
65
66
67
68
69
70
...
122
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
Results per page:
10
25
50
100
200