ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml: getElementsByTagName does not respect namespaces. 

We can't just use //tagname; we have to do //*[local-name()='tagname'].
This commit is contained in:
Mike Kaplinskiy 2010-01-16 16:17:36 -05:00 committed by Alexandre Julliard
parent 152c0d4b93
commit 90cf2f1ac3
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/msxml3/domdoc.c
View File

@ -1279,14 +1279,25 @@ static HRESULT WINAPI domdoc_getElementsByTagName(
BSTR tagName,
IXMLDOMNodeList** resultList )
{
static const WCHAR xpathformat[] =
{ '/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 };
domdoc *This = impl_from_IXMLDOMDocument2( iface );
LPWSTR szPattern;
HRESULT hr;
TRACE("(%p)->(%s, %p)\n", This, debugstr_w(tagName), resultList);
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(2+lstrlenW(tagName)+1));
szPattern[0] = szPattern[1] = '/';
lstrcpyW(szPattern + 2, tagName);
if (tagName[0] == '*' && tagName[1] == 0)
{
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*4);
szPattern[0] = szPattern[1] = '/';
szPattern[2] = '*';
szPattern[3] = 0;
}
else
{
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(20+lstrlenW(tagName)+1));
wsprintfW(szPattern, xpathformat, tagName);
}
hr = queryresult_create((xmlNodePtr)get_doc(This), szPattern, resultList);
HeapFree(GetProcessHeap(), 0, szPattern);

19
dlls/msxml3/element.c
View File

@ -666,6 +666,8 @@ static HRESULT WINAPI domelem_getElementsByTagName(
IXMLDOMElement *iface,
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 );
LPWSTR szPattern;
xmlNodePtr element;
@ -673,10 +675,19 @@ static HRESULT WINAPI domelem_getElementsByTagName(
TRACE("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), resultList);
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(3+lstrlenW(bstrName)+1));
szPattern[0] = '.';
szPattern[1] = szPattern[2] = '/';
lstrcpyW(szPattern+3, bstrName);
if (bstrName[0] == '*' && bstrName[1] == 0)
{
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*5);
szPattern[0] = '.';
szPattern[1] = szPattern[2] = '/';
szPattern[3] = '*';
szPattern[4] = 0;
}
else
{
szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(21+lstrlenW(bstrName)+1));
wsprintfW(szPattern, xpathformat, bstrName);
}
TRACE("%s\n", debugstr_w(szPattern));
element = get_element(This);