Module: wine Branch: master Commit: 9d625ad0e433700ac9fa4e2a2739dfe1b1c2363e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d625ad0e433700ac9fa4e2a27...
Author: Michael Stefaniuc mstefani@redhat.de Date: Wed Nov 8 23:46:13 2006 +0100
oleaut32: Fix the warnings introduced by the "unsigned long" to "ULONG" header changes.
---
dlls/oleaut32/tmarshal.c | 6 +++--- dlls/oleaut32/usrmarshal.c | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index ee35076..f3e93a7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -804,8 +804,8 @@ serialize_param( case VT_SAFEARRAY: { if (writeit) { - unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); - unsigned long size = LPSAFEARRAY_UserSize(&flags, buf->curoff, (LPSAFEARRAY *)arg); + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG size = LPSAFEARRAY_UserSize(&flags, buf->curoff, (LPSAFEARRAY *)arg); xbuf_resize(buf, size); LPSAFEARRAY_UserMarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg); buf->curoff = size; @@ -1149,7 +1149,7 @@ deserialize_param( case VT_SAFEARRAY: { if (readit) { - unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); unsigned char *buffer; buffer = LPSAFEARRAY_UserUnmarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg); buf->curoff = buffer - buf->base; diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 07000a1..c940f80 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -144,11 +144,11 @@ typedef struct
ULONG WINAPI BSTR_UserSize(ULONG *pFlags, ULONG Start, BSTR *pstr) { - TRACE("(%lx,%ld,%p) => %p\n", *pFlags, Start, pstr, *pstr); + TRACE("(%x,%d,%p) => %p\n", *pFlags, Start, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_LENGTH(Start, 3); Start += sizeof(bstr_wire_t) + ((SysStringByteLen(*pstr) + 1) & ~1); - TRACE("returning %ld\n", Start); + TRACE("returning %d\n", Start); return Start; }
@@ -157,7 +157,7 @@ unsigned char * WINAPI BSTR_UserMarshal( bstr_wire_t *header; DWORD len = SysStringByteLen(*pstr);
- TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr));
ALIGN_POINTER(Buffer, 3); @@ -177,7 +177,7 @@ unsigned char * WINAPI BSTR_UserMarshal( unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, BSTR *pstr) { bstr_wire_t *header; - TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr);
ALIGN_POINTER(Buffer, 3); header = (bstr_wire_t*)Buffer; @@ -199,7 +199,7 @@ unsigned char * WINAPI BSTR_UserUnmarsha
void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) { - TRACE("(%lx,%p) => %p\n", *pFlags, pstr, *pstr); + TRACE("(%x,%p) => %p\n", *pFlags, pstr, *pstr); if (*pstr) { SysFreeString(*pstr); @@ -338,7 +338,7 @@ static unsigned char* interface_variant_ ULONG size; HRESULT hr;
- TRACE("pFlags=%ld, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar); + TRACE("pFlags=%d, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar);
oldpos = Buffer;
@@ -387,7 +387,7 @@ static unsigned char *interface_variant_ ULONG size; HRESULT hr;
- TRACE("pFlags=%ld, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar); + TRACE("pFlags=%d, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar);
oldpos = Buffer;
@@ -427,7 +427,7 @@ static unsigned char *interface_variant_ ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) { int align; - TRACE("(%lx,%ld,%p)\n", *pFlags, Start, pvar); + TRACE("(%x,%d,%p)\n", *pFlags, Start, pvar); TRACE("vt=%04x\n", V_VT(pvar));
ALIGN_LENGTH(Start, 7); @@ -443,7 +443,7 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFl Start += get_type_size(pFlags, pvar); Start = wire_extra_user_size(pFlags, Start, pvar);
- TRACE("returning %ld\n", Start); + TRACE("returning %d\n", Start); return Start; }
@@ -454,7 +454,7 @@ unsigned char * WINAPI VARIANT_UserMarsh int align; unsigned char *Pos;
- TRACE("(%lx,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); TRACE("vt=%04x\n", V_VT(pvar));
ALIGN_POINTER(Buffer, 7); @@ -551,7 +551,7 @@ unsigned char * WINAPI VARIANT_UserUnmar int align; unsigned char *Pos;
- TRACE("(%lx,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar);
ALIGN_POINTER(Buffer, 7); VariantInit(pvar); @@ -636,7 +636,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFla VARTYPE vt = V_VT(pvar); PVOID ref = NULL;
- TRACE("(%lx,%p)\n", *pFlags, pvar); + TRACE("(%x,%p)\n", *pFlags, pvar); TRACE("vt=%04x\n", V_VT(pvar));
if (vt & VT_BYREF) ref = pvar->n1.n2.n3.byref; @@ -736,7 +736,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG { ULONG size = StartingSize;
- TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa); + TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, *ppsa);
ALIGN_LENGTH(size, 3); size += sizeof(ULONG_PTR);