inetcomm: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-11 08:40:23 +01:00 committed by Alexandre Julliard
parent 427e16d0b3
commit 2e38cb9efd
8 changed files with 140 additions and 141 deletions

View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = inetcomm.dll MODULE = inetcomm.dll
IMPORTLIB = inetcomm IMPORTLIB = inetcomm
IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32

View File

@ -191,35 +191,35 @@ static HRESULT WINAPI IMAPTransport_Capability(IIMAPTransport *iface,
static HRESULT WINAPI IMAPTransport_Select(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Select(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{ {
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_Examine(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Examine(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{ {
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_Create(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Create(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{ {
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_Delete(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Delete(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{ {
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR lpszMailboxName, LPSTR lpszNewMailboxName) IIMAPCallback *pCBHandler, LPSTR lpszMailboxName, LPSTR lpszNewMailboxName)
{ {
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxName), debugstr_a(lpszNewMailboxName)); debugstr_a(lpszMailboxName), debugstr_a(lpszNewMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -227,21 +227,21 @@ static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam,
static HRESULT WINAPI IMAPTransport_Subscribe(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Subscribe(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{ {
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_Unsubscribe(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Unsubscribe(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{ {
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern) IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern)
{ {
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern)); debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern));
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -249,7 +249,7 @@ static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, L
static HRESULT WINAPI IMAPTransport_Lsub(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, static HRESULT WINAPI IMAPTransport_Lsub(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern) IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern)
{ {
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern)); debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern));
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -258,7 +258,7 @@ static HRESULT WINAPI IMAPTransport_Append(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName, WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName,
LPSTR lpszMessageFlags, FILETIME ftMessageDateTime, LPSTREAM lpstmMessageToSave) LPSTR lpszMessageFlags, FILETIME ftMessageDateTime, LPSTREAM lpstmMessageToSave)
{ {
FIXME("(%ld, %ld, %p, %s, %s, %p): stub\n", wParam, lParam, pCBHandler, FIXME("(%Id, %Id, %p, %s, %s, %p): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxName), debugstr_a(lpszMessageFlags), lpstmMessageToSave); debugstr_a(lpszMailboxName), debugstr_a(lpszMessageFlags), lpstmMessageToSave);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -266,14 +266,14 @@ static HRESULT WINAPI IMAPTransport_Append(IIMAPTransport *iface,
static HRESULT WINAPI IMAPTransport_Close(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Close(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
{ {
FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler); FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_Expunge(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Expunge(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
{ {
FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler); FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -281,7 +281,7 @@ static HRESULT WINAPI IMAPTransport_Search(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszSearchCriteria, WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszSearchCriteria,
boolean bReturnUIDs, IRangeList *pMsgRange, boolean bUIDRangeList) boolean bReturnUIDs, IRangeList *pMsgRange, boolean bUIDRangeList)
{ {
FIXME("(%ld, %ld, %p, %s, %d, %p, %d): stub\n", wParam, lParam, pCBHandler, FIXME("(%Id, %Id, %p, %s, %d, %p, %d): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszSearchCriteria), bReturnUIDs, pMsgRange, bUIDRangeList); debugstr_a(lpszSearchCriteria), bReturnUIDs, pMsgRange, bUIDRangeList);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -289,7 +289,7 @@ static HRESULT WINAPI IMAPTransport_Search(IIMAPTransport *iface,
static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDMsgRange, LPSTR lpszFetchArgs) IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDMsgRange, LPSTR lpszFetchArgs)
{ {
FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange, FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
bUIDMsgRange, debugstr_a(lpszFetchArgs)); bUIDMsgRange, debugstr_a(lpszFetchArgs));
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -297,7 +297,7 @@ static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam,
static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszStoreArgs) IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszStoreArgs)
{ {
FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange, FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
bUIDRangeList, debugstr_a(lpszStoreArgs)); bUIDRangeList, debugstr_a(lpszStoreArgs));
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -305,7 +305,7 @@ static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam,
static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszMailboxName) IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszMailboxName)
{ {
FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange, FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
bUIDRangeList, debugstr_a(lpszMailboxName)); bUIDRangeList, debugstr_a(lpszMailboxName));
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -313,33 +313,33 @@ static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, L
static HRESULT WINAPI IMAPTransport_Noop(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_Noop(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler) WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
{ {
FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler); FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_ResizeMsgSeqNumTable(IIMAPTransport *iface, DWORD dwSizeOfMbox) static HRESULT WINAPI IMAPTransport_ResizeMsgSeqNumTable(IIMAPTransport *iface, DWORD dwSizeOfMbox)
{ {
FIXME("(%u): stub\n", dwSizeOfMbox); FIXME("(%lu): stub\n", dwSizeOfMbox);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_UpdateSeqNumToUID(IIMAPTransport *iface, static HRESULT WINAPI IMAPTransport_UpdateSeqNumToUID(IIMAPTransport *iface,
DWORD dwMsgSeqNum, DWORD dwUID) DWORD dwMsgSeqNum, DWORD dwUID)
{ {
FIXME("(%u, %u): stub\n", dwMsgSeqNum, dwUID); FIXME("(%lu, %lu): stub\n", dwMsgSeqNum, dwUID);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_RemoveSequenceNum(IIMAPTransport *iface, DWORD dwDeletedMsgSeqNum) static HRESULT WINAPI IMAPTransport_RemoveSequenceNum(IIMAPTransport *iface, DWORD dwDeletedMsgSeqNum)
{ {
FIXME("(%u): stub\n", dwDeletedMsgSeqNum); FIXME("(%lu): stub\n", dwDeletedMsgSeqNum);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IMAPTransport_MsgSeqNumToUID(IIMAPTransport *iface, DWORD dwMsgSeqNum, static HRESULT WINAPI IMAPTransport_MsgSeqNumToUID(IIMAPTransport *iface, DWORD dwMsgSeqNum,
DWORD *pdwUID) DWORD *pdwUID)
{ {
FIXME("(%u, %p): stub\n", dwMsgSeqNum, pdwUID); FIXME("(%lu, %p): stub\n", dwMsgSeqNum, pdwUID);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -371,7 +371,7 @@ static HRESULT WINAPI IMAPTransport_SetDefaultCBHandler(IIMAPTransport *iface, I
static HRESULT WINAPI IMAPTransport_Status(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, static HRESULT WINAPI IMAPTransport_Status(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR pszMailboxName, LPSTR pszStatusCmdArgs) IIMAPCallback *pCBHandler, LPSTR pszMailboxName, LPSTR pszStatusCmdArgs)
{ {
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(pszMailboxName), debugstr_a(pszStatusCmdArgs)); debugstr_a(pszMailboxName), debugstr_a(pszStatusCmdArgs));
return E_NOTIMPL; return E_NOTIMPL;
} }

View File

@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
static IMimeInternational *international; static IMimeInternational *international;
TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) switch (fdwReason)
{ {

View File

@ -166,7 +166,7 @@ static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface,
HRESULT hr; HRESULT hr;
MIMECPINFO mlang_cp_info; MIMECPINFO mlang_cp_info;
TRACE("(%p)->(%d, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset); TRACE("(%p)->(%ld, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset);
*phCharset = NULL; *phCharset = NULL;
@ -315,7 +315,7 @@ static HRESULT WINAPI MimeInternat_CanConvertCodePages(IMimeInternational *iface
HRESULT hr; HRESULT hr;
IMultiLanguage *ml; IMultiLanguage *ml;
TRACE("(%p)->(%d, %d)\n", iface, cpiSource, cpiDest); TRACE("(%p)->(%ld, %ld)\n", iface, cpiSource, cpiDest);
/* Could call mlang.IsConvertINetStringAvailable() to avoid the COM overhead if need be. */ /* Could call mlang.IsConvertINetStringAvailable() to avoid the COM overhead if need be. */
@ -354,7 +354,7 @@ static HRESULT WINAPI MimeInternat_ConvertBuffer(IMimeInternational *iface, CODE
HRESULT hr; HRESULT hr;
IMultiLanguage *ml; IMultiLanguage *ml;
TRACE("(%p)->(%d, %d, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead); TRACE("(%p)->(%ld, %ld, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead);
*pcbRead = 0; *pcbRead = 0;
pOut->cbSize = 0; pOut->cbSize = 0;
@ -404,7 +404,7 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE
int src_len; int src_len;
IMultiLanguage *ml; IMultiLanguage *ml;
TRACE("(%p)->(%d, %d, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut); TRACE("(%p)->(%ld, %ld, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut);
switch(pIn->vt) switch(pIn->vt)
{ {

View File

@ -204,7 +204,7 @@ static ULONG WINAPI sub_stream_AddRef(IStream *iface)
sub_stream_t *This = impl_from_IStream(iface); sub_stream_t *This = impl_from_IStream(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
@ -214,7 +214,7 @@ static ULONG WINAPI sub_stream_Release(IStream *iface)
sub_stream_t *This = impl_from_IStream(iface); sub_stream_t *This = impl_from_IStream(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) if(!ref)
{ {
@ -234,7 +234,7 @@ static HRESULT WINAPI sub_stream_Read(
HRESULT hr; HRESULT hr;
LARGE_INTEGER tmp_pos; LARGE_INTEGER tmp_pos;
TRACE("(%p, %d, %p)\n", pv, cb, pcbRead); TRACE("(%p, %ld, %p)\n", pv, cb, pcbRead);
tmp_pos.QuadPart = This->pos.QuadPart + This->start.QuadPart; tmp_pos.QuadPart = This->pos.QuadPart + This->start.QuadPart;
IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL);
@ -268,7 +268,7 @@ static HRESULT WINAPI sub_stream_Seek(
sub_stream_t *This = impl_from_IStream(iface); sub_stream_t *This = impl_from_IStream(iface);
LARGE_INTEGER new_pos; LARGE_INTEGER new_pos;
TRACE("(%08x.%08x, %x, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
switch(dwOrigin) switch(dwOrigin)
{ {
@ -315,7 +315,7 @@ static HRESULT WINAPI sub_stream_CopyTo(
ULARGE_INTEGER totalBytesRead; ULARGE_INTEGER totalBytesRead;
ULARGE_INTEGER totalBytesWritten; ULARGE_INTEGER totalBytesWritten;
TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);
totalBytesRead.QuadPart = 0; totalBytesRead.QuadPart = 0;
totalBytesWritten.QuadPart = 0; totalBytesWritten.QuadPart = 0;
@ -392,7 +392,7 @@ static HRESULT WINAPI sub_stream_Stat(
DWORD grfStatFlag) DWORD grfStatFlag)
{ {
sub_stream_t *This = impl_from_IStream(iface); sub_stream_t *This = impl_from_IStream(iface);
FIXME("(%p)->(%p, %08x)\n", This, pstatstg, grfStatFlag); FIXME("(%p)->(%p, %08lx)\n", This, pstatstg, grfStatFlag);
memset(pstatstg, 0, sizeof(*pstatstg)); memset(pstatstg, 0, sizeof(*pstatstg));
pstatstg->cbSize = This->length; pstatstg->cbSize = This->length;
return S_OK; return S_OK;
@ -566,7 +566,7 @@ static header_t *read_prop(MimeBody *body, char **ptr)
{ {
if(!lstrcmpiA(*ptr, prop->name)) if(!lstrcmpiA(*ptr, prop->name))
{ {
TRACE("%s: found match with default property id %d\n", *ptr, prop->id); TRACE("%s: found match with default property id %ld\n", *ptr, prop->id);
break; break;
} }
} }
@ -578,7 +578,7 @@ static header_t *read_prop(MimeBody *body, char **ptr)
{ {
if(!lstrcmpiA(*ptr, prop_entry->prop.name)) if(!lstrcmpiA(*ptr, prop_entry->prop.name))
{ {
TRACE("%s: found match with already added new property id %d\n", *ptr, prop_entry->prop.id); TRACE("%s: found match with already added new property id %ld\n", *ptr, prop_entry->prop.id);
prop = &prop_entry->prop; prop = &prop_entry->prop;
break; break;
} }
@ -592,7 +592,7 @@ static header_t *read_prop(MimeBody *body, char **ptr)
prop_entry->prop.default_vt = VT_LPSTR; prop_entry->prop.default_vt = VT_LPSTR;
list_add_tail(&body->new_props, &prop_entry->entry); list_add_tail(&body->new_props, &prop_entry->entry);
prop = &prop_entry->prop; prop = &prop_entry->prop;
TRACE("%s: allocating new prop id %d\n", *ptr, prop_entry->prop.id); TRACE("%s: allocating new prop id %ld\n", *ptr, prop_entry->prop.id);
} }
} }
@ -905,7 +905,7 @@ static const property_t *find_default_prop(const char *name)
} }
if(prop_def->id) if(prop_def->id)
TRACE("%s: found match with default property id %d\n", prop_def->name, prop_def->id); TRACE("%s: found match with default property id %ld\n", prop_def->name, prop_def->id);
else else
prop_def = NULL; prop_def = NULL;
@ -944,7 +944,7 @@ static ULONG WINAPI MimeBody_AddRef(IMimeBody *iface)
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
@ -954,7 +954,7 @@ static ULONG WINAPI MimeBody_Release(IMimeBody *iface)
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) if (!ref)
{ {
@ -1041,10 +1041,10 @@ static HRESULT WINAPI MimeBody_GetPropInfo(
if(!pszName || !pInfo) if(!pszName || !pInfo)
return E_INVALIDARG; return E_INVALIDARG;
TRACE("mask 0x%04x\n", pInfo->dwMask); TRACE("mask 0x%04lx\n", pInfo->dwMask);
if(pInfo->dwMask & ~supported) if(pInfo->dwMask & ~supported)
FIXME("Unsupported mask flags 0x%04x\n", pInfo->dwMask & ~supported); FIXME("Unsupported mask flags 0x%04lx\n", pInfo->dwMask & ~supported);
hr = find_prop(This, pszName, &header); hr = find_prop(This, pszName, &header);
if(hr == S_OK) if(hr == S_OK)
@ -1090,7 +1090,7 @@ static HRESULT WINAPI MimeBody_GetProp(
header_t *header; header_t *header;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s, 0x%x, %p)\n", This, debugstr_a(pszName), dwFlags, pValue); TRACE("(%p)->(%s, 0x%lx, %p)\n", This, debugstr_a(pszName), dwFlags, pValue);
if(!pszName || !pValue) if(!pszName || !pValue)
return E_INVALIDARG; return E_INVALIDARG;
@ -1126,7 +1126,7 @@ static HRESULT WINAPI MimeBody_SetProp(
header_t *header; header_t *header;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s, 0x%x, %p)\n", This, debugstr_a(pszName), dwFlags, pValue); TRACE("(%p)->(%s, 0x%lx, %p)\n", This, debugstr_a(pszName), dwFlags, pValue);
if(!pszName || !pValue) if(!pszName || !pValue)
return E_INVALIDARG; return E_INVALIDARG;
@ -1143,14 +1143,14 @@ static HRESULT WINAPI MimeBody_SetProp(
{ {
if(STRTOPID(pszName) == prop_entry->prop.id) if(STRTOPID(pszName) == prop_entry->prop.id)
{ {
TRACE("Found match with already added new property id %d\n", prop_entry->prop.id); TRACE("Found match with already added new property id %ld\n", prop_entry->prop.id);
prop = &prop_entry->prop; prop = &prop_entry->prop;
break; break;
} }
} }
else if(!lstrcmpiA(pszName, prop_entry->prop.name)) else if(!lstrcmpiA(pszName, prop_entry->prop.name))
{ {
TRACE("Found match with already added new property id %d\n", prop_entry->prop.id); TRACE("Found match with already added new property id %ld\n", prop_entry->prop.id);
prop = &prop_entry->prop; prop = &prop_entry->prop;
break; break;
} }
@ -1193,7 +1193,7 @@ static HRESULT WINAPI MimeBody_SetProp(
prop_entry->prop.default_vt = pValue->vt; prop_entry->prop.default_vt = pValue->vt;
list_add_tail(&This->new_props, &prop_entry->entry); list_add_tail(&This->new_props, &prop_entry->entry);
prop = &prop_entry->prop; prop = &prop_entry->prop;
TRACE("Allocating new prop id %d\n", prop_entry->prop.id); TRACE("Allocating new prop id %ld\n", prop_entry->prop.id);
} }
header->prop = prop; header->prop = prop;
@ -1214,7 +1214,7 @@ static HRESULT WINAPI MimeBody_AppendProp(
LPPROPVARIANT pValue) LPPROPVARIANT pValue)
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
FIXME("(%p)->(%s, 0x%x, %p) stub\n", This, debugstr_a(pszName), dwFlags, pValue); FIXME("(%p)->(%s, 0x%lx, %p) stub\n", This, debugstr_a(pszName), dwFlags, pValue);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1252,7 +1252,7 @@ static HRESULT WINAPI MimeBody_CopyProps(
IMimePropertySet* pPropertySet) IMimePropertySet* pPropertySet)
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
FIXME("(%p)->(%d, %p, %p) stub\n", This, cNames, prgszName, pPropertySet); FIXME("(%p)->(%ld, %p, %p) stub\n", This, cNames, prgszName, pPropertySet);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1263,7 +1263,7 @@ static HRESULT WINAPI MimeBody_MoveProps(
IMimePropertySet* pPropertySet) IMimePropertySet* pPropertySet)
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
FIXME("(%p)->(%d, %p, %p) stub\n", This, cNames, prgszName, pPropertySet); FIXME("(%p)->(%ld, %p, %p) stub\n", This, cNames, prgszName, pPropertySet);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1273,7 +1273,7 @@ static HRESULT WINAPI MimeBody_DeleteExcept(
LPCSTR* prgszName) LPCSTR* prgszName)
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
FIXME("(%p)->(%d, %p) stub\n", This, cNames, prgszName); FIXME("(%p)->(%ld, %p) stub\n", This, cNames, prgszName);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1405,26 +1405,26 @@ static HRESULT WINAPI MimeBody_SetOption(
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
HRESULT hr = E_NOTIMPL; HRESULT hr = E_NOTIMPL;
TRACE("(%p)->(%08x, %p)\n", This, oid, pValue); TRACE("(%p)->(%08lx, %p)\n", This, oid, pValue);
if(pValue->vt != TYPEDID_TYPE(oid)) if(pValue->vt != TYPEDID_TYPE(oid))
{ {
WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); WARN("Called with vartype %04x and oid %08lx\n", pValue->vt, oid);
return E_INVALIDARG; return E_INVALIDARG;
} }
switch(oid) switch(oid)
{ {
case OID_SECURITY_HWND_OWNER: case OID_SECURITY_HWND_OWNER:
FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->ulVal); FIXME("OID_SECURITY_HWND_OWNER (value %08lx): ignoring\n", pValue->ulVal);
hr = S_OK; hr = S_OK;
break; break;
case OID_TRANSMIT_BODY_ENCODING: case OID_TRANSMIT_BODY_ENCODING:
FIXME("OID_TRANSMIT_BODY_ENCODING (value %08x): ignoring\n", pValue->ulVal); FIXME("OID_TRANSMIT_BODY_ENCODING (value %08lx): ignoring\n", pValue->ulVal);
hr = S_OK; hr = S_OK;
break; break;
default: default:
FIXME("Unhandled oid %08x\n", oid); FIXME("Unhandled oid %08lx\n", oid);
} }
return hr; return hr;
@ -1436,7 +1436,7 @@ static HRESULT WINAPI MimeBody_GetOption(
LPPROPVARIANT pValue) LPPROPVARIANT pValue)
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
FIXME("(%p)->(%08x, %p): stub\n", This, oid, pValue); FIXME("(%p)->(%08lx, %p): stub\n", This, oid, pValue);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1446,7 +1446,7 @@ static HRESULT WINAPI MimeBody_EnumProps(
IMimeEnumProperties** ppEnum) IMimeEnumProperties** ppEnum)
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
FIXME("(%p)->(0x%x, %p) stub\n", This, dwFlags, ppEnum); FIXME("(%p)->(0x%lx, %p) stub\n", This, dwFlags, ppEnum);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1877,7 +1877,7 @@ static IMimeBodyVtbl body_vtbl =
static HRESULT MimeBody_set_offsets(MimeBody *body, const BODYOFFSETS *offsets) static HRESULT MimeBody_set_offsets(MimeBody *body, const BODYOFFSETS *offsets)
{ {
TRACE("setting offsets to %d, %d, %d, %d\n", offsets->cbBoundaryStart, TRACE("setting offsets to %ld, %ld, %ld, %ld\n", offsets->cbBoundaryStart,
offsets->cbHeaderStart, offsets->cbBodyStart, offsets->cbBodyEnd); offsets->cbHeaderStart, offsets->cbBodyStart, offsets->cbBodyEnd);
body->body_offsets = *offsets; body->body_offsets = *offsets;
@ -1983,7 +1983,7 @@ static ULONG WINAPI MimeMessage_AddRef(IMimeMessage *iface)
MimeMessage *This = impl_from_IMimeMessage(iface); MimeMessage *This = impl_from_IMimeMessage(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
@ -2005,7 +2005,7 @@ static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface)
MimeMessage *This = impl_from_IMimeMessage(iface); MimeMessage *This = impl_from_IMimeMessage(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) if (!ref)
{ {
@ -2266,7 +2266,7 @@ static HRESULT WINAPI MimeMessage_GetMessageSource(IMimeMessage *iface, IStream
{ {
MimeMessage *This = impl_from_IMimeMessage(iface); MimeMessage *This = impl_from_IMimeMessage(iface);
FIXME("(%p)->(%p, 0x%x)\n", iface, ppStream, dwFlags); FIXME("(%p)->(%p, 0x%lx)\n", iface, ppStream, dwFlags);
IStream_AddRef(This->stream); IStream_AddRef(This->stream);
*ppStream = This->stream; *ppStream = This->stream;
@ -2278,7 +2278,7 @@ static HRESULT WINAPI MimeMessage_GetMessageSize(
ULONG *pcbSize, ULONG *pcbSize,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p, 0x%x)\n", iface, pcbSize, dwFlags); FIXME("(%p)->(%p, 0x%lx)\n", iface, pcbSize, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2295,7 +2295,7 @@ static HRESULT WINAPI MimeMessage_SaveOffsetTable(
IStream *pStream, IStream *pStream,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p, 0x%x)\n", iface, pStream, dwFlags); FIXME("(%p)->(%p, 0x%lx)\n", iface, pStream, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2312,7 +2312,7 @@ static HRESULT WINAPI MimeMessage_Commit(
IMimeMessage *iface, IMimeMessage *iface,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(0x%x)\n", iface, dwFlags); FIXME("(%p)->(0x%lx)\n", iface, dwFlags);
return S_OK; return S_OK;
} }
@ -2377,7 +2377,7 @@ static HRESULT WINAPI MimeMessage_SaveBody(
DWORD dwFlags, DWORD dwFlags,
IStream *pStream) IStream *pStream)
{ {
FIXME("(%p)->(%p, 0x%x, %p)\n", iface, hBody, dwFlags, pStream); FIXME("(%p)->(%p, 0x%lx, %p)\n", iface, hBody, dwFlags, pStream);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2485,7 +2485,7 @@ static HRESULT WINAPI MimeMessage_DeleteBody(
HBODY hBody, HBODY hBody,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p, %08x)\n", iface, hBody, dwFlags); FIXME("(%p)->(%p, %08lx)\n", iface, hBody, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2589,7 +2589,7 @@ static HRESULT WINAPI MimeMessage_ResolveURL(
DWORD dwFlags, DWORD dwFlags,
LPHBODY phBody) LPHBODY phBody)
{ {
FIXME("(%p)->(%p, %s, %s, 0x%x, %p)\n", iface, hRelated, pszBase, pszURL, dwFlags, phBody); FIXME("(%p)->(%p, %s, %s, 0x%lx, %p)\n", iface, hRelated, pszBase, pszURL, dwFlags, phBody);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2688,7 +2688,7 @@ static HRESULT WINAPI MimeMessage_GetBodyProp(
HRESULT hr; HRESULT hr;
IMimeBody *mime_body; IMimeBody *mime_body;
TRACE("(%p)->(%p, %s, 0x%x, %p)\n", iface, hBody, pszName, dwFlags, pValue); TRACE("(%p)->(%p, %s, 0x%lx, %p)\n", iface, hBody, pszName, dwFlags, pValue);
hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body); hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body);
if(hr != S_OK) return hr; if(hr != S_OK) return hr;
@ -2706,7 +2706,7 @@ static HRESULT WINAPI MimeMessage_SetBodyProp(
DWORD dwFlags, DWORD dwFlags,
LPCPROPVARIANT pValue) LPCPROPVARIANT pValue)
{ {
FIXME("(%p)->(%p, %s, 0x%x, %p)\n", iface, hBody, pszName, dwFlags, pValue); FIXME("(%p)->(%p, %s, 0x%lx, %p)\n", iface, hBody, pszName, dwFlags, pValue);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2725,20 +2725,20 @@ static HRESULT WINAPI MimeMessage_SetOption(
LPCPROPVARIANT pValue) LPCPROPVARIANT pValue)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue); TRACE("(%p)->(%08lx, %p)\n", iface, oid, pValue);
/* Message ID is checked before type. /* Message ID is checked before type.
* OID 0x4D -> 0x56 and 0x58 aren't defined but will filtered out later. * OID 0x4D -> 0x56 and 0x58 aren't defined but will filtered out later.
*/ */
if(TYPEDID_ID(oid) < TYPEDID_ID(OID_ALLOW_8BIT_HEADER) || TYPEDID_ID(oid) > TYPEDID_ID(OID_SECURITY_2KEY_CERT_BAG_64)) if(TYPEDID_ID(oid) < TYPEDID_ID(OID_ALLOW_8BIT_HEADER) || TYPEDID_ID(oid) > TYPEDID_ID(OID_SECURITY_2KEY_CERT_BAG_64))
{ {
WARN("oid (%08x) out of range\n", oid); WARN("oid (%08lx) out of range\n", oid);
return MIME_E_INVALID_OPTION_ID; return MIME_E_INVALID_OPTION_ID;
} }
if(pValue->vt != TYPEDID_TYPE(oid)) if(pValue->vt != TYPEDID_TYPE(oid))
{ {
WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); WARN("Called with vartype %04x and oid %08lx\n", pValue->vt, oid);
return S_OK; return S_OK;
} }
@ -2757,7 +2757,7 @@ static HRESULT WINAPI MimeMessage_SetOption(
FIXME("OID_CLEANUP_TREE_ON_SAVE (value %d): ignoring\n", pValue->boolVal); FIXME("OID_CLEANUP_TREE_ON_SAVE (value %d): ignoring\n", pValue->boolVal);
break; break;
default: default:
FIXME("Unhandled oid %08x\n", oid); FIXME("Unhandled oid %08lx\n", oid);
hr = MIME_E_INVALID_OPTION_ID; hr = MIME_E_INVALID_OPTION_ID;
} }
@ -2769,7 +2769,7 @@ static HRESULT WINAPI MimeMessage_GetOption(
const TYPEDID oid, const TYPEDID oid,
LPPROPVARIANT pValue) LPPROPVARIANT pValue)
{ {
FIXME("(%p)->(%08x, %p)\n", iface, oid, pValue); FIXME("(%p)->(%08lx, %p)\n", iface, oid, pValue);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2792,7 +2792,7 @@ static HRESULT WINAPI MimeMessage_GetProp(
DWORD dwFlags, DWORD dwFlags,
LPPROPVARIANT pValue) LPPROPVARIANT pValue)
{ {
FIXME("(%p)->(%s, 0x%x, %p)\n", iface, pszName, dwFlags, pValue); FIXME("(%p)->(%s, 0x%lx, %p)\n", iface, pszName, dwFlags, pValue);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2802,7 +2802,7 @@ static HRESULT WINAPI MimeMessage_SetProp(
DWORD dwFlags, DWORD dwFlags,
LPCPROPVARIANT pValue) LPCPROPVARIANT pValue)
{ {
FIXME("(%p)->(%s, 0x%x, %p)\n", iface, pszName, dwFlags, pValue); FIXME("(%p)->(%s, 0x%lx, %p)\n", iface, pszName, dwFlags, pValue);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2840,7 +2840,7 @@ static HRESULT WINAPI MimeMessage_GetTextBody(
static char plain[] = "plain"; static char plain[] = "plain";
static char html[] = "html"; static char html[] = "html";
TRACE("(%p)->(%d, %d, %p, %p)\n", iface, dwTxtType, ietEncoding, pStream, phBody); TRACE("(%p)->(%ld, %d, %p, %p)\n", iface, dwTxtType, ietEncoding, pStream, phBody);
find_struct.pszPriType = text; find_struct.pszPriType = text;
@ -2859,7 +2859,7 @@ static HRESULT WINAPI MimeMessage_GetTextBody(
hr = IMimeMessage_FindFirst(iface, &find_struct, &hbody); hr = IMimeMessage_FindFirst(iface, &find_struct, &hbody);
if(hr != S_OK) if(hr != S_OK)
{ {
TRACE("not found hr %08x\n", hr); TRACE("not found hr %08lx\n", hr);
*phBody = NULL; *phBody = NULL;
return hr; return hr;
} }
@ -2880,7 +2880,7 @@ static HRESULT WINAPI MimeMessage_SetTextBody(
IStream *pStream, IStream *pStream,
LPHBODY phBody) LPHBODY phBody)
{ {
FIXME("(%p)->(%d, %d, %p, %p, %p)\n", iface, dwTxtType, ietEncoding, hAlternative, pStream, phBody); FIXME("(%p)->(%ld, %d, %p, %p, %p)\n", iface, dwTxtType, ietEncoding, hAlternative, pStream, phBody);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2913,7 +2913,7 @@ static HRESULT WINAPI MimeMessage_AttachURL(
LPSTR *ppszCIDURL, LPSTR *ppszCIDURL,
LPHBODY phBody) LPHBODY phBody)
{ {
FIXME("(%p)->(%s, %s, 0x%x, %p, %p, %p)\n", iface, pszBase, pszURL, dwFlags, pstmURL, ppszCIDURL, phBody); FIXME("(%p)->(%s, %s, 0x%lx, %p, %p, %p)\n", iface, pszBase, pszURL, dwFlags, pstmURL, ppszCIDURL, phBody);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2938,7 +2938,7 @@ static HRESULT WINAPI MimeMessage_GetAttachments(
while(hr == S_OK) while(hr == S_OK)
{ {
hr = IMimeMessage_IsContentType(iface, hbody, "multipart", NULL); hr = IMimeMessage_IsContentType(iface, hbody, "multipart", NULL);
TRACE("IsCT rets %08x %d\n", hr, *pcAttach); TRACE("IsCT rets %08lx %ld\n", hr, *pcAttach);
if(hr != S_OK) if(hr != S_OK)
{ {
if(*pcAttach + 1 > size) if(*pcAttach + 1 > size)
@ -2978,7 +2978,7 @@ static HRESULT WINAPI MimeMessage_GetAddressTypes(
DWORD dwProps, DWORD dwProps,
LPADDRESSLIST pList) LPADDRESSLIST pList)
{ {
FIXME("(%p)->(%d, %d, %p)\n", iface, dwAdrTypes, dwProps, pList); FIXME("(%p)->(%ld, %ld, %p)\n", iface, dwAdrTypes, dwProps, pList);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2988,7 +2988,7 @@ static HRESULT WINAPI MimeMessage_GetAddressFormat(
ADDRESSFORMAT format, ADDRESSFORMAT format,
LPSTR *ppszFormat) LPSTR *ppszFormat)
{ {
FIXME("(%p)->(%d, %d, %p)\n", iface, dwAdrTypes, format, ppszFormat); FIXME("(%p)->(%ld, %d, %p)\n", iface, dwAdrTypes, format, ppszFormat);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -2998,7 +2998,7 @@ static HRESULT WINAPI MimeMessage_EnumAddressTypes(
DWORD dwProps, DWORD dwProps,
IMimeEnumAddressTypes **ppEnum) IMimeEnumAddressTypes **ppEnum)
{ {
FIXME("(%p)->(%d, %d, %p)\n", iface, dwAdrTypes, dwProps, ppEnum); FIXME("(%p)->(%ld, %ld, %p)\n", iface, dwAdrTypes, dwProps, ppEnum);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3007,7 +3007,7 @@ static HRESULT WINAPI MimeMessage_SplitMessage(
ULONG cbMaxPart, ULONG cbMaxPart,
IMimeMessageParts **ppParts) IMimeMessageParts **ppParts)
{ {
FIXME("(%p)->(%d, %p)\n", iface, cbMaxPart, ppParts); FIXME("(%p)->(%ld, %p)\n", iface, cbMaxPart, ppParts);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3126,7 +3126,7 @@ HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessag
*/ */
HRESULT WINAPI MimeOleSetCompatMode(DWORD dwMode) HRESULT WINAPI MimeOleSetCompatMode(DWORD dwMode)
{ {
FIXME("(0x%x)\n", dwMode); FIXME("(0x%lx)\n", dwMode);
return S_OK; return S_OK;
} }
@ -3175,7 +3175,7 @@ static ULONG WINAPI MimeSecurity_AddRef(IMimeSecurity *iface)
MimeSecurity *This = impl_from_IMimeSecurity(iface); MimeSecurity *This = impl_from_IMimeSecurity(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
@ -3185,7 +3185,7 @@ static ULONG WINAPI MimeSecurity_Release(IMimeSecurity *iface)
MimeSecurity *This = impl_from_IMimeSecurity(iface); MimeSecurity *This = impl_from_IMimeSecurity(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) if (!ref)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
@ -3212,7 +3212,7 @@ static HRESULT WINAPI MimeSecurity_EncodeMessage(
IMimeMessageTree* pTree, IMimeMessageTree* pTree,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p, %08x): stub\n", iface, pTree, dwFlags); FIXME("(%p)->(%p, %08lx): stub\n", iface, pTree, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3222,7 +3222,7 @@ static HRESULT WINAPI MimeSecurity_EncodeBody(
HBODY hEncodeRoot, HBODY hEncodeRoot,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p, %p, %08x): stub\n", iface, pTree, hEncodeRoot, dwFlags); FIXME("(%p)->(%p, %p, %08lx): stub\n", iface, pTree, hEncodeRoot, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3231,7 +3231,7 @@ static HRESULT WINAPI MimeSecurity_DecodeMessage(
IMimeMessageTree* pTree, IMimeMessageTree* pTree,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p, %08x): stub\n", iface, pTree, dwFlags); FIXME("(%p)->(%p, %08lx): stub\n", iface, pTree, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3241,7 +3241,7 @@ static HRESULT WINAPI MimeSecurity_DecodeBody(
HBODY hDecodeRoot, HBODY hDecodeRoot,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p, %p, %08x): stub\n", iface, pTree, hDecodeRoot, dwFlags); FIXME("(%p)->(%p, %p, %08lx): stub\n", iface, pTree, hDecodeRoot, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3252,7 +3252,7 @@ static HRESULT WINAPI MimeSecurity_EnumCertificates(
PCX509CERT pPrev, PCX509CERT pPrev,
PCX509CERT* ppCert) PCX509CERT* ppCert)
{ {
FIXME("(%p)->(%p, %08x, %p, %p): stub\n", iface, hc, dwUsage, pPrev, ppCert); FIXME("(%p)->(%p, %08lx, %p, %p): stub\n", iface, hc, dwUsage, pPrev, ppCert);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3415,7 +3415,7 @@ static HRESULT WINAPI MimeAlloc_FreeParamInfoArray(
boolean fFreeArray) boolean fFreeArray)
{ {
ULONG i; ULONG i;
TRACE("(%p)->(%d, %p, %d)\n", iface, cParams, prgParam, fFreeArray); TRACE("(%p)->(%ld, %p, %d)\n", iface, cParams, prgParam, fFreeArray);
for(i = 0; i < cParams; i++) for(i = 0; i < cParams; i++)
{ {
@ -3567,7 +3567,7 @@ static ULONG WINAPI propschema_AddRef(IMimePropertySchema *iface)
propschema *This = impl_from_IMimePropertySchema(iface); propschema *This = impl_from_IMimePropertySchema(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
@ -3577,7 +3577,7 @@ static ULONG WINAPI propschema_Release(IMimePropertySchema *iface)
propschema *This = impl_from_IMimePropertySchema(iface); propschema *This = impl_from_IMimePropertySchema(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) if (!ref)
{ {
@ -3591,7 +3591,7 @@ static HRESULT WINAPI propschema_RegisterProperty(IMimePropertySchema *iface, co
DWORD rownumber, VARTYPE vtdefault, DWORD *propid) DWORD rownumber, VARTYPE vtdefault, DWORD *propid)
{ {
propschema *This = impl_from_IMimePropertySchema(iface); propschema *This = impl_from_IMimePropertySchema(iface);
FIXME("(%p)->(%s, %x, %d, %d, %p) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault, propid); FIXME("(%p)->(%s, %lx, %ld, %d, %p) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault, propid);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3599,7 +3599,7 @@ static HRESULT WINAPI propschema_ModifyProperty(IMimePropertySchema *iface, cons
DWORD rownumber, VARTYPE vtdefault) DWORD rownumber, VARTYPE vtdefault)
{ {
propschema *This = impl_from_IMimePropertySchema(iface); propschema *This = impl_from_IMimePropertySchema(iface);
FIXME("(%p)->(%s, %x, %d, %d) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault); FIXME("(%p)->(%s, %lx, %ld, %d) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault);
return S_OK; return S_OK;
} }
@ -3613,7 +3613,7 @@ static HRESULT WINAPI propschema_GetPropertyId(IMimePropertySchema *iface, const
static HRESULT WINAPI propschema_GetPropertyName(IMimePropertySchema *iface, DWORD propid, char **name) static HRESULT WINAPI propschema_GetPropertyName(IMimePropertySchema *iface, DWORD propid, char **name)
{ {
propschema *This = impl_from_IMimePropertySchema(iface); propschema *This = impl_from_IMimePropertySchema(iface);
FIXME("(%p)->(%d, %p) stub\n", This, propid, name); FIXME("(%p)->(%ld, %p) stub\n", This, propid, name);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -3658,7 +3658,7 @@ HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema)
HRESULT WINAPI MimeGetAddressFormatW(REFIID riid, void *object, DWORD addr_type, HRESULT WINAPI MimeGetAddressFormatW(REFIID riid, void *object, DWORD addr_type,
ADDRESSFORMAT addr_format, WCHAR **address) ADDRESSFORMAT addr_format, WCHAR **address)
{ {
FIXME("(%s, %p, %d, %d, %p) stub\n", debugstr_guid(riid), object, addr_type, addr_format, address); FIXME("(%s, %p, %ld, %d, %p) stub\n", debugstr_guid(riid), object, addr_type, addr_format, address);
return E_NOTIMPL; return E_NOTIMPL;
} }

View File

@ -96,7 +96,7 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
if ((p = strchr(This->ptr, ' '))) if ((p = strchr(This->ptr, ' ')))
{ {
while (*p == ' ') p++; while (*p == ' ') p++;
sscanf(p, "%u", &uidl->dwPopId); sscanf(p, "%lu", &uidl->dwPopId);
if ((p = strchr(p, ' '))) if ((p = strchr(p, ' ')))
{ {
while (*p == ' ') p++; while (*p == ' ') p++;
@ -117,7 +117,7 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
This->state = STATE_DONE; This->state = STATE_DONE;
return S_OK; return S_OK;
} }
sscanf(This->response, "%u", &uidl->dwPopId); sscanf(This->response, "%lu", &uidl->dwPopId);
if ((p = strchr(This->response, ' '))) if ((p = strchr(This->response, ' ')))
{ {
while (*p == ' ') p++; while (*p == ' ') p++;
@ -145,7 +145,7 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat)
if ((p = strchr(This->ptr, ' '))) if ((p = strchr(This->ptr, ' ')))
{ {
while (*p == ' ') p++; while (*p == ' ') p++;
sscanf(p, "%u %u", &stat->cMessages, &stat->cbMessages); sscanf(p, "%lu %lu", &stat->cMessages, &stat->cbMessages);
This->valid_info = TRUE; This->valid_info = TRUE;
This->state = STATE_DONE; This->state = STATE_DONE;
return S_OK; return S_OK;
@ -172,7 +172,7 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
if ((p = strchr(This->ptr, ' '))) if ((p = strchr(This->ptr, ' ')))
{ {
while (*p == ' ') p++; while (*p == ' ') p++;
sscanf(p, "%u %u", &list->dwPopId, &list->cbSize); sscanf(p, "%lu %lu", &list->dwPopId, &list->cbSize);
This->valid_info = TRUE; This->valid_info = TRUE;
} }
This->state = STATE_DONE; This->state = STATE_DONE;
@ -188,11 +188,11 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
This->state = STATE_DONE; This->state = STATE_DONE;
return S_OK; return S_OK;
} }
sscanf(This->response, "%u", &list->dwPopId); sscanf(This->response, "%lu", &list->dwPopId);
if ((p = strchr(This->response, ' '))) if ((p = strchr(This->response, ' ')))
{ {
while (*p == ' ') p++; while (*p == ' ') p++;
sscanf(p, "%u", &list->cbSize); sscanf(p, "%lu", &list->cbSize);
This->valid_info = TRUE; This->valid_info = TRUE;
return S_OK; return S_OK;
} }
@ -858,7 +858,7 @@ static HRESULT WINAPI POP3Transport_InitNew(IPOP3Transport *iface,
static HRESULT WINAPI POP3Transport_MarkItem(IPOP3Transport *iface, POP3MARKTYPE marktype, static HRESULT WINAPI POP3Transport_MarkItem(IPOP3Transport *iface, POP3MARKTYPE marktype,
DWORD dwPopId, boolean fMarked) DWORD dwPopId, boolean fMarked)
{ {
FIXME("(%u, %u, %d)\n", marktype, dwPopId, fMarked); FIXME("(%u, %lu, %d)\n", marktype, dwPopId, fMarked);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -917,13 +917,13 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas
static HRESULT WINAPI POP3Transport_CommandLIST( static HRESULT WINAPI POP3Transport_CommandLIST(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{ {
static const char list[] = "LIST %u\r\n"; static const char list[] = "LIST %lu\r\n";
static char list_all[] = "LIST\r\n"; static char list_all[] = "LIST\r\n";
POP3Transport *This = (POP3Transport *)iface; POP3Transport *This = (POP3Transport *)iface;
char *command; char *command;
int len; int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId); TRACE("(%u, %lu)\n", cmdtype, dwPopId);
if (dwPopId) if (dwPopId)
{ {
@ -944,12 +944,12 @@ static HRESULT WINAPI POP3Transport_CommandLIST(
static HRESULT WINAPI POP3Transport_CommandTOP( static HRESULT WINAPI POP3Transport_CommandTOP(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines) IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines)
{ {
static const char top[] = "TOP %u %u\r\n"; static const char top[] = "TOP %lu %lu\r\n";
POP3Transport *This = (POP3Transport *)iface; POP3Transport *This = (POP3Transport *)iface;
char *command; char *command;
int len; int len;
TRACE("(%u, %u, %u)\n", cmdtype, dwPopId, cPreviewLines); TRACE("(%u, %lu, %lu)\n", cmdtype, dwPopId, cPreviewLines);
len = sizeof(top) + 20 + 2; /* 2 * "4294967296" + "\r\n" */ len = sizeof(top) + 20 + 2; /* 2 * "4294967296" + "\r\n" */
if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
@ -1016,13 +1016,13 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface)
static HRESULT WINAPI POP3Transport_CommandUIDL( static HRESULT WINAPI POP3Transport_CommandUIDL(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{ {
static const char uidl[] = "UIDL %u\r\n"; static const char uidl[] = "UIDL %lu\r\n";
static char uidl_all[] = "UIDL\r\n"; static char uidl_all[] = "UIDL\r\n";
POP3Transport *This = (POP3Transport *)iface; POP3Transport *This = (POP3Transport *)iface;
char *command; char *command;
int len; int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId); TRACE("(%u, %lu)\n", cmdtype, dwPopId);
if (dwPopId) if (dwPopId)
{ {
@ -1043,12 +1043,12 @@ static HRESULT WINAPI POP3Transport_CommandUIDL(
static HRESULT WINAPI POP3Transport_CommandDELE( static HRESULT WINAPI POP3Transport_CommandDELE(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{ {
static const char dele[] = "DELE %u\r\n"; static const char dele[] = "DELE %lu\r\n";
POP3Transport *This = (POP3Transport *)iface; POP3Transport *This = (POP3Transport *)iface;
char *command; char *command;
int len; int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId); TRACE("(%u, %lu)\n", cmdtype, dwPopId);
len = sizeof(dele) + 10 + 2; /* "4294967296" + "\r\n" */ len = sizeof(dele) + 10 + 2; /* "4294967296" + "\r\n" */
if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
@ -1065,12 +1065,12 @@ static HRESULT WINAPI POP3Transport_CommandDELE(
static HRESULT WINAPI POP3Transport_CommandRETR( static HRESULT WINAPI POP3Transport_CommandRETR(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{ {
static const char retr[] = "RETR %u\r\n"; static const char retr[] = "RETR %lu\r\n";
POP3Transport *This = (POP3Transport *)iface; POP3Transport *This = (POP3Transport *)iface;
char *command; char *command;
int len; int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId); TRACE("(%u, %lu)\n", cmdtype, dwPopId);
len = sizeof(retr) + 10 + 2; /* "4294967296" + "\r\n" */ len = sizeof(retr) + 10 + 2; /* "4294967296" + "\r\n" */
if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;

View File

@ -230,7 +230,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
@ -240,7 +240,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { if(!ref) {
if(This->protocol) if(This->protocol)
@ -258,7 +258,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
{ {
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); TRACE("(%p)->(%lx %p)\n", This, dwReserved, pib);
assert(!This->stream); assert(!This->stream);
return CreateStreamOnHGlobal(NULL, TRUE, &This->stream); return CreateStreamOnHGlobal(NULL, TRUE, &This->stream);
@ -278,7 +278,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{ {
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
TRACE("(%p)->(%u/%u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); TRACE("(%p)->(%lu/%lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText));
return S_OK; return S_OK;
} }
@ -287,7 +287,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface); MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
IMimeMessage *mime_message = NULL; IMimeMessage *mime_message = NULL;
TRACE("(%p)->(%x %s)\n", This, hresult, debugstr_w(szError)); TRACE("(%p)->(%lx %s)\n", This, hresult, debugstr_w(szError));
if(SUCCEEDED(hresult)) { if(SUCCEEDED(hresult)) {
hresult = load_mime_message(This->stream, &mime_message); hresult = load_mime_message(This->stream, &mime_message);
@ -402,7 +402,7 @@ static ULONG WINAPI MimeHtmlProtocol_AddRef(IUnknown *iface)
MimeHtmlProtocol *This = impl_from_IUnknown(iface); MimeHtmlProtocol *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
@ -412,7 +412,7 @@ static ULONG WINAPI MimeHtmlProtocol_Release(IUnknown *iface)
MimeHtmlProtocol *This = impl_from_IUnknown(iface); MimeHtmlProtocol *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%x\n", This, ref); TRACE("(%p) ref=%lx\n", This, ref);
if(!ref) { if(!ref) {
if(This->sink) if(This->sink)
@ -469,7 +469,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH
IMoniker *mon; IMoniker *mon;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved);
hres = parse_mhtml_url(szUrl, &url); hres = parse_mhtml_url(szUrl, &url);
if(FAILED(hres)) if(FAILED(hres))
@ -480,11 +480,11 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH
hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("GetBindInfo failed: %08x\n", hres); WARN("GetBindInfo failed: %08lx\n", hres);
return hres; return hres;
} }
if((bindf & (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE)) != (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE)) if((bindf & (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE)) != (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE))
FIXME("unsupported bindf %x\n", bindf); FIXME("unsupported bindf %lx\n", bindf);
IInternetProtocolSink_AddRef(This->sink = pOIProtSink); IInternetProtocolSink_AddRef(This->sink = pOIProtSink);
@ -538,14 +538,14 @@ static HRESULT WINAPI MimeHtmlProtocol_Continue(IInternetProtocol *iface, PROTOC
static HRESULT WINAPI MimeHtmlProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions) static HRESULT WINAPI MimeHtmlProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions)
{ {
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI MimeHtmlProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) static HRESULT WINAPI MimeHtmlProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{ {
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions); TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK; return S_OK;
} }
@ -569,7 +569,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Read(IInternetProtocol *iface, void* pv,
ULONG read = 0; ULONG read = 0;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
hres = IStream_Read(This->stream, pv, cb, &read); hres = IStream_Read(This->stream, pv, cb, &read);
if(pcbRead) if(pcbRead)
@ -584,14 +584,14 @@ static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTE
DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
{ {
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI MimeHtmlProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) static HRESULT WINAPI MimeHtmlProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
{ {
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d)\n", This, dwOptions); FIXME("(%p)->(%ld)\n", This, dwOptions);
return S_OK; return S_OK;
} }
@ -646,7 +646,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_ParseUrl(IInternetProtocolInfo *iface
DWORD* pcchResult, DWORD dwReserved) DWORD* pcchResult, DWORD dwReserved)
{ {
MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
FIXME("(%p)->(%s %d %x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction, FIXME("(%p)->(%s %d %lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), ParseAction,
dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
return INET_E_DEFAULT_ACTION; return INET_E_DEFAULT_ACTION;
} }
@ -661,7 +661,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
WCHAR *p; WCHAR *p;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), TRACE("(%p)->(%s %s %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzBaseUrl),
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
pcchResult, dwReserved); pcchResult, dwReserved);
@ -701,7 +701,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CompareUrl(IInternetProtocolInfo *ifa
LPCWSTR pwzUrl2, DWORD dwCompareFlags) LPCWSTR pwzUrl2, DWORD dwCompareFlags)
{ {
MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
FIXME("(%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); FIXME("(%p)->(%s %s %08lx)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -710,7 +710,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInfo(IInternetProtocolInfo *ifac
DWORD dwReserved) DWORD dwReserved)
{ {
MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, FIXME("(%p)->(%s %08x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
cbBuffer, pcbBuf, dwReserved); cbBuffer, pcbBuf, dwReserved);
return INET_E_USE_DEFAULT_PROTOCOLHANDLER; return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
} }

View File

@ -478,7 +478,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char
for (; This->ulCurrentAddressIndex < This->pending_message.rAddressList.cAddress; This->ulCurrentAddressIndex++) for (; This->ulCurrentAddressIndex < This->pending_message.rAddressList.cAddress; This->ulCurrentAddressIndex++)
{ {
TRACE("address[%d]: %s\n", This->ulCurrentAddressIndex, TRACE("address[%ld]: %s\n", This->ulCurrentAddressIndex,
This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail);
if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
@ -685,13 +685,13 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface,
{ {
if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_FROM) if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_FROM)
{ {
TRACE("address[%d]: ADDR_FROM, %s\n", i, TRACE("address[%ld]: ADDR_FROM, %s\n", i,
pMessage->rAddressList.prgAddress[i].szEmail); pMessage->rAddressList.prgAddress[i].szEmail);
pszFromAddress = pMessage->rAddressList.prgAddress[i].szEmail; pszFromAddress = pMessage->rAddressList.prgAddress[i].szEmail;
} }
else if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) else if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
{ {
TRACE("address[%d]: ADDR_TO, %s\n", i, TRACE("address[%ld]: ADDR_TO, %s\n", i,
pMessage->rAddressList.prgAddress[i].szEmail); pMessage->rAddressList.prgAddress[i].szEmail);
} }
} }
@ -891,7 +891,7 @@ static HRESULT WINAPI SMTPTransport_CommandDOT(ISMTPTransport2 *iface)
static HRESULT WINAPI SMTPTransport_SendDataStream(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_SendDataStream(ISMTPTransport2 *iface,
IStream *pStream, ULONG cbSize) IStream *pStream, ULONG cbSize)
{ {
FIXME("(%p, %d)\n", pStream, cbSize); FIXME("(%p, %ld)\n", pStream, cbSize);
return E_NOTIMPL; return E_NOTIMPL;
} }