Author: cwittich
Date: Tue Apr 28 23:57:36 2009
New Revision: 40719
URL: http://svn.reactos.org/svn/reactos?rev=40719&view=rev
Log:
sync msxml3 with wine 1.1.20
Modified:
trunk/reactos/dll/win32/msxml3/cdata.c
trunk/reactos/dll/win32/msxml3/comment.c
trunk/reactos/dll/win32/msxml3/domdoc.c
trunk/reactos/dll/win32/msxml3/httprequest.c
trunk/reactos/dll/win32/msxml3/node.c
trunk/reactos/dll/win32/msxml3/nodelist.c
trunk/reactos/dll/win32/msxml3/nodemap.c
trunk/reactos/dll/win32/msxml3/parseerror.c
trunk/reactos/dll/win32/msxml3/queryresult.c
trunk/reactos/dll/win32/msxml3/schema.c
trunk/reactos/dll/win32/msxml3/text.c
trunk/reactos/dll/win32/msxml3/xmldoc.c
trunk/reactos/dll/win32/msxml3/xmlelem.c
trunk/reactos/include/psdk/msxml.idl
trunk/reactos/include/psdk/msxml2.idl
Modified: trunk/reactos/dll/win32/msxml3/cdata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Tue Apr 28 23:57:36 2009
@@ -517,12 +517,12 @@
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_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_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_deleteData(
IXMLDOMCDATASection *iface,
- long offset, long count)
+ LONG offset, LONG count)
{
FIXME("\n");
return E_NOTIMPL;
@@ -696,7 +696,7 @@
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_splitText(
IXMLDOMCDATASection *iface,
- long offset, IXMLDOMText **txtNode)
+ LONG offset, IXMLDOMText **txtNode)
{
FIXME("\n");
return E_NOTIMPL;
Modified: trunk/reactos/dll/win32/msxml3/comment.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Tue Apr 28 23:57:36
2009
@@ -511,12 +511,12 @@
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_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_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_deleteData(
IXMLDOMComment *iface,
- long offset, long count)
+ LONG offset, LONG count)
{
FIXME("\n");
return E_NOTIMPL;
@@ -704,7 +704,7 @@
static HRESULT WINAPI domcomment_replaceData(
IXMLDOMComment *iface,
- long offset, long count, BSTR p)
+ LONG offset, LONG count, BSTR p)
{
FIXME("\n");
return E_NOTIMPL;
Modified: trunk/reactos/dll/win32/msxml3/domdoc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Tue Apr 28 23:57:36
2009
@@ -1521,7 +1521,7 @@
static HRESULT WINAPI domdoc_get_readyState(
IXMLDOMDocument2 *iface,
- long* value )
+ LONG *value )
{
FIXME("\n");
return E_NOTIMPL;
Modified: trunk/reactos/dll/win32/msxml3/httprequest.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httprequest.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Tue Apr 28
23:57:36 2009
@@ -213,7 +213,7 @@
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 @@
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 );
Modified: trunk/reactos/dll/win32/msxml3/node.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Tue Apr 28 23:57:36 2009
@@ -388,7 +388,7 @@
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;
Modified: trunk/reactos/dll/win32/msxml3/nodelist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Tue Apr 28 23:57:36
2009
@@ -198,14 +198,14 @@
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;
-
- TRACE("%p %ld\n", This, index);
+ LONG nodeIndex = 0;
+
+ TRACE("%p %d\n", This, index);
if(!listItem)
return E_INVALIDARG;
@@ -230,11 +230,11 @@
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 );
Modified: trunk/reactos/dll/win32/msxml3/nodemap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] Tue Apr 28 23:57:36
2009
@@ -44,7 +44,7 @@
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_get_item(
IXMLDOMNamedNodeMap *iface,
- long index,
+ LONG index,
IXMLDOMNode** listItem)
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
xmlNodePtr node;
xmlAttrPtr curr;
- long attrIndex;
-
- TRACE("%p %ld\n", This, index);
+ LONG attrIndex;
+
+ TRACE("%p %d\n", This, index);
*listItem = NULL;
@@ -361,12 +361,12 @@
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 @@
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
xmlNodePtr node;
xmlAttrPtr curr;
- long attrIndex;
-
- TRACE("%p %ld\n", This, This->iterator);
+ LONG attrIndex;
+
+ TRACE("%p %d\n", This, This->iterator);
*nextItem = NULL;
@@ -451,7 +451,7 @@
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
- TRACE("%p %ld\n", This, This->iterator);
+ TRACE("%p %d\n", This, This->iterator);
This->iterator = 0;
Modified: trunk/reactos/dll/win32/msxml3/parseerror.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerror.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] Tue Apr 28
23:57:36 2009
@@ -191,7 +191,7 @@
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_line(
IXMLDOMParseError *iface,
- long *line )
+ LONG *line )
{
FIXME("\n");
return E_NOTIMPL;
@@ -246,7 +246,7 @@
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_filepos(
IXMLDOMParseError *iface,
- long *filepos )
+ LONG *filepos )
{
FIXME("\n");
return E_NOTIMPL;
Modified: trunk/reactos/dll/win32/msxml3/queryresult.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/queryresult.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] Tue Apr 28
23:57:36 2009
@@ -212,12 +212,12 @@
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_length(
IXMLDOMNodeList* iface,
- long* listLength)
+ LONG* listLength)
{
queryresult *This = impl_from_IXMLDOMNodeList( iface );
Modified: trunk/reactos/dll/win32/msxml3/schema.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Tue Apr 28 23:57:36
2009
@@ -189,13 +189,13 @@
return E_NOTIMPL;
}
-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_length( IXMLDOMSchemaCollection *iface,
LONG *length )
+{
+ FIXME("stub\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI schema_cache_get_namespaceURI( IXMLDOMSchemaCollection
*iface, LONG index, BSTR *len )
{
FIXME("stub\n");
return E_NOTIMPL;
Modified: trunk/reactos/dll/win32/msxml3/text.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] Tue Apr 28 23:57:36 2009
@@ -519,12 +519,12 @@
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_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_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_deleteData(
IXMLDOMText *iface,
- long offset, long count)
+ LONG offset, LONG count)
{
FIXME("\n");
return E_NOTIMPL;
@@ -698,7 +698,7 @@
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_splitText(
IXMLDOMText *iface,
- long offset, IXMLDOMText **txtNode)
+ LONG offset, IXMLDOMText **txtNode)
{
FIXME("\n");
return E_NOTIMPL;
Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] Tue Apr 28 23:57:36
2009
@@ -419,7 +419,7 @@
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 @@
return E_NOTIMPL;
}
-static xmlElementType type_msxml_to_libxml(long type)
+static xmlElementType type_msxml_to_libxml(LONG type)
{
switch (type)
{
Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] Tue Apr 28 23:57:36
2009
@@ -333,7 +333,7 @@
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 @@
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 @@
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_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 @@
return E_NOTIMPL;
}
-static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection
*iface, long v)
-{
- TRACE("(%p, %ld)\n", iface, v);
+static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection
*iface, LONG 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);
Modified: trunk/reactos/include/psdk/msxml.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml.idl?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/include/psdk/msxml.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/msxml.idl [iso-8859-1] Tue Apr 28 23:57:36 2009
@@ -37,10 +37,10 @@
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 @@
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 @@
[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 @@
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 @@
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 @@
[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 @@
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);
Modified: trunk/reactos/include/psdk/msxml2.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?rev=40719&r1=40718&r2=40719&view=diff
==============================================================================
--- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Tue Apr 28 23:57:36 2009
@@ -327,7 +327,7 @@
[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 @@
[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 @@
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 @@
[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 @@
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 @@
[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 @@
{
[id(DISPID_DOM_TEXT_SPLITTEXT)]
HRESULT splitText(
- [in] long offset,
+ [in] LONG offset,
[retval, out] IXMLDOMText **txtNode);
}
@@ -819,32 +819,32 @@
[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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
{
[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);
};
[
