msxml3: Enable inline wrappers and fix warnings.

This commit is contained in:
Nikolay Sivov 2012-07-27 07:53:58 +04:00 committed by Alexandre Julliard
parent 5f3f9cdb9c
commit f14c2f712f
10 changed files with 10 additions and 9 deletions

View File

@ -1,6 +1,7 @@
EXTRADEFS = -DCOM_NO_WINDOWS_H EXTRADEFS = -DCOM_NO_WINDOWS_H
MODULE = msxml3.dll MODULE = msxml3.dll
IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
EXTRALIBS = @XML2LIBS@ EXTRALIBS = @XML2LIBS@
EXTRAINCL = @XML2INCL@ @XSLTINCL@ EXTRAINCL = @XML2INCL@ @XSLTINCL@

View File

@ -91,7 +91,7 @@ static HRESULT WINAPI domattr_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMText_AddRef((IUnknown*)*ppvObject); IXMLDOMAttribute_AddRef(iface);
return S_OK; return S_OK;
} }

View File

@ -91,7 +91,7 @@ static HRESULT WINAPI domcdata_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMText_AddRef((IUnknown*)*ppvObject); IXMLDOMCDATASection_AddRef(iface);
return S_OK; return S_OK;
} }

View File

@ -91,7 +91,7 @@ static HRESULT WINAPI domcomment_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMText_AddRef((IUnknown*)*ppvObject); IXMLDOMComment_AddRef(iface);
return S_OK; return S_OK;
} }

View File

@ -90,7 +90,7 @@ static HRESULT WINAPI domfrag_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMText_AddRef((IUnknown*)*ppvObject); IXMLDOMDocumentFragment_AddRef(iface);
return S_OK; return S_OK;
} }

View File

@ -2115,7 +2115,7 @@ static HRESULT WINAPI domdoc_load(
if(hr == S_OK) if(hr == S_OK)
{ {
IPersistStream *pDocStream; IPersistStream *pDocStream;
hr = IUnknown_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream); hr = IXMLDOMDocument3_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream);
if(hr == S_OK) if(hr == S_OK)
{ {
hr = IPersistStream_Load(pDocStream, pStream); hr = IPersistStream_Load(pDocStream, pStream);

View File

@ -117,7 +117,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMElement_AddRef( iface ); IXMLDOMNamedNodeMap_AddRef( iface );
return S_OK; return S_OK;
} }

View File

@ -82,7 +82,7 @@ static HRESULT WINAPI domtext_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMText_AddRef((IUnknown*)*ppvObject); IXMLDOMText_AddRef(iface);
return S_OK; return S_OK;
} }

View File

@ -75,7 +75,7 @@ static HRESULT WINAPI xmlparser_QueryInterface(IXMLParser* iface, REFIID riid, v
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLParser_AddRef((IUnknown*)*ppvObject); IXMLParser_AddRef(iface);
return S_OK; return S_OK;
} }

View File

@ -491,7 +491,7 @@ static inline HRESULT handle_xml_load(BindStatusCallback *This)
return display_error_page(This); return display_error_page(This);
} }
hres = IXMLDOMDocument_transformNode(xml, (IXMLDOMNode*)xsl, &bstr); hres = IXMLDOMDocument3_transformNode(xml, (IXMLDOMNode*)xsl, &bstr);
IXMLDOMDocument3_Release(xsl); IXMLDOMDocument3_Release(xsl);
IXMLDOMDocument3_Release(xml); IXMLDOMDocument3_Release(xml);
if(FAILED(hres)) if(FAILED(hres))