Skip to content

W
wine-cw
Commit b80cb315 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

mapi32: Win64 printf format warning fixes.

parent 99de79ad
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 40 deletions
dlls/mapi32/Makefile.in
View file @ b80cb315
......@@ -6,7 +6,6 @@ MODULE = mapi32.dll
IMPORTLIB = libmapi32.$(IMPLIBEXT)
IMPORTS = shlwapi shell32 ole32 user32 kernel32 ntdll
EXTRALIBS = -luuid
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
imalloc.c \
......
dlls/mapi32/imalloc.c
View file @ b80cb315
......@@ -111,7 +111,7 @@ static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface)
*/
static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb)
{
TRACE("(%p)->(%ld)\n", iface, cb);
TRACE("(%p)->(%d)\n", iface, cb);
return LocalAlloc(LMEM_FIXED, cb);
}
......@@ -121,7 +121,7 @@ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb)
*/
static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb)
{
TRACE("(%p)->(%p, %ld)\n", iface, pv, cb);
TRACE("(%p)->(%p, %d)\n", iface, pv, cb);
if (!pv)
return LocalAlloc(LMEM_FIXED, cb);
......
dlls/mapi32/mapi32_main.c
View file @ b80cb315
......@@ -37,7 +37,7 @@ LONG MAPI_ObjectCount = 0;
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("(%p,%ld,%p)\n", hinstDLL, fdwReason, fImpLoad);
TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad);
switch (fdwReason)
{
......@@ -45,7 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
DisableThreadLibraryCalls(hinstDLL);
break;
case DLL_PROCESS_DETACH:
TRACE("DLL_PROCESS_DETACH: %ld objects remaining\n", MAPI_ObjectCount);
TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount);
break;
}
return TRUE;
......@@ -77,7 +77,7 @@ HRESULT WINAPI MAPIInitialize(LPVOID init)
ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password,
FLAGS flags, ULONG reserved, LPLHANDLE session)
{
FIXME("(0x%08lx %s %p 0x%08lx 0x%08lx %p) Stub\n", uiparam,
FIXME("(0x%08lx %s %p 0x%08lx 0x%08x %p) Stub\n", uiparam,
debugstr_a(profile), password, flags, reserved, session);
if (session) *session = 1;
......@@ -87,7 +87,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password,
ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags,
ULONG reserved )
{
FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08lx) Stub\n", session,
FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08x) Stub\n", session,
uiparam, flags, reserved);
return SUCCESS_SUCCESS;
}
......@@ -95,7 +95,7 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags,
HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile,
LPWSTR password, ULONG flags, LPMAPISESSION *session)
{
FIXME("(0x%08lx %s %p 0x%08lx %p) Stub\n", uiparam,
FIXME("(0x%08lx %s %p 0x%08x %p) Stub\n", uiparam,
debugstr_w(profile), password, flags, session);
return SUCCESS_SUCCESS;
}
......
dlls/mapi32/prop.c
View file @ b80cb315
......@@ -293,7 +293,7 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp)
*/
BOOL WINAPI FPropContainsProp(LPSPropValue lpHaystack, LPSPropValue lpNeedle, ULONG ulFuzzy)
{
TRACE("(%p,%p,0x%08lx)\n", lpHaystack, lpNeedle, ulFuzzy);
TRACE("(%p,%p,0x%08x)\n", lpHaystack, lpNeedle, ulFuzzy);
if (FBadProp(lpHaystack) || FBadProp(lpNeedle) ||
PROP_TYPE(lpHaystack->ulPropTag) != PROP_TYPE(lpNeedle->ulPropTag))
......@@ -394,7 +394,7 @@ BOOL WINAPI FPropCompareProp(LPSPropValue lpPropLeft, ULONG ulOp, LPSPropValue l
{
LONG iCmp;
TRACE("(%p,%ld,%p)\n", lpPropLeft, ulOp, lpPropRight);
TRACE("(%p,%d,%p)\n", lpPropLeft, ulOp, lpPropRight);
if (ulOp > RELOP_RE || FBadProp(lpPropLeft) || FBadProp(lpPropRight))
return FALSE;
......@@ -436,7 +436,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight)
{
LONG iRet;
TRACE("(%p->0x%08lx,%p->0x%08lx)\n", lpPropLeft, lpPropLeft->ulPropTag,
TRACE("(%p->0x%08x,%p->0x%08x)\n", lpPropLeft, lpPropLeft->ulPropTag,
lpPropRight, lpPropRight->ulPropTag);
/* If the properties are not the same, sort by property type */
......@@ -508,7 +508,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight)
return memcmp(lpPropLeft->Value.lpguid, lpPropRight->Value.lpguid,
sizeof(GUID));
}
FIXME("Unhandled property type %ld\n", PROP_TYPE(lpPropLeft->ulPropTag));
FIXME("Unhandled property type %d\n", PROP_TYPE(lpPropLeft->ulPropTag));
return 0;
}
......@@ -532,7 +532,7 @@ HRESULT WINAPI HrGetOneProp(LPMAPIPROP lpIProp, ULONG ulPropTag, LPSPropValue *l
ULONG ulCount;
HRESULT hRet;
TRACE("(%p,%ld,%p)\n", lpIProp, ulPropTag, lppProp);
TRACE("(%p,%d,%p)\n", lpIProp, ulPropTag, lppProp);
pta.cValues = 1u;
pta.aulPropTag[0] = ulPropTag;
......@@ -587,7 +587,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp)
{
BOOL bRet = FALSE;
TRACE("(%p,%ld)\n", lpIProp, ulPropTag);
TRACE("(%p,%d)\n", lpIProp, ulPropTag);
if (lpIProp)
{
......@@ -632,7 +632,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp)
*/
LPSPropValue WINAPI PpropFindProp(LPSPropValue lpProps, ULONG cValues, ULONG ulPropTag)
{
TRACE("(%p,%ld,%ld)\n", lpProps, cValues, ulPropTag);
TRACE("(%p,%d,%d)\n", lpProps, cValues, ulPropTag);
if (lpProps && cValues)
{
......@@ -1068,7 +1068,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
*/
LPSPropValue WINAPI LpValFindProp(ULONG ulPropTag, ULONG cValues, LPSPropValue lpProps)
{
TRACE("(%ld,%ld,%p)\n", ulPropTag, cValues, lpProps);
TRACE("(%d,%d,%p)\n", ulPropTag, cValues, lpProps);
if (lpProps && cValues)
{
......@@ -1132,7 +1132,7 @@ BOOL WINAPI FBadRglpszA(LPSTR *lppszStrs, ULONG ulCount)
{
ULONG i;
TRACE("(%p,%ld)\n", lppszStrs, ulCount);
TRACE("(%p,%d)\n", lppszStrs, ulCount);
if (!ulCount)
return FALSE;
......@@ -1157,7 +1157,7 @@ BOOL WINAPI FBadRglpszW(LPWSTR *lppszStrs, ULONG ulCount)
{
ULONG i;
TRACE("(%p,%ld)\n", lppszStrs, ulCount);
TRACE("(%p,%d)\n", lppszStrs, ulCount);
if (!ulCount)
return FALSE;
......@@ -1213,7 +1213,7 @@ BOOL WINAPI FBadRowSet(LPSRowSet lpRowSet)
*/
ULONG WINAPI FBadPropTag(ULONG ulPropTag)
{
TRACE("(0x%08lx)\n", ulPropTag);
TRACE("(0x%08x)\n", ulPropTag);
switch (ulPropTag & (~MV_FLAG & PROP_TYPE_MASK))
{
......@@ -1521,7 +1521,7 @@ static inline ULONG WINAPI IMAPIProp_fnAddRef(LPMAPIPROP iface)
{
IPropDataImpl *This = (IPropDataImpl*)iface;
TRACE("(%p)->(count before=%lu)\n", This, This->lRef);
TRACE("(%p)->(count before=%u)\n", This, This->lRef);
return InterlockedIncrement(&This->lRef);
}
......@@ -1537,7 +1537,7 @@ static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface)
IPropDataImpl *This = (IPropDataImpl*)iface;
LONG lRef;
TRACE("(%p)->(count before=%lu)\n", This, This->lRef);
TRACE("(%p)->(count before=%u)\n", This, This->lRef);
lRef = InterlockedDecrement(&This->lRef);
if (!lRef)
......@@ -1585,7 +1585,7 @@ static inline HRESULT WINAPI
IMAPIProp_fnGetLastError(LPMAPIPROP iface, HRESULT hRes,
ULONG ulFlags, LPMAPIERROR *lppError)
{
TRACE("(%p,0x%08lX,0x%08lX,%p)\n", iface, hRes, ulFlags, lppError);
TRACE("(%p,0x%08X,0x%08X,%p)\n", iface, hRes, ulFlags, lppError);
if (!lppError || SUCCEEDED(hRes) || (ulFlags & ~MAPI_UNICODE))
return MAPI_E_INVALID_PARAMETER;
......@@ -1610,7 +1610,7 @@ IMAPIProp_fnGetLastError(LPMAPIPROP iface, HRESULT hRes,
static inline HRESULT WINAPI
IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags)
{
TRACE("(%p,0x%08lX)\n", iface, ulFlags);
TRACE("(%p,0x%08X)\n", iface, ulFlags);
/* Since this object is not transacted we do not need to implement this */
/* FIXME: Should we set the access levels to clean? */
......@@ -1649,7 +1649,7 @@ IMAPIProp_fnGetProps(LPMAPIPROP iface, LPSPropTagArray lpTags,
HRESULT hRet = S_OK;
IPropDataImpl *This = (IPropDataImpl*)iface;
TRACE("(%p,%p,0x%08lx,%p,%p) stub\n", iface, lpTags, ulFlags,
TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags,
lpCount, lppProps);
if (!iface || ulFlags & ~MAPI_UNICODE || !lpTags || *lpCount || !lppProps)
......@@ -1716,7 +1716,7 @@ IMAPIProp_fnGetPropList(LPMAPIPROP iface, ULONG ulFlags,
ULONG i;
HRESULT hRet;
TRACE("(%p,0x%08lx,%p) stub\n", iface, ulFlags, lppTags);
TRACE("(%p,0x%08x,%p) stub\n", iface, ulFlags, lppTags);
if (!iface || ulFlags & ~MAPI_UNICODE || !lppTags)
return MAPI_E_INVALID_PARAMETER;
......@@ -1759,7 +1759,7 @@ static inline HRESULT WINAPI
IMAPIProp_fnOpenProperty(LPMAPIPROP iface, ULONG ulPropTag, LPCIID iid,
ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk)
{
FIXME("(%p,%lu,%s,%lu,0x%08lx,%p) stub\n", iface, ulPropTag,
FIXME("(%p,%u,%s,%u,0x%08x,%p) stub\n", iface, ulPropTag,
debugstr_guid(iid), ulOpts, ulFlags, lpUnk);
return MAPI_E_NO_SUPPORT;
}
......@@ -1789,7 +1789,7 @@ IMAPIProp_fnSetProps(LPMAPIPROP iface, ULONG ulValues,
HRESULT hRet = S_OK;
ULONG i;
TRACE("(%p,%lu,%p,%p)\n", iface, ulValues, lpProps, lppProbs);
TRACE("(%p,%u,%p,%p)\n", iface, ulValues, lpProps, lppProbs);
if (!iface || !lpProps)
return MAPI_E_INVALID_PARAMETER;
......@@ -1958,7 +1958,7 @@ IMAPIProp_fnCopyTo(LPMAPIPROP iface, ULONG niids, LPCIID lpiidExcl,
LPMAPIPROGRESS lpIProgress, LPCIID lpIfaceIid, LPVOID lpDstObj,
ULONG ulFlags, LPSPropProblemArray *lppProbs)
{
FIXME("(%p,%lu,%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, niids,
FIXME("(%p,%u,%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, niids,
lpiidExcl, lpPropsExcl, ulParam, lpIProgress,
debugstr_guid(lpIfaceIid), lpDstObj, ulFlags, lppProbs);
return MAPI_E_NO_SUPPORT;
......@@ -1978,7 +1978,7 @@ IMAPIProp_fnCopyProps(LPMAPIPROP iface, LPSPropTagArray lpInclProps,
LPVOID lpDstObj, ULONG ulFlags,
LPSPropProblemArray *lppProbs)
{
FIXME("(%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, lpInclProps,
FIXME("(%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, lpInclProps,
ulParam, lpIProgress, debugstr_guid(lpIface), lpDstObj, ulFlags,
lppProbs);
return MAPI_E_NO_SUPPORT;
......@@ -2012,7 +2012,7 @@ IMAPIProp_fnGetNamesFromIDs(LPMAPIPROP iface, LPSPropTagArray *lppPropTags,
LPGUID iid, ULONG ulFlags, ULONG *lpCount,
LPMAPINAMEID **lpppNames)
{
FIXME("(%p,%p,%s,0x%08lX,%p,%p) stub\n", iface, lppPropTags,
FIXME("(%p,%p,%s,0x%08X,%p,%p) stub\n", iface, lppPropTags,
debugstr_guid(iid), ulFlags, lpCount, lpppNames);
return MAPI_E_NO_SUPPORT;
}
......@@ -2043,7 +2043,7 @@ IMAPIProp_fnGetIDsFromNames(LPMAPIPROP iface, ULONG ulNames,
LPMAPINAMEID *lppNames, ULONG ulFlags,
LPSPropTagArray *lppPropTags)
{
FIXME("(%p,%ld,%p,0x%08lX,%p) stub\n",
FIXME("(%p,%d,%p,0x%08X,%p) stub\n",
iface, ulNames, lppNames, ulFlags, lppPropTags);
return MAPI_E_NO_SUPPORT;
}
......@@ -2275,7 +2275,7 @@ IPropData_fnHrSetObjAccess(LPPROPDATA iface, ULONG ulAccess)
{
IPropDataImpl *This = (IPropDataImpl*)iface;
TRACE("(%p,%lx)\n", iface, ulAccess);
TRACE("(%p,%x)\n", iface, ulAccess);
if (!iface || ulAccess < IPROP_READONLY || ulAccess > IPROP_READWRITE)
return MAPI_E_INVALID_PARAMETER;
......
dlls/mapi32/sendmail.c
View file @ b80cb315
......@@ -71,7 +71,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam,
HRESULT res;
DWORD size;
TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08lx)\n", session, uiparam,
TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08x)\n", session, uiparam,
message, flags, reserved );
if (!message) return MAPI_E_FAILURE;
......@@ -105,7 +105,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam,
bcc_size += lstrlenA( address ) + 1;
break;
default:
TRACE( "Unknown recipient class: %ld\n",
TRACE( "Unknown recipient class: %d\n",
message->lpRecips[i].ulRecipClass );
}
}
......
dlls/mapi32/util.c
View file @ b80cb315
......@@ -64,7 +64,7 @@ static const BYTE digitsToHex[] = {
*/
SCODE WINAPI ScInitMapiUtil(ULONG ulReserved)
{
FIXME("(0x%08lx)stub!\n", ulReserved);
FIXME("(0x%08x)stub!\n", ulReserved);
if (ulReserved)
return MAPI_E_INVALID_PARAMETER;
return S_OK;
......@@ -118,7 +118,7 @@ SCODE WINAPI MAPIAllocateBuffer(ULONG cbSize, LPVOID *lppBuffer)
{
LPMAPIALLOCBUFFER lpBuff;
TRACE("(%ld,%p)\n", cbSize, lppBuffer);
TRACE("(%d,%p)\n", cbSize, lppBuffer);
if (!lppBuffer)
return E_INVALIDARG;
......@@ -158,7 +158,7 @@ SCODE WINAPI MAPIAllocateMore(ULONG cbSize, LPVOID lpOrig, LPVOID *lppBuffer)
{
LPMAPIALLOCBUFFER lpBuff = lpOrig;
TRACE("(%ld,%p,%p)\n", cbSize, lpOrig, lppBuffer);
TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer);
if (!lppBuffer || !lpBuff || !--lpBuff)
return E_INVALIDARG;
......@@ -436,7 +436,7 @@ INT WINAPI MNLS_CompareStringW(DWORD dwCp, LPCWSTR lpszLeft, LPCWSTR lpszRight)
{
INT ret;
TRACE("0x%08lx,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight));
TRACE("0x%08x,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight));
ret = MNLS_lstrcmpW(lpszLeft, lpszRight);
return ret < 0 ? CSTR_LESS_THAN : ret ? CSTR_GREATER_THAN : CSTR_EQUAL;
}
......@@ -688,7 +688,7 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree,
DWORD dwMode = STGM_READWRITE, dwAttributes = 0;
HRESULT hRet;
TRACE("(%p,%p,0x%08lx,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags,
TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags,
debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream);
if (lppStream)
......@@ -851,7 +851,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path
BOOL ret = FALSE;
HMODULE hmsi;
TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install);
TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install);
dll_path[0] = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment