[ros-diffs] [cwittich] 38841: sync mapi32 with wine 1.1.13

Author: cwittich
Date: Sat Jan 17 13:59:02 2009
New Revision: 38841

URL: http://svn.reactos.org/svn/reactos?rev=38841&view=rev
Log:
sync mapi32 with wine 1.1.13

Modified:
    trunk/reactos/dll/win32/mapi32/imalloc.c
    trunk/reactos/dll/win32/mapi32/mapi32_main.c
    trunk/reactos/dll/win32/mapi32/sendmail.c

Modified: trunk/reactos/dll/win32/mapi32/imalloc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c?...
==============================================================================
--- trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] Sat Jan 17 13:59:02 2009
@@ -78,7 +78,7 @@
     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;
     }

Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_mai...
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Sat Jan 17 13:59:02 2009
@@ -89,7 +89,7 @@
 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 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;
 }

Modified: trunk/reactos/dll/win32/mapi32/sendmail.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.c...
==============================================================================
--- trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] Sat Jan 17 13:59:02 2009
@@ -71,7 +71,7 @@
     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;