Headers diff for mapi32.dll between 1.0.2536.0-Windows 6.0 and 1.0.2536.0-Windows 7.0 versions



 mapi.h (1.0.2536.0-Windows 6.0)   mapi.h (1.0.2536.0-Windows 7.0) 
skipping to change at line 188 skipping to change at line 188
typedef ULONG (FAR PASCAL MAPILOGON)( typedef ULONG (FAR PASCAL MAPILOGON)(
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPSTR lpszProfileName, __in LPSTR lpszProfileName,
__in LPSTR lpszPassword, __in LPSTR lpszPassword,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved, ULONG ulReserved,
LPLHANDLE lplhSession LPLHANDLE lplhSession
); );
typedef MAPILOGON FAR *LPMAPILOGON; typedef MAPILOGON FAR *LPMAPILOGON;
MAPILOGON MAPILogon; DECLSPEC_DEPRECATED MAPILOGON MAPILogon;
typedef ULONG (FAR PASCAL MAPILOGOFF)( typedef ULONG (FAR PASCAL MAPILOGOFF)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved ULONG ulReserved
); );
typedef MAPILOGOFF FAR *LPMAPILOGOFF; typedef MAPILOGOFF FAR *LPMAPILOGOFF;
MAPILOGOFF MAPILogoff; DECLSPEC_DEPRECATED MAPILOGOFF MAPILogoff;
typedef ULONG (FAR PASCAL MAPISENDMAIL)( typedef ULONG (FAR PASCAL MAPISENDMAIL)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
lpMapiMessage lpMessage, lpMapiMessage lpMessage,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved ULONG ulReserved
); );
typedef MAPISENDMAIL FAR *LPMAPISENDMAIL; typedef MAPISENDMAIL FAR *LPMAPISENDMAIL;
MAPISENDMAIL MAPISendMail; MAPISENDMAIL MAPISendMail;
typedef ULONG (FAR PASCAL MAPISENDDOCUMENTS)( typedef ULONG (FAR PASCAL MAPISENDDOCUMENTS)(
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPSTR lpszDelimChar, __in LPSTR lpszDelimChar,
__in LPSTR lpszFilePaths, __in LPSTR lpszFilePaths,
__in LPSTR lpszFileNames, __in LPSTR lpszFileNames,
ULONG ulReserved ULONG ulReserved
); );
typedef MAPISENDDOCUMENTS FAR *LPMAPISENDDOCUMENTS; typedef MAPISENDDOCUMENTS FAR *LPMAPISENDDOCUMENTS;
MAPISENDDOCUMENTS MAPISendDocuments; DECLSPEC_DEPRECATED MAPISENDDOCUMENTS MAPISendDocuments;
typedef ULONG (FAR PASCAL MAPIFINDNEXT)( typedef ULONG (FAR PASCAL MAPIFINDNEXT)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPSTR lpszMessageType, __in LPSTR lpszMessageType,
__in LPSTR lpszSeedMessageID, __in LPSTR lpszSeedMessageID,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved, ULONG ulReserved,
__in LPSTR lpszMessageID __in LPSTR lpszMessageID
); );
typedef MAPIFINDNEXT FAR *LPMAPIFINDNEXT; typedef MAPIFINDNEXT FAR *LPMAPIFINDNEXT;
MAPIFINDNEXT MAPIFindNext; DECLSPEC_DEPRECATED MAPIFINDNEXT MAPIFindNext;
typedef ULONG (FAR PASCAL MAPIREADMAIL)( typedef ULONG (FAR PASCAL MAPIREADMAIL)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPSTR lpszMessageID, __in LPSTR lpszMessageID,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved, ULONG ulReserved,
lpMapiMessage FAR *lppMessage lpMapiMessage FAR *lppMessage
); );
typedef MAPIREADMAIL FAR *LPMAPIREADMAIL; typedef MAPIREADMAIL FAR *LPMAPIREADMAIL;
MAPIREADMAIL MAPIReadMail; DECLSPEC_DEPRECATED MAPIREADMAIL MAPIReadMail;
typedef ULONG (FAR PASCAL MAPISAVEMAIL)( typedef ULONG (FAR PASCAL MAPISAVEMAIL)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
lpMapiMessage lpMessage, lpMapiMessage lpMessage,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved, ULONG ulReserved,
__in LPSTR lpszMessageID __in LPSTR lpszMessageID
); );
typedef MAPISAVEMAIL FAR *LPMAPISAVEMAIL; typedef MAPISAVEMAIL FAR *LPMAPISAVEMAIL;
MAPISAVEMAIL MAPISaveMail; DECLSPEC_DEPRECATED MAPISAVEMAIL MAPISaveMail;
typedef ULONG (FAR PASCAL MAPIDELETEMAIL)( typedef ULONG (FAR PASCAL MAPIDELETEMAIL)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPSTR lpszMessageID, __in LPSTR lpszMessageID,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved ULONG ulReserved
); );
typedef MAPIDELETEMAIL FAR *LPMAPIDELETEMAIL; typedef MAPIDELETEMAIL FAR *LPMAPIDELETEMAIL;
MAPIDELETEMAIL MAPIDeleteMail; DECLSPEC_DEPRECATED MAPIDELETEMAIL MAPIDeleteMail;
typedef ULONG (EXPORT FAR PASCAL *LPMAPIFREEBUFFER)(LPVOID pv); typedef ULONG (EXPORT FAR PASCAL *LPMAPIFREEBUFFER)(LPVOID pv);
ULONG FAR PASCAL MAPIFreeBuffer(LPVOID pv); ULONG FAR PASCAL MAPIFreeBuffer(LPVOID pv);
typedef ULONG (FAR PASCAL MAPIADDRESS)( typedef ULONG (FAR PASCAL MAPIADDRESS)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPSTR lpszCaption, __in LPSTR lpszCaption,
ULONG nEditFields, ULONG nEditFields,
__in LPSTR lpszLabels, __in LPSTR lpszLabels,
ULONG nRecips, ULONG nRecips,
lpMapiRecipDesc lpRecips, lpMapiRecipDesc lpRecips,
skipping to change at line 281 skipping to change at line 280
ULONG nEditFields, ULONG nEditFields,
__in LPSTR lpszLabels, __in LPSTR lpszLabels,
ULONG nRecips, ULONG nRecips,
lpMapiRecipDesc lpRecips, lpMapiRecipDesc lpRecips,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved, ULONG ulReserved,
LPULONG lpnNewRecips, LPULONG lpnNewRecips,
lpMapiRecipDesc FAR *lppNewRecips lpMapiRecipDesc FAR *lppNewRecips
); );
typedef MAPIADDRESS FAR *LPMAPIADDRESS; typedef MAPIADDRESS FAR *LPMAPIADDRESS;
MAPIADDRESS MAPIAddress; DECLSPEC_DEPRECATED MAPIADDRESS MAPIAddress;
typedef ULONG (FAR PASCAL MAPIDETAILS)( typedef ULONG (FAR PASCAL MAPIDETAILS)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
lpMapiRecipDesc lpRecip, lpMapiRecipDesc lpRecip,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved ULONG ulReserved
); );
typedef MAPIDETAILS FAR *LPMAPIDETAILS; typedef MAPIDETAILS FAR *LPMAPIDETAILS;
MAPIDETAILS MAPIDetails; DECLSPEC_DEPRECATED MAPIDETAILS MAPIDetails;
typedef ULONG (FAR PASCAL MAPIRESOLVENAME)( typedef ULONG (FAR PASCAL MAPIRESOLVENAME)(
LHANDLE lhSession, LHANDLE lhSession,
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPSTR lpszName, __in LPSTR lpszName,
FLAGS flFlags, FLAGS flFlags,
ULONG ulReserved, ULONG ulReserved,
lpMapiRecipDesc FAR *lppRecip lpMapiRecipDesc FAR *lppRecip
); );
typedef MAPIRESOLVENAME FAR *LPMAPIRESOLVENAME; typedef MAPIRESOLVENAME FAR *LPMAPIRESOLVENAME;
MAPIRESOLVENAME MAPIResolveName; DECLSPEC_DEPRECATED MAPIRESOLVENAME MAPIResolveName;
#ifndef SUCCESS_SUCCESS #ifndef SUCCESS_SUCCESS
#define SUCCESS_SUCCESS 0 #define SUCCESS_SUCCESS 0
#endif #endif
#define MAPI_USER_ABORT 1 #define MAPI_USER_ABORT 1
#define MAPI_E_USER_ABORT MAPI_USER_ABORT #define MAPI_E_USER_ABORT MAPI_USER_ABORT
#define MAPI_E_FAILURE 2 #define MAPI_E_FAILURE 2
#define MAPI_E_LOGON_FAILURE 3 #define MAPI_E_LOGON_FAILURE 3
#define MAPI_E_LOGIN_FAILURE MAPI_E_LOGON_FAILURE #define MAPI_E_LOGIN_FAILURE MAPI_E_LOGON_FAILURE
#define MAPI_E_DISK_FULL 4 #define MAPI_E_DISK_FULL 4
 End of changes. 11 change blocks. 
11 lines changed or deleted 10 lines changed or added


 mapiutil.h (1.0.2536.0-Windows 6.0)   mapiutil.h (1.0.2536.0-Windows 7.0) 
skipping to change at line 481 skipping to change at line 481
* (as defined in the OLE 2.0 specs) on top of a system file. * (as defined in the OLE 2.0 specs) on top of a system file.
*/ */
#define SOF_UNIQUEFILENAME ((ULONG) 0x80000000) #define SOF_UNIQUEFILENAME ((ULONG) 0x80000000)
STDMETHODIMP OpenStreamOnFile( STDMETHODIMP OpenStreamOnFile(
LPALLOCATEBUFFER lpAllocateBuffer, LPALLOCATEBUFFER lpAllocateBuffer,
LPFREEBUFFER lpFreeBuffer, LPFREEBUFFER lpFreeBuffer,
ULONG ulFlags, ULONG ulFlags,
__in LPTSTR lpszFileName, __in LPTSTR lpszFileName,
__in LPTSTR lpszPrefix, __in_opt LPTSTR lpszPrefix,
LPSTREAM FAR * lppStream); LPSTREAM FAR * lppStream);
typedef HRESULT (STDMETHODCALLTYPE FAR * LPOPENSTREAMONFILE) ( typedef HRESULT (STDMETHODCALLTYPE FAR * LPOPENSTREAMONFILE) (
LPALLOCATEBUFFER lpAllocateBuffer, LPALLOCATEBUFFER lpAllocateBuffer,
LPFREEBUFFER lpFreeBuffer, LPFREEBUFFER lpFreeBuffer,
ULONG ulFlags, ULONG ulFlags,
__in LPTSTR lpszFileName, __in LPTSTR lpszFileName,
__in LPTSTR lpszPrefix, __in LPTSTR lpszPrefix,
LPSTREAM FAR * lppStream); LPSTREAM FAR * lppStream);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mapix.h (1.0.2536.0-Windows 6.0)   mapix.h (1.0.2536.0-Windows 7.0) 
skipping to change at line 102 skipping to change at line 102
typedef void (STDAPICALLTYPE MAPIUNINITIALIZE)(void); typedef void (STDAPICALLTYPE MAPIUNINITIALIZE)(void);
typedef MAPIUNINITIALIZE FAR *LPMAPIUNINITIALIZE; typedef MAPIUNINITIALIZE FAR *LPMAPIUNINITIALIZE;
MAPIINITIALIZE MAPIInitialize; MAPIINITIALIZE MAPIInitialize;
MAPIUNINITIALIZE MAPIUninitialize; MAPIUNINITIALIZE MAPIUninitialize;
/* Extended MAPI Logon function */ /* Extended MAPI Logon function */
typedef HRESULT (STDMETHODCALLTYPE MAPILOGONEX)( typedef HRESULT (STDMETHODCALLTYPE MAPILOGONEX)(
ULONG_PTR ulUIParam, ULONG_PTR ulUIParam,
__in LPTSTR lpszProfileName, __in_opt LPTSTR lpszProfileName,
__in LPTSTR lpszPassword, __in_opt LPTSTR lpszPassword,
ULONG ulFlags, /* ulFlags takes all that SimpleMAPI does + MAPI_UNICOD E */ ULONG ulFlags, /* ulFlags takes all that SimpleMAPI does + MAPI_UNICOD E */
LPMAPISESSION FAR * lppSession LPMAPISESSION FAR * lppSession
); );
typedef MAPILOGONEX FAR *LPMAPILOGONEX; typedef MAPILOGONEX FAR *LPMAPILOGONEX;
MAPILOGONEX MAPILogonEx; MAPILOGONEX MAPILogonEx;
typedef SCODE (STDMETHODCALLTYPE MAPIALLOCATEBUFFER)( typedef SCODE (STDMETHODCALLTYPE MAPIALLOCATEBUFFER)(
ULONG cbSize, ULONG cbSize,
LPVOID FAR * lppBuffer LPVOID FAR * lppBuffer
skipping to change at line 226 skipping to change at line 226
(THIS_ ULONG cbEntryID , \ (THIS_ ULONG cbEntryID , \
LPENTRYID l pEntryID, \ LPENTRYID l pEntryID, \
ULONG u lEventMask, \ ULONG u lEventMask, \
LPMAPIADVISESINK lpAdviseS ink, \ LPMAPIADVISESINK lpAdviseS ink, \
ULONG FAR * l pulConnection) IPURE; \ ULONG FAR * l pulConnection) IPURE; \
MAPIMETHOD(Unadvise) \ MAPIMETHOD(Unadvise) \
(THIS_ ULONG ulConnect ion) IPURE; \ (THIS_ ULONG ulConnect ion) IPURE; \
MAPIMETHOD(MessageOptions) \ MAPIMETHOD(MessageOptions) \
(THIS_ ULONG_PTR ulUIParam , \ (THIS_ ULONG_PTR ulUIParam , \
ULONG u lFlags, \ ULONG u lFlags, \
LPTSTR l pszAdrType, \ __in LPTSTR l pszAdrType, \
LPMESSAGE l pMessage) IPURE; \ LPMESSAGE l pMessage) IPURE; \
MAPIMETHOD(QueryDefaultMessageOpt) \ MAPIMETHOD(QueryDefaultMessageOpt) \
(THIS_ LPTSTR lpszAdrTy pe, \ (THIS_ __in LPTSTR l pszAdrType, \
ULONG u lFlags, \ ULONG u lFlags, \
ULONG FAR * l pcValues, \ ULONG FAR * l pcValues, \
LPSPropValue FAR * lppOption s) IPURE; \ LPSPropValue FAR * lppOption s) IPURE; \
MAPIMETHOD(EnumAdrTypes) \ MAPIMETHOD(EnumAdrTypes) \
(THIS_ ULONG ulFlags, \ (THIS_ ULONG ulFlags, \
ULONG FAR * l __out ULONG FAR *
pcAdrTypes, \ lpcAdrTypes, \
LPTSTR FAR * FAR * lpppszAdr __out_ecount(lpcAdrTypes)
Types) IPURE; \ \
LPTSTR FAR * FAR *lpppszAdrTypes)
IPURE; \
MAPIMETHOD(QueryIdentity) \ MAPIMETHOD(QueryIdentity) \
(THIS_ ULONG FAR * lpcbEntry ID, \ (THIS_ ULONG FAR * lpcbEntry ID, \
LPENTRYID FAR * lppEntryI D) IPURE; \ LPENTRYID FAR * lppEntryI D) IPURE; \
MAPIMETHOD(Logoff) \ MAPIMETHOD(Logoff) \
(THIS_ ULONG_PTR ulUIParam , \ (THIS_ ULONG_PTR ulUIParam , \
ULONG u lFlags, \ ULONG u lFlags, \
ULONG u lReserved) IPURE; \ ULONG u lReserved) IPURE; \
MAPIMETHOD(SetDefaultStore) \ MAPIMETHOD(SetDefaultStore) \
(THIS_ ULONG ulFlags, \ (THIS_ ULONG ulFlags, \
ULONG c bEntryID, \ ULONG c bEntryID, \
skipping to change at line 262 skipping to change at line 263
(THIS_ ULONG_PTR ulUIParam , \ (THIS_ ULONG_PTR ulUIParam , \
LPMDB l pMsgStore, \ LPMDB l pMsgStore, \
LPMAPIFOLDER lpParentF older, \ LPMAPIFOLDER lpParentF older, \
LPCIID l pInterface, \ LPCIID l pInterface, \
ULONG u lMessageToken, \ ULONG u lMessageToken, \
LPMESSAGE l pMessageSent, \ LPMESSAGE l pMessageSent, \
ULONG u lFlags, \ ULONG u lFlags, \
ULONG u lMessageStatus, \ ULONG u lMessageStatus, \
ULONG u lMessageFlags, \ ULONG u lMessageFlags, \
ULONG u lAccess, \ ULONG u lAccess, \
LPSTR l pszMessageClass) IPURE; \ __in LPSTR l pszMessageClass) IPURE; \
MAPIMETHOD(PrepareForm) \ MAPIMETHOD(PrepareForm) \
(THIS_ LPCIID lpInterfa ce, \ (THIS_ LPCIID lpInterfa ce, \
LPMESSAGE l pMessage, \ LPMESSAGE l pMessage, \
ULONG FAR * l pulMessageToken) IPURE; \ ULONG FAR * l pulMessageToken) IPURE; \
#undef INTERFACE #undef INTERFACE
#define INTERFACE IMAPISession #define INTERFACE IMAPISession
DECLARE_MAPI_INTERFACE_(IMAPISession, IUnknown) DECLARE_MAPI_INTERFACE_(IMAPISession, IUnknown)
{ {
BEGIN_INTERFACE BEGIN_INTERFACE
skipping to change at line 318 skipping to change at line 319
ULONG FAR * l pulResult) IPURE; \ ULONG FAR * l pulResult) IPURE; \
MAPIMETHOD(Advise) \ MAPIMETHOD(Advise) \
(THIS_ ULONG cbEntryID , \ (THIS_ ULONG cbEntryID , \
LPENTRYID l pEntryID, \ LPENTRYID l pEntryID, \
ULONG u lEventMask, \ ULONG u lEventMask, \
LPMAPIADVISESINK lpAdviseS ink, \ LPMAPIADVISESINK lpAdviseS ink, \
ULONG FAR * l pulConnection) IPURE; \ ULONG FAR * l pulConnection) IPURE; \
MAPIMETHOD(Unadvise) \ MAPIMETHOD(Unadvise) \
(THIS_ ULONG ulConnect ion) IPURE; \ (THIS_ ULONG ulConnect ion) IPURE; \
MAPIMETHOD(CreateOneOff) \ MAPIMETHOD(CreateOneOff) \
(THIS_ LPTSTR lpszName, (THIS_ __in LPTSTR lpszName,
\ \
LPTSTR l __in LPTSTR l
pszAdrType, \ pszAdrType, \
LPTSTR l __in LPTSTR l
pszAddress, \ pszAddress, \
ULONG u lFlags, \ ULONG u lFlags, \
ULONG FAR * l pcbEntryID, \ ULONG FAR * l pcbEntryID, \
LPENTRYID FAR * lppEntryI D) IPURE; \ LPENTRYID FAR * lppEntryI D) IPURE; \
MAPIMETHOD(NewEntry) \ MAPIMETHOD(NewEntry) \
(THIS_ ULONG_PTR ulUIParam , \ (THIS_ ULONG_PTR ulUIParam , \
ULONG u lFlags, \ ULONG u lFlags, \
ULONG c bEIDContainer, \ ULONG c bEIDContainer, \
LPENTRYID l pEIDContainer, \ LPENTRYID l pEIDContainer, \
ULONG c bEIDNewEntryTpl, \ ULONG c bEIDNewEntryTpl, \
LPENTRYID l pEIDNewEntryTpl, \ LPENTRYID l pEIDNewEntryTpl, \
ULONG FAR * l pcbEIDNewEntry, \ ULONG FAR * l pcbEIDNewEntry, \
LPENTRYID FAR * lppEIDNew Entry) IPURE; \ LPENTRYID FAR * lppEIDNew Entry) IPURE; \
MAPIMETHOD(ResolveName) \ MAPIMETHOD(ResolveName) \
(THIS_ ULONG_PTR ulUIParam , \ (THIS_ ULONG_PTR ulUIParam , \
ULONG u lFlags, \ ULONG u lFlags, \
LPTSTR l pszNewEntryTitle, \ __in LPTSTR l pszNewEntryTitle, \
LPADRLIST l pAdrList) IPURE; \ LPADRLIST l pAdrList) IPURE; \
MAPIMETHOD(Address) \ MAPIMETHOD(Address) \
(THIS_ ULONG_PTR FAR * lpulUIParam, \ (THIS_ ULONG_PTR FAR * lpulUIParam, \
LPADRPARM l pAdrParms, \ LPADRPARM l pAdrParms, \
LPADRLIST FAR * lppAdrLis t) IPURE; \ LPADRLIST FAR * lppAdrLis t) IPURE; \
MAPIMETHOD(Details) \ MAPIMETHOD(Details) \
(THIS_ ULONG FAR * lpulUIPar am, \ (THIS_ ULONG FAR * lpulUIPar am, \
LPFNDISMISS l pfnDismiss, \ LPFNDISMISS l pfnDismiss, \
LPVOID l pvDismissContext, \ LPVOID l pvDismissContext, \
ULONG c bEntryID, \ ULONG c bEntryID, \
LPENTRYID l pEntryID, \ LPENTRYID l pEntryID, \
LPFNBUTTON l pfButtonCallback, \ LPFNBUTTON l pfButtonCallback, \
LPVOID l pvButtonContext, \ LPVOID l pvButtonContext, \
LPTSTR l pszButtonText, \ __in LPTSTR l pszButtonText, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(RecipOptions) \ MAPIMETHOD(RecipOptions) \
(THIS_ ULONG_PTR ulUIParam , \ (THIS_ ULONG_PTR ulUIParam , \
ULONG u lFlags, \ ULONG u lFlags, \
LPADRENTRY l pRecip) IPURE; \ LPADRENTRY l pRecip) IPURE; \
MAPIMETHOD(QueryDefaultRecipOpt) \ MAPIMETHOD(QueryDefaultRecipOpt) \
(THIS_ LPTSTR lpszAdrTy pe, \ (THIS_ __in LPTSTR lpszAdrTy pe, \
ULONG u lFlags, \ ULONG u lFlags, \
ULONG FAR * l pcValues, \ ULONG FAR * l pcValues, \
LPSPropValue FAR * lppOption s) IPURE; \ LPSPropValue FAR * lppOption s) IPURE; \
MAPIMETHOD(GetPAB) \ MAPIMETHOD(GetPAB) \
(THIS_ ULONG FAR * lpcbEntry ID, \ (THIS_ ULONG FAR * lpcbEntry ID, \
LPENTRYID FAR * lppEntryI D) IPURE; \ LPENTRYID FAR * lppEntryI D) IPURE; \
MAPIMETHOD(SetPAB) \ MAPIMETHOD(SetPAB) \
(THIS_ ULONG cbEntryID , \ (THIS_ ULONG cbEntryID , \
LPENTRYID l pEntryID) IPURE; \ LPENTRYID l pEntryID) IPURE; \
MAPIMETHOD(GetDefaultDir) \ MAPIMETHOD(GetDefaultDir) \
skipping to change at line 413 skipping to change at line 414
#define MAPI_IPROFADMIN_METHODS(IPURE) \ #define MAPI_IPROFADMIN_METHODS(IPURE) \
MAPIMETHOD(GetLastError) \ MAPIMETHOD(GetLastError) \
(THIS_ HRESULT hResult, \ (THIS_ HRESULT hResult, \
ULONG u lFlags, \ ULONG u lFlags, \
LPMAPIERROR FAR * lppMAPIEr ror) IPURE; \ LPMAPIERROR FAR * lppMAPIEr ror) IPURE; \
MAPIMETHOD(GetProfileTable) \ MAPIMETHOD(GetProfileTable) \
(THIS_ ULONG ulFlags, \ (THIS_ ULONG ulFlags, \
LPMAPITABLE FAR * lppTable) IPURE; \ LPMAPITABLE FAR * lppTable) IPURE; \
MAPIMETHOD(CreateProfile) \ MAPIMETHOD(CreateProfile) \
(THIS_ LPTSTR lpszProfi (THIS_ __in LPTSTR lpszProfi
leName, \ leName, \
LPTSTR l __in LPTSTR l
pszPassword, \ pszPassword, \
ULONG_PTR u lUIParam, \ ULONG_PTR u lUIParam, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(DeleteProfile) \ MAPIMETHOD(DeleteProfile) \
(THIS_ LPTSTR lpszProfi leName, \ (THIS_ __in LPTSTR lpszProfi leName, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(ChangeProfilePassword) \ MAPIMETHOD(ChangeProfilePassword) \
(THIS_ LPTSTR lpszProfi (THIS_ __in LPTSTR lpszProfi
leName, \ leName, \
LPTSTR l __in LPTSTR l
pszOldPassword, \ pszOldPassword, \
LPTSTR l __in LPTSTR l
pszNewPassword, \ pszNewPassword, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(CopyProfile) \ MAPIMETHOD(CopyProfile) \
(THIS_ LPTSTR lpszOldPr (THIS_ __in LPTSTR lpszOldPr
ofileName, \ ofileName, \
LPTSTR l __in LPTSTR l
pszOldPassword, \ pszOldPassword, \
LPTSTR l __in LPTSTR l
pszNewProfileName, \ pszNewProfileName, \
ULONG_PTR u lUIParam, \ ULONG_PTR u lUIParam, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(RenameProfile) \ MAPIMETHOD(RenameProfile) \
(THIS_ LPTSTR lpszOldPr (THIS_ __in LPTSTR lpszOldPr
ofileName, \ ofileName, \
LPTSTR l __in LPTSTR l
pszOldPassword, \ pszOldPassword, \
LPTSTR l __in LPTSTR l
pszNewProfileName, \ pszNewProfileName, \
ULONG_PTR u lUIParam, \ ULONG_PTR u lUIParam, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(SetDefaultProfile) \ MAPIMETHOD(SetDefaultProfile) \
(THIS_ LPTSTR lpszProfi leName, \ (THIS_ __in LPTSTR lpszProfi leName, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(AdminServices) \ MAPIMETHOD(AdminServices) \
(THIS_ LPTSTR lpszProfi (THIS_ __in LPTSTR lpszProfi
leName, \ leName, \
LPTSTR l __in LPTSTR l
pszPassword, \ pszPassword, \
ULONG_PTR u lUIParam, \ ULONG_PTR u lUIParam, \
ULONG u lFlags, \ ULONG u lFlags, \
LPSERVICEADMIN FAR * lppServiceAdmin) IPURE; \ LPSERVICEADMIN FAR * lppServiceAdmin) IPURE; \
#undef INTERFACE #undef INTERFACE
#define INTERFACE IProfAdmin #define INTERFACE IProfAdmin
DECLARE_MAPI_INTERFACE_(IProfAdmin, IUnknown) DECLARE_MAPI_INTERFACE_(IProfAdmin, IUnknown)
{ {
BEGIN_INTERFACE BEGIN_INTERFACE
MAPI_IUNKNOWN_METHODS(PURE) MAPI_IUNKNOWN_METHODS(PURE)
skipping to change at line 481 skipping to change at line 482
#define MAPI_IMSGSERVICEADMIN_METHODS(IPURE) \ #define MAPI_IMSGSERVICEADMIN_METHODS(IPURE) \
MAPIMETHOD(GetLastError) \ MAPIMETHOD(GetLastError) \
(THIS_ HRESULT hResult, \ (THIS_ HRESULT hResult, \
ULONG u lFlags, \ ULONG u lFlags, \
LPMAPIERROR FAR * lppMAPIEr ror) IPURE; \ LPMAPIERROR FAR * lppMAPIEr ror) IPURE; \
MAPIMETHOD(GetMsgServiceTable) \ MAPIMETHOD(GetMsgServiceTable) \
(THIS_ ULONG ulFlags, \ (THIS_ ULONG ulFlags, \
LPMAPITABLE FAR * lppTable) IPURE; \ LPMAPITABLE FAR * lppTable) IPURE; \
MAPIMETHOD(CreateMsgService) \ MAPIMETHOD(CreateMsgService) \
(THIS_ LPTSTR lpszServi (THIS_ __in LPTSTR lpszServi
ce, \ ce, \
LPTSTR l __in LPTSTR l
pszDisplayName, \ pszDisplayName, \
ULONG_PTR u lUIParam, \ ULONG_PTR u lUIParam, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(DeleteMsgService) \ MAPIMETHOD(DeleteMsgService) \
(THIS_ LPMAPIUID lpUID) IP URE; \ (THIS_ LPMAPIUID lpUID) IP URE; \
MAPIMETHOD(CopyMsgService) \ MAPIMETHOD(CopyMsgService) \
(THIS_ LPMAPIUID lpUID, \ (THIS_ LPMAPIUID lpUID, \
LPTSTR l pszDisplayName, \ __in LPTSTR l pszDisplayName, \
LPCIID l pInterfaceToCopy, \ LPCIID l pInterfaceToCopy, \
LPCIID l pInterfaceDst, \ LPCIID l pInterfaceDst, \
LPVOID l pObjectDst, \ LPVOID l pObjectDst, \
ULONG_PTR u lUIParam, \ ULONG_PTR u lUIParam, \
ULONG u lFlags) IPURE; \ ULONG u lFlags) IPURE; \
MAPIMETHOD(RenameMsgService) \ MAPIMETHOD(RenameMsgService) \
(THIS_ LPMAPIUID lpUID, \ (THIS_ LPMAPIUID lpUID, \
ULONG u lFlags, \ ULONG u lFlags, \
LPTSTR l pszDisplayName) IPURE; \ __in LPTSTR l pszDisplayName) IPURE; \
MAPIMETHOD(ConfigureMsgService) \ MAPIMETHOD(ConfigureMsgService) \
(THIS_ LPMAPIUID lpUID, \ (THIS_ LPMAPIUID lpUID, \
ULONG_PTR u lUIParam, \ ULONG_PTR u lUIParam, \
ULONG u lFlags, \ ULONG u lFlags, \
ULONG c Values, \ ULONG c Values, \
LPSPropValue lpProps) IPURE; \ LPSPropValue lpProps) IPURE; \
MAPIMETHOD(OpenProfileSection) \ MAPIMETHOD(OpenProfileSection) \
(THIS_ LPMAPIUID lpUID, \ (THIS_ LPMAPIUID lpUID, \
LPCIID l pInterface, \ LPCIID l pInterface, \
ULONG u lFlags, \ ULONG u lFlags, \
 End of changes. 19 change blocks. 
52 lines changed or deleted 54 lines changed or added

This html diff was produced by rfcdiff 1.41.