msxml3: Change long to LONG in msxml2.idl and xmldom.idl.

dlls/msxml3/cdata.c

@@ -517,7 +517,7 @@ 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 );
@@ -543,7 +543,7 @@ 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 );
@@ -618,7 +618,7 @@ 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 );
@@ -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;

dlls/msxml3/comment.c

@@ -511,7 +511,7 @@ 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 );
@@ -537,7 +537,7 @@ 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 );
@@ -626,7 +626,7 @@ 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 );
@@ -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;

dlls/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;

dlls/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 );
 

dlls/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;
 
-    TRACE("%p %ld\n", This, index);
+    TRACE("%p %d\n", This, index);
 
     if(!listItem)
         return E_INVALIDARG;
@@ -230,7 +230,7 @@ static HRESULT WINAPI xmlnodelist_get_item(
 
 static HRESULT WINAPI xmlnodelist_get_length(
         IXMLDOMNodeList* iface,
-        long* listLength)
+        LONG* listLength)
 {
 
     xmlNodePtr curr;

dlls/msxml3/nodemap.c

@@ -329,7 +329,7 @@ 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 );
@@ -337,7 +337,7 @@ static HRESULT WINAPI xmlnodemap_get_item(
     xmlAttrPtr curr;
     long attrIndex;
 
-    TRACE("%p %ld\n", This, index);
+    TRACE("%p %d\n", This, index);
 
     *listItem = NULL;
 
@@ -361,7 +361,7 @@ static HRESULT WINAPI xmlnodemap_get_item(
 
 static HRESULT WINAPI xmlnodemap_get_length(
     IXMLDOMNamedNodeMap *iface,
-    long* listLength)
+    LONG *listLength)
 {
     xmlNodePtr node;
     xmlAttrPtr first;

dlls/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;

dlls/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 );
 

dlls/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;

dlls/msxml3/text.c

@@ -519,7 +519,7 @@ 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 );
@@ -545,7 +545,7 @@ 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 );
@@ -620,7 +620,7 @@ 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 );
@@ -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;

include/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);
 };
 
 [

include/xmldom.idl

@@ -264,7 +264,7 @@ interface IXMLDOMDocument : IXMLDOMNode
                   [out,retval] VARIANT_BOOL *isSuccessful );
 
     [propget, id(DISPID_READYSTATE)]
-    HRESULT readyState( [out,retval] long *value );
+    HRESULT readyState( [out,retval] LONG *value );
 
     [propget, id(DISPID_XMLDOM_DOCUMENT_PARSEERROR)]
     HRESULT parseError( [out,retval] IXMLDOMParseError **errorObj );
@@ -330,11 +330,11 @@ pointer_default(unique)
 interface IXMLDOMNodeList : IDispatch
 {
     [propget, id(DISPID_VALUE)]
-    HRESULT item( [in] long index,
+    HRESULT item( [in] LONG index,
                   [out,retval] IXMLDOMNode **listItem );
 
     [propget, id(DISPID_DOM_NODELIST_LENGTH)]
-    HRESULT length( [out,retval] long *listLength );
+    HRESULT length( [out,retval] LONG *listLength );
 
     [id(DISPID_XMLDOM_NODELIST_NEXTNODE)]
     HRESULT nextNode( [out,retval] IXMLDOMNode **nextItem );
@@ -371,11 +371,11 @@ interface IXMLDOMNamedNodeMap : IDispatch
                              [out,retval] IXMLDOMNode **namedItem );
 
     [propget, id(DISPID_VALUE)]
-    HRESULT item( [in] long index,
+    HRESULT item( [in] LONG index,
                   [out,retval] IXMLDOMNode **listItem );
 
     [propget, id(DISPID_DOM_NODELIST_LENGTH)]
-    HRESULT length( [out,retval] long *listLength );
+    HRESULT length( [out,retval] LONG *listLength );
 
     [id(DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM)]
     HRESULT getQualifiedItem( [in] BSTR baseName,
@@ -431,27 +431,27 @@ interface IXMLDOMCharacterData : IXMLDOMNode
     HRESULT data( [in] BSTR data );
 
     [propget, id(DISPID_DOM_DATA_LENGTH)]
-    HRESULT length( [out,retval] long *dataLength );
+    HRESULT length( [out,retval] LONG *dataLength );
 
     [id(DISPID_DOM_DATA_SUBSTRING)]
-    HRESULT substringData( [in] long offset,
-                           [in] long count,
+    HRESULT substringData( [in] LONG offset,
+                           [in] LONG count,
                            [out,retval] BSTR *data );
 
     [id(DISPID_DOM_DATA_APPEND)]
     HRESULT appendData( [in] BSTR data );
 
     [id(DISPID_DOM_DATA_INSERT)]
-    HRESULT insertData( [in] long offset,
+    HRESULT insertData( [in] LONG offset,
                         [in] BSTR data );
 
     [id(DISPID_DOM_DATA_DELETE)]
-    HRESULT deleteData( [in] long offset,
-                        [in] long count );
+    HRESULT deleteData( [in] LONG offset,
+                        [in] LONG count );
 
     [id(DISPID_DOM_DATA_REPLACE)]
-    HRESULT replaceData( [in] long offset,
-                         [in] long count,
+    HRESULT replaceData( [in] LONG offset,
+                         [in] LONG count,
                          [in] BSTR data );
 }
 
@@ -536,7 +536,7 @@ pointer_default(unique)
 interface IXMLDOMText : IXMLDOMCharacterData
 {
     [id(DISPID_DOM_TEXT_SPLITTEXT)]
-    HRESULT splitText( [in] long offset,
+    HRESULT splitText( [in] LONG offset,
                        [out,retval] IXMLDOMText **rightHandTextNode );
 }
 
@@ -699,7 +699,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);
@@ -711,13 +711,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);
 }
 
 [
@@ -784,7 +784,7 @@ interface IXMLHttpRequest : IDispatch
     HRESULT abort();
 
     [propget, id(7)]
-    HRESULT status([out, retval] long *plStatus);
+    HRESULT status([out, retval] LONG *plStatus);
 
     [propget, id(8)]
     HRESULT statusText([out, retval] BSTR *bstrStatus);
@@ -802,7 +802,7 @@ interface IXMLHttpRequest : IDispatch
     HRESULT responseStream([out, retval] VARIANT *pvarBody);
 
     [propget, id(13)]
-    HRESULT readyState([out, retval] long *plState);
+    HRESULT readyState([out, retval] LONG *plState);
 
     [propput, id(14)]
     HRESULT onreadystatechange([in] IDispatch *pReadyStateSink);