winemapi: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemapi: Enable compilation with long types.
fb3b8493 · Eric Pouech · Alexandre Julliard · 5595b2c4 · fb3b8493 · fb3b8493
Commit fb3b8493 authored Feb 23, 2022 by Eric Pouech Committed by Alexandre Julliard Feb 23, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

Makefile.in dlls/winemapi/Makefile.in +0 -1

main.c dlls/winemapi/main.c +3 -3

sendmail.c dlls/winemapi/sendmail.c +3 -3

No files found.
--- a/dlls/winemapi/Makefile.in
+++ b/dlls/winemapi/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = winemapi.dll
 IMPORTS   = shlwapi shell32 mapi32


--- 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])

--- 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));