Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 07:48:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSXML3]

Browse source 
sync msxml3 to wine 1.1.38

svn path=/trunk/; revision=45470
This commit is contained in:
Christoph von Wittich 2010-02-06 21:34:28 +00:00
parent 4cead51c5f
commit 6f10f0d34b
25 changed files with 400 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/msxml3/attribute.c
View file

@ -94,7 +94,7 @@ static ULONG WINAPI domattr_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -546,7 +546,7 @@ IUnknown* create_attribute( xmlNodePtr attribute )
{ {
domattr *This; domattr *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

10
reactos/dll/win32/msxml3/bsc.c
View file

@ -93,11 +93,9 @@ static ULONG WINAPI bsc_Release(
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
if(This->binding) if (This->binding) IBinding_Release(This->binding);
IBinding_Release(This->binding); if (This->memstream) IStream_Release(This->memstream);
if(This->memstream) heap_free(This);
IStream_Release(This->memstream);
HeapFree(GetProcessHeap(), 0, This);
} }
return ref; return ref;
@ -270,7 +268,7 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi
if(FAILED(hr)) if(FAILED(hr))
return hr; return hr;
bsc = HeapAlloc(GetProcessHeap(), 0, sizeof(bsc_t)); bsc = heap_alloc(sizeof(bsc_t));
bsc->lpVtbl = &bsc_vtbl; bsc->lpVtbl = &bsc_vtbl;
bsc->ref = 1; bsc->ref = 1;

51
reactos/dll/win32/msxml3/cdata.c
View file

@ -101,7 +101,7 @@ static ULONG WINAPI domcdata_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -606,7 +606,7 @@ static HRESULT WINAPI domcdata_appendData(
} }
else else
hr = E_FAIL; hr = E_FAIL;
HeapFree(GetProcessHeap(), 0, pContent); heap_free(pContent);
return hr; return hr;
} }
@ -667,7 +667,7 @@ static HRESULT WINAPI domcdata_insertData(
xmlNodeSetContent(This->node.node, str); xmlNodeSetContent(This->node.node, str);
hr = S_OK; hr = S_OK;
} }
HeapFree(GetProcessHeap(), 0, str); heap_free(str);
SysFreeString(sNewString); SysFreeString(sNewString);
} }
@ -684,8 +684,47 @@ static HRESULT WINAPI domcdata_deleteData(
IXMLDOMCDATASection *iface, IXMLDOMCDATASection *iface,
LONG offset, LONG count) LONG offset, LONG count)
{ {
FIXME("\n"); HRESULT hr;
return E_NOTIMPL; LONG len = -1;
BSTR str;
TRACE("%p %d %d\n", iface, offset, count);
hr = IXMLDOMCDATASection_get_length(iface, &len);
if(hr != S_OK) return hr;
if((offset < 0) || (offset > len) || (count < 0))
return E_INVALIDARG;
if(len == 0) return S_OK;
/* cutting start or end */
if((offset == 0) || ((count + offset) >= len))
{
if(offset == 0)
IXMLDOMCDATASection_substringData(iface, count, len - count, &str);
else
IXMLDOMCDATASection_substringData(iface, 0, offset, &str);
hr = IXMLDOMCDATASection_put_data(iface, str);
}
else
/* cutting from the inside */
{
BSTR str_end;
IXMLDOMCDATASection_substringData(iface, 0, offset, &str);
IXMLDOMCDATASection_substringData(iface, offset + count, len - count, &str_end);
hr = IXMLDOMCDATASection_put_data(iface, str);
if(hr == S_OK)
hr = IXMLDOMCDATASection_appendData(iface, str_end);
SysFreeString(str_end);
}
SysFreeString(str);
return hr;
} }
static HRESULT WINAPI domcdata_replaceData( static HRESULT WINAPI domcdata_replaceData(
@ -765,7 +804,7 @@ IUnknown* create_cdata( xmlNodePtr text )
{ {
domcdata *This; domcdata *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

53
reactos/dll/win32/msxml3/comment.c
View file

@ -95,7 +95,7 @@ static ULONG WINAPI domcomment_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -541,7 +541,7 @@ static HRESULT WINAPI domcomment_substringData(
LONG nLength = 0; LONG nLength = 0;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
TRACE("%p\n", iface); TRACE("%p %d %d %p\n", iface, offset, count, p);
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
@ -551,7 +551,7 @@ static HRESULT WINAPI domcomment_substringData(
return E_INVALIDARG; return E_INVALIDARG;
if(count == 0) if(count == 0)
return hr; return S_FALSE;
pContent = xmlNodeGetContent(This->node.node); pContent = xmlNodeGetContent(This->node.node);
if(pContent) if(pContent)
@ -630,7 +630,7 @@ static HRESULT WINAPI domcomment_insertData(
LONG nLength = 0, nLengthP = 0; LONG nLength = 0, nLengthP = 0;
xmlChar *str = NULL; xmlChar *str = NULL;
TRACE("%p\n", This); TRACE("%p %d %p\n", iface, offset, p);
/* If have a NULL or empty string, don't do anything. */ /* If have a NULL or empty string, don't do anything. */
if(SysStringLen(p) == 0) if(SysStringLen(p) == 0)
@ -692,8 +692,47 @@ static HRESULT WINAPI domcomment_deleteData(
IXMLDOMComment *iface, IXMLDOMComment *iface,
LONG offset, LONG count) LONG offset, LONG count)
{ {
FIXME("\n"); HRESULT hr;
return E_NOTIMPL; LONG len = -1;
BSTR str;
TRACE("%p %d %d\n", iface, offset, count);
hr = IXMLDOMComment_get_length(iface, &len);
if(hr != S_OK) return hr;
if((offset < 0) || (offset > len) || (count < 0))
return E_INVALIDARG;
if(len == 0) return S_OK;
/* cutting start or end */
if((offset == 0) || ((count + offset) >= len))
{
if(offset == 0)
IXMLDOMComment_substringData(iface, count, len - count, &str);
else
IXMLDOMComment_substringData(iface, 0, offset, &str);
hr = IXMLDOMComment_put_data(iface, str);
}
else
/* cutting from the inside */
{
BSTR str_end;
IXMLDOMComment_substringData(iface, 0, offset, &str);
IXMLDOMComment_substringData(iface, offset + count, len - count, &str_end);
hr = IXMLDOMComment_put_data(iface, str);
if(hr == S_OK)
hr = IXMLDOMComment_appendData(iface, str_end);
SysFreeString(str_end);
}
SysFreeString(str);
return hr;
} }
static HRESULT WINAPI domcomment_replaceData( static HRESULT WINAPI domcomment_replaceData(
@ -763,7 +802,7 @@ IUnknown* create_comment( xmlNodePtr comment )
{ {
domcomment *This; domcomment *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

4
reactos/dll/win32/msxml3/docfrag.c
View file

@ -94,7 +94,7 @@ static ULONG WINAPI domfrag_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -519,7 +519,7 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment )
{ {
domfrag *This; domfrag *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

51
reactos/dll/win32/msxml3/domdoc.c
View file

@ -119,7 +119,7 @@ static inline xmldoc_priv * priv_from_xmlDocPtr(xmlDocPtr doc)
static xmldoc_priv * create_priv(void) static xmldoc_priv * create_priv(void)
{ {
xmldoc_priv *priv; xmldoc_priv *priv;
priv = HeapAlloc( GetProcessHeap(), 0, sizeof (*priv) ); priv = heap_alloc( sizeof (*priv) );
if(priv) if(priv)
{ {
@ -164,9 +164,9 @@ LONG xmldoc_release(xmlDocPtr doc)
LIST_FOR_EACH_ENTRY_SAFE( orphan, orphan2, &priv->orphans, orphan_entry, entry ) LIST_FOR_EACH_ENTRY_SAFE( orphan, orphan2, &priv->orphans, orphan_entry, entry )
{ {
xmlFreeNode( orphan->node ); xmlFreeNode( orphan->node );
HeapFree( GetProcessHeap(), 0, orphan ); heap_free( orphan );
} }
HeapFree(GetProcessHeap(), 0, doc->_private); heap_free(doc->_private);
xmlFreeDoc(doc); xmlFreeDoc(doc);
} }
@ -179,7 +179,7 @@ HRESULT xmldoc_add_orphan(xmlDocPtr doc, xmlNodePtr node)
xmldoc_priv *priv = priv_from_xmlDocPtr(doc); xmldoc_priv *priv = priv_from_xmlDocPtr(doc);
orphan_entry *entry; orphan_entry *entry;
entry = HeapAlloc( GetProcessHeap(), 0, sizeof (*entry) ); entry = heap_alloc( sizeof (*entry) );
if(!entry) if(!entry)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -198,7 +198,7 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node)
if( entry->node == node ) if( entry->node == node )
{ {
list_remove( &entry->entry ); list_remove( &entry->entry );
HeapFree( GetProcessHeap(), 0, entry ); heap_free( entry );
return S_OK; return S_OK;
} }
} }
@ -1041,7 +1041,7 @@ static HRESULT WINAPI domdoc_createElement(
TRACE("created xmlptr %p\n", xmlnode); TRACE("created xmlptr %p\n", xmlnode);
elem_unk = create_element(xmlnode); elem_unk = create_element(xmlnode);
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
hr = IUnknown_QueryInterface(elem_unk, &IID_IXMLDOMElement, (void **)element); hr = IUnknown_QueryInterface(elem_unk, &IID_IXMLDOMElement, (void **)element);
IUnknown_Release(elem_unk); IUnknown_Release(elem_unk);
@ -1094,7 +1094,7 @@ static HRESULT WINAPI domdoc_createTextNode(
xml_content = xmlChar_from_wchar(data); xml_content = xmlChar_from_wchar(data);
xmlnode = xmlNewText(xml_content); xmlnode = xmlNewText(xml_content);
HeapFree(GetProcessHeap(), 0, xml_content); heap_free(xml_content);
if(!xmlnode) if(!xmlnode)
return E_FAIL; return E_FAIL;
@ -1126,7 +1126,7 @@ static HRESULT WINAPI domdoc_createComment(
xml_content = xmlChar_from_wchar(data); xml_content = xmlChar_from_wchar(data);
xmlnode = xmlNewComment(xml_content); xmlnode = xmlNewComment(xml_content);
HeapFree(GetProcessHeap(), 0, xml_content); heap_free(xml_content);
if(!xmlnode) if(!xmlnode)
return E_FAIL; return E_FAIL;
@ -1158,7 +1158,7 @@ static HRESULT WINAPI domdoc_createCDATASection(
xml_content = xmlChar_from_wchar(data); xml_content = xmlChar_from_wchar(data);
xmlnode = xmlNewCDataBlock(get_doc( This ), xml_content, strlen( (char*)xml_content) ); xmlnode = xmlNewCDataBlock(get_doc( This ), xml_content, strlen( (char*)xml_content) );
HeapFree(GetProcessHeap(), 0, xml_content); heap_free(xml_content);
if(!xmlnode) if(!xmlnode)
return E_FAIL; return E_FAIL;
@ -1199,8 +1199,8 @@ static HRESULT WINAPI domdoc_createProcessingInstruction(
TRACE("created xmlptr %p\n", xmlnode); TRACE("created xmlptr %p\n", xmlnode);
*pi = (IXMLDOMProcessingInstruction*)create_pi(xmlnode); *pi = (IXMLDOMProcessingInstruction*)create_pi(xmlnode);
HeapFree(GetProcessHeap(), 0, xml_content); heap_free(xml_content);
HeapFree(GetProcessHeap(), 0, xml_target); heap_free(xml_target);
return S_OK; return S_OK;
#else #else
@ -1228,7 +1228,7 @@ static HRESULT WINAPI domdoc_createAttribute(
xml_name = xmlChar_from_wchar(name); xml_name = xmlChar_from_wchar(name);
xmlnode = (xmlNode *)xmlNewProp(NULL, xml_name, NULL); xmlnode = (xmlNode *)xmlNewProp(NULL, xml_name, NULL);
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
if(!xmlnode) if(!xmlnode)
return E_FAIL; return E_FAIL;
@ -1260,7 +1260,7 @@ static HRESULT WINAPI domdoc_createEntityReference(
xml_name = xmlChar_from_wchar(name); xml_name = xmlChar_from_wchar(name);
xmlnode = xmlNewReference(get_doc( This ), xml_name ); xmlnode = xmlNewReference(get_doc( This ), xml_name );
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
if(!xmlnode) if(!xmlnode)
return E_FAIL; return E_FAIL;
@ -1279,17 +1279,28 @@ static HRESULT WINAPI domdoc_getElementsByTagName(
BSTR tagName, BSTR tagName,
IXMLDOMNodeList** resultList ) IXMLDOMNodeList** resultList )
{ {
static const WCHAR xpathformat[] =
{ '/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 };
domdoc *This = impl_from_IXMLDOMDocument2( iface ); domdoc *This = impl_from_IXMLDOMDocument2( iface );
LPWSTR szPattern; LPWSTR szPattern;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s, %p)\n", This, debugstr_w(tagName), resultList); TRACE("(%p)->(%s, %p)\n", This, debugstr_w(tagName), resultList);
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(2+lstrlenW(tagName)+1)); if (tagName[0] == '*' && tagName[1] == 0)
{
szPattern = heap_alloc(sizeof(WCHAR)*4);
szPattern[0] = szPattern[1] = '/'; szPattern[0] = szPattern[1] = '/';
lstrcpyW(szPattern + 2, tagName); szPattern[2] = '*';
szPattern[3] = 0;
}
else
{
szPattern = heap_alloc(sizeof(WCHAR)*(20+lstrlenW(tagName)+1));
wsprintfW(szPattern, xpathformat, tagName);
}
hr = queryresult_create((xmlNodePtr)get_doc(This), szPattern, resultList); hr = queryresult_create((xmlNodePtr)get_doc(This), szPattern, resultList);
HeapFree(GetProcessHeap(), 0, szPattern); heap_free(szPattern);
return hr; return hr;
} }
@ -1359,7 +1370,7 @@ static HRESULT WINAPI domdoc_createNode(
break; break;
} }
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
if(xmlnode && *node) if(xmlnode && *node)
{ {
@ -1588,7 +1599,7 @@ static BOOL bstr_to_utf8( BSTR bstr, char **pstr, int *plen )
LPSTR str; LPSTR str;
len = WideCharToMultiByte( CP_UTF8, 0, bstr, blen, NULL, 0, NULL, NULL ); len = WideCharToMultiByte( CP_UTF8, 0, bstr, blen, NULL, 0, NULL, NULL );
str = HeapAlloc( GetProcessHeap(), 0, len ); str = heap_alloc( len );
if ( !str ) if ( !str )
return FALSE; return FALSE;
WideCharToMultiByte( CP_UTF8, 0, bstr, blen, str, len, NULL, NULL ); WideCharToMultiByte( CP_UTF8, 0, bstr, blen, str, len, NULL, NULL );
@ -1619,7 +1630,7 @@ static HRESULT WINAPI domdoc_loadXML(
if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) )
{ {
xmldoc = doparse( str, len ); xmldoc = doparse( str, len );
HeapFree( GetProcessHeap(), 0, str ); heap_free( str );
if ( !xmldoc ) if ( !xmldoc )
This->error = E_FAIL; This->error = E_FAIL;
else else
@ -2193,7 +2204,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu
{ {
domdoc *doc; domdoc *doc;
doc = HeapAlloc( GetProcessHeap(), 0, sizeof (*doc) ); doc = heap_alloc( sizeof (*doc) );
if( !doc ) if( !doc )
return E_OUTOFMEMORY; return E_OUTOFMEMORY;

4
reactos/dll/win32/msxml3/domimpl.c
View file

@ -89,7 +89,7 @@ static ULONG WINAPI dimimpl_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -216,7 +216,7 @@ IUnknown* create_doc_Implementation(void)
{ {
domimpl *This; domimpl *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

48
reactos/dll/win32/msxml3/element.c
View file

@ -502,7 +502,7 @@ static HRESULT WINAPI domelem_get_tagName(
len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, NULL, 0 ); len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, NULL, 0 );
if (element->ns) if (element->ns)
len += MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, NULL, 0 ); len += MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, NULL, 0 );
str = HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); str = heap_alloc( len * sizeof (WCHAR) );
if ( !str ) if ( !str )
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
if (element->ns) if (element->ns)
@ -512,7 +512,7 @@ static HRESULT WINAPI domelem_get_tagName(
} }
MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, str + offset, len - offset ); MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, str + offset, len - offset );
*p = SysAllocString( str ); *p = SysAllocString( str );
HeapFree( GetProcessHeap(), 0, str ); heap_free( str );
return S_OK; return S_OK;
} }
@ -545,7 +545,7 @@ static HRESULT WINAPI domelem_getAttribute(
else else
xml_value = xmlGetNsProp(element, xml_name, NULL); xml_value = xmlGetNsProp(element, xml_name, NULL);
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
if(xml_value) if(xml_value)
{ {
V_VT(value) = VT_BSTR; V_VT(value) = VT_BSTR;
@ -587,8 +587,8 @@ static HRESULT WINAPI domelem_setAttribute(
if(!xmlSetNsProp(element, NULL, xml_name, xml_value)) if(!xmlSetNsProp(element, NULL, xml_name, xml_value))
hr = E_FAIL; hr = E_FAIL;
HeapFree(GetProcessHeap(), 0, xml_value); heap_free(xml_value);
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
VariantClear(&var); VariantClear(&var);
return hr; return hr;
@ -598,8 +598,19 @@ static HRESULT WINAPI domelem_removeAttribute(
IXMLDOMElement *iface, IXMLDOMElement *iface,
BSTR p) BSTR p)
{ {
FIXME("\n"); domelem *This = impl_from_IXMLDOMElement( iface );
return E_NOTIMPL; IXMLDOMNamedNodeMap *attr;
HRESULT hr;
TRACE("(%p)->(%s)", This, debugstr_w(p));
hr = IXMLDOMElement_get_attributes(iface, &attr);
if (hr != S_OK) return hr;
hr = IXMLDOMNamedNodeMap_removeNamedItem(attr, p, NULL);
IXMLDOMNamedNodeMap_Release(attr);
return hr;
} }
static HRESULT WINAPI domelem_getAttributeNode( static HRESULT WINAPI domelem_getAttributeNode(
@ -628,7 +639,7 @@ static HRESULT WINAPI domelem_getAttributeNode(
if(!xmlValidateNameValue(xml_name)) if(!xmlValidateNameValue(xml_name))
{ {
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
return E_FAIL; return E_FAIL;
} }
@ -639,7 +650,7 @@ static HRESULT WINAPI domelem_getAttributeNode(
IUnknown_Release(unk); IUnknown_Release(unk);
} }
HeapFree(GetProcessHeap(), 0, xml_name); heap_free(xml_name);
return hr; return hr;
} }
@ -666,6 +677,8 @@ static HRESULT WINAPI domelem_getElementsByTagName(
IXMLDOMElement *iface, IXMLDOMElement *iface,
BSTR bstrName, IXMLDOMNodeList** resultList) BSTR bstrName, IXMLDOMNodeList** resultList)
{ {
static const WCHAR xpathformat[] =
{ '.','/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 };
domelem *This = impl_from_IXMLDOMElement( iface ); domelem *This = impl_from_IXMLDOMElement( iface );
LPWSTR szPattern; LPWSTR szPattern;
xmlNodePtr element; xmlNodePtr element;
@ -673,10 +686,19 @@ static HRESULT WINAPI domelem_getElementsByTagName(
TRACE("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), resultList); TRACE("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), resultList);
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(3+lstrlenW(bstrName)+1)); if (bstrName[0] == '*' && bstrName[1] == 0)
{
szPattern = heap_alloc(sizeof(WCHAR)*5);
szPattern[0] = '.'; szPattern[0] = '.';
szPattern[1] = szPattern[2] = '/'; szPattern[1] = szPattern[2] = '/';
lstrcpyW(szPattern+3, bstrName); szPattern[3] = '*';
szPattern[4] = 0;
}
else
{
szPattern = heap_alloc(sizeof(WCHAR)*(21+lstrlenW(bstrName)+1));
wsprintfW(szPattern, xpathformat, bstrName);
}
TRACE("%s\n", debugstr_w(szPattern)); TRACE("%s\n", debugstr_w(szPattern));
element = get_element(This); element = get_element(This);
@ -684,7 +706,7 @@ static HRESULT WINAPI domelem_getElementsByTagName(
hr = E_FAIL; hr = E_FAIL;
else else
hr = queryresult_create(element, szPattern, resultList); hr = queryresult_create(element, szPattern, resultList);
HeapFree(GetProcessHeap(), 0, szPattern); heap_free(szPattern);
return hr; return hr;
} }
@ -768,7 +790,7 @@ IUnknown* create_element( xmlNodePtr element )
{ {
domelem *This; domelem *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

4
reactos/dll/win32/msxml3/entityref.c
View file

@ -94,7 +94,7 @@ static ULONG WINAPI entityref_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -518,7 +518,7 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity )
{ {
entityref *This; entityref *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

3
reactos/dll/win32/msxml3/factory.c
View file

@ -147,7 +147,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
if( IsEqualCLSID( rclsid, &CLSID_DOMDocument ) || /* Version indep. v 2.x */ if( IsEqualCLSID( rclsid, &CLSID_DOMDocument ) || /* Version indep. v 2.x */
IsEqualCLSID( rclsid, &CLSID_DOMDocument2 ) || /* Version indep. v 3.0 */ IsEqualCLSID( rclsid, &CLSID_DOMDocument2 ) || /* Version indep. v 3.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument30 ) ) /* Version dep. v 3.0 */ IsEqualCLSID( rclsid, &CLSID_DOMDocument30 )|| /* Version dep. v 3.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument40 )) /* Version dep. v 4.0 */
{ {
cf = (IClassFactory*) &domdoccf.lpVtbl; cf = (IClassFactory*) &domdoccf.lpVtbl;
} }

4
reactos/dll/win32/msxml3/httprequest.c
View file

@ -83,7 +83,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface)
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -317,7 +317,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, LPVOID *ppObj)
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p,%p)\n", pUnkOuter, ppObj);
req = HeapAlloc( GetProcessHeap(), 0, sizeof (*req) ); req = heap_alloc( sizeof (*req) );
if( !req ) if( !req )
return E_OUTOFMEMORY; return E_OUTOFMEMORY;

2
reactos/dll/win32/msxml3/msxml_private.h
View file

@ -135,7 +135,7 @@ extern LONG xmldoc_release( xmlDocPtr doc );
extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node );
extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node );
extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own );
extern xmlDocPtr parse_xml(char *ptr, int len); extern xmlDocPtr parse_xml(char *ptr, int len);

8
reactos/dll/win32/msxml3/node.c
View file

@ -130,7 +130,7 @@ static ULONG WINAPI xmlnode_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if(!ref) { if(!ref) {
destroy_xmlnode(This); destroy_xmlnode(This);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -354,7 +354,7 @@ static HRESULT WINAPI xmlnode_put_nodeValue(
{ {
str = xmlChar_from_wchar(V_BSTR(&string_value)); str = xmlChar_from_wchar(V_BSTR(&string_value));
xmlNodeSetContent(This->node, str); xmlNodeSetContent(This->node, str);
HeapFree(GetProcessHeap(),0,str); heap_free(str);
hr = S_OK; hr = S_OK;
break; break;
} }
@ -920,7 +920,7 @@ static HRESULT WINAPI xmlnode_put_text(
/* Escape the string. */ /* Escape the string. */
str2 = xmlEncodeEntitiesReentrant(This->node->doc, str); str2 = xmlEncodeEntitiesReentrant(This->node->doc, str);
HeapFree(GetProcessHeap(), 0, str); heap_free(str);
xmlNodeSetContent(This->node, str2); xmlNodeSetContent(This->node, str2);
xmlFree(str2); xmlFree(str2);
@ -1284,7 +1284,7 @@ static HRESULT WINAPI xmlnode_put_dataType(
else else
ERR("Failed to Create Namepsace\n"); ERR("Failed to Create Namepsace\n");
} }
HeapFree( GetProcessHeap(), 0, str ); heap_free( str );
} }
return hr; return hr;

4
reactos/dll/win32/msxml3/nodelist.c
View file

@ -104,7 +104,7 @@ static ULONG WINAPI xmlnodelist_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
xmldoc_release( This->parent->doc ); xmldoc_release( This->parent->doc );
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -314,7 +314,7 @@ IXMLDOMNodeList* create_children_nodelist( xmlNodePtr node )
{ {
xmlnodelist *nodelist; xmlnodelist *nodelist;
nodelist = HeapAlloc( GetProcessHeap(), 0, sizeof *nodelist ); nodelist = heap_alloc( sizeof *nodelist );
if ( !nodelist ) if ( !nodelist )
return NULL; return NULL;

10
reactos/dll/win32/msxml3/nodemap.c
View file

@ -102,7 +102,7 @@ static ULONG WINAPI xmlnodemap_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
IXMLDOMNode_Release( This->node ); IXMLDOMNode_Release( This->node );
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -191,7 +191,7 @@ xmlChar *xmlChar_from_wchar( LPWSTR str )
xmlChar *xmlstr; xmlChar *xmlstr;
len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL );
xmlstr = HeapAlloc( GetProcessHeap(), 0, len ); xmlstr = heap_alloc( len );
if ( xmlstr ) if ( xmlstr )
WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL ); WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL );
return xmlstr; return xmlstr;
@ -218,7 +218,7 @@ static HRESULT WINAPI xmlnodemap_getNamedItem(
element_name = xmlChar_from_wchar( name ); element_name = xmlChar_from_wchar( name );
attr = xmlHasNsProp( node, element_name, NULL ); attr = xmlHasNsProp( node, element_name, NULL );
HeapFree( GetProcessHeap(), 0, element_name ); heap_free( element_name );
if ( !attr ) if ( !attr )
{ {
@ -303,7 +303,7 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem(
element_name = xmlChar_from_wchar( name ); element_name = xmlChar_from_wchar( name );
attr = xmlHasNsProp( node, element_name, NULL ); attr = xmlHasNsProp( node, element_name, NULL );
HeapFree( GetProcessHeap(), 0, element_name ); heap_free( element_name );
if ( !attr ) if ( !attr )
{ {
@ -531,7 +531,7 @@ IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node )
{ {
xmlnodemap *nodemap; xmlnodemap *nodemap;
nodemap = HeapAlloc( GetProcessHeap(), 0, sizeof *nodemap ); nodemap = heap_alloc( sizeof *nodemap );
if ( !nodemap ) if ( !nodemap )
return NULL; return NULL;

4
reactos/dll/win32/msxml3/parseerror.c
View file

@ -97,7 +97,7 @@ static ULONG WINAPI parseError_Release(
SysFreeString(This->url); SysFreeString(This->url);
SysFreeString(This->reason); SysFreeString(This->reason);
SysFreeString(This->srcText); SysFreeString(This->srcText);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -283,7 +283,7 @@ IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR src
{ {
parse_error_t *This; parse_error_t *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof(*This) ); This = heap_alloc( sizeof(*This) );
if ( !This ) if ( !This )
return NULL; return NULL;

4
reactos/dll/win32/msxml3/pi.c
View file

@ -94,7 +94,7 @@ static ULONG WINAPI dom_pi_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -604,7 +604,7 @@ IUnknown* create_pi( xmlNodePtr pi )
{ {
dom_pi *This; dom_pi *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

2
reactos/dll/win32/msxml3/queryresult.c
View file

@ -413,7 +413,7 @@ cleanup:
IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl ); IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl );
if (ctxt != NULL) if (ctxt != NULL)
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
HeapFree(GetProcessHeap(), 0, str); heap_free(str);
return hr; return hr;
} }

6
reactos/dll/win32/msxml3/regsvr.c
View file

@ -47,7 +47,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(msxml);
/* /*
* Near the bottom of this file are the exported DllRegisterServer and * Near the bottom of this file are the exported DllRegisterServer and
@ -702,7 +702,7 @@ static struct progid const progid_list[] = {
}; };
/*********************************************************************** /***********************************************************************
* DllRegisterServer (OLEAUT32.@) * DllRegisterServer (MSXML3.@)
*/ */
HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
@ -729,7 +729,7 @@ HRESULT WINAPI DllRegisterServer(void)
} }
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (OLEAUT32.@) * DllUnregisterServer (MSXML3.@)
*/ */
HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {

87
reactos/dll/win32/msxml3/saxreader.c
View file

@ -126,6 +126,11 @@ static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface )
return (saxattributes *)((char*)iface - FIELD_OFFSET(saxattributes, lpSAXAttributesVtbl)); return (saxattributes *)((char*)iface - FIELD_OFFSET(saxattributes, lpSAXAttributesVtbl));
} }
static inline BOOL has_content_handler(const saxlocator *locator)
{
return (locator->vbInterface && locator->saxreader->vbcontentHandler) ||
(!locator->vbInterface && locator->saxreader->contentHandler);
}
static HRESULT namespacePush(saxlocator *locator, int ns) static HRESULT namespacePush(saxlocator *locator, int ns)
{ {
@ -161,13 +166,13 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len)
dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0);
if(len != -1) dLen++; if(len != -1) dLen++;
str = HeapAlloc(GetProcessHeap(), 0, dLen * sizeof (WCHAR)); str = heap_alloc(dLen * sizeof (WCHAR));
if (!str) if (!str)
return NULL; return NULL;
MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, dLen); MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, dLen);
if(len != -1) str[dLen-1] = '\0'; if(len != -1) str[dLen-1] = '\0';
bstr = SysAllocString(str); bstr = SysAllocString(str);
HeapFree(GetProcessHeap(), 0, str); heap_free(str);
return bstr; return bstr;
} }
@ -185,7 +190,7 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name)
dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, NULL, 0) dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, NULL, 0)
+ MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0); + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0);
str = HeapAlloc(GetProcessHeap(), 0, dLen * sizeof(WCHAR)); str = heap_alloc(dLen * sizeof(WCHAR));
if(!str) if(!str)
return NULL; return NULL;
@ -194,7 +199,7 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name)
MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &str[dLast], dLen-dLast); MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &str[dLast], dLen-dLast);
bstr = SysAllocString(str); bstr = SysAllocString(str);
HeapFree(GetProcessHeap(), 0, str); heap_free(str);
return bstr; return bstr;
} }
@ -624,12 +629,12 @@ static ULONG WINAPI isaxattributes_Release(ISAXAttributes* iface)
SysFreeString(This->szQName[index]); SysFreeString(This->szQName[index]);
} }
HeapFree(GetProcessHeap(), 0, This->szLocalname); heap_free(This->szLocalname);
HeapFree(GetProcessHeap(), 0, This->szURI); heap_free(This->szURI);
HeapFree(GetProcessHeap(), 0, This->szValue); heap_free(This->szValue);
HeapFree(GetProcessHeap(), 0, This->szQName); heap_free(This->szQName);
HeapFree(GetProcessHeap(), 0, This); heap_free(This);
} }
return ref; return ref;
@ -914,7 +919,7 @@ static HRESULT SAXAttributes_create(saxattributes **attr,
int index; int index;
static const xmlChar xmlns[] = "xmlns"; static const xmlChar xmlns[] = "xmlns";
attributes = HeapAlloc(GetProcessHeap(), 0, sizeof(*attributes)); attributes = heap_alloc(sizeof(*attributes));
if(!attributes) if(!attributes)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -924,23 +929,19 @@ static HRESULT SAXAttributes_create(saxattributes **attr,
attributes->nb_attributes = nb_namespaces+nb_attributes; attributes->nb_attributes = nb_namespaces+nb_attributes;
attributes->szLocalname = attributes->szLocalname = heap_alloc(sizeof(BSTR)*attributes->nb_attributes);
HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes); attributes->szURI = heap_alloc(sizeof(BSTR)*attributes->nb_attributes);
attributes->szURI = attributes->szValue = heap_alloc(sizeof(BSTR)*attributes->nb_attributes);
HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes); attributes->szQName = heap_alloc(sizeof(BSTR)*attributes->nb_attributes);
attributes->szValue =
HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes);
attributes->szQName =
HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*attributes->nb_attributes);
if(!attributes->szLocalname || !attributes->szURI if(!attributes->szLocalname || !attributes->szURI
|| !attributes->szValue || !attributes->szQName) || !attributes->szValue || !attributes->szQName)
{ {
HeapFree(GetProcessHeap(), 0, attributes->szLocalname); heap_free(attributes->szLocalname);
HeapFree(GetProcessHeap(), 0, attributes->szURI); heap_free(attributes->szURI);
HeapFree(GetProcessHeap(), 0, attributes->szValue); heap_free(attributes->szValue);
HeapFree(GetProcessHeap(), 0, attributes->szQName); heap_free(attributes->szQName);
HeapFree(GetProcessHeap(), 0, attributes); heap_free(attributes);
return E_FAIL; return E_FAIL;
} }
@ -978,8 +979,7 @@ static void libxmlStartDocument(void *ctx)
saxlocator *This = ctx; saxlocator *This = ctx;
HRESULT hr; HRESULT hr;
if((This->vbInterface && This->saxreader->vbcontentHandler) if(has_content_handler(This))
|| (!This->vbInterface && This->saxreader->contentHandler))
{ {
if(This->vbInterface) if(This->vbInterface)
hr = IVBSAXContentHandler_startDocument(This->saxreader->vbcontentHandler); hr = IVBSAXContentHandler_startDocument(This->saxreader->vbcontentHandler);
@ -1003,8 +1003,7 @@ static void libxmlEndDocument(void *ctx)
if(This->ret != S_OK) return; if(This->ret != S_OK) return;
if((This->vbInterface && This->saxreader->vbcontentHandler) if(has_content_handler(This))
|| (!This->vbInterface && This->saxreader->contentHandler))
{ {
if(This->vbInterface) if(This->vbInterface)
hr = IVBSAXContentHandler_endDocument(This->saxreader->vbcontentHandler); hr = IVBSAXContentHandler_endDocument(This->saxreader->vbcontentHandler);
@ -1039,8 +1038,7 @@ static void libxmlStartElementNS(
update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1);
hr = namespacePush(This, nb_namespaces); hr = namespacePush(This, nb_namespaces);
if(hr==S_OK && ((This->vbInterface && This->saxreader->vbcontentHandler) if(hr==S_OK && has_content_handler(This))
|| (!This->vbInterface && This->saxreader->contentHandler)))
{ {
for(index=0; index<nb_namespaces; index++) for(index=0; index<nb_namespaces; index++)
{ {
@ -1119,8 +1117,7 @@ static void libxmlEndElementNS(
nsNr = namespacePop(This); nsNr = namespacePop(This);
if((This->vbInterface && This->saxreader->vbcontentHandler) if(has_content_handler(This))
|| (!This->vbInterface && This->saxreader->contentHandler))
{ {
NamespaceUri = bstr_from_xmlChar(URI); NamespaceUri = bstr_from_xmlChar(URI);
LocalName = bstr_from_xmlChar(localname); LocalName = bstr_from_xmlChar(localname);
@ -1186,9 +1183,7 @@ static void libxmlCharacters(
xmlChar *end; xmlChar *end;
BOOL lastEvent = FALSE; BOOL lastEvent = FALSE;
if((This->vbInterface && !This->saxreader->vbcontentHandler) if(!(has_content_handler(This))) return;
|| (!This->vbInterface && !This->saxreader->contentHandler))
return;
cur = (xmlChar*)ch; cur = (xmlChar*)ch;
if(*(ch-1)=='\r') cur--; if(*(ch-1)=='\r') cur--;
@ -1320,7 +1315,7 @@ static void libxmlFatalError(void *ctx, const char *msg, ...)
va_end(args); va_end(args);
len = MultiByteToWideChar(CP_UNIXCP, 0, message, -1, NULL, 0); len = MultiByteToWideChar(CP_UNIXCP, 0, message, -1, NULL, 0);
wszError = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); wszError = heap_alloc(sizeof(WCHAR)*len);
if(wszError) if(wszError)
MultiByteToWideChar(CP_UNIXCP, 0, message, -1, wszError, len); MultiByteToWideChar(CP_UNIXCP, 0, message, -1, wszError, len);
@ -1334,7 +1329,7 @@ static void libxmlFatalError(void *ctx, const char *msg, ...)
ISAXErrorHandler_fatalError(This->saxreader->errorHandler, ISAXErrorHandler_fatalError(This->saxreader->errorHandler,
(ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL); (ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL);
HeapFree(GetProcessHeap(), 0, wszError); heap_free(wszError);
xmlStopParser(This->pParserCtxt); xmlStopParser(This->pParserCtxt);
This->ret = E_FAIL; This->ret = E_FAIL;
@ -1384,8 +1379,7 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len)
if(change) *end = '\n'; if(change) *end = '\n';
if((This->vbInterface && This->saxreader->vbcontentHandler) || if(has_content_handler(This))
(!This->vbInterface && This->saxreader->contentHandler))
{ {
Chars = bstr_from_xmlCharN(cur, end-cur+1); Chars = bstr_from_xmlCharN(cur, end-cur+1);
if(This->vbInterface) if(This->vbInterface)
@ -1645,10 +1639,10 @@ static ULONG WINAPI isaxlocator_Release(
{ {
SysFreeString(This->publicId); SysFreeString(This->publicId);
SysFreeString(This->systemId); SysFreeString(This->systemId);
HeapFree(GetProcessHeap(), 0, This->nsStack); heap_free(This->nsStack);
ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl); ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -1734,7 +1728,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B
{ {
saxlocator *locator; saxlocator *locator;
locator = HeapAlloc( GetProcessHeap(), 0, sizeof (*locator) ); locator = heap_alloc( sizeof (*locator) );
if( !locator ) if( !locator )
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -1755,11 +1749,11 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B
locator->ret = S_OK; locator->ret = S_OK;
locator->nsStackSize = 8; locator->nsStackSize = 8;
locator->nsStackLast = 0; locator->nsStackLast = 0;
locator->nsStack = HeapAlloc(GetProcessHeap(), 0, locator->nsStackSize); locator->nsStack = heap_alloc(locator->nsStackSize);
if(!locator->nsStack) if(!locator->nsStack)
{ {
ISAXXMLReader_Release((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); ISAXXMLReader_Release((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl);
HeapFree(GetProcessHeap(), 0, locator); heap_free(locator);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
@ -1787,6 +1781,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz
return E_FAIL; return E_FAIL;
} }
xmlFree(locator->pParserCtxt->sax);
locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->sax = &locator->saxreader->sax;
locator->pParserCtxt->userData = locator; locator->pParserCtxt->userData = locator;
@ -1852,7 +1847,6 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt
} }
This->isParsing = FALSE; This->isParsing = FALSE;
locator->pParserCtxt->sax = NULL;
xmlFreeParserCtxt(locator->pParserCtxt); xmlFreeParserCtxt(locator->pParserCtxt);
locator->pParserCtxt = NULL; locator->pParserCtxt = NULL;
ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl);
@ -2045,6 +2039,7 @@ static HRESULT internal_parse(
hr = internal_parseBuffer(This, (const char*)bstrData, hr = internal_parseBuffer(This, (const char*)bstrData,
SysStringByteLen(bstrData), vbInterface); SysStringByteLen(bstrData), vbInterface);
IXMLDOMDocument_Release(xmlDoc); IXMLDOMDocument_Release(xmlDoc);
SysFreeString(bstrData);
break; break;
} }
if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), if(IUnknown_QueryInterface(V_UNKNOWN(&varInput),
@ -2315,7 +2310,7 @@ static ULONG WINAPI saxxmlreader_Release(
if(This->vbdeclHandler) if(This->vbdeclHandler)
IVBSAXDeclHandler_Release(This->vbdeclHandler); IVBSAXDeclHandler_Release(This->vbdeclHandler);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -2810,7 +2805,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj)
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p,%p)\n", pUnkOuter, ppObj);
reader = HeapAlloc( GetProcessHeap(), 0, sizeof (*reader) ); reader = heap_alloc( sizeof (*reader) );
if( !reader ) if( !reader )
return E_OUTOFMEMORY; return E_OUTOFMEMORY;

4
reactos/dll/win32/msxml3/schema.c
View file

@ -86,7 +86,7 @@ static ULONG WINAPI schema_cache_Release( IXMLDOMSchemaCollection *iface )
if ( ref == 0 ) if ( ref == 0 )
{ {
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -233,7 +233,7 @@ static const struct IXMLDOMSchemaCollectionVtbl schema_vtbl =
HRESULT SchemaCache_create(IUnknown *pUnkOuter, LPVOID *ppObj) HRESULT SchemaCache_create(IUnknown *pUnkOuter, LPVOID *ppObj)
{ {
schema_t *schema = HeapAlloc( GetProcessHeap(), 0, sizeof (*schema) ); schema_t *schema = heap_alloc( sizeof (*schema) );
if( !schema ) if( !schema )
return E_OUTOFMEMORY; return E_OUTOFMEMORY;

51
reactos/dll/win32/msxml3/text.c
View file

@ -103,7 +103,7 @@ static ULONG WINAPI domtext_Release(
if ( ref == 0 ) if ( ref == 0 )
{ {
destroy_xmlnode(&This->node); destroy_xmlnode(&This->node);
HeapFree( GetProcessHeap(), 0, This ); heap_free( This );
} }
return ref; return ref;
@ -605,7 +605,7 @@ static HRESULT WINAPI domtext_appendData(
hr = S_OK; hr = S_OK;
else else
hr = E_FAIL; hr = E_FAIL;
HeapFree( GetProcessHeap(), 0, pContent ); heap_free( pContent );
} }
else else
hr = E_FAIL; hr = E_FAIL;
@ -669,7 +669,7 @@ static HRESULT WINAPI domtext_insertData(
xmlNodeSetContent(This->node.node, str); xmlNodeSetContent(This->node.node, str);
hr = S_OK; hr = S_OK;
} }
HeapFree(GetProcessHeap(), 0, str); heap_free(str);
SysFreeString(sNewString); SysFreeString(sNewString);
} }
@ -686,8 +686,47 @@ static HRESULT WINAPI domtext_deleteData(
IXMLDOMText *iface, IXMLDOMText *iface,
LONG offset, LONG count) LONG offset, LONG count)
{ {
FIXME("\n"); HRESULT hr;
return E_NOTIMPL; LONG len = -1;
BSTR str;
TRACE("%p %d %d\n", iface, offset, count);
hr = IXMLDOMText_get_length(iface, &len);
if(hr != S_OK) return hr;
if((offset < 0) || (offset > len) || (count < 0))
return E_INVALIDARG;
if(len == 0) return S_OK;
/* cutting start or end */
if((offset == 0) || ((count + offset) >= len))
{
if(offset == 0)
IXMLDOMText_substringData(iface, count, len - count, &str);
else
IXMLDOMText_substringData(iface, 0, offset, &str);
hr = IXMLDOMText_put_data(iface, str);
}
else
/* cutting from the inside */
{
BSTR str_end;
IXMLDOMText_substringData(iface, 0, offset, &str);
IXMLDOMText_substringData(iface, offset + count, len - count, &str_end);
hr = IXMLDOMText_put_data(iface, str);
if(hr == S_OK)
hr = IXMLDOMText_appendData(iface, str_end);
SysFreeString(str_end);
}
SysFreeString(str);
return hr;
} }
static HRESULT WINAPI domtext_replaceData( static HRESULT WINAPI domtext_replaceData(
@ -767,7 +806,7 @@ IUnknown* create_text( xmlNodePtr text )
{ {
domtext *This; domtext *This;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = heap_alloc( sizeof *This );
if ( !This ) if ( !This )
return NULL; return NULL;

68
reactos/dll/win32/msxml3/xmldoc.c
View file

@ -54,7 +54,6 @@ typedef struct _xmldoc
HRESULT error; HRESULT error;
/* IXMLDocument */ /* IXMLDocument */
IXMLElement *root;
xmlDocPtr xmldoc; xmlDocPtr xmldoc;
/* IPersistStream */ /* IPersistStream */
@ -118,7 +117,7 @@ static ULONG WINAPI xmldoc_Release(IXMLDocument *iface)
{ {
xmlFreeDoc(This->xmldoc); xmlFreeDoc(This->xmldoc);
if (This->stream) IStream_Release(This->stream); if (This->stream) IStream_Release(This->stream);
HeapFree(GetProcessHeap(), 0, This); heap_free(This);
} }
return ref; return ref;
@ -198,17 +197,19 @@ static HRESULT WINAPI xmldoc_Invoke(IXMLDocument *iface, DISPID dispIdMember,
static HRESULT WINAPI xmldoc_get_root(IXMLDocument *iface, IXMLElement **p) static HRESULT WINAPI xmldoc_get_root(IXMLDocument *iface, IXMLElement **p)
{ {
xmldoc *This = impl_from_IXMLDocument(iface); xmldoc *This = impl_from_IXMLDocument(iface);
xmlNodePtr root;
TRACE("(%p, %p)\n", iface, p); TRACE("(%p, %p)\n", iface, p);
if (!p) if (!p)
return E_INVALIDARG; return E_INVALIDARG;
*p = This->root; *p = NULL;
if (!*p)
if (!(root = xmlDocGetRootElement(This->xmldoc)))
return E_FAIL; return E_FAIL;
return S_OK; return XMLElement_create((IUnknown *)This, root, (LPVOID *)p, FALSE);
} }
static HRESULT WINAPI xmldoc_get_fileSize(IXMLDocument *iface, BSTR *p) static HRESULT WINAPI xmldoc_get_fileSize(IXMLDocument *iface, BSTR *p)
@ -439,14 +440,32 @@ static HRESULT WINAPI xmldoc_put_charset(IXMLDocument *iface, BSTR p)
static HRESULT WINAPI xmldoc_get_version(IXMLDocument *iface, BSTR *p) static HRESULT WINAPI xmldoc_get_version(IXMLDocument *iface, BSTR *p)
{ {
FIXME("(%p, %p): stub\n", iface, p); xmldoc *This = impl_from_IXMLDocument(iface);
return E_NOTIMPL;
TRACE("(%p, %p)\n", This, p);
if (!p) return E_INVALIDARG;
*p = bstr_from_xmlChar(This->xmldoc->version);
return S_OK;
} }
static HRESULT WINAPI xmldoc_get_doctype(IXMLDocument *iface, BSTR *p) static HRESULT WINAPI xmldoc_get_doctype(IXMLDocument *iface, BSTR *p)
{ {
FIXME("(%p, %p): stub\n", iface, p); xmldoc *This = impl_from_IXMLDocument(iface);
return E_NOTIMPL; xmlDtd *dtd;
TRACE("(%p, %p)\n", This, p);
if (!p) return E_INVALIDARG;
dtd = xmlGetIntSubset(This->xmldoc);
if (!dtd) return S_FALSE;
*p = bstr_from_xmlChar(dtd->name);
CharUpperBuffW(*p, SysStringLen(*p));
return S_OK;
} }
static HRESULT WINAPI xmldoc_get_dtdURl(IXMLDocument *iface, BSTR *p) static HRESULT WINAPI xmldoc_get_dtdURl(IXMLDocument *iface, BSTR *p)
@ -501,7 +520,7 @@ static HRESULT WINAPI xmldoc_createElement(IXMLDocument *iface, VARIANT vType,
node->type = type_msxml_to_libxml(V_I4(&vType)); node->type = type_msxml_to_libxml(V_I4(&vType));
/* FIXME: create xmlNodePtr based on vType and var1 */ /* FIXME: create xmlNodePtr based on vType and var1 */
return XMLElement_create((IUnknown *)iface, node, (LPVOID *)ppElem); return XMLElement_create((IUnknown *)iface, node, (LPVOID *)ppElem, TRUE);
} }
static const struct IXMLDocumentVtbl xmldoc_vtbl = static const struct IXMLDocumentVtbl xmldoc_vtbl =
@ -556,8 +575,13 @@ static ULONG WINAPI xmldoc_IPersistStreamInit_Release(
static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID(
IPersistStreamInit *iface, CLSID *classid) IPersistStreamInit *iface, CLSID *classid)
{ {
FIXME("(%p,%p): stub!\n", iface, classid); xmldoc *this = impl_from_IPersistStreamInit(iface);
return E_NOTIMPL; TRACE("(%p,%p)\n", this, classid);
if (!classid) return E_POINTER;
*classid = CLSID_XMLDocument;
return S_OK;
} }
static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty( static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty(
@ -581,7 +605,6 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load(
IPersistStreamInit *iface, LPSTREAM pStm) IPersistStreamInit *iface, LPSTREAM pStm)
{ {
xmldoc *This = impl_from_IPersistStreamInit(iface); xmldoc *This = impl_from_IPersistStreamInit(iface);
xmlNodePtr xmlnode;
HRESULT hr; HRESULT hr;
HGLOBAL hglobal; HGLOBAL hglobal;
DWORD read, written, len; DWORD read, written, len;
@ -593,6 +616,8 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load(
if (!pStm) if (!pStm)
return E_INVALIDARG; return E_INVALIDARG;
/* release previously allocated stream */
if (This->stream) IStream_Release(This->stream);
hr = CreateStreamOnHGlobal(NULL, TRUE, &This->stream); hr = CreateStreamOnHGlobal(NULL, TRUE, &This->stream);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
@ -616,7 +641,10 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load(
len = GlobalSize(hglobal); len = GlobalSize(hglobal);
ptr = GlobalLock(hglobal); ptr = GlobalLock(hglobal);
if (len != 0) if (len != 0)
{
xmlFreeDoc(This->xmldoc);
This->xmldoc = parse_xml(ptr, len); This->xmldoc = parse_xml(ptr, len);
}
GlobalUnlock(hglobal); GlobalUnlock(hglobal);
if (!This->xmldoc) if (!This->xmldoc)
@ -625,8 +653,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load(
return E_FAIL; return E_FAIL;
} }
xmlnode = xmlDocGetRootElement(This->xmldoc); return S_OK;
return XMLElement_create((IUnknown *)This, xmlnode, (LPVOID *)&This->root);
} }
static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( static HRESULT WINAPI xmldoc_IPersistStreamInit_Save(
@ -639,15 +666,17 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Save(
static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax(
IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize)
{ {
FIXME("(%p, %p): stub!\n", iface, pcbSize); xmldoc *This = impl_from_IPersistStreamInit(iface);
TRACE("(%p, %p)\n", This, pcbSize);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew(
IPersistStreamInit *iface) IPersistStreamInit *iface)
{ {
FIXME("(%p): stub!\n", iface); xmldoc *This = impl_from_IPersistStreamInit(iface);
return E_NOTIMPL; TRACE("(%p)\n", This);
return S_OK;
} }
static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable = static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable =
@ -669,7 +698,7 @@ HRESULT XMLDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj)
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p,%p)\n", pUnkOuter, ppObj);
doc = HeapAlloc(GetProcessHeap(), 0, sizeof (*doc)); doc = heap_alloc(sizeof (*doc));
if(!doc) if(!doc)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -677,7 +706,6 @@ HRESULT XMLDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj)
doc->lpvtblIPersistStreamInit = &xmldoc_IPersistStreamInit_VTable; doc->lpvtblIPersistStreamInit = &xmldoc_IPersistStreamInit_VTable;
doc->ref = 1; doc->ref = 1;
doc->error = S_OK; doc->error = S_OK;
doc->root = NULL;
doc->xmldoc = NULL; doc->xmldoc = NULL;
doc->stream = NULL; doc->stream = NULL;

105
reactos/dll/win32/msxml3/xmlelem.c
View file

@ -48,6 +48,7 @@ typedef struct _xmlelem
const IXMLElementVtbl *lpVtbl; const IXMLElementVtbl *lpVtbl;
LONG ref; LONG ref;
xmlNodePtr node; xmlNodePtr node;
BOOL own;
} xmlelem; } xmlelem;
static inline xmlelem *impl_from_IXMLElement(IXMLElement *iface) static inline xmlelem *impl_from_IXMLElement(IXMLElement *iface)
@ -94,7 +95,8 @@ static ULONG WINAPI xmlelem_Release(IXMLElement *iface)
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (ref == 0) if (ref == 0)
{ {
HeapFree(GetProcessHeap(), 0, This); if (This->own) xmlFreeNode(This->node);
heap_free(This);
} }
return ref; return ref;
@ -171,31 +173,17 @@ static HRESULT WINAPI xmlelem_Invoke(IXMLElement *iface, DISPID dispIdMember,
return hr; return hr;
} }
static inline BSTR str_dup_upper(BSTR str)
{
INT len = (lstrlenW(str) + 1) * sizeof(WCHAR);
BSTR p = SysAllocStringLen(NULL, len);
if (p)
{
memcpy(p, str, len);
CharUpperW(p);
}
return p;
}
static HRESULT WINAPI xmlelem_get_tagName(IXMLElement *iface, BSTR *p) static HRESULT WINAPI xmlelem_get_tagName(IXMLElement *iface, BSTR *p)
{ {
xmlelem *This = impl_from_IXMLElement(iface); xmlelem *This = impl_from_IXMLElement(iface);
BSTR temp;
TRACE("(%p, %p)\n", iface, p); TRACE("(%p, %p)\n", iface, p);
if (!p) if (!p)
return E_INVALIDARG; return E_INVALIDARG;
temp = bstr_from_xmlChar(This->node->name); *p = bstr_from_xmlChar(This->node->name);
*p = str_dup_upper(temp); CharUpperBuffW(*p, SysStringLen(*p));
SysFreeString(temp);
TRACE("returning %s\n", debugstr_w(*p)); TRACE("returning %s\n", debugstr_w(*p));
@ -226,7 +214,7 @@ static HRESULT WINAPI xmlelem_get_parent(IXMLElement *iface, IXMLElement **paren
if (!This->node->parent) if (!This->node->parent)
return S_FALSE; return S_FALSE;
return XMLElement_create((IUnknown *)iface, This->node->parent, (LPVOID *)parent); return XMLElement_create((IUnknown *)iface, This->node->parent, (LPVOID *)parent, FALSE);
} }
static HRESULT WINAPI xmlelem_setAttribute(IXMLElement *iface, BSTR strPropertyName, static HRESULT WINAPI xmlelem_setAttribute(IXMLElement *iface, BSTR strPropertyName,
@ -245,8 +233,8 @@ static HRESULT WINAPI xmlelem_setAttribute(IXMLElement *iface, BSTR strPropertyN
value = xmlChar_from_wchar(V_BSTR(&PropertyValue)); value = xmlChar_from_wchar(V_BSTR(&PropertyValue));
attr = xmlSetProp(This->node, name, value); attr = xmlSetProp(This->node, name, value);
HeapFree(GetProcessHeap(), 0, name); heap_free(name);
HeapFree(GetProcessHeap(), 0, value); heap_free(value);
return (attr) ? S_OK : S_FALSE; return (attr) ? S_OK : S_FALSE;
} }
@ -287,7 +275,7 @@ static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR strPropertyN
V_BSTR(PropertyValue) = bstr_from_xmlChar(val); V_BSTR(PropertyValue) = bstr_from_xmlChar(val);
} }
HeapFree(GetProcessHeap(), 0, name); heap_free(name);
xmlFree(val); xmlFree(val);
TRACE("returning %s\n", debugstr_w(V_BSTR(PropertyValue))); TRACE("returning %s\n", debugstr_w(V_BSTR(PropertyValue)));
return (val) ? S_OK : S_FALSE; return (val) ? S_OK : S_FALSE;
@ -317,7 +305,7 @@ static HRESULT WINAPI xmlelem_removeAttribute(IXMLElement *iface, BSTR strProper
hr = S_OK; hr = S_OK;
done: done:
HeapFree(GetProcessHeap(), 0, name); heap_free(name);
return hr; return hr;
} }
@ -330,7 +318,7 @@ static HRESULT WINAPI xmlelem_get_children(IXMLElement *iface, IXMLElementCollec
if (!p) if (!p)
return E_INVALIDARG; return E_INVALIDARG;
return XMLElementCollection_create((IUnknown *)iface, This->node->children, (LPVOID *)p); return XMLElementCollection_create((IUnknown *)iface, This->node, (LPVOID *)p);
} }
static LONG type_libxml_to_msxml(xmlElementType type) static LONG type_libxml_to_msxml(xmlElementType type)
@ -402,7 +390,7 @@ static HRESULT WINAPI xmlelem_put_text(IXMLElement *iface, BSTR p)
content = xmlChar_from_wchar(p); content = xmlChar_from_wchar(p);
xmlNodeSetContent(This->node, content); xmlNodeSetContent(This->node, content);
HeapFree( GetProcessHeap(), 0, content); heap_free(content);
return S_OK; return S_OK;
} }
@ -421,13 +409,31 @@ static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildEl
else else
child = xmlAddNextSibling(This->node, childElem->node->last); child = xmlAddNextSibling(This->node, childElem->node->last);
/* parent is responsible for child data */
if (child) childElem->own = FALSE;
return (child) ? S_OK : S_FALSE; return (child) ? S_OK : S_FALSE;
} }
static HRESULT WINAPI xmlelem_removeChild(IXMLElement *iface, IXMLElement *pChildElem) static HRESULT WINAPI xmlelem_removeChild(IXMLElement *iface, IXMLElement *pChildElem)
{ {
FIXME("(%p, %p): stub\n", iface, pChildElem); xmlelem *This = impl_from_IXMLElement(iface);
return E_NOTIMPL; xmlelem *childElem = impl_from_IXMLElement(pChildElem);
TRACE("(%p, %p)\n", This, childElem);
if (!pChildElem)
return E_INVALIDARG;
/* only supported for This is childElem parent case */
if (This->node != childElem->node->parent)
return E_INVALIDARG;
xmlUnlinkNode(childElem->node);
/* standalone element now */
childElem->own = TRUE;
return S_OK;
} }
static const struct IXMLElementVtbl xmlelem_vtbl = static const struct IXMLElementVtbl xmlelem_vtbl =
@ -453,7 +459,7 @@ static const struct IXMLElementVtbl xmlelem_vtbl =
xmlelem_removeChild xmlelem_removeChild
}; };
HRESULT XMLElement_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) HRESULT XMLElement_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own)
{ {
xmlelem *elem; xmlelem *elem;
@ -464,13 +470,14 @@ HRESULT XMLElement_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj)
*ppObj = NULL; *ppObj = NULL;
elem = HeapAlloc(GetProcessHeap(), 0, sizeof (*elem)); elem = heap_alloc(sizeof (*elem));
if(!elem) if(!elem)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
elem->lpVtbl = &xmlelem_vtbl; elem->lpVtbl = &xmlelem_vtbl;
elem->ref = 1; elem->ref = 1;
elem->node = node; elem->node = node;
elem->own = own;
*ppObj = &elem->lpVtbl; *ppObj = &elem->lpVtbl;
@ -493,6 +500,19 @@ typedef struct _xmlelem_collection
xmlNodePtr current; xmlNodePtr current;
} xmlelem_collection; } xmlelem_collection;
static inline LONG xmlelem_collection_updatelength(xmlelem_collection *collection)
{
xmlNodePtr ptr = collection->node->children;
collection->length = 0;
while (ptr)
{
collection->length++;
ptr = ptr->next;
}
return collection->length;
}
static inline xmlelem_collection *impl_from_IXMLElementCollection(IXMLElementCollection *iface) static inline xmlelem_collection *impl_from_IXMLElementCollection(IXMLElementCollection *iface)
{ {
return (xmlelem_collection *)((char*)iface - FIELD_OFFSET(xmlelem_collection, lpVtbl)); return (xmlelem_collection *)((char*)iface - FIELD_OFFSET(xmlelem_collection, lpVtbl));
@ -546,7 +566,7 @@ static ULONG WINAPI xmlelem_collection_Release(IXMLElementCollection *iface)
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (ref == 0) if (ref == 0)
{ {
HeapFree(GetProcessHeap(), 0, This); heap_free(This);
} }
return ref; return ref;
@ -597,7 +617,7 @@ static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface
if (!p) if (!p)
return E_INVALIDARG; return E_INVALIDARG;
*p = This->length; *p = xmlelem_collection_updatelength(This);
return S_OK; return S_OK;
} }
@ -619,7 +639,7 @@ static HRESULT WINAPI xmlelem_collection_item(IXMLElementCollection *iface, VARI
VARIANT var2, IDispatch **ppDisp) VARIANT var2, IDispatch **ppDisp)
{ {
xmlelem_collection *This = impl_from_IXMLElementCollection(iface); xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
xmlNodePtr ptr = This->node; xmlNodePtr ptr = This->node->children;
int index, i; int index, i;
TRACE("(%p, %p)\n", iface, ppDisp); TRACE("(%p, %p)\n", iface, ppDisp);
@ -632,13 +652,15 @@ static HRESULT WINAPI xmlelem_collection_item(IXMLElementCollection *iface, VARI
index = V_I4(&var1); index = V_I4(&var1);
if (index < 0) if (index < 0)
return E_INVALIDARG; return E_INVALIDARG;
xmlelem_collection_updatelength(This);
if (index >= This->length) if (index >= This->length)
return E_FAIL; return E_FAIL;
for (i = 0; i < index; i++) for (i = 0; i < index; i++)
ptr = ptr->next; ptr = ptr->next;
return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)ppDisp); return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)ppDisp, FALSE);
} }
static const struct IXMLElementCollectionVtbl xmlelem_collection_vtbl = static const struct IXMLElementCollectionVtbl xmlelem_collection_vtbl =
@ -698,7 +720,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
This->current = This->current->next; This->current = This->current->next;
V_VT(rgVar) = VT_DISPATCH; V_VT(rgVar) = VT_DISPATCH;
return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)&V_DISPATCH(rgVar)); return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)&V_DISPATCH(rgVar), FALSE);
} }
static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip( static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(
@ -712,7 +734,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Reset(
IEnumVARIANT *iface) IEnumVARIANT *iface)
{ {
xmlelem_collection *This = impl_from_IEnumVARIANT(iface); xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
This->current = This->node; This->current = This->node->children;
return S_OK; return S_OK;
} }
@ -737,16 +759,15 @@ static const struct IEnumVARIANTVtbl xmlelem_collection_IEnumVARIANTvtbl =
static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj)
{ {
xmlelem_collection *collection; xmlelem_collection *collection;
xmlNodePtr ptr;
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p,%p)\n", pUnkOuter, ppObj);
*ppObj = NULL; *ppObj = NULL;
if (!node) if (!node->children)
return S_FALSE; return S_FALSE;
collection = HeapAlloc(GetProcessHeap(), 0, sizeof (*collection)); collection = heap_alloc(sizeof (*collection));
if(!collection) if(!collection)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -755,14 +776,8 @@ static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node,
collection->ref = 1; collection->ref = 1;
collection->length = 0; collection->length = 0;
collection->node = node; collection->node = node;
collection->current = node; collection->current = node->children;
xmlelem_collection_updatelength(collection);
ptr = node;
while (ptr)
{
collection->length++;
ptr = ptr->next;
}
*ppObj = &collection->lpVtbl; *ppObj = &collection->lpVtbl;

8
reactos/include/psdk/msxml2.idl
View file

@ -1070,6 +1070,14 @@ coclass DOMDocument30
[default, source] dispinterface XMLDOMDocumentEvents; [default, source] dispinterface XMLDOMDocumentEvents;
} }
[
uuid(88d969c0-f192-11d4-a65f-0040963251e5)
]
coclass DOMDocument40
{
[default] interface IXMLDOMDocument2;
[default, source] dispinterface XMLDOMDocumentEvents;
}
[ [
uuid(F6D90F12-9C73-11D3-B32E-00C04F990BB4) uuid(F6D90F12-9C73-11D3-B32E-00C04F990BB4)