[akhaldi] 73956: [MAPI32] Sync with Wine Staging 2.2. CORE-12823 d618c0f mapi32: Properly return interface pointer. 6e8553c mapi32: Fix some spec file entries. 454bccd mapi32: Add a stub implementa...
Author: akhaldi Date: Sun Feb 26 17:47:40 2017 New Revision: 73956
URL: http://svn.reactos.org/svn/reactos?rev=73956&view=rev Log: [MAPI32] Sync with Wine Staging 2.2. CORE-12823
d618c0f mapi32: Properly return interface pointer. 6e8553c mapi32: Fix some spec file entries. 454bccd mapi32: Add a stub implementation of HrDispatchNotifications.
Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/util.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.spe... ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] Sun Feb 26 17:47:40 2017 @@ -87,8 +87,8 @@ 144 stub HrDecomposeEID@28 145 stub HrComposeMsgID@24 146 stub HrDecomposeMsgID@24 -147 stdcall OpenStreamOnFile@24(ptr ptr ptr ptr ptr ptr) OpenStreamOnFile -148 stdcall OpenStreamOnFile(ptr ptr ptr ptr ptr ptr) +147 stdcall OpenStreamOnFile@24(ptr ptr long ptr ptr ptr) OpenStreamOnFile +148 stdcall OpenStreamOnFile(ptr ptr long ptr ptr ptr) 149 stdcall OpenTnefStream@28(ptr ptr ptr long ptr long ptr) OpenTnefStream 150 stdcall OpenTnefStream(ptr ptr ptr long ptr long ptr) 151 stdcall OpenTnefStreamEx@32(ptr ptr ptr long ptr long ptr ptr) OpenTnefStreamEx @@ -145,17 +145,17 @@ 205 stub FDecodeID@12 206 stub CchOfEncoding@4 207 stdcall CbOfEncoded@4(ptr) CbOfEncoded -208 stdcall MAPISendDocuments(ptr str str str long) -209 stdcall MAPILogon(ptr str str long long ptr) -210 stdcall MAPILogoff(ptr ptr long long) -211 stdcall MAPISendMail(ptr ptr ptr long long) -212 stdcall MAPISaveMail(ptr ptr ptr long long str) -213 stdcall MAPIReadMail(ptr ptr str long long ptr) -214 stdcall MAPIFindNext(ptr ptr str str long long ptr) -215 stdcall MAPIDeleteMail(ptr ptr str long long) -217 stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) -218 stdcall MAPIDetails(ptr ptr ptr long long) -219 stdcall MAPIResolveName(ptr ptr str long long ptr) +208 stdcall MAPISendDocuments(long str str str long) +209 stdcall MAPILogon(long str str long long ptr) +210 stdcall MAPILogoff(ptr long long long) +211 stdcall MAPISendMail(ptr long ptr long long) +212 stdcall MAPISaveMail(ptr long ptr long long str) +213 stdcall MAPIReadMail(ptr long str long long ptr) +214 stdcall MAPIFindNext(ptr long str str long long ptr) +215 stdcall MAPIDeleteMail(ptr long str long long) +217 stdcall MAPIAddress(ptr long str long str long ptr long long ptr ptr) +218 stdcall MAPIDetails(ptr long ptr long long) +219 stdcall MAPIResolveName(ptr long str long long ptr) 220 stub BMAPISendMail 221 stub BMAPISaveMail 222 stub BMAPIReadMail @@ -175,7 +175,7 @@ 236 stub cmc_read 237 stub cmc_send 238 stub cmc_send_documents -239 stub HrDispatchNotifications@4 +239 stdcall HrDispatchNotifications@4(long) HrDispatchNotifications 241 stub HrValidateParameters@8 244 stub ScCreateConversationIndex@16 246 stdcall HrGetOmiProvidersFlags(long long) @@ -188,4 +188,4 @@ 253 stdcall FixMAPI@0() FixMAPI 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath@20(str str ptr long long) FGetComponentPath -256 stdcall MAPISendMailW(ptr ptr ptr long long) +256 stdcall MAPISendMailW(ptr long ptr long long)
Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?rev... ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Sun Feb 26 17:47:40 2017 @@ -1501,7 +1501,7 @@ IsEqualIID(riid, &IID_IMAPIProp) || IsEqualIID(riid, &IID_IMAPIPropData)) { - *ppvObj = This; + *ppvObj = &This->IPropData_iface; IPropData_AddRef(iface); TRACE("returning %p\n", *ppvObj); return S_OK;
Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?rev... ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Sun Feb 26 17:47:40 2017 @@ -221,6 +221,15 @@ { /* Native does not implement this function */ return MAPI_E_NO_SUPPORT; +} + +/************************************************************************* + * HrDispatchNotifications@4 (MAPI32.239) + */ +HRESULT WINAPI HrDispatchNotifications(ULONG flags) +{ + FIXME("(%08x)\n", flags); + return S_OK; }
/*************************************************************************
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 17:47:40 2017 @@ -89,7 +89,7 @@ reactos/dll/win32/jsproxy # Synced to WineStaging-2.2 reactos/dll/win32/loadperf # Synced to WineStaging-2.2 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mapi32 # Synced to WineStaging-2.2 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.16 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.16 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.16
-
akhaldi＠svn.reactos.org