Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/winemapi/Makefile.in | 1 - dlls/winemapi/main.c | 6 +++--- dlls/winemapi/sendmail.c | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in index 5408ee834b7..813ee42b349 100644 --- a/dlls/winemapi/Makefile.in +++ b/dlls/winemapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemapi.dll IMPORTS = shlwapi shell32 mapi32
diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index b627d49a6b1..e8407f8879b 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -64,7 +64,7 @@ ULONG WINAPI MAPIFindNext(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_type, ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - TRACE("(0x%08lx %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 (session) @@ -76,7 +76,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%08lx 0x%08lx 0x%08x 0x%08x)\n", session, + TRACE("(0x%08Ix 0x%08Ix 0x%08lx 0x%08lx)\n", session, uiparam, flags, reserved);
return SUCCESS_SUCCESS; @@ -97,7 +97,7 @@ ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, SCODE scode; char *p;
- TRACE("(0x%08lx 0x%08lx %s 0x%08x 0x%08x %p)\n", session, uiparam, + TRACE("(0x%08Ix 0x%08Ix %s 0x%08lx 0x%08lx %p)\n", session, uiparam, debugstr_a(name), flags, reserved, recip);
if (!name || !name[0]) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index ca1b6c59df1..1bd3908ef6d 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -101,7 +101,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, HRESULT res; DWORD size;
- TRACE("(0x%08lx 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, + TRACE("(0x%08Ix 0x%08Ix %p 0x%08lx 0x%08lx)\n", session, uiparam, message, flags, reserved);
if (!message) @@ -144,7 +144,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, break;
default: - TRACE("Unknown recipient class: %d\n", + TRACE("Unknown recipient class: %ld\n", message->lpRecips[i].ulRecipClass); } } @@ -154,7 +154,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam,
if (message->nFileCount) { - FIXME("Ignoring %u attachments:\n", message->nFileCount); + FIXME("Ignoring %lu attachments:\n", message->nFileCount); for (i = 0; i < message->nFileCount; i++) FIXME("\t%s (%s)\n", debugstr_a(message->lpFiles[i].lpszPathName), debugstr_a(message->lpFiles[i].lpszFileName));