Module: wine Branch: master Commit: 7ae24a04b5389a0a9a2a5131788e543a82856dd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ae24a04b5389a0a9a2a5131788e543...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 8 15:06:04 2022 +0100
oleaut32: Fix printf format warnings on ARM platforms.
---
dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/typelib.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e0ad9719f1c..bcbe85efae2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1282,7 +1282,7 @@ static VARIANT WINAPI inst_func2(void *inst, VARIANT v1, VARIANT v2) ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst );
ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); - ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_I4(&v1) == 2, "unexpected %ld\n", V_I4(&v1)); ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2)));
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a7bbb273856..602b9a1ee17 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6374,7 +6374,7 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART UINT i; DWORD *args;
- TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("(%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d))\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult));
@@ -6673,7 +6673,7 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART int dcount = 0; /* double-precision float register index count */ #endif
- TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("(%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d))\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult));
if (cc != CC_STDCALL && cc != CC_CDECL) @@ -6883,7 +6883,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART int rcount; /* 64-bit register index count */ int fpcount = 0; /* float register index count */
- TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("(%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d))\n", instance, offset, cc, ret_type, count, types, vargs, result, V_VT(result));
if (cc != CC_STDCALL && cc != CC_CDECL)