From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sat, 17 Jan 2009 19:59:02 +0000 (+0000)
Subject: sync mapi32 with wine 1.1.13
X-Git-Tag: ReactOS-0.3.8~301
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=6e08f16ab12e3127827acd0ddd07c4b4d8c1afdd

sync mapi32 with wine 1.1.13

svn path=/trunk/; revision=38841
---

diff --git a/reactos/dll/win32/mapi32/imalloc.c b/reactos/dll/win32/mapi32/imalloc.c
index c5b4570da1a..a913eee022d 100644
--- a/reactos/dll/win32/mapi32/imalloc.c
+++ b/reactos/dll/win32/mapi32/imalloc.c
@@ -78,7 +78,7 @@ static HRESULT WINAPI IMAPIMalloc_fnQueryInterface(LPMALLOC iface, REFIID refiid
     if (IsEqualIID(refiid, &IID_IUnknown) ||
         IsEqualIID(refiid, &IID_IMalloc))
     {
-        *ppvObj = (LPMALLOC) &MAPI_IMalloc;
+        *ppvObj = &MAPI_IMalloc;
         TRACE("Returning IMalloc (%p)\n", *ppvObj);
         return S_OK;
     }
diff --git a/reactos/dll/win32/mapi32/mapi32_main.c b/reactos/dll/win32/mapi32/mapi32_main.c
index 936d4352132..b9d5888bead 100644
--- a/reactos/dll/win32/mapi32/mapi32_main.c
+++ b/reactos/dll/win32/mapi32/mapi32_main.c
@@ -89,7 +89,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%08x %p) Stub\n", uiparam,
+    FIXME("(0x%08lx %s %p 0x%08x 0x%08x %p) Stub\n", uiparam,
           debugstr_a(profile), password, flags, reserved, session);
 
     if (session) *session = 1;
@@ -99,7 +99,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%08x) Stub\n", session,
+    FIXME("(0x%08lx 0x%08lx 0x%08x 0x%08x) Stub\n", session,
           uiparam, flags, reserved);
     return SUCCESS_SUCCESS;
 }
diff --git a/reactos/dll/win32/mapi32/sendmail.c b/reactos/dll/win32/mapi32/sendmail.c
index 4103117d800..7b8de6676d5 100644
--- a/reactos/dll/win32/mapi32/sendmail.c
+++ b/reactos/dll/win32/mapi32/sendmail.c
@@ -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%08x)\n", session, uiparam,
+    TRACE( "(0x%08x 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam,
            message, flags, reserved );
 
     if (!message) return MAPI_E_FAILURE;