forked from Mirrors/wine-wine
include: Fix function names in IVBSAXXMLReader interface in msxml2.idl.
parent
0d50b33b17
commit
60b4feedca
|
@ -2172,7 +2172,7 @@ static HRESULT WINAPI saxxmlreader_putProperty(
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_getEntityResolver(
|
static HRESULT WINAPI saxxmlreader_get_entityResolver(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXEntityResolver **pEntityResolver)
|
IVBSAXEntityResolver **pEntityResolver)
|
||||||
{
|
{
|
||||||
|
@ -2180,7 +2180,7 @@ static HRESULT WINAPI saxxmlreader_getEntityResolver(
|
||||||
return internal_getEntityResolver(This, pEntityResolver, TRUE);
|
return internal_getEntityResolver(This, pEntityResolver, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_putEntityResolver(
|
static HRESULT WINAPI saxxmlreader_put_entityResolver(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXEntityResolver *pEntityResolver)
|
IVBSAXEntityResolver *pEntityResolver)
|
||||||
{
|
{
|
||||||
|
@ -2188,7 +2188,7 @@ static HRESULT WINAPI saxxmlreader_putEntityResolver(
|
||||||
return internal_putEntityResolver(This, pEntityResolver, TRUE);
|
return internal_putEntityResolver(This, pEntityResolver, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_getContentHandler(
|
static HRESULT WINAPI saxxmlreader_get_contentHandler(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXContentHandler **ppContentHandler)
|
IVBSAXContentHandler **ppContentHandler)
|
||||||
{
|
{
|
||||||
|
@ -2196,7 +2196,7 @@ static HRESULT WINAPI saxxmlreader_getContentHandler(
|
||||||
return internal_getContentHandler(This, ppContentHandler, TRUE);
|
return internal_getContentHandler(This, ppContentHandler, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_putContentHandler(
|
static HRESULT WINAPI saxxmlreader_put_contentHandler(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXContentHandler *contentHandler)
|
IVBSAXContentHandler *contentHandler)
|
||||||
{
|
{
|
||||||
|
@ -2204,7 +2204,7 @@ static HRESULT WINAPI saxxmlreader_putContentHandler(
|
||||||
return internal_putContentHandler(This, contentHandler, TRUE);
|
return internal_putContentHandler(This, contentHandler, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_getDTDHandler(
|
static HRESULT WINAPI saxxmlreader_get_dtdHandler(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXDTDHandler **pDTDHandler)
|
IVBSAXDTDHandler **pDTDHandler)
|
||||||
{
|
{
|
||||||
|
@ -2212,7 +2212,7 @@ static HRESULT WINAPI saxxmlreader_getDTDHandler(
|
||||||
return internal_getDTDHandler(This, pDTDHandler, TRUE);
|
return internal_getDTDHandler(This, pDTDHandler, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_putDTDHandler(
|
static HRESULT WINAPI saxxmlreader_put_dtdHandler(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXDTDHandler *pDTDHandler)
|
IVBSAXDTDHandler *pDTDHandler)
|
||||||
{
|
{
|
||||||
|
@ -2220,7 +2220,7 @@ static HRESULT WINAPI saxxmlreader_putDTDHandler(
|
||||||
return internal_putDTDHandler(This, pDTDHandler, TRUE);
|
return internal_putDTDHandler(This, pDTDHandler, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_getErrorHandler(
|
static HRESULT WINAPI saxxmlreader_get_errorHandler(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXErrorHandler **pErrorHandler)
|
IVBSAXErrorHandler **pErrorHandler)
|
||||||
{
|
{
|
||||||
|
@ -2228,7 +2228,7 @@ static HRESULT WINAPI saxxmlreader_getErrorHandler(
|
||||||
return internal_getErrorHandler(This, pErrorHandler, TRUE);
|
return internal_getErrorHandler(This, pErrorHandler, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_putErrorHandler(
|
static HRESULT WINAPI saxxmlreader_put_errorHandler(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
IVBSAXErrorHandler *errorHandler)
|
IVBSAXErrorHandler *errorHandler)
|
||||||
{
|
{
|
||||||
|
@ -2236,7 +2236,7 @@ static HRESULT WINAPI saxxmlreader_putErrorHandler(
|
||||||
return internal_putErrorHandler(This, errorHandler, TRUE);
|
return internal_putErrorHandler(This, errorHandler, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_getBaseURL(
|
static HRESULT WINAPI saxxmlreader_get_baseURL(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
const WCHAR **pBaseUrl)
|
const WCHAR **pBaseUrl)
|
||||||
{
|
{
|
||||||
|
@ -2246,7 +2246,7 @@ static HRESULT WINAPI saxxmlreader_getBaseURL(
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_putBaseURL(
|
static HRESULT WINAPI saxxmlreader_put_baseURL(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
const WCHAR *pBaseUrl)
|
const WCHAR *pBaseUrl)
|
||||||
{
|
{
|
||||||
|
@ -2256,7 +2256,7 @@ static HRESULT WINAPI saxxmlreader_putBaseURL(
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI saxxmlreader_getSecureBaseURL(
|
static HRESULT WINAPI saxxmlreader_get_secureBaseURL(
|
||||||
IVBSAXXMLReader* iface,
|
IVBSAXXMLReader* iface,
|
||||||
const WCHAR **pSecureBaseUrl)
|
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,
|
IVBSAXXMLReader* iface,
|
||||||
const WCHAR *secureBaseUrl)
|
const WCHAR *secureBaseUrl)
|
||||||
{
|
{
|
||||||
|
@ -2306,18 +2306,18 @@ static const struct IVBSAXXMLReaderVtbl saxreader_vtbl =
|
||||||
saxxmlreader_putFeature,
|
saxxmlreader_putFeature,
|
||||||
saxxmlreader_getProperty,
|
saxxmlreader_getProperty,
|
||||||
saxxmlreader_putProperty,
|
saxxmlreader_putProperty,
|
||||||
saxxmlreader_getEntityResolver,
|
saxxmlreader_get_entityResolver,
|
||||||
saxxmlreader_putEntityResolver,
|
saxxmlreader_put_entityResolver,
|
||||||
saxxmlreader_getContentHandler,
|
saxxmlreader_get_contentHandler,
|
||||||
saxxmlreader_putContentHandler,
|
saxxmlreader_put_contentHandler,
|
||||||
saxxmlreader_getDTDHandler,
|
saxxmlreader_get_dtdHandler,
|
||||||
saxxmlreader_putDTDHandler,
|
saxxmlreader_put_dtdHandler,
|
||||||
saxxmlreader_getErrorHandler,
|
saxxmlreader_get_errorHandler,
|
||||||
saxxmlreader_putErrorHandler,
|
saxxmlreader_put_errorHandler,
|
||||||
saxxmlreader_getBaseURL,
|
saxxmlreader_get_baseURL,
|
||||||
saxxmlreader_putBaseURL,
|
saxxmlreader_put_baseURL,
|
||||||
saxxmlreader_getSecureBaseURL,
|
saxxmlreader_get_secureBaseURL,
|
||||||
saxxmlreader_putSecureBaseURL,
|
saxxmlreader_put_secureBaseURL,
|
||||||
saxxmlreader_parse,
|
saxxmlreader_parse,
|
||||||
saxxmlreader_parseURL
|
saxxmlreader_parseURL
|
||||||
};
|
};
|
||||||
|
@ -2456,7 +2456,7 @@ static HRESULT WINAPI isaxxmlreader_getBaseURL(
|
||||||
const WCHAR **pBaseUrl)
|
const WCHAR **pBaseUrl)
|
||||||
{
|
{
|
||||||
saxreader *This = impl_from_ISAXXMLReader( iface );
|
saxreader *This = impl_from_ISAXXMLReader( iface );
|
||||||
return IVBSAXXMLReader_get_getBaseURL(
|
return IVBSAXXMLReader_get_baseURL(
|
||||||
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
||||||
pBaseUrl);
|
pBaseUrl);
|
||||||
}
|
}
|
||||||
|
@ -2466,7 +2466,7 @@ static HRESULT WINAPI isaxxmlreader_putBaseURL(
|
||||||
const WCHAR *pBaseUrl)
|
const WCHAR *pBaseUrl)
|
||||||
{
|
{
|
||||||
saxreader *This = impl_from_ISAXXMLReader( iface );
|
saxreader *This = impl_from_ISAXXMLReader( iface );
|
||||||
return IVBSAXXMLReader_put_putBaseURL(
|
return IVBSAXXMLReader_put_baseURL(
|
||||||
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
||||||
pBaseUrl);
|
pBaseUrl);
|
||||||
}
|
}
|
||||||
|
@ -2476,7 +2476,7 @@ static HRESULT WINAPI isaxxmlreader_getSecureBaseURL(
|
||||||
const WCHAR **pSecureBaseUrl)
|
const WCHAR **pSecureBaseUrl)
|
||||||
{
|
{
|
||||||
saxreader *This = impl_from_ISAXXMLReader( iface );
|
saxreader *This = impl_from_ISAXXMLReader( iface );
|
||||||
return IVBSAXXMLReader_get_getSecureBaseURL(
|
return IVBSAXXMLReader_get_secureBaseURL(
|
||||||
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
||||||
pSecureBaseUrl);
|
pSecureBaseUrl);
|
||||||
}
|
}
|
||||||
|
@ -2486,7 +2486,7 @@ static HRESULT WINAPI isaxxmlreader_putSecureBaseURL(
|
||||||
const WCHAR *secureBaseUrl)
|
const WCHAR *secureBaseUrl)
|
||||||
{
|
{
|
||||||
saxreader *This = impl_from_ISAXXMLReader( iface );
|
saxreader *This = impl_from_ISAXXMLReader( iface );
|
||||||
return IVBSAXXMLReader_put_putSecureBaseURL(
|
return IVBSAXXMLReader_put_secureBaseURL(
|
||||||
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
(IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl,
|
||||||
secureBaseUrl);
|
secureBaseUrl);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1736,40 +1736,40 @@ interface IVBSAXXMLReader : IDispatch
|
||||||
HRESULT putProperty( [in] const WCHAR * pProp, [in] VARIANT value);
|
HRESULT putProperty( [in] const WCHAR * pProp, [in] VARIANT value);
|
||||||
|
|
||||||
[propget, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)]
|
[propget, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)]
|
||||||
HRESULT getEntityResolver(
|
HRESULT entityResolver(
|
||||||
[out, retval] IVBSAXEntityResolver ** ppEntityResolver);
|
[out, retval] IVBSAXEntityResolver ** ppEntityResolver);
|
||||||
[propputref, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)]
|
[propputref, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)]
|
||||||
HRESULT putEntityResolver( [in] IVBSAXEntityResolver * pEntityResolver);
|
HRESULT entityResolver( [in] IVBSAXEntityResolver * pEntityResolver);
|
||||||
|
|
||||||
[propget, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)]
|
[propget, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)]
|
||||||
HRESULT getContentHandler(
|
HRESULT contentHandler(
|
||||||
[out, retval] IVBSAXContentHandler ** pContentHandler);
|
[out, retval] IVBSAXContentHandler ** pContentHandler);
|
||||||
[propputref, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)]
|
[propputref, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)]
|
||||||
HRESULT putContentHandler([in] IVBSAXContentHandler * contentHandler);
|
HRESULT contentHandler([in] IVBSAXContentHandler * contentHandler);
|
||||||
|
|
||||||
[propget, id(DISPID_SAX_XMLREADER_DTDHANDLER)]
|
[propget, id(DISPID_SAX_XMLREADER_DTDHANDLER)]
|
||||||
HRESULT getDTDHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler);
|
HRESULT dtdHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler);
|
||||||
[propputref, id(DISPID_SAX_XMLREADER_DTDHANDLER)]
|
[propputref, id(DISPID_SAX_XMLREADER_DTDHANDLER)]
|
||||||
HRESULT putDTDHandler([in] IVBSAXDTDHandler * pDTDHandler);
|
HRESULT dtdHandler([in] IVBSAXDTDHandler * pDTDHandler);
|
||||||
|
|
||||||
[propget, id(DISPID_SAX_XMLREADER_ERRORHANDLER)]
|
[propget, id(DISPID_SAX_XMLREADER_ERRORHANDLER)]
|
||||||
HRESULT getErrorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler);
|
HRESULT errorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler);
|
||||||
[propputref, id(DISPID_SAX_XMLREADER_ERRORHANDLER)]
|
[propputref, id(DISPID_SAX_XMLREADER_ERRORHANDLER)]
|
||||||
HRESULT putErrorHandler([in] IVBSAXErrorHandler * errorHandler);
|
HRESULT errorHandler([in] IVBSAXErrorHandler * errorHandler);
|
||||||
|
|
||||||
[propget, id(DISPID_SAX_XMLREADER_BASEURL)]
|
[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)]
|
[propput, id(DISPID_SAX_XMLREADER_BASEURL)]
|
||||||
HRESULT putBaseURL([in] const WCHAR * pBaseUrl);
|
HRESULT baseURL([in] const WCHAR * pBaseUrl);
|
||||||
|
|
||||||
[propget, id(DISPID_SAX_XMLREADER_SECUREBASEURL)]
|
[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)]
|
[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);
|
HRESULT parse( [in] VARIANT varInput);
|
||||||
[propput, id(DISPID_SAX_XMLREADER_PARSE)]
|
[id(DISPID_SAX_XMLREADER_PARSEURL)]
|
||||||
HRESULT parseURL([in] const WCHAR * url);
|
HRESULT parseURL([in] const WCHAR * url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue