msxml3: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Wed Oct 4 17:58:11 CDT 2006
Huw,
please have a check over this patch. The IXMLDOMParseErrorVtbl struct
definitions from msxml2.h and xmldom.h show the member functions taking
"long" and not "LONG" arguments. I went with the "when in doubt follow
the header files" but it might be wrong.
thanks
bye
michael
---
dlls/msxml3/Makefile.in | 2 +-
dlls/msxml3/domdoc.c | 4 ++--
dlls/msxml3/node.c | 2 +-
dlls/msxml3/parseerror.c | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index e7dc2ee..fed6633 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index c617fb7..35ff59e 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -174,14 +174,14 @@ typedef struct _domdoc
LONG xmldoc_add_ref(xmlDocPtr doc)
{
LONG ref = InterlockedIncrement((LONG*)&doc->_private);
- TRACE("%ld\n", ref);
+ TRACE("%d\n", ref);
return ref;
}
LONG xmldoc_release(xmlDocPtr doc)
{
LONG ref = InterlockedDecrement((LONG*)&doc->_private);
- TRACE("%ld\n", ref);
+ TRACE("%d\n", ref);
if(ref == 0)
{
TRACE("freeing docptr %p\n", doc);
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 1109a98..094af5b 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -743,7 +743,7 @@ static HRESULT WINAPI xmlnode_get_baseNa
break;
}
- TRACE("returning %08lx str = %s\n", r, debugstr_w( str ) );
+ TRACE("returning %08x str = %s\n", r, debugstr_w( str ) );
*nameString = str;
return r;
diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
index 6f29498..0680103 100644
--- a/dlls/msxml3/parseerror.c
+++ b/dlls/msxml3/parseerror.c
@@ -78,7 +78,7 @@ static ULONG WINAPI parseError_AddRef(
{
parse_error_t *This = impl_from_IXMLDOMParseError( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p) ref now %ld\n", This, ref);
+ TRACE("(%p) ref now %d\n", This, ref);
return ref;
}
@@ -89,7 +89,7 @@ static ULONG WINAPI parseError_Release(
ULONG ref;
ref = InterlockedDecrement( &This->ref );
- TRACE("(%p) ref now %ld\n", This, ref);
+ TRACE("(%p) ref now %d\n", This, ref);
if ( ref == 0 )
{
SysFreeString(This->url);
@@ -148,7 +148,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);
@@ -195,7 +195,7 @@ static HRESULT WINAPI parseError_get_src
static HRESULT WINAPI parseError_get_line(
IXMLDOMParseError *iface,
- LONG *line )
+ long *line )
{
FIXME("\n");
return E_NOTIMPL;
@@ -203,7 +203,7 @@ static HRESULT WINAPI parseError_get_lin
static HRESULT WINAPI parseError_get_linepos(
IXMLDOMParseError *iface,
- LONG *linepos )
+ long *linepos )
{
FIXME("\n");
return E_NOTIMPL;
@@ -211,7 +211,7 @@ static HRESULT WINAPI parseError_get_lin
static HRESULT WINAPI parseError_get_filepos(
IXMLDOMParseError *iface,
- LONG *filepos )
+ long *filepos )
{
FIXME("\n");
return E_NOTIMPL;
--
1.4.2.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061005/be35cb28/attachment.pgp
More information about the wine-patches
mailing list