Skip to content

W
wine-winehq
Commit 5ec2a8b9 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

mapi32: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1747b0b1
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 45 deletions
dlls/mapi32/Makefile.in
View file @ 5ec2a8b9
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = mapi32.dll
IMPORTLIB = mapi32
IMPORTS = uuid shlwapi shell32 user32 advapi32
......
dlls/mapi32/mapi32_main.c
View file @ 5ec2a8b9
......@@ -41,7 +41,7 @@ DECLSPEC_HIDDEN HINSTANCE hInstMAPI32;
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad);
TRACE("(%p,%ld,%p)\n", hinstDLL, fdwReason, fImpLoad);
switch (fdwReason)
{
......@@ -52,7 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
break;
case DLL_PROCESS_DETACH:
if (fImpLoad) break;
TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount);
TRACE("DLL_PROCESS_DETACH: %ld objects remaining\n", MAPI_ObjectCount);
unload_mapi_providers();
break;
}
......@@ -68,7 +68,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
{
HRESULT ret = mapiFunctions.DllGetClassObject(rclsid, iid, ppv);
TRACE("ret: %x\n", ret);
TRACE("ret: %lx\n", ret);
return ret;
}
......@@ -97,7 +97,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
if (mapiFunctions.DllCanUnloadNow)
{
ret = mapiFunctions.DllCanUnloadNow();
TRACE("(): provider returns %d\n", ret);
TRACE("(): provider returns %ld\n", ret);
}
return MAPI_ObjectCount == 0 ? ret : S_FALSE;
......@@ -129,7 +129,7 @@ HRESULT WINAPI MAPIInitialize(LPVOID init)
ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password,
FLAGS flags, ULONG reserved, LPLHANDLE session)
{
TRACE("(0x%08Ix %s %p 0x%08x 0x%08x %p)\n", uiparam,
TRACE("(0x%08Ix %s %p 0x%08lx 0x%08lx %p)\n", uiparam,
debugstr_a(profile), password, flags, reserved, session);
if (mapiFunctions.MAPILogon)
......@@ -149,7 +149,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password,
ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags,
ULONG reserved )
{
TRACE("(0x%08Ix 0x%08Ix 0x%08x 0x%08x)\n", session,
TRACE("(0x%08Ix 0x%08Ix 0x%08lx 0x%08lx)\n", session,
uiparam, flags, reserved);
if (mapiFunctions.MAPILogoff)
......@@ -167,7 +167,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)
{
TRACE("(0x%08Ix %s %p 0x%08x %p)\n", uiparam,
TRACE("(0x%08Ix %s %p 0x%08lx %p)\n", uiparam,
debugstr_w(profile), password, flags, session);
if (mapiFunctions.MAPILogonEx)
......@@ -206,7 +206,7 @@ HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin)
if (mapiFunctions.MAPIAdminProfiles)
return mapiFunctions.MAPIAdminProfiles(ulFlags, lppProfAdmin);
FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin);
FIXME("(%lu, %p): stub\n", ulFlags, lppProfAdmin);
*lppProfAdmin = NULL;
return E_FAIL;
}
......
dlls/mapi32/prop.c
View file @ 5ec2a8b9
......@@ -299,7 +299,7 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp)
*/
BOOL WINAPI FPropContainsProp(LPSPropValue lpHaystack, LPSPropValue lpNeedle, ULONG ulFuzzy)
{
TRACE("(%p,%p,0x%08x)\n", lpHaystack, lpNeedle, ulFuzzy);
TRACE("(%p,%p,0x%08lx)\n", lpHaystack, lpNeedle, ulFuzzy);
if (FBadProp(lpHaystack) || FBadProp(lpNeedle) ||
PROP_TYPE(lpHaystack->ulPropTag) != PROP_TYPE(lpNeedle->ulPropTag))
......@@ -400,7 +400,7 @@ BOOL WINAPI FPropCompareProp(LPSPropValue lpPropLeft, ULONG ulOp, LPSPropValue l
{
LONG iCmp;
TRACE("(%p,%d,%p)\n", lpPropLeft, ulOp, lpPropRight);
TRACE("(%p,%ld,%p)\n", lpPropLeft, ulOp, lpPropRight);
if (ulOp > RELOP_RE || FBadProp(lpPropLeft) || FBadProp(lpPropRight))
return FALSE;
......@@ -442,7 +442,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight)
{
LONG iRet;
TRACE("(%p->0x%08x,%p->0x%08x)\n", lpPropLeft, lpPropLeft->ulPropTag,
TRACE("(%p->0x%08lx,%p->0x%08lx)\n", lpPropLeft, lpPropLeft->ulPropTag,
lpPropRight, lpPropRight->ulPropTag);
/* If the properties are not the same, sort by property type */
......@@ -514,7 +514,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight)
return memcmp(lpPropLeft->Value.lpguid, lpPropRight->Value.lpguid,
sizeof(GUID));
}
FIXME("Unhandled property type %d\n", PROP_TYPE(lpPropLeft->ulPropTag));
FIXME("Unhandled property type %ld\n", PROP_TYPE(lpPropLeft->ulPropTag));
return 0;
}
......@@ -538,7 +538,7 @@ HRESULT WINAPI HrGetOneProp(LPMAPIPROP lpIProp, ULONG ulPropTag, LPSPropValue *l
ULONG ulCount;
HRESULT hRet;
TRACE("(%p,%d,%p)\n", lpIProp, ulPropTag, lppProp);
TRACE("(%p,%ld,%p)\n", lpIProp, ulPropTag, lppProp);
pta.cValues = 1u;
pta.aulPropTag[0] = ulPropTag;
......@@ -593,7 +593,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp)
{
BOOL bRet = FALSE;
TRACE("(%p,%d)\n", lpIProp, ulPropTag);
TRACE("(%p,%ld)\n", lpIProp, ulPropTag);
if (lpIProp)
{
......@@ -638,7 +638,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp)
*/
LPSPropValue WINAPI PpropFindProp(LPSPropValue lpProps, ULONG cValues, ULONG ulPropTag)
{
TRACE("(%p,%d,%d)\n", lpProps, cValues, ulPropTag);
TRACE("(%p,%ld,%ld)\n", lpProps, cValues, ulPropTag);
if (lpProps && cValues)
{
......@@ -1075,7 +1075,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
*/
LPSPropValue WINAPI LpValFindProp(ULONG ulPropTag, ULONG cValues, LPSPropValue lpProps)
{
TRACE("(%d,%d,%p)\n", ulPropTag, cValues, lpProps);
TRACE("(%ld,%ld,%p)\n", ulPropTag, cValues, lpProps);
if (lpProps && cValues)
{
......@@ -1139,7 +1139,7 @@ BOOL WINAPI FBadRglpszA(LPSTR *lppszStrs, ULONG ulCount)
{
ULONG i;
TRACE("(%p,%d)\n", lppszStrs, ulCount);
TRACE("(%p,%ld)\n", lppszStrs, ulCount);
if (!ulCount)
return FALSE;
......@@ -1164,7 +1164,7 @@ BOOL WINAPI FBadRglpszW(LPWSTR *lppszStrs, ULONG ulCount)
{
ULONG i;
TRACE("(%p,%d)\n", lppszStrs, ulCount);
TRACE("(%p,%ld)\n", lppszStrs, ulCount);
if (!ulCount)
return FALSE;
......@@ -1220,7 +1220,7 @@ BOOL WINAPI FBadRowSet(LPSRowSet lpRowSet)
*/
ULONG WINAPI FBadPropTag(ULONG ulPropTag)
{
TRACE("(0x%08x)\n", ulPropTag);
TRACE("(0x%08lx)\n", ulPropTag);
switch (ulPropTag & (~MV_FLAG & PROP_TYPE_MASK))
{
......@@ -1532,7 +1532,7 @@ static ULONG WINAPI IPropData_fnAddRef(LPPROPDATA iface)
{
IPropDataImpl *This = impl_from_IPropData(iface);
TRACE("(%p)->(count before=%u)\n", This, This->lRef);
TRACE("(%p)->(count before=%lu)\n", This, This->lRef);
return InterlockedIncrement(&This->lRef);
}
......@@ -1548,7 +1548,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface)
IPropDataImpl *This = impl_from_IPropData(iface);
LONG lRef;
TRACE("(%p)->(count before=%u)\n", This, This->lRef);
TRACE("(%p)->(count before=%lu)\n", This, This->lRef);
lRef = InterlockedDecrement(&This->lRef);
if (!lRef)
......@@ -1596,7 +1596,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface)
static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, ULONG ulFlags,
LPMAPIERROR *lppError)
{
TRACE("(%p,0x%08X,0x%08X,%p)\n", iface, hRes, ulFlags, lppError);
TRACE("(%p,0x%08lX,0x%08lX,%p)\n", iface, hRes, ulFlags, lppError);
if (!lppError || SUCCEEDED(hRes) || (ulFlags & ~MAPI_UNICODE))
return MAPI_E_INVALID_PARAMETER;
......@@ -1620,7 +1620,7 @@ static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, U
*/
static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags)
{
TRACE("(%p,0x%08X)\n", iface, ulFlags);
TRACE("(%p,0x%08lX)\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? */
......@@ -1658,7 +1658,7 @@ static HRESULT WINAPI IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpT
ULONG i;
HRESULT hRet = S_OK;
TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags,
TRACE("(%p,%p,0x%08lx,%p,%p) stub\n", iface, lpTags, ulFlags,
lpCount, lppProps);
if (!iface || ulFlags & ~MAPI_UNICODE || !lpTags || *lpCount || !lppProps)
......@@ -1724,7 +1724,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags,
ULONG i;
HRESULT hRet;
TRACE("(%p,0x%08x,%p) stub\n", iface, ulFlags, lppTags);
TRACE("(%p,0x%08lx,%p) stub\n", iface, ulFlags, lppTags);
if (!iface || ulFlags & ~MAPI_UNICODE || !lppTags)
return MAPI_E_INVALID_PARAMETER;
......@@ -1766,7 +1766,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags,
static HRESULT WINAPI IPropData_fnOpenProperty(LPPROPDATA iface, ULONG ulPropTag, LPCIID iid,
ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk)
{
FIXME("(%p,%u,%s,%u,0x%08x,%p) stub\n", iface, ulPropTag,
FIXME("(%p,%lu,%s,%lu,0x%08lx,%p) stub\n", iface, ulPropTag,
debugstr_guid(iid), ulOpts, ulFlags, lpUnk);
return MAPI_E_NO_SUPPORT;
}
......@@ -1795,7 +1795,7 @@ static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPS
HRESULT hRet = S_OK;
ULONG i;
TRACE("(%p,%u,%p,%p)\n", iface, ulValues, lpProps, lppProbs);
TRACE("(%p,%lu,%p,%p)\n", iface, ulValues, lpProps, lppProbs);
if (!iface || !lpProps)
return MAPI_E_INVALID_PARAMETER;
......@@ -1963,7 +1963,7 @@ static HRESULT WINAPI IPropData_fnCopyTo(LPPROPDATA iface, ULONG niids, LPCIID l
LPVOID lpDstObj, ULONG ulFlags,
LPSPropProblemArray *lppProbs)
{
FIXME("(%p,%u,%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, niids,
FIXME("(%p,%lu,%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, niids,
lpiidExcl, lpPropsExcl, ulParam, lpIProgress,
debugstr_guid(lpIfaceIid), lpDstObj, ulFlags, lppProbs);
return MAPI_E_NO_SUPPORT;
......@@ -1982,7 +1982,7 @@ static HRESULT WINAPI IPropData_fnCopyProps(LPPROPDATA iface, LPSPropTagArray lp
LPCIID lpIface, LPVOID lpDstObj, ULONG ulFlags,
LPSPropProblemArray *lppProbs)
{
FIXME("(%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, lpInclProps,
FIXME("(%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, lpInclProps,
ulParam, lpIProgress, debugstr_guid(lpIface), lpDstObj, ulFlags,
lppProbs);
return MAPI_E_NO_SUPPORT;
......@@ -2015,7 +2015,7 @@ static HRESULT WINAPI IPropData_fnGetNamesFromIDs(LPPROPDATA iface, LPSPropTagAr
LPGUID iid, ULONG ulFlags, ULONG *lpCount,
LPMAPINAMEID **lpppNames)
{
FIXME("(%p,%p,%s,0x%08X,%p,%p) stub\n", iface, lppPropTags,
FIXME("(%p,%p,%s,0x%08lX,%p,%p) stub\n", iface, lppPropTags,
debugstr_guid(iid), ulFlags, lpCount, lpppNames);
return MAPI_E_NO_SUPPORT;
}
......@@ -2045,7 +2045,7 @@ static HRESULT WINAPI IPropData_fnGetIDsFromNames(LPPROPDATA iface, ULONG ulName
LPMAPINAMEID *lppNames, ULONG ulFlags,
LPSPropTagArray *lppPropTags)
{
FIXME("(%p,%d,%p,0x%08X,%p) stub\n",
FIXME("(%p,%ld,%p,0x%08lX,%p) stub\n",
iface, ulNames, lppNames, ulFlags, lppPropTags);
return MAPI_E_NO_SUPPORT;
}
......@@ -2069,7 +2069,7 @@ IPropData_fnHrSetObjAccess(LPPROPDATA iface, ULONG ulAccess)
{
IPropDataImpl *This = impl_from_IPropData(iface);
TRACE("(%p,%x)\n", iface, ulAccess);
TRACE("(%p,%lx)\n", iface, ulAccess);
if (!iface || ulAccess < IPROP_READONLY || ulAccess > IPROP_READWRITE)
return MAPI_E_INVALID_PARAMETER;
......
dlls/mapi32/sendmail.c
View file @ 5ec2a8b9
......@@ -107,7 +107,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
/* Attempt to log on via Extended MAPI */
ret = MAPILogonEx(0, NULL, NULL, MAPI_EXTENDED | MAPI_USE_DEFAULT | MAPI_NEW_SESSION, &session);
TRACE("MAPILogonEx: %x\n", ret);
TRACE("MAPILogonEx: %lx\n", ret);
if (ret != S_OK)
{
......@@ -361,7 +361,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
size += read;
}
TRACE("%d bytes written of attachment\n", size);
TRACE("%ld bytes written of attachment\n", size);
IStream_Commit(stream, STGC_DEFAULT);
IStream_Release(stream);
......@@ -436,7 +436,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
break;
default:
TRACE("ShowForm failure: %x\n", ret);
TRACE("ShowForm failure: %lx\n", ret);
break;
}
}
......
dlls/mapi32/util.c
View file @ 5ec2a8b9
......@@ -69,7 +69,7 @@ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved)
if (mapiFunctions.ScInitMapiUtil)
return mapiFunctions.ScInitMapiUtil(ulReserved);
FIXME("(0x%08x)stub!\n", ulReserved);
FIXME("(0x%08lx)stub!\n", ulReserved);
if (ulReserved)
return MAPI_E_INVALID_PARAMETER;
return S_OK;
......@@ -126,7 +126,7 @@ SCODE WINAPI MAPIAllocateBuffer(ULONG cbSize, LPVOID *lppBuffer)
{
LPMAPIALLOCBUFFER lpBuff;
TRACE("(%d,%p)\n", cbSize, lppBuffer);
TRACE("(%ld,%p)\n", cbSize, lppBuffer);
if (mapiFunctions.MAPIAllocateBuffer)
return mapiFunctions.MAPIAllocateBuffer(cbSize, lppBuffer);
......@@ -169,7 +169,7 @@ SCODE WINAPI MAPIAllocateMore(ULONG cbSize, LPVOID lpOrig, LPVOID *lppBuffer)
{
LPMAPIALLOCBUFFER lpBuff = lpOrig;
TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer);
TRACE("(%ld,%p,%p)\n", cbSize, lpOrig, lppBuffer);
if (mapiFunctions.MAPIAllocateMore)
return mapiFunctions.MAPIAllocateMore(cbSize, lpOrig, lppBuffer);
......@@ -242,7 +242,7 @@ HRESULT WINAPI WrapProgress(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4, PVOI
*/
HRESULT WINAPI HrDispatchNotifications(ULONG flags)
{
FIXME("(%08x)\n", flags);
FIXME("(%08lx)\n", flags);
return S_OK;
}
......@@ -465,7 +465,7 @@ INT WINAPI MNLS_CompareStringW(DWORD dwCp, LPCWSTR lpszLeft, LPCWSTR lpszRight)
{
INT ret;
TRACE("0x%08x,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight));
TRACE("0x%08lx,%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;
}
......@@ -717,7 +717,7 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree,
DWORD dwMode = STGM_READWRITE, dwAttributes = 0;
HRESULT hRet;
TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags,
TRACE("(%p,%p,0x%08lx,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags,
debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream);
if (mapiFunctions.OpenStreamOnFile)
......@@ -883,7 +883,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path
BOOL ret = FALSE;
HMODULE hmsi;
TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install);
TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install);
if (mapiFunctions.FGetComponentPath)
return mapiFunctions.FGetComponentPath(component, qualifier, dll_path, dll_path_length, install);
......@@ -937,7 +937,7 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags,
if (mapiFunctions.HrQueryAllRows)
return mapiFunctions.HrQueryAllRows(lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows);
FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows);
FIXME("(%p, %p, %p, %p, %ld, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows);
*lppRows = NULL;
return MAPI_E_CALL_FAILED;
}
......@@ -950,7 +950,7 @@ HRESULT WINAPI WrapCompressedRTFStream(LPSTREAM compressed, ULONG flags, LPSTREA
if (mapiFunctions.WrapCompressedRTFStream)
return mapiFunctions.WrapCompressedRTFStream(compressed, flags, uncompressed);
FIXME("(%p, 0x%08x, %p): stub\n", compressed, flags, uncompressed);
FIXME("(%p, 0x%08lx, %p): stub\n", compressed, flags, uncompressed);
return MAPI_E_NO_SUPPORT;
}
......
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