From 44baddcec92defcf05b5da5d85464b9a6c4b878b Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Tue, 28 Apr 2009 19:57:36 +0000 Subject: [PATCH] sync msxml3 with wine 1.1.20 svn path=/trunk/; revision=40719 --- reactos/dll/win32/msxml3/cdata.c | 18 +++---- reactos/dll/win32/msxml3/comment.c | 16 +++---- reactos/dll/win32/msxml3/domdoc.c | 2 +- reactos/dll/win32/msxml3/httprequest.c | 4 +- reactos/dll/win32/msxml3/node.c | 2 +- reactos/dll/win32/msxml3/nodelist.c | 10 ++-- reactos/dll/win32/msxml3/nodemap.c | 18 +++---- reactos/dll/win32/msxml3/parseerror.c | 8 ++-- reactos/dll/win32/msxml3/queryresult.c | 6 +-- reactos/dll/win32/msxml3/schema.c | 4 +- reactos/dll/win32/msxml3/text.c | 18 +++---- reactos/dll/win32/msxml3/xmldoc.c | 4 +- reactos/dll/win32/msxml3/xmlelem.c | 16 +++---- reactos/include/psdk/msxml.idl | 20 ++++---- reactos/include/psdk/msxml2.idl | 66 +++++++++++++------------- 15 files changed, 106 insertions(+), 106 deletions(-) diff --git a/reactos/dll/win32/msxml3/cdata.c b/reactos/dll/win32/msxml3/cdata.c index 7672bbaafe0..3d3c87514b9 100644 --- a/reactos/dll/win32/msxml3/cdata.c +++ b/reactos/dll/win32/msxml3/cdata.c @@ -517,12 +517,12 @@ static HRESULT WINAPI domcdata_put_data( static HRESULT WINAPI domcdata_get_length( IXMLDOMCDATASection *iface, - long *len) + LONG *len) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -543,12 +543,12 @@ static HRESULT WINAPI domcdata_get_length( static HRESULT WINAPI domcdata_substringData( IXMLDOMCDATASection *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -618,14 +618,14 @@ static HRESULT WINAPI domcdata_appendData( static HRESULT WINAPI domcdata_insertData( IXMLDOMCDATASection *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -688,7 +688,7 @@ static HRESULT WINAPI domcdata_insertData( static HRESULT WINAPI domcdata_deleteData( IXMLDOMCDATASection *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -696,7 +696,7 @@ static HRESULT WINAPI domcdata_deleteData( static HRESULT WINAPI domcdata_replaceData( IXMLDOMCDATASection *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; @@ -704,7 +704,7 @@ static HRESULT WINAPI domcdata_replaceData( static HRESULT WINAPI domcdata_splitText( IXMLDOMCDATASection *iface, - long offset, IXMLDOMText **txtNode) + LONG offset, IXMLDOMText **txtNode) { FIXME("\n"); return E_NOTIMPL; diff --git a/reactos/dll/win32/msxml3/comment.c b/reactos/dll/win32/msxml3/comment.c index 1950b528c84..717c73d0c45 100644 --- a/reactos/dll/win32/msxml3/comment.c +++ b/reactos/dll/win32/msxml3/comment.c @@ -511,12 +511,12 @@ static HRESULT WINAPI domcomment_put_data( static HRESULT WINAPI domcomment_get_length( IXMLDOMComment *iface, - long *len) + LONG *len) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -537,12 +537,12 @@ static HRESULT WINAPI domcomment_get_length( static HRESULT WINAPI domcomment_substringData( IXMLDOMComment *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -626,14 +626,14 @@ static HRESULT WINAPI domcomment_appendData( static HRESULT WINAPI domcomment_insertData( IXMLDOMComment *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -696,7 +696,7 @@ static HRESULT WINAPI domcomment_insertData( static HRESULT WINAPI domcomment_deleteData( IXMLDOMComment *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -704,7 +704,7 @@ static HRESULT WINAPI domcomment_deleteData( static HRESULT WINAPI domcomment_replaceData( IXMLDOMComment *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; diff --git a/reactos/dll/win32/msxml3/domdoc.c b/reactos/dll/win32/msxml3/domdoc.c index a50b4e9633d..1724093a39e 100644 --- a/reactos/dll/win32/msxml3/domdoc.c +++ b/reactos/dll/win32/msxml3/domdoc.c @@ -1521,7 +1521,7 @@ static HRESULT WINAPI domdoc_load( static HRESULT WINAPI domdoc_get_readyState( IXMLDOMDocument2 *iface, - long* value ) + LONG *value ) { FIXME("\n"); return E_NOTIMPL; diff --git a/reactos/dll/win32/msxml3/httprequest.c b/reactos/dll/win32/msxml3/httprequest.c index c5395738427..bc0fe7c3fb2 100644 --- a/reactos/dll/win32/msxml3/httprequest.c +++ b/reactos/dll/win32/msxml3/httprequest.c @@ -213,7 +213,7 @@ static HRESULT WINAPI httprequest_abort(IXMLHTTPRequest *iface) return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, long *plStatus) +static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *plStatus) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); @@ -267,7 +267,7 @@ static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VAR return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, long *plState) +static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *plState) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); diff --git a/reactos/dll/win32/msxml3/node.c b/reactos/dll/win32/msxml3/node.c index 72cc61e4c15..f33f6f8e6e4 100644 --- a/reactos/dll/win32/msxml3/node.c +++ b/reactos/dll/win32/msxml3/node.c @@ -388,7 +388,7 @@ static HRESULT get_node( if ( !out ) return E_INVALIDARG; - /* if we dont have a doc, use our parent. */ + /* if we don't have a doc, use our parent. */ if(node && !node->doc && node->parent) node->doc = node->parent->doc; diff --git a/reactos/dll/win32/msxml3/nodelist.c b/reactos/dll/win32/msxml3/nodelist.c index c4427751d35..e4ae604a5b9 100644 --- a/reactos/dll/win32/msxml3/nodelist.c +++ b/reactos/dll/win32/msxml3/nodelist.c @@ -198,14 +198,14 @@ static HRESULT WINAPI xmlnodelist_Invoke( static HRESULT WINAPI xmlnodelist_get_item( IXMLDOMNodeList* iface, - long index, + LONG index, IXMLDOMNode** listItem) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); xmlNodePtr curr; - long nodeIndex = 0; + LONG nodeIndex = 0; - TRACE("%p %ld\n", This, index); + TRACE("%p %d\n", This, index); if(!listItem) return E_INVALIDARG; @@ -230,11 +230,11 @@ static HRESULT WINAPI xmlnodelist_get_item( static HRESULT WINAPI xmlnodelist_get_length( IXMLDOMNodeList* iface, - long* listLength) + LONG* listLength) { xmlNodePtr curr; - long nodeCount = 0; + LONG nodeCount = 0; xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); diff --git a/reactos/dll/win32/msxml3/nodemap.c b/reactos/dll/win32/msxml3/nodemap.c index 8c7c1d01f59..825abef3149 100644 --- a/reactos/dll/win32/msxml3/nodemap.c +++ b/reactos/dll/win32/msxml3/nodemap.c @@ -44,7 +44,7 @@ typedef struct _xmlnodemap const struct ISupportErrorInfoVtbl *lpSEIVtbl; LONG ref; IXMLDOMNode *node; - long iterator; + LONG iterator; } xmlnodemap; static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) @@ -329,15 +329,15 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( static HRESULT WINAPI xmlnodemap_get_item( IXMLDOMNamedNodeMap *iface, - long index, + LONG index, IXMLDOMNode** listItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr node; xmlAttrPtr curr; - long attrIndex; + LONG attrIndex; - TRACE("%p %ld\n", This, index); + TRACE("%p %d\n", This, index); *listItem = NULL; @@ -361,12 +361,12 @@ static HRESULT WINAPI xmlnodemap_get_item( static HRESULT WINAPI xmlnodemap_get_length( IXMLDOMNamedNodeMap *iface, - long* listLength) + LONG *listLength) { xmlNodePtr node; xmlAttrPtr first; xmlAttrPtr curr; - long attrCount; + LONG attrCount; xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); @@ -423,9 +423,9 @@ static HRESULT WINAPI xmlnodemap_nextNode( xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr node; xmlAttrPtr curr; - long attrIndex; + LONG attrIndex; - TRACE("%p %ld\n", This, This->iterator); + TRACE("%p %d\n", This, This->iterator); *nextItem = NULL; @@ -451,7 +451,7 @@ static HRESULT WINAPI xmlnodemap_reset( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("%p %ld\n", This, This->iterator); + TRACE("%p %d\n", This, This->iterator); This->iterator = 0; diff --git a/reactos/dll/win32/msxml3/parseerror.c b/reactos/dll/win32/msxml3/parseerror.c index 4db078b690e..b78f82915e9 100644 --- a/reactos/dll/win32/msxml3/parseerror.c +++ b/reactos/dll/win32/msxml3/parseerror.c @@ -191,7 +191,7 @@ static HRESULT WINAPI parseError_Invoke( static HRESULT WINAPI parseError_get_errorCode( IXMLDOMParseError *iface, - long *code ) + LONG *code ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); TRACE("(%p)->(%p)\n", This, code); @@ -238,7 +238,7 @@ static HRESULT WINAPI parseError_get_srcText( static HRESULT WINAPI parseError_get_line( IXMLDOMParseError *iface, - long *line ) + LONG *line ) { FIXME("\n"); return E_NOTIMPL; @@ -246,7 +246,7 @@ static HRESULT WINAPI parseError_get_line( static HRESULT WINAPI parseError_get_linepos( IXMLDOMParseError *iface, - long *linepos ) + LONG *linepos ) { FIXME("\n"); return E_NOTIMPL; @@ -254,7 +254,7 @@ static HRESULT WINAPI parseError_get_linepos( static HRESULT WINAPI parseError_get_filepos( IXMLDOMParseError *iface, - long *filepos ) + LONG *filepos ) { FIXME("\n"); return E_NOTIMPL; diff --git a/reactos/dll/win32/msxml3/queryresult.c b/reactos/dll/win32/msxml3/queryresult.c index e0367bca537..1cdd9f66f47 100644 --- a/reactos/dll/win32/msxml3/queryresult.c +++ b/reactos/dll/win32/msxml3/queryresult.c @@ -212,12 +212,12 @@ static HRESULT WINAPI queryresult_Invoke( static HRESULT WINAPI queryresult_get_item( IXMLDOMNodeList* iface, - long index, + LONG index, IXMLDOMNode** listItem) { queryresult *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p %ld\n", This, index); + TRACE("%p %d\n", This, index); if(!listItem) return E_INVALIDARG; @@ -235,7 +235,7 @@ static HRESULT WINAPI queryresult_get_item( static HRESULT WINAPI queryresult_get_length( IXMLDOMNodeList* iface, - long* listLength) + LONG* listLength) { queryresult *This = impl_from_IXMLDOMNodeList( iface ); diff --git a/reactos/dll/win32/msxml3/schema.c b/reactos/dll/win32/msxml3/schema.c index 08f4933a348..e71586e421a 100644 --- a/reactos/dll/win32/msxml3/schema.c +++ b/reactos/dll/win32/msxml3/schema.c @@ -189,13 +189,13 @@ static HRESULT WINAPI schema_cache_remove( IXMLDOMSchemaCollection *iface, BSTR return E_NOTIMPL; } -static HRESULT WINAPI schema_cache_get_length( IXMLDOMSchemaCollection *iface, long *length ) +static HRESULT WINAPI schema_cache_get_length( IXMLDOMSchemaCollection *iface, LONG *length ) { FIXME("stub\n"); return E_NOTIMPL; } -static HRESULT WINAPI schema_cache_get_namespaceURI( IXMLDOMSchemaCollection *iface, long index, BSTR *len ) +static HRESULT WINAPI schema_cache_get_namespaceURI( IXMLDOMSchemaCollection *iface, LONG index, BSTR *len ) { FIXME("stub\n"); return E_NOTIMPL; diff --git a/reactos/dll/win32/msxml3/text.c b/reactos/dll/win32/msxml3/text.c index 4d78fdd5d2c..0e231994d69 100644 --- a/reactos/dll/win32/msxml3/text.c +++ b/reactos/dll/win32/msxml3/text.c @@ -519,12 +519,12 @@ static HRESULT WINAPI domtext_put_data( static HRESULT WINAPI domtext_get_length( IXMLDOMText *iface, - long *len) + LONG *len) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -545,12 +545,12 @@ static HRESULT WINAPI domtext_get_length( static HRESULT WINAPI domtext_substringData( IXMLDOMText *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -620,14 +620,14 @@ static HRESULT WINAPI domtext_appendData( static HRESULT WINAPI domtext_insertData( IXMLDOMText *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -690,7 +690,7 @@ static HRESULT WINAPI domtext_insertData( static HRESULT WINAPI domtext_deleteData( IXMLDOMText *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -698,7 +698,7 @@ static HRESULT WINAPI domtext_deleteData( static HRESULT WINAPI domtext_replaceData( IXMLDOMText *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; @@ -706,7 +706,7 @@ static HRESULT WINAPI domtext_replaceData( static HRESULT WINAPI domtext_splitText( IXMLDOMText *iface, - long offset, IXMLDOMText **txtNode) + LONG offset, IXMLDOMText **txtNode) { FIXME("\n"); return E_NOTIMPL; diff --git a/reactos/dll/win32/msxml3/xmldoc.c b/reactos/dll/win32/msxml3/xmldoc.c index ea2d06268f7..1a8c89404c5 100644 --- a/reactos/dll/win32/msxml3/xmldoc.c +++ b/reactos/dll/win32/msxml3/xmldoc.c @@ -419,7 +419,7 @@ static HRESULT WINAPI xmldoc_get_mimeType(IXMLDocument *iface, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI xmldoc_get_readyState(IXMLDocument *iface, long *p) +static HRESULT WINAPI xmldoc_get_readyState(IXMLDocument *iface, LONG *p) { FIXME("(%p, %p): stub\n", iface, p); return E_NOTIMPL; @@ -455,7 +455,7 @@ static HRESULT WINAPI xmldoc_get_dtdURl(IXMLDocument *iface, BSTR *p) return E_NOTIMPL; } -static xmlElementType type_msxml_to_libxml(long type) +static xmlElementType type_msxml_to_libxml(LONG type) { switch (type) { diff --git a/reactos/dll/win32/msxml3/xmlelem.c b/reactos/dll/win32/msxml3/xmlelem.c index 97e342961b9..93cc53a2047 100644 --- a/reactos/dll/win32/msxml3/xmlelem.c +++ b/reactos/dll/win32/msxml3/xmlelem.c @@ -333,7 +333,7 @@ static HRESULT WINAPI xmlelem_get_children(IXMLElement *iface, IXMLElementCollec return XMLElementCollection_create((IUnknown *)iface, This->node->children, (LPVOID *)p); } -static long type_libxml_to_msxml(xmlElementType type) +static LONG type_libxml_to_msxml(xmlElementType type) { switch (type) { @@ -356,7 +356,7 @@ static long type_libxml_to_msxml(xmlElementType type) return XMLELEMTYPE_OTHER; } -static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, long *p) +static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, LONG *p) { xmlelem *This = impl_from_IXMLElement(iface); @@ -366,7 +366,7 @@ static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, long *p) return E_INVALIDARG; *p = type_libxml_to_msxml(This->node->type); - TRACE("returning %ld\n", *p); + TRACE("returning %d\n", *p); return S_OK; } @@ -408,13 +408,13 @@ static HRESULT WINAPI xmlelem_put_text(IXMLElement *iface, BSTR p) } static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildElem, - long lIndex, long lreserved) + LONG lIndex, LONG lreserved) { xmlelem *This = impl_from_IXMLElement(iface); xmlelem *childElem = impl_from_IXMLElement(pChildElem); xmlNodePtr child; - TRACE("(%p, %p, %ld, %ld)\n", iface, pChildElem, lIndex, lreserved); + TRACE("(%p, %p, %d, %d)\n", iface, pChildElem, lIndex, lreserved); if (lIndex == 0) child = xmlAddChild(This->node, childElem->node); @@ -582,13 +582,13 @@ static HRESULT WINAPI xmlelem_collection_Invoke(IXMLElementCollection *iface, DI return E_NOTIMPL; } -static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, long v) +static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, LONG v) { - TRACE("(%p, %ld)\n", iface, v); + TRACE("(%p, %d)\n", iface, v); return E_FAIL; } -static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface, long *p) +static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface, LONG *p) { xmlelem_collection *This = impl_from_IXMLElementCollection(iface); diff --git a/reactos/include/psdk/msxml.idl b/reactos/include/psdk/msxml.idl index ff5cc498981..8c2496b2abe 100644 --- a/reactos/include/psdk/msxml.idl +++ b/reactos/include/psdk/msxml.idl @@ -37,10 +37,10 @@ uuid(65725580-9b5d-11d0-9bfe-00c04fc99c8e) interface IXMLElementCollection : IDispatch { [propput, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] - HRESULT length( [in] long v ); + HRESULT length( [in] LONG v ); [propget, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] - HRESULT length( [retval, out] long *p ); + HRESULT length( [retval, out] LONG *p ); [propget, id(DISPID_XMLELEMENTCOLLECTION_NEWENUM)] HRESULT _newEnum( [retval, out] IUnknown ** ppUnk ); @@ -86,7 +86,7 @@ interface IXMLElement : IDispatch HRESULT children( [retval, out] IXMLElementCollection **p ); [propget, id(DISPID_XMLELEMENT_TYPE)] - HRESULT type( [retval, out] long *p ); + HRESULT type( [retval, out] LONG *p ); [propget, id(DISPID_XMLELEMENT_TEXT)] HRESULT text( [retval, out] BSTR *p ); @@ -97,8 +97,8 @@ interface IXMLElement : IDispatch [id(DISPID_XMLELEMENT_ADDCHILD)] HRESULT addChild( [in] IXMLElement *pChildElem, - [in] long lIndex, - [in] long lreserved ); + [in] LONG lIndex, + [in] LONG lreserved ); [id(DISPID_XMLELEMENT_REMOVECHILD)] HRESULT removeChild( @@ -134,7 +134,7 @@ interface IXMLDocument : IDispatch HRESULT mimeType( [retval, out] BSTR *p ); [propget, id(DISPID_XMLDOCUMENT_READYSTATE)] - HRESULT readyState( [retval, out] long *p ); + HRESULT readyState( [retval, out] LONG *p ); [propget, id(DISPID_XMLDOCUMENT_CHARSET)] HRESULT charset( [retval, out] BSTR *p ); @@ -191,7 +191,7 @@ interface IXMLElement2 : IDispatch HRESULT children([retval, out] IXMLElementCollection **pp); [propget, id(DISPID_XMLELEMENT_TYPE)] - HRESULT type([retval, out] long *plType); + HRESULT type([retval, out] LONG *plType); [propget, id(DISPID_XMLELEMENT_TEXT)] HRESULT text([retval, out] BSTR *p); @@ -202,8 +202,8 @@ interface IXMLElement2 : IDispatch [id(DISPID_XMLELEMENT_ADDCHILD)] HRESULT addChild( [in] IXMLElement2 *pChildElem, - [in] long lIndex, - [in] long lReserved); + [in] LONG lIndex, + [in] LONG lReserved); [id(DISPID_XMLELEMENT_REMOVECHILD)] HRESULT removeChild([in]IXMLElement2 *pChildElem); @@ -241,7 +241,7 @@ interface IXMLDocument2 : IDispatch HRESULT mimeType([retval, out] BSTR *p); [propget, id(DISPID_XMLDOCUMENT_READYSTATE)] - HRESULT readyState([retval, out]long *pl); + HRESULT readyState([retval, out]LONG *pl); [propget, id(DISPID_XMLDOCUMENT_CHARSET)] HRESULT charset([retval, out]BSTR *p); diff --git a/reactos/include/psdk/msxml2.idl b/reactos/include/psdk/msxml2.idl index 49d057c2b4e..e6f07b3b8b4 100644 --- a/reactos/include/psdk/msxml2.idl +++ b/reactos/include/psdk/msxml2.idl @@ -327,7 +327,7 @@ interface IXMLDOMDocument : IXMLDOMNode [retval, out] VARIANT_BOOL *pbool); [propget, id(DISPID_READYSTATE)] - HRESULT readyState([retval, out] long *value); + HRESULT readyState([retval, out] LONG *value); [propget, id(DISPID_XMLDOM_DOCUMENT_PARSEERROR)] HRESULT parseError([retval, out] IXMLDOMParseError **err); @@ -404,10 +404,10 @@ interface IXMLDOMSchemaCollection : IDispatch [propget, id(DISPID_XMLDOM_SCHEMACOLLECTION_LENGTH)] HRESULT length( - [retval, out] long *length); + [retval, out] LONG *length); [propget, id(DISPID_VALUE)] - HRESULT namespaceURI([in] long index, [out, retval] BSTR *len); + HRESULT namespaceURI([in] LONG index, [out, retval] BSTR *len); [id(DISPID_XMLDOM_SCHEMACOLLECTION_ADDCOLLECTION)] HRESULT addCollection( @@ -456,10 +456,10 @@ uuid (2933BF82-7B36-11d2-B20E-00C04F983E60) interface IXMLDOMNodeList : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT item([in] long lIndex, [retval, out] IXMLDOMNode **outNode); + HRESULT item([in] LONG lIndex, [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length([retval, out] long *lLength); + HRESULT length([retval, out] LONG *lLength); [id(DISPID_XMLDOM_NODELIST_NEXTNODE)] HRESULT nextNode( @@ -545,10 +545,10 @@ interface IXMLDOMNamedNodeMap : IDispatch [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_VALUE)] - HRESULT item([in] long lIndex, [retval, out] IXMLDOMNode **outNode); + HRESULT item([in] LONG lIndex, [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length([retval, out] long *lLength); + HRESULT length([retval, out] LONG *lLength); [id(DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM)] HRESULT getQualifiedItem( @@ -596,12 +596,12 @@ interface IXMLDOMCharacterData : IXMLDOMNode HRESULT data([in] BSTR data); [propget, id(DISPID_DOM_DATA_LENGTH)] - HRESULT length([retval, out] long *len); + HRESULT length([retval, out] LONG *len); [id(DISPID_DOM_DATA_SUBSTRING)] HRESULT substringData( - [in] long offset, - [in] long count, + [in] LONG offset, + [in] LONG count, [retval, out] BSTR *p); [id(DISPID_DOM_DATA_APPEND)] @@ -610,18 +610,18 @@ interface IXMLDOMCharacterData : IXMLDOMNode [id(DISPID_DOM_DATA_INSERT)] HRESULT insertData( - [in] long offset, + [in] LONG offset, [in] BSTR p); [id(DISPID_DOM_DATA_DELETE)] HRESULT deleteData( - [in] long offset, - [in] long count); + [in] LONG offset, + [in] LONG count); [id(DISPID_DOM_DATA_REPLACE)] HRESULT replaceData( - [in] long offset, - [in] long count, + [in] LONG offset, + [in] LONG count, [in] BSTR p); } @@ -699,7 +699,7 @@ interface IXMLDOMText : IXMLDOMCharacterData { [id(DISPID_DOM_TEXT_SPLITTEXT)] HRESULT splitText( - [in] long offset, + [in] LONG offset, [retval, out] IXMLDOMText **txtNode); } @@ -819,32 +819,32 @@ interface IXTLRuntime : IXMLDOMNode [id(DISPID_XTLRUNTIME_UNIQUEID)] HRESULT uniqueID( [in]IXMLDOMNode *pNode, - [retval, out]long *pID); + [retval, out]LONG *pID); [id(DISPID_XTLRUNTIME_DEPTH)] HRESULT depth( [in] IXMLDOMNode *pNode, - [retval, out]long * pDepth); + [retval, out]LONG * pDepth); [id(DISPID_XTLRUNTIME_CHILDNUMBER)] HRESULT childNumber( [in]IXMLDOMNode *pNode, - [retval, out] long *pNumber); + [retval, out] LONG *pNumber); [id(DISPID_XTLRUNTIME_ANCESTORCHILDNUMBER)] HRESULT ancestorChildNumber( [in]BSTR bstr, [in]IXMLDOMNode *pNode, - [retval, out]long *pNumber); + [retval, out]LONG *pNumber); [id(DISPID_XTLRUNTIME_ABSOLUTECHILDNUMBER)] HRESULT absoluteChildNumber( [in]IXMLDOMNode *pNode, - [retval, out]long *pNumber); + [retval, out]LONG *pNumber); [id(DISPID_XTLRUNTIME_FORMATINDEX)] HRESULT formatIndex( - [in] long lIndex, + [in] LONG lIndex, [in] BSTR bstr, [retval, out]BSTR *pbstr); @@ -925,7 +925,7 @@ interface IXSLProcessor : IDispatch HRESULT reset(); [propget, id(DISPID_XMLDOM_PROCESSOR_READYSTATE)] - HRESULT readyState([retval, out] long *pstate); + HRESULT readyState([retval, out] LONG *pstate); [id(DISPID_XMLDOM_PROCESSOR_ADDPARAMETER)] HRESULT addParameter( @@ -990,7 +990,7 @@ interface IXMLHTTPRequest : IDispatch HRESULT abort(); [propget, id(7)] - HRESULT status([out, retval] long *pStatus); + HRESULT status([out, retval] LONG *pStatus); [propget, id(8)] HRESULT statusText([out, retval] BSTR *pStatus); @@ -1008,7 +1008,7 @@ interface IXMLHTTPRequest : IDispatch HRESULT responseStream([out, retval] VARIANT *pBody); [propget, id(13)] - HRESULT readyState([out, retval] long *pState); + HRESULT readyState([out, retval] LONG *pState); [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); @@ -1022,7 +1022,7 @@ uuid (3efaa426-272f-11d2-836f-0000f87a7782) interface IXMLDOMParseError : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT errorCode([retval, out] long *errCode); + HRESULT errorCode([retval, out] LONG *errCode); [propget, id(DISPID_DOM_ERROR_URL)] HRESULT url([retval, out] BSTR *p); @@ -1034,13 +1034,13 @@ interface IXMLDOMParseError : IDispatch HRESULT srcText([retval, out] BSTR *p); [propget, id(DISPID_DOM_ERROR_LINE)] - HRESULT line([retval, out] long *lineNo); + HRESULT line([retval, out] LONG *lineNo); [propget, id(DISPID_DOM_ERROR_LINEPOS)] - HRESULT linepos([retval, out] long * linePos); + HRESULT linepos([retval, out] LONG * linePos); [propget, id(DISPID_DOM_ERROR_FILEPOS)] - HRESULT filepos([retval, out] long * filePos); + HRESULT filepos([retval, out] LONG * filePos); } [ @@ -1690,21 +1690,21 @@ interface IVBSAXErrorHandler : IDispatch { [id(DISPID_SAX_ERRORHANDLER_ERROR)] HRESULT error( - [in] IVBSAXLocator * locator, + [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); [id(DISPID_SAX_ERRORHANDLER_FATALERROR)] HRESULT fatalError( [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); [id(DISPID_SAX_ERRORHANDLER_IGNORABLEWARNING)] HRESULT ignorableWarning( [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); }; [