Module: wine Branch: master Commit: 60b4feedca740f7f8c4ed484dca87b90845f6c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b4feedca740f7f8c4ed484dc...
Author: Rob Shearman robertshearman@gmail.com Date: Tue Sep 9 10:26:51 2008 +0100
include: Fix function names in IVBSAXXMLReader interface in msxml2.idl.
---
dlls/msxml3/saxreader.c | 56 +++++++++++++++++++++++----------------------- include/msxml2.idl | 28 +++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4821a60..d0ba6b5 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2172,7 +2172,7 @@ static HRESULT WINAPI saxxmlreader_putProperty( return E_NOTIMPL; }
-static HRESULT WINAPI saxxmlreader_getEntityResolver( +static HRESULT WINAPI saxxmlreader_get_entityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver **pEntityResolver) { @@ -2180,7 +2180,7 @@ static HRESULT WINAPI saxxmlreader_getEntityResolver( return internal_getEntityResolver(This, pEntityResolver, TRUE); }
-static HRESULT WINAPI saxxmlreader_putEntityResolver( +static HRESULT WINAPI saxxmlreader_put_entityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver *pEntityResolver) { @@ -2188,7 +2188,7 @@ static HRESULT WINAPI saxxmlreader_putEntityResolver( return internal_putEntityResolver(This, pEntityResolver, TRUE); }
-static HRESULT WINAPI saxxmlreader_getContentHandler( +static HRESULT WINAPI saxxmlreader_get_contentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler **ppContentHandler) { @@ -2196,7 +2196,7 @@ static HRESULT WINAPI saxxmlreader_getContentHandler( return internal_getContentHandler(This, ppContentHandler, TRUE); }
-static HRESULT WINAPI saxxmlreader_putContentHandler( +static HRESULT WINAPI saxxmlreader_put_contentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler *contentHandler) { @@ -2204,7 +2204,7 @@ static HRESULT WINAPI saxxmlreader_putContentHandler( return internal_putContentHandler(This, contentHandler, TRUE); }
-static HRESULT WINAPI saxxmlreader_getDTDHandler( +static HRESULT WINAPI saxxmlreader_get_dtdHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler **pDTDHandler) { @@ -2212,7 +2212,7 @@ static HRESULT WINAPI saxxmlreader_getDTDHandler( return internal_getDTDHandler(This, pDTDHandler, TRUE); }
-static HRESULT WINAPI saxxmlreader_putDTDHandler( +static HRESULT WINAPI saxxmlreader_put_dtdHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler *pDTDHandler) { @@ -2220,7 +2220,7 @@ static HRESULT WINAPI saxxmlreader_putDTDHandler( return internal_putDTDHandler(This, pDTDHandler, TRUE); }
-static HRESULT WINAPI saxxmlreader_getErrorHandler( +static HRESULT WINAPI saxxmlreader_get_errorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler **pErrorHandler) { @@ -2228,7 +2228,7 @@ static HRESULT WINAPI saxxmlreader_getErrorHandler( return internal_getErrorHandler(This, pErrorHandler, TRUE); }
-static HRESULT WINAPI saxxmlreader_putErrorHandler( +static HRESULT WINAPI saxxmlreader_put_errorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler *errorHandler) { @@ -2236,7 +2236,7 @@ static HRESULT WINAPI saxxmlreader_putErrorHandler( return internal_putErrorHandler(This, errorHandler, TRUE); }
-static HRESULT WINAPI saxxmlreader_getBaseURL( +static HRESULT WINAPI saxxmlreader_get_baseURL( IVBSAXXMLReader* iface, const WCHAR **pBaseUrl) { @@ -2246,7 +2246,7 @@ static HRESULT WINAPI saxxmlreader_getBaseURL( return E_NOTIMPL; }
-static HRESULT WINAPI saxxmlreader_putBaseURL( +static HRESULT WINAPI saxxmlreader_put_baseURL( IVBSAXXMLReader* iface, const WCHAR *pBaseUrl) { @@ -2256,7 +2256,7 @@ static HRESULT WINAPI saxxmlreader_putBaseURL( return E_NOTIMPL; }
-static HRESULT WINAPI saxxmlreader_getSecureBaseURL( +static HRESULT WINAPI saxxmlreader_get_secureBaseURL( IVBSAXXMLReader* iface, const WCHAR **pSecureBaseUrl) { @@ -2267,7 +2267,7 @@ static HRESULT WINAPI saxxmlreader_getSecureBaseURL( }
-static HRESULT WINAPI saxxmlreader_putSecureBaseURL( +static HRESULT WINAPI saxxmlreader_put_secureBaseURL( IVBSAXXMLReader* iface, const WCHAR *secureBaseUrl) { @@ -2306,18 +2306,18 @@ static const struct IVBSAXXMLReaderVtbl saxreader_vtbl = saxxmlreader_putFeature, saxxmlreader_getProperty, saxxmlreader_putProperty, - saxxmlreader_getEntityResolver, - saxxmlreader_putEntityResolver, - saxxmlreader_getContentHandler, - saxxmlreader_putContentHandler, - saxxmlreader_getDTDHandler, - saxxmlreader_putDTDHandler, - saxxmlreader_getErrorHandler, - saxxmlreader_putErrorHandler, - saxxmlreader_getBaseURL, - saxxmlreader_putBaseURL, - saxxmlreader_getSecureBaseURL, - saxxmlreader_putSecureBaseURL, + saxxmlreader_get_entityResolver, + saxxmlreader_put_entityResolver, + saxxmlreader_get_contentHandler, + saxxmlreader_put_contentHandler, + saxxmlreader_get_dtdHandler, + saxxmlreader_put_dtdHandler, + saxxmlreader_get_errorHandler, + saxxmlreader_put_errorHandler, + saxxmlreader_get_baseURL, + saxxmlreader_put_baseURL, + saxxmlreader_get_secureBaseURL, + saxxmlreader_put_secureBaseURL, saxxmlreader_parse, saxxmlreader_parseURL }; @@ -2456,7 +2456,7 @@ static HRESULT WINAPI isaxxmlreader_getBaseURL( const WCHAR **pBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_get_getBaseURL( + return IVBSAXXMLReader_get_baseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pBaseUrl); } @@ -2466,7 +2466,7 @@ static HRESULT WINAPI isaxxmlreader_putBaseURL( const WCHAR *pBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_put_putBaseURL( + return IVBSAXXMLReader_put_baseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pBaseUrl); } @@ -2476,7 +2476,7 @@ static HRESULT WINAPI isaxxmlreader_getSecureBaseURL( const WCHAR **pSecureBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_get_getSecureBaseURL( + return IVBSAXXMLReader_get_secureBaseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pSecureBaseUrl); } @@ -2486,7 +2486,7 @@ static HRESULT WINAPI isaxxmlreader_putSecureBaseURL( const WCHAR *secureBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_put_putSecureBaseURL( + return IVBSAXXMLReader_put_secureBaseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, secureBaseUrl); } diff --git a/include/msxml2.idl b/include/msxml2.idl index ab10f14..eae84c4 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1736,40 +1736,40 @@ interface IVBSAXXMLReader : IDispatch HRESULT putProperty( [in] const WCHAR * pProp, [in] VARIANT value);
[propget, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)] - HRESULT getEntityResolver( + HRESULT entityResolver( [out, retval] IVBSAXEntityResolver ** ppEntityResolver); [propputref, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)] - HRESULT putEntityResolver( [in] IVBSAXEntityResolver * pEntityResolver); + HRESULT entityResolver( [in] IVBSAXEntityResolver * pEntityResolver);
[propget, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)] - HRESULT getContentHandler( + HRESULT contentHandler( [out, retval] IVBSAXContentHandler ** pContentHandler); [propputref, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)] - HRESULT putContentHandler([in] IVBSAXContentHandler * contentHandler); + HRESULT contentHandler([in] IVBSAXContentHandler * contentHandler);
[propget, id(DISPID_SAX_XMLREADER_DTDHANDLER)] - HRESULT getDTDHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler); + HRESULT dtdHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler); [propputref, id(DISPID_SAX_XMLREADER_DTDHANDLER)] - HRESULT putDTDHandler([in] IVBSAXDTDHandler * pDTDHandler); + HRESULT dtdHandler([in] IVBSAXDTDHandler * pDTDHandler);
[propget, id(DISPID_SAX_XMLREADER_ERRORHANDLER)] - HRESULT getErrorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler); + HRESULT errorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler); [propputref, id(DISPID_SAX_XMLREADER_ERRORHANDLER)] - HRESULT putErrorHandler([in] IVBSAXErrorHandler * errorHandler); + HRESULT errorHandler([in] IVBSAXErrorHandler * errorHandler);
[propget, id(DISPID_SAX_XMLREADER_BASEURL)] - HRESULT getBaseURL([out, retval] const WCHAR ** pBaseUrl); + HRESULT baseURL([out, retval] const WCHAR ** pBaseUrl); [propput, id(DISPID_SAX_XMLREADER_BASEURL)] - HRESULT putBaseURL([in] const WCHAR * pBaseUrl); + HRESULT baseURL([in] const WCHAR * pBaseUrl);
[propget, id(DISPID_SAX_XMLREADER_SECUREBASEURL)] - HRESULT getSecureBaseURL([out, retval] const WCHAR ** pSecureBaseUrl); + HRESULT secureBaseURL([out, retval] const WCHAR ** pSecureBaseUrl); [propput, id(DISPID_SAX_XMLREADER_SECUREBASEURL)] - HRESULT putSecureBaseURL([in] const WCHAR * secureBaseUrl); + HRESULT secureBaseURL([in] const WCHAR * secureBaseUrl);
- [propget, id(DISPID_SAX_XMLREADER_PARSE)] + [id(DISPID_SAX_XMLREADER_PARSE)] HRESULT parse( [in] VARIANT varInput); - [propput, id(DISPID_SAX_XMLREADER_PARSE)] + [id(DISPID_SAX_XMLREADER_PARSEURL)] HRESULT parseURL([in] const WCHAR * url); }
-
Alexandre Julliard