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

This commit is contained in:
Nikolay Sivov 2011-02-28 22:28:53 +03:00 committed by Alexandre Julliard
parent a4cc8bc63c
commit 37ce949745
18 changed files with 18 additions and 13 deletions

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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(
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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }

View File

@ -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;
} }