Author: akhaldi
Date: Thu Mar 3 13:36:26 2016
New Revision: 70874
URL:
http://svn.reactos.org/svn/reactos?rev=70874&view=rev
Log:
[MAPI32] Sync with Wine Staging 1.9.4. CORE-10912
Modified:
trunk/reactos/dll/win32/mapi32/imalloc.c
trunk/reactos/media/doc/README.WINE
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] Thu Mar 3 13:36:26 2016
@@ -98,7 +98,7 @@
*/
static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb)
{
- TRACE("(%p)->(%d)\n", iface, cb);
+ TRACE("(%p)->(%ld)\n", iface, cb);
return LocalAlloc(LMEM_FIXED, cb);
}
@@ -108,7 +108,7 @@
*/
static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, SIZE_T cb)
{
- TRACE("(%p)->(%p, %d)\n", iface, pv, cb);
+ TRACE("(%p)->(%p, %ld)\n", iface, pv, cb);
if (!pv)
return LocalAlloc(LMEM_FIXED, cb);
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 3 13:36:26 2016
@@ -91,7 +91,7 @@
reactos/dll/win32/localspl # Synced to WineStaging-1.7.55
reactos/dll/win32/localui # Synced to WineStaging-1.7.55
reactos/dll/win32/lz32 # Synced to WineStaging-1.7.55
-reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.55
+reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.4
reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.55
reactos/dll/win32/mcicda # Synced to WineStaging-1.7.55
reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.55