Author: winesync
Date: Wed Apr 25 12:21:30 2007
New Revision: 26497
URL:
http://svn.reactos.org/svn/reactos?rev=26497&view=rev
Log:
Autosyncing with Wine HEAD
Modified:
trunk/reactos/dll/win32/mapi32/mapi32.spec
trunk/reactos/dll/win32/mapi32/mapi32_main.c
trunk/reactos/dll/win32/mapi32/prop.c
Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32.spec (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32.spec Wed Apr 25 12:21:30 2007
@@ -7,8 +7,8 @@
15 stdcall MAPIAllocateMore@12(long ptr ptr) MAPIAllocateMore
16 stdcall MAPIFreeBuffer(ptr)
17 stdcall MAPIFreeBuffer@4(ptr) MAPIFreeBuffer
- 18 stub MAPIAdminProfiles
- 19 stub MAPIAdminProfiles@8
+ 18 stdcall MAPIAdminProfiles(long ptr)
+ 19 stdcall MAPIAdminProfiles@8(long ptr) MAPIAdminProfiles
20 stdcall MAPIInitialize(ptr)
21 stdcall MAPIInitialize@4(ptr) MAPIInitialize
22 stdcall MAPIUninitialize()
Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32_main.c (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32_main.c Wed Apr 25 12:21:30 2007
@@ -110,3 +110,10 @@
{
FIXME("Stub\n");
}
+
+HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin)
+{
+ FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin);
+ *lppProfAdmin = NULL;
+ return E_FAIL;
+}
Modified: trunk/reactos/dll/win32/mapi32/prop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/prop.c (original)
+++ trunk/reactos/dll/win32/mapi32/prop.c Wed Apr 25 12:21:30 2007
@@ -665,7 +665,7 @@
TRACE("(%p)\n", lpAddrs);
/* Structures are binary compatible; use the same implementation */
- return FreeProws((LPSRowSet)lpAddrs);
+ FreeProws((LPSRowSet)lpAddrs);
}
/*************************************************************************