Commit 37ce9497 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

msxml3: Always set out pointer to null on failed QueryInterface.

parent a4cc8bc6
...@@ -77,6 +77,7 @@ static HRESULT WINAPI domattr_QueryInterface( ...@@ -77,6 +77,7 @@ static HRESULT WINAPI domattr_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -74,6 +74,7 @@ static HRESULT WINAPI bsc_QueryInterface( ...@@ -74,6 +74,7 @@ static HRESULT WINAPI bsc_QueryInterface(
} }
TRACE("interface %s not implemented\n", debugstr_guid(riid)); TRACE("interface %s not implemented\n", debugstr_guid(riid));
*ppobj = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -70,12 +70,6 @@ static HRESULT WINAPI domcdata_QueryInterface( ...@@ -70,12 +70,6 @@ static HRESULT WINAPI domcdata_QueryInterface(
{ {
*ppvObject = iface; *ppvObject = iface;
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMText ) ||
IsEqualGUID( riid, &IID_IXMLDOMElement ) )
{
TRACE("Unsupported interface\n");
return E_NOINTERFACE;
}
else if(node_query_interface(&This->node, riid, ppvObject)) else if(node_query_interface(&This->node, riid, ppvObject))
{ {
return *ppvObject ? S_OK : E_NOINTERFACE; return *ppvObject ? S_OK : E_NOINTERFACE;
...@@ -83,6 +77,7 @@ static HRESULT WINAPI domcdata_QueryInterface( ...@@ -83,6 +77,7 @@ static HRESULT WINAPI domcdata_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -77,6 +77,7 @@ static HRESULT WINAPI domcomment_QueryInterface( ...@@ -77,6 +77,7 @@ static HRESULT WINAPI domcomment_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -76,6 +76,7 @@ static HRESULT WINAPI domfrag_QueryInterface( ...@@ -76,6 +76,7 @@ static HRESULT WINAPI domfrag_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -78,6 +78,7 @@ static HRESULT WINAPI domdoctype_QueryInterface( ...@@ -78,6 +78,7 @@ static HRESULT WINAPI domdoctype_QueryInterface(
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -70,6 +70,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( ...@@ -70,6 +70,7 @@ static HRESULT WINAPI dimimpl_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -86,6 +86,7 @@ static HRESULT WINAPI domelem_QueryInterface( ...@@ -86,6 +86,7 @@ static HRESULT WINAPI domelem_QueryInterface(
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -76,6 +76,7 @@ static HRESULT WINAPI entityref_QueryInterface( ...@@ -76,6 +76,7 @@ static HRESULT WINAPI entityref_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -80,6 +80,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface( ...@@ -80,6 +80,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(
} }
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppobj = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -82,6 +82,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( ...@@ -82,6 +82,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface(
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -71,6 +71,7 @@ static HRESULT WINAPI parseError_QueryInterface( ...@@ -71,6 +71,7 @@ static HRESULT WINAPI parseError_QueryInterface(
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -76,6 +76,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( ...@@ -76,6 +76,7 @@ static HRESULT WINAPI dom_pi_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -948,6 +948,7 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac ...@@ -948,6 +948,7 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -96,6 +96,7 @@ static HRESULT WINAPI xsltemplate_QueryInterface( ...@@ -96,6 +96,7 @@ static HRESULT WINAPI xsltemplate_QueryInterface(
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -75,16 +75,10 @@ static HRESULT WINAPI domtext_QueryInterface( ...@@ -75,16 +75,10 @@ static HRESULT WINAPI domtext_QueryInterface(
{ {
return *ppvObject ? S_OK : E_NOINTERFACE; return *ppvObject ? S_OK : E_NOINTERFACE;
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) ||
IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) )
{
/* IXMLDOMText is known to be correct in not implementing these */
TRACE("Unsupported interface\n");
return E_NOINTERFACE;
}
else else
{ {
FIXME("Unsupported interface %s\n", debugstr_guid(riid)); FIXME("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -95,6 +95,7 @@ static HRESULT WINAPI xmldoc_QueryInterface(IXMLDocument *iface, REFIID riid, vo ...@@ -95,6 +95,7 @@ static HRESULT WINAPI xmldoc_QueryInterface(IXMLDocument *iface, REFIID riid, vo
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
...@@ -75,6 +75,7 @@ static HRESULT WINAPI xmlelem_QueryInterface(IXMLElement *iface, REFIID riid, vo ...@@ -75,6 +75,7 @@ static HRESULT WINAPI xmlelem_QueryInterface(IXMLElement *iface, REFIID riid, vo
else else
{ {
FIXME("interface %s not implemented\n", debugstr_guid(riid)); FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment