Module: wine Branch: master Commit: af15cfefcdd2aa1b516f37ad9d5a1d1c87523107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af15cfefcdd2aa1b516f37ad9d...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Tue Jan 22 13:19:13 2008 +1100
msxml3: Return correct IDispatch Interface.
---
dlls/msxml3/attribute.c | 4 ++-- dlls/msxml3/cdata.c | 4 ++-- dlls/msxml3/comment.c | 4 ++-- dlls/msxml3/docfrag.c | 4 ++-- dlls/msxml3/domdoc.c | 4 ++-- dlls/msxml3/element.c | 4 ++-- dlls/msxml3/entityref.c | 4 ++-- dlls/msxml3/pi.c | 4 ++-- dlls/msxml3/text.c | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 2409aa6..805bafe 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domattr_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMAttribute ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 4589896..186b9e4 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domcdata_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) || + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || IsEqualGUID( riid, &IID_IXMLDOMElement ) ) { return IUnknown_QueryInterface(This->element_unk, riid, ppvObject); diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 6359885..702a339 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domcomment_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMComment ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 7b3ff62..c741f24 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domfrag_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMDocumentFragment ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1bfeab1..cb63922 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -354,13 +354,13 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii *ppvObject = NULL;
if ( IsEqualGUID( riid, &IID_IUnknown ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMDocument ) || IsEqualGUID( riid, &IID_IXMLDOMDocument2 ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || - IsEqualGUID( riid, &IID_IDispatch ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 814a987..ba01247 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -652,12 +652,12 @@ static HRESULT WINAPI Internal_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = &This->lpVtbl; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 9671fa1..8902152 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -59,12 +59,12 @@ static HRESULT WINAPI entityref_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMEntityReference ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index ec70746..054d7f8 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -59,12 +59,12 @@ static HRESULT WINAPI dom_pi_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMProcessingInstruction ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 7c0f42e..0d402a4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domtext_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) || + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || IsEqualGUID( riid, &IID_IXMLDOMElement ) ) { return IUnknown_QueryInterface(This->element_unk, riid, ppvObject);
-
Alexandre Julliard