[PATCH 2/3] msxml3: Change long to LONG in msxml.idl.
Michael Stefaniuc
mstefani at redhat.de
Mon Mar 9 17:28:42 CDT 2009
---
dlls/msxml3/tests/xmldoc.c | 24 ++++++++++++------------
dlls/msxml3/tests/xmlelem.c | 24 ++++++++++++------------
dlls/msxml3/xmldoc.c | 2 +-
dlls/msxml3/xmlelem.c | 14 +++++++-------
include/msxml.idl | 20 ++++++++++----------
5 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c
index 5c1c4f8..d2d99fc 100644
--- a/dlls/msxml3/tests/xmldoc.c
+++ b/dlls/msxml3/tests/xmldoc.c
@@ -61,7 +61,7 @@ static void test_xmldoc(void)
LPVOID ptr;
DWORD file_size, read;
CHAR path[MAX_PATH];
- long type, num_child;
+ LONG type, num_child;
VARIANT vIndex, vName;
BSTR name = NULL;
@@ -121,7 +121,7 @@ static void test_xmldoc(void)
hr = IXMLElement_get_type(element, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_tagName(element, &name);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -134,7 +134,7 @@ static void test_xmldoc(void)
hr = IXMLElementCollection_get_length(collection, &num_child);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(num_child == 2, "Expected 2, got %ld\n", num_child);
+ ok(num_child == 2, "Expected 2, got %d\n", num_child);
V_VT(&vIndex) = VT_I4;
V_I4(&vIndex) = 0;
@@ -146,7 +146,7 @@ static void test_xmldoc(void)
hr = IXMLElement_get_type(child, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_tagName(child, &name);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -159,7 +159,7 @@ static void test_xmldoc(void)
hr = IXMLElementCollection_get_length(inner, &num_child);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(num_child == 1, "Expected 1, got %ld\n", num_child);
+ ok(num_child == 1, "Expected 1, got %d\n", num_child);
hr = IXMLElementCollection_item(inner, vIndex, vName, (IDispatch **)&value);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -167,7 +167,7 @@ static void test_xmldoc(void)
hr = IXMLElement_get_type(value, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_TEXT, "Expected XMLELEMTYPE_TEXT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_TEXT, "Expected XMLELEMTYPE_TEXT, got %d\n", type);
hr = IXMLElement_get_text(value, &name);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -193,7 +193,7 @@ static void test_xmldoc(void)
hr = IXMLElement_get_type(child, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_tagName(child, &name);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -206,7 +206,7 @@ static void test_xmldoc(void)
hr = IXMLElementCollection_get_length(inner, &num_child);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(num_child == 1, "Expected 1, got %ld\n", num_child);
+ ok(num_child == 1, "Expected 1, got %d\n", num_child);
V_I4(&vIndex) = 0;
hr = IXMLElementCollection_item(inner, vIndex, vName, (IDispatch **)&value);
@@ -215,7 +215,7 @@ static void test_xmldoc(void)
hr = IXMLElement_get_type(value, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_TEXT, "Expected XMLELEMTYPE_TEXT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_TEXT, "Expected XMLELEMTYPE_TEXT, got %d\n", type);
hr = IXMLElement_get_text(value, &name);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -247,7 +247,7 @@ static void test_createElement(void)
IXMLDocument *doc = NULL;
IXMLElement *element = NULL, *root = NULL;
VARIANT vType, vName;
- long type;
+ LONG type;
hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER,
&IID_IXMLDocument, (LPVOID*)&doc);
@@ -280,7 +280,7 @@ static void test_createElement(void)
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
/* SP7 returns an XMLELEMTYPE_ELEMENT */
ok(type == XMLELEMTYPE_OTHER || type == XMLELEMTYPE_ELEMENT,
- "Expected XMLELEMTYPE_OTHER || XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ "Expected XMLELEMTYPE_OTHER || XMLELEMTYPE_ELEMENT, got %d\n", type);
IXMLElement_Release(element);
}
@@ -301,7 +301,7 @@ static void test_createElement(void)
hr = IXMLElement_get_type(element, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
IXMLElement_Release(element);
diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c
index f0b195d..1738b2c 100644
--- a/dlls/msxml3/tests/xmlelem.c
+++ b/dlls/msxml3/tests/xmlelem.c
@@ -42,7 +42,7 @@ static void test_xmlelem(void)
VARIANT vType, vName;
VARIANT vIndex, vValue;
BSTR str, val;
- long type, num_child;
+ LONG type, num_child;
static const WCHAR propName[] = {'p','r','o','p',0};
static const WCHAR propVal[] = {'v','a','l',0};
@@ -136,7 +136,7 @@ static void test_xmlelem(void)
hr = IXMLElement_get_type(element, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_text(element, &str);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -171,7 +171,7 @@ static void test_xmlelem(void)
hr = IXMLElement_get_type(parent, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
children = (IXMLElementCollection *)0xdeadbeef;
hr = IXMLElement_get_children(element, &children);
@@ -180,7 +180,7 @@ static void test_xmlelem(void)
hr = IXMLElementCollection_get_length(children, &num_child);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(num_child == 1, "Expected 1, got %ld\n", num_child);
+ ok(num_child == 1, "Expected 1, got %d\n", num_child);
V_VT(&vIndex) = VT_I4;
V_I4(&vIndex) = 0;
@@ -192,7 +192,7 @@ static void test_xmlelem(void)
hr = IXMLElement_get_type(child2, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_TEXT, "Expected XMLELEMTYPE_TEXT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_TEXT, "Expected XMLELEMTYPE_TEXT, got %d\n", type);
hr = IXMLElement_get_text(element, &str);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -255,7 +255,7 @@ static void test_xmlelem_collection(void)
IEnumVARIANT *enumVar = NULL;
CHAR pathA[MAX_PATH];
WCHAR path[MAX_PATH];
- long length, type;
+ LONG length, type;
ULONG num_vars;
VARIANT var, vIndex, vName;
BSTR url, str;
@@ -296,7 +296,7 @@ static void test_xmlelem_collection(void)
hr = IXMLElementCollection_get_length(collection, &length);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(length == 2, "Expected 2, got %ld\n", length);
+ ok(length == 2, "Expected 2, got %d\n", length);
/* IXMLElementCollection:put_length does nothing */
hr = IXMLElementCollection_put_length(collection, -1);
@@ -320,7 +320,7 @@ static void test_xmlelem_collection(void)
/* make sure the length hasn't changed */
hr = IXMLElementCollection_get_length(collection, &length);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(length == 2, "Expected 2, got %ld\n", length);
+ ok(length == 2, "Expected 2, got %d\n", length);
/* IXMLElementCollection implements IEnumVARIANT */
hr = IXMLElementCollection_QueryInterface(collection, &IID_IEnumVARIANT, (LPVOID *)&enumVar);
@@ -351,7 +351,7 @@ static void test_xmlelem_collection(void)
hr = IXMLElement_get_type(child, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_tagName(child, &str);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -373,7 +373,7 @@ static void test_xmlelem_collection(void)
hr = IXMLElement_get_type(child, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_tagName(child, &str);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -392,7 +392,7 @@ static void test_xmlelem_collection(void)
hr = IXMLElement_get_type(child, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_tagName(child, &str);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@@ -411,7 +411,7 @@ static void test_xmlelem_collection(void)
hr = IXMLElement_get_type(child, &type);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %ld\n", type);
+ ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type);
hr = IXMLElement_get_tagName(child, &str);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
index ea2d062..174be2f 100644
--- a/dlls/msxml3/xmldoc.c
+++ b/dlls/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;
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index 97e3429..b7b0f29 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -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/include/msxml.idl b/include/msxml.idl
index ff5cc49..8c2496b 100644
--- a/include/msxml.idl
+++ b/include/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);
--
1.6.2
More information about the wine-patches
mailing list