[PATCH 1/3] msxml3: Change long to LONG in msxml2.idl and xmldom.idl.
Michael Stefaniuc
mstefani at redhat.de
Mon Mar 9 17:28:16 CDT 2009
---
dlls/msxml3/cdata.c | 12 +++---
dlls/msxml3/comment.c | 10 +++---
dlls/msxml3/domdoc.c | 2 +-
dlls/msxml3/httprequest.c | 4 +-
dlls/msxml3/nodelist.c | 6 ++--
dlls/msxml3/nodemap.c | 6 ++--
dlls/msxml3/parseerror.c | 8 ++--
dlls/msxml3/queryresult.c | 6 ++--
dlls/msxml3/schema.c | 4 +-
dlls/msxml3/tests/domdoc.c | 80 ++++++++++++++++++++++----------------------
dlls/msxml3/text.c | 12 +++---
include/msxml2.idl | 66 ++++++++++++++++++------------------
include/xmldom.idl | 40 +++++++++++-----------
13 files changed, 128 insertions(+), 128 deletions(-)
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index 7672bba..52548b2 100644
--- a/dlls/msxml3/cdata.c
+++ b/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;
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index 1950b52..a29e3d5 100644
--- a/dlls/msxml3/comment.c
+++ b/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;
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index a50b4e9..1724093 100644
--- a/dlls/msxml3/domdoc.c
+++ b/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;
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index c539573..bc0fe7c 100644
--- a/dlls/msxml3/httprequest.c
+++ b/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 );
diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
index c442775..45b1271 100644
--- a/dlls/msxml3/nodelist.c
+++ b/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;
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index 8c7c1d0..1fa48ab 100644
--- a/dlls/msxml3/nodemap.c
+++ b/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;
diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
index 4db078b..b78f829 100644
--- a/dlls/msxml3/parseerror.c
+++ b/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;
diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
index e0367bc..1cdd9f6 100644
--- a/dlls/msxml3/queryresult.c
+++ b/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 );
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index 08f4933..e71586e 100644
--- a/dlls/msxml3/schema.c
+++ b/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;
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index c70e6ed..18b9576 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -376,7 +376,7 @@ static char *list_to_string(IXMLDOMNodeList *list)
{
static char buf[4096];
char *pos = buf;
- long len = 0;
+ LONG len = 0;
int i;
if (list == NULL)
@@ -418,8 +418,8 @@ static void test_domdoc( void )
VARIANT_BOOL b;
VARIANT var;
BSTR str;
- long code;
- long nLength = 0;
+ LONG code;
+ LONG nLength = 0;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -571,7 +571,7 @@ static void test_domdoc( void )
r = IXMLDOMParseError_get_errorCode( error, &code );
ok( r == S_FALSE, "returns %08x\n", r );
- ok( code == 0, "code %ld\n", code );
+ ok( code == 0, "code %d\n", code );
IXMLDOMParseError_Release( error );
/* test createTextNode */
@@ -618,7 +618,7 @@ static void test_domdoc( void )
r = IXMLDOMText_get_length(nodetext, &nLength);
ok(r == S_OK, "ret %08x\n", r );
- ok(nLength == 4, "expected 4 got %ld\n", nLength);
+ ok(nLength == 4, "expected 4 got %d\n", nLength);
/* test nodeTypeString */
r = IXMLDOMText_get_nodeTypeString(nodetext, &str);
@@ -909,7 +909,7 @@ static void test_domnode( void )
VARIANT_BOOL b;
BSTR str;
VARIANT var;
- long count;
+ LONG count;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -1244,7 +1244,7 @@ todo_wine
r = IXMLDOMNodeList_get_length( list, &count );
ok( r == S_OK, "get_length returns %08x\n", r );
- ok( count == 4, "get_length got %ld\n", count );
+ ok( count == 4, "get_length got %d\n", count );
r = IXMLDOMNodeList_nextNode(list, NULL);
ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r);
@@ -1439,7 +1439,7 @@ static void test_create(void)
IXMLDOMNamedNodeMap *attr_map;
IUnknown *unk;
LONG ref;
- long num;
+ LONG num;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -1536,7 +1536,7 @@ static void test_create(void)
ok( r == S_OK, "returns %08x\n", r );
r = IXMLDOMNamedNodeMap_get_length( attr_map, &num );
ok( r == S_OK, "returns %08x\n", r );
- ok( num == 0, "num %ld\n", num );
+ ok( num == 0, "num %d\n", num );
IXMLDOMNamedNodeMap_Release( attr_map );
V_VT(&var) = VT_BSTR;
@@ -1548,7 +1548,7 @@ static void test_create(void)
ok( r == S_OK, "returns %08x\n", r );
r = IXMLDOMNamedNodeMap_get_length( attr_map, &num );
ok( r == S_OK, "returns %08x\n", r );
- ok( num == 1, "num %ld\n", num );
+ ok( num == 1, "num %d\n", num );
IXMLDOMNamedNodeMap_Release( attr_map );
VariantClear(&var);
@@ -1560,7 +1560,7 @@ static void test_create(void)
ok( r == S_OK, "returns %08x\n", r );
r = IXMLDOMNamedNodeMap_get_length( attr_map, &num );
ok( r == S_OK, "returns %08x\n", r );
- ok( num == 1, "num %ld\n", num );
+ ok( num == 1, "num %d\n", num );
IXMLDOMNamedNodeMap_Release( attr_map );
VariantClear(&var);
r = IXMLDOMElement_getAttribute( element, name, &var );
@@ -1578,7 +1578,7 @@ static void test_create(void)
ok( r == S_OK, "returns %08x\n", r );
r = IXMLDOMNamedNodeMap_get_length( attr_map, &num );
ok( r == S_OK, "returns %08x\n", r );
- ok( num == 2, "num %ld\n", num );
+ ok( num == 2, "num %d\n", num );
IXMLDOMNamedNodeMap_Release( attr_map );
VariantClear(&var);
SysFreeString(name);
@@ -1626,7 +1626,7 @@ static void test_getElementsByTagName(void)
IXMLDOMDocument *doc;
IXMLDOMNodeList *node_list;
IDispatchEx *dispex;
- long len;
+ LONG len;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -1644,7 +1644,7 @@ static void test_getElementsByTagName(void)
ok( r == S_OK, "ret %08x\n", r );
r = IXMLDOMNodeList_get_length( node_list, &len );
ok( r == S_OK, "ret %08x\n", r );
- ok( len == 6, "len %ld\n", len );
+ ok( len == 6, "len %d\n", len );
r = IXMLDOMNodeList_QueryInterface( node_list, &IID_IDispatchEx, (void**)&dispex );
ok( r == S_OK, "rets %08x\n", r);
@@ -1692,7 +1692,7 @@ static void test_getElementsByTagName(void)
ok( r == S_OK, "ret %08x\n", r );
r = IXMLDOMNodeList_get_length( node_list, &len );
ok( r == S_OK, "ret %08x\n", r );
- ok( len == 1, "len %ld\n", len );
+ ok( len == 1, "len %d\n", len );
IXMLDOMNodeList_Release( node_list );
SysFreeString( str );
@@ -1701,7 +1701,7 @@ static void test_getElementsByTagName(void)
ok( r == S_OK, "ret %08x\n", r );
r = IXMLDOMNodeList_get_length( node_list, &len );
ok( r == S_OK, "ret %08x\n", r );
- ok( len == 0, "len %ld\n", len );
+ ok( len == 0, "len %d\n", len );
IXMLDOMNodeList_Release( node_list );
SysFreeString( str );
@@ -1710,7 +1710,7 @@ static void test_getElementsByTagName(void)
ok( r == S_OK, "ret %08x\n", r );
r = IXMLDOMNodeList_get_length( node_list, &len );
ok( r == S_OK, "ret %08x\n", r );
- ok( len == 0, "len %ld\n", len );
+ ok( len == 0, "len %d\n", len );
IXMLDOMNodeList_Release( node_list );
SysFreeString( str );
@@ -1727,7 +1727,7 @@ static void test_get_text(void)
IXMLDOMNode *nodeRoot;
IXMLDOMNodeList *node_list;
IXMLDOMNamedNodeMap *node_map;
- long len;
+ LONG len;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -1769,7 +1769,7 @@ static void test_get_text(void)
r = IXMLDOMNodeList_get_length( node_list, &len );
ok( r == S_OK, "ret %08x\n", r );
- ok( len == 1, "expect 1 got %ld\n", len );
+ ok( len == 1, "expect 1 got %d\n", len );
r = IXMLDOMNodeList_get_item( node_list, 0, NULL );
ok( r == E_INVALIDARG, "ret %08x\n", r );
@@ -1828,7 +1828,7 @@ static void test_get_childNodes(void)
IXMLDOMElement *element;
IXMLDOMNode *node, *node2;
IXMLDOMNodeList *node_list, *node_list2;
- long len;
+ LONG len;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -1849,7 +1849,7 @@ static void test_get_childNodes(void)
r = IXMLDOMNodeList_get_length( node_list, &len );
ok( r == S_OK, "ret %08x\n", r);
- ok( len == 4, "len %ld\n", len);
+ ok( len == 4, "len %d\n", len);
r = IXMLDOMNodeList_get_item( node_list, 2, &node );
ok( r == S_OK, "ret %08x\n", r);
@@ -1859,7 +1859,7 @@ static void test_get_childNodes(void)
r = IXMLDOMNodeList_get_length( node_list2, &len );
ok( r == S_OK, "ret %08x\n", r);
- ok( len == 0, "len %ld\n", len);
+ ok( len == 0, "len %d\n", len);
r = IXMLDOMNodeList_get_item( node_list2, 0, &node2);
ok( r == S_FALSE, "ret %08x\n", r);
@@ -1968,7 +1968,7 @@ static void test_replaceChild(void)
IXMLDOMNode *fo_node, *ba_node, *lc_node, *removed_node, *temp_node;
IXMLDOMNodeList *root_list, *fo_list;
IUnknown * unk1, *unk2;
- long len;
+ LONG len;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -2056,7 +2056,7 @@ static void test_replaceChild(void)
r = IXMLDOMNodeList_get_length( fo_list, &len);
ok( r == S_OK, "ret %08x\n", r );
- ok( len == 0, "len %ld\n", len);
+ ok( len == 0, "len %d\n", len);
IXMLDOMNodeList_Release( fo_list );
@@ -2077,7 +2077,7 @@ static void test_removeNamedItem(void)
IXMLDOMNamedNodeMap * pr_attrs;
VARIANT_BOOL b;
BSTR str;
- long len;
+ LONG len;
HRESULT r;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
@@ -2105,7 +2105,7 @@ static void test_removeNamedItem(void)
r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len );
ok( r == S_OK, "ret %08x\n", r);
- ok( len == 3, "length %ld\n", len);
+ ok( len == 3, "length %d\n", len);
removed_node = (void*)0xdeadbeef;
r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, NULL, &removed_node);
@@ -2124,7 +2124,7 @@ static void test_removeNamedItem(void)
r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len );
ok( r == S_OK, "ret %08x\n", r);
- ok( len == 2, "length %ld\n", len);
+ ok( len == 2, "length %d\n", len);
r = IXMLDOMNamedNodeMap_setNamedItem( pr_attrs, removed_node, NULL);
ok ( r == S_OK, "ret %08x\n", r);
@@ -2132,14 +2132,14 @@ static void test_removeNamedItem(void)
r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len );
ok( r == S_OK, "ret %08x\n", r);
- ok( len == 3, "length %ld\n", len);
+ ok( len == 3, "length %d\n", len);
r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL);
ok ( r == S_OK, "ret %08x\n", r);
r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len );
ok( r == S_OK, "ret %08x\n", r);
- ok( len == 2, "length %ld\n", len);
+ ok( len == 2, "length %d\n", len);
r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL);
ok ( r == S_FALSE, "ret %08x\n", r);
@@ -2400,8 +2400,8 @@ static void test_cloneNode(void )
VARIANT_BOOL b;
IXMLDOMNodeList *pList;
IXMLDOMNamedNodeMap *mapAttr;
- long nLength = 0, nLength1 = 0;
- long nAttrCnt = 0, nAttrCnt1 = 0;
+ LONG nLength = 0, nLength1 = 0;
+ LONG nAttrCnt = 0, nAttrCnt1 = 0;
IXMLDOMNode *node;
IXMLDOMNode *node_clone;
IXMLDOMNode *node_first;
@@ -2495,8 +2495,8 @@ static void test_cloneNode(void )
IXMLDOMNamedNodeMap_Release(mapAttr);
}
- ok(nLength == nLength1, "wrong Child count (%ld, %ld)\n", nLength, nLength1);
- ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%ld, %ld)\n", nAttrCnt, nAttrCnt1);
+ ok(nLength == nLength1, "wrong Child count (%d, %d)\n", nLength, nLength1);
+ ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%d, %d)\n", nAttrCnt, nAttrCnt1);
IXMLDOMNode_Release(node_clone);
/* No Children */
@@ -2530,7 +2530,7 @@ static void test_cloneNode(void )
if (pList)
{
IXMLDOMNodeList_get_length(pList, &nLength1);
- ok( nLength1 == 0, "Length should be 0 (%ld)\n", nLength1);
+ ok( nLength1 == 0, "Length should be 0 (%d)\n", nLength1);
IXMLDOMNodeList_Release(pList);
}
@@ -2539,12 +2539,12 @@ static void test_cloneNode(void )
if(mapAttr)
{
IXMLDOMNamedNodeMap_get_length(mapAttr, &nAttrCnt1);
- ok( nAttrCnt1 == 3, "Attribute count should be 3 (%ld)\n", nAttrCnt1);
+ ok( nAttrCnt1 == 3, "Attribute count should be 3 (%d)\n", nAttrCnt1);
IXMLDOMNamedNodeMap_Release(mapAttr);
}
- ok(nLength != nLength1, "wrong Child count (%ld, %ld)\n", nLength, nLength1);
- ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%ld, %ld)\n", nAttrCnt, nAttrCnt1);
+ ok(nLength != nLength1, "wrong Child count (%d, %d)\n", nLength, nLength1);
+ ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%d, %d)\n", nAttrCnt, nAttrCnt1);
IXMLDOMNode_Release(node_clone);
@@ -2568,7 +2568,7 @@ static void test_xmlTypes(void)
BSTR str;
IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; /* Used for testing Siblings */
VARIANT v;
- long len = 0;
+ LONG len = 0;
hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
if( hr != S_OK )
@@ -2744,7 +2744,7 @@ static void test_xmlTypes(void)
/* test length property */
hr = IXMLDOMComment_get_length(pComment, &len);
ok(hr == S_OK, "ret %08x\n", hr );
- ok(len == 21, "expected 21 got %ld\n", len);
+ ok(len == 21, "expected 21 got %d\n", len);
/* test substringData */
hr = IXMLDOMComment_substringData(pComment, 0, 4, NULL);
@@ -3072,7 +3072,7 @@ static void test_xmlTypes(void)
/* test length property */
hr = IXMLDOMCDATASection_get_length(pCDataSec, &len);
ok(hr == S_OK, "ret %08x\n", hr );
- ok(len == 21, "expected 21 got %ld\n", len);
+ ok(len == 21, "expected 21 got %d\n", len);
/* test get nodeValue */
hr = IXMLDOMCDATASection_get_nodeValue(pCDataSec, &var);
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index 4d78fdd..60c5f23 100644
--- a/dlls/msxml3/text.c
+++ b/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;
diff --git a/include/msxml2.idl b/include/msxml2.idl
index 49d057c..e6f07b3 100644
--- a/include/msxml2.idl
+++ b/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);
};
[
diff --git a/include/xmldom.idl b/include/xmldom.idl
index 31c5e66..d5d51ff 100644
--- a/include/xmldom.idl
+++ b/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);
--
1.6.2
More information about the wine-patches
mailing list