Headers diff for mapi32.dll between 1.0.2536.0-Windows 5.0 and 1.0.2536.0-Windows 6.0 versions
| mapi.h (1.0.2536.0-Windows 5.0) | | mapi.h (1.0.2536.0-Windows 6.0) |
|---|
| | |
| skipping to change at line 181 | | skipping to change at line 181 |
|---|
| | |
| /* MAPIResolveName() flags. */ | | /* MAPIResolveName() flags. */ |
| | |
| /* #define MAPI_LOGON_UI 0x00000001 Display logon UI */ | | /* #define MAPI_LOGON_UI 0x00000001 Display logon UI */ |
| /* #define MAPI_NEW_SESSION 0x00000002 Don't use shared session */ | | /* #define MAPI_NEW_SESSION 0x00000002 Don't use shared session */ |
| /* #define MAPI_DIALOG 0x00000008 Prompt for choices if ambiguous *
/ | | /* #define MAPI_DIALOG 0x00000008 Prompt for choices if ambiguous *
/ |
| /* #define MAPI_AB_NOMODIFY 0x00000400 Don't allow mods of AB entries */ | | /* #define MAPI_AB_NOMODIFY 0x00000400 Don't allow mods of AB entries */ |
| | |
| typedef ULONG (FAR PASCAL MAPILOGON)( | | typedef ULONG (FAR PASCAL MAPILOGON)( |
| ULONG_PTR ulUIParam, | | ULONG_PTR ulUIParam, |
|
| LPSTR lpszProfileName, | | __in LPSTR lpszProfileName, |
| 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; | | MAPILOGON MAPILogon; |
| | |
| typedef ULONG (FAR PASCAL MAPILOGOFF)( | | typedef ULONG (FAR PASCAL MAPILOGOFF)( |
| LHANDLE lhSession, | | LHANDLE lhSession, |
| ULONG_PTR ulUIParam, | | ULONG_PTR ulUIParam, |
| | |
| skipping to change at line 211 | | skipping to change at line 211 |
|---|
| 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, |
|
| LPSTR lpszDelimChar, | | __in LPSTR lpszDelimChar, |
| LPSTR lpszFilePaths, | | __in LPSTR lpszFilePaths, |
| LPSTR lpszFileNames, | | __in LPSTR lpszFileNames, |
| ULONG ulReserved | | ULONG ulReserved |
| ); | | ); |
| typedef MAPISENDDOCUMENTS FAR *LPMAPISENDDOCUMENTS; | | typedef MAPISENDDOCUMENTS FAR *LPMAPISENDDOCUMENTS; |
| MAPISENDDOCUMENTS MAPISendDocuments; | | MAPISENDDOCUMENTS MAPISendDocuments; |
| | |
| typedef ULONG (FAR PASCAL MAPIFINDNEXT)( | | typedef ULONG (FAR PASCAL MAPIFINDNEXT)( |
| LHANDLE lhSession, | | LHANDLE lhSession, |
| ULONG_PTR ulUIParam, | | ULONG_PTR ulUIParam, |
|
| LPSTR lpszMessageType, | | __in LPSTR lpszMessageType, |
| LPSTR lpszSeedMessageID, | | __in LPSTR lpszSeedMessageID, |
| FLAGS flFlags, | | FLAGS flFlags, |
| ULONG ulReserved, | | ULONG ulReserved, |
|
| LPSTR lpszMessageID | | __in LPSTR lpszMessageID |
| ); | | ); |
| typedef MAPIFINDNEXT FAR *LPMAPIFINDNEXT; | | typedef MAPIFINDNEXT FAR *LPMAPIFINDNEXT; |
| MAPIFINDNEXT MAPIFindNext; | | MAPIFINDNEXT MAPIFindNext; |
| | |
| typedef ULONG (FAR PASCAL MAPIREADMAIL)( | | typedef ULONG (FAR PASCAL MAPIREADMAIL)( |
| LHANDLE lhSession, | | LHANDLE lhSession, |
| ULONG_PTR ulUIParam, | | ULONG_PTR ulUIParam, |
|
| 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; | | 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, |
|
| LPSTR lpszMessageID | | __in LPSTR lpszMessageID |
| ); | | ); |
| typedef MAPISAVEMAIL FAR *LPMAPISAVEMAIL; | | typedef MAPISAVEMAIL FAR *LPMAPISAVEMAIL; |
| MAPISAVEMAIL MAPISaveMail; | | MAPISAVEMAIL MAPISaveMail; |
| | |
| typedef ULONG (FAR PASCAL MAPIDELETEMAIL)( | | typedef ULONG (FAR PASCAL MAPIDELETEMAIL)( |
| LHANDLE lhSession, | | LHANDLE lhSession, |
| ULONG_PTR ulUIParam, | | ULONG_PTR ulUIParam, |
|
| LPSTR lpszMessageID, | | __in LPSTR lpszMessageID, |
| FLAGS flFlags, | | FLAGS flFlags, |
| ULONG ulReserved | | ULONG ulReserved |
| ); | | ); |
| typedef MAPIDELETEMAIL FAR *LPMAPIDELETEMAIL; | | typedef MAPIDELETEMAIL FAR *LPMAPIDELETEMAIL; |
| MAPIDELETEMAIL MAPIDeleteMail; | | 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, |
|
| LPSTR lpszCaption, | | __in LPSTR lpszCaption, |
| ULONG nEditFields, | | ULONG nEditFields, |
|
| 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; | | MAPIADDRESS MAPIAddress; |
| | |
| | |
| skipping to change at line 296 | | skipping to change at line 296 |
|---|
| lpMapiRecipDesc lpRecip, | | lpMapiRecipDesc lpRecip, |
| FLAGS flFlags, | | FLAGS flFlags, |
| ULONG ulReserved | | ULONG ulReserved |
| ); | | ); |
| typedef MAPIDETAILS FAR *LPMAPIDETAILS; | | typedef MAPIDETAILS FAR *LPMAPIDETAILS; |
| MAPIDETAILS MAPIDetails; | | MAPIDETAILS MAPIDetails; |
| | |
| typedef ULONG (FAR PASCAL MAPIRESOLVENAME)( | | typedef ULONG (FAR PASCAL MAPIRESOLVENAME)( |
| LHANDLE lhSession, | | LHANDLE lhSession, |
| ULONG_PTR ulUIParam, | | ULONG_PTR ulUIParam, |
|
| 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; | | MAPIRESOLVENAME MAPIResolveName; |
| | |
| #ifndef SUCCESS_SUCCESS | | #ifndef SUCCESS_SUCCESS |
| #define SUCCESS_SUCCESS 0 | | #define SUCCESS_SUCCESS 0 |
| #endif | | #endif |
| | |
| End of changes. 10 change blocks. |
|---|
| 14 lines changed or deleted | | 14 lines changed or added |
|---|
|
| mapiutil.h (1.0.2536.0-Windows 5.0) | | mapiutil.h (1.0.2536.0-Windows 6.0) |
|---|
| | |
| skipping to change at line 480 | | skipping to change at line 480 |
|---|
| * Methods and #define's for implementing an OLE 2.0 storage stream | | * Methods and #define's for implementing an OLE 2.0 storage stream |
| * (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, |
|
| LPTSTR lpszFileName, | | __in LPTSTR lpszFileName, |
| LPTSTR lpszPrefix, | | __in 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, |
|
| LPTSTR lpszFileName, | | __in LPTSTR lpszFileName, |
| LPTSTR lpszPrefix, | | __in LPTSTR lpszPrefix, |
| LPSTREAM FAR * lppStream); | | LPSTREAM FAR * lppStream); |
| | |
| #ifdef _WIN32 | | #ifdef _WIN32 |
| #define OPENSTREAMONFILE "OpenStreamOnFile" | | #define OPENSTREAMONFILE "OpenStreamOnFile" |
| #endif | | #endif |
| #ifdef WIN16 | | #ifdef WIN16 |
| #define OPENSTREAMONFILE "_OPENSTREAMONFILE" | | #define OPENSTREAMONFILE "_OPENSTREAMONFILE" |
| #endif | | #endif |
| | |
| /* Property interface utilities */ | | /* Property interface utilities */ |
| | |
| skipping to change at line 719 | | skipping to change at line 719 |
|---|
| | |
| #define MAPI_FORCE_CREATE 1 | | #define MAPI_FORCE_CREATE 1 |
| #define MAPI_FULL_IPM_TREE 2 | | #define MAPI_FULL_IPM_TREE 2 |
| | |
| STDAPI HrValidateIPMSubtree(LPMDB lpMDB, ULONG u
lFlags, | | STDAPI HrValidateIPMSubtree(LPMDB lpMDB, ULONG u
lFlags, |
| ULONG FAR *lpcValues, LPSPropValu
e FAR *lppValues, | | ULONG FAR *lpcValues, LPSPropValu
e FAR *lppValues, |
| LPMAPIERROR FAR *lpperr); | | LPMAPIERROR FAR *lpperr); |
| | |
| /* Encoding and decoding strings */ | | /* Encoding and decoding strings */ |
| | |
|
| STDAPI_(BOOL) FBinFromHex(LPTSTR lpsz, LPBYTE lpb); | | STDAPI_(BOOL) FBinFromHex(__in LPTSTR lpsz, LPBYTE lpb); |
| STDAPI_(SCODE) ScBinFromHexBounded(LPTSTR lpsz, LPBYTE lpb, ULON | | STDAPI_(SCODE) ScBinFromHexBounded(__in LPTSTR lpsz, LPBYTE lpb, |
| G cb); | | ULONG cb); |
| STDAPI_(void) HexFromBin(LPBYTE lpb, int cb, LPTSTR lpsz); | | STDAPI_(void) HexFromBin(LPBYTE lpb, int cb, __in LPTSTR lpsz); |
| STDAPI_(ULONG) UlFromSzHex(LPCTSTR lpsz); | | STDAPI_(ULONG) UlFromSzHex(LPCTSTR lpsz); |
| | |
| /* Encoding and decoding entry IDs */ | | /* Encoding and decoding entry IDs */ |
|
| STDAPI HrEntryIDFromSz(LPTSTR lpsz, ULONG FAR *l
pcb, | | STDAPI HrEntryIDFromSz(__in LPTSTR lpsz, ULONG F
AR *lpcb, |
| LPENTRYID FAR *lppEntryID); | | LPENTRYID FAR *lppEntryID); |
| STDAPI HrSzFromEntryID(ULONG cb, LPENTRYID lpEnt
ryID, | | STDAPI HrSzFromEntryID(ULONG cb, LPENTRYID lpEnt
ryID, |
|
| LPTSTR FAR *lpsz); | | __in LPTSTR FAR *lpsz); |
| STDAPI HrComposeEID(LPMAPISESSION lpSession, | | STDAPI HrComposeEID(LPMAPISESSION lpSession, |
| ULONG cbStoreRecordKey, LPBYTE lp
StoreRecordKey, | | ULONG cbStoreRecordKey, LPBYTE lp
StoreRecordKey, |
| ULONG cbMsgEntryID, LPENTRYID lpM
sgEntryID, | | ULONG cbMsgEntryID, LPENTRYID lpM
sgEntryID, |
| ULONG FAR *lpcbEID, LPENTRYID FAR
*lppEntryID); | | ULONG FAR *lpcbEID, LPENTRYID FAR
*lppEntryID); |
| STDAPI HrDecomposeEID(LPMAPISESSION lpSession, | | STDAPI HrDecomposeEID(LPMAPISESSION lpSession, |
| ULONG cbEntryID, LPENTRYID lpEntr
yID, | | ULONG cbEntryID, LPENTRYID lpEntr
yID, |
| ULONG FAR *lpcbStoreEntryID, | | ULONG FAR *lpcbStoreEntryID, |
| LPENTRYID FAR *lppStoreEntryID, | | LPENTRYID FAR *lppStoreEntryID, |
| ULONG FAR *lpcbMsgEntryID, | | ULONG FAR *lpcbMsgEntryID, |
| LPENTRYID FAR *lppMsgEntryID); | | LPENTRYID FAR *lppMsgEntryID); |
| STDAPI HrComposeMsgID(LPMAPISESSION lpSession, | | STDAPI HrComposeMsgID(LPMAPISESSION lpSession, |
| ULONG cbStoreSearchKey, LPBYTE pS
toreSearchKey, | | ULONG cbStoreSearchKey, LPBYTE pS
toreSearchKey, |
| ULONG cbMsgEntryID, LPENTRYID lpM
sgEntryID, | | ULONG cbMsgEntryID, LPENTRYID lpM
sgEntryID, |
|
| LPTSTR FAR *lpszMsgID); | | __in LPTSTR FAR *lpszMsgID); |
| STDAPI HrDecomposeMsgID(LPMAPISESSION lpSession, | | STDAPI HrDecomposeMsgID(LPMAPISESSION lpSession, |
|
| LPTSTR lpszMsgID, | | __in LPTSTR lpszMsgID, |
| ULONG FAR *lpcbStoreEntryID, | | ULONG FAR *lpcbStoreEntryID, |
| LPENTRYID FAR *lppStoreEntryID, | | LPENTRYID FAR *lppStoreEntryID, |
| ULONG FAR *lppcbMsgEntryID, | | ULONG FAR *lppcbMsgEntryID, |
| LPENTRYID FAR *lppMsgEntryID); | | LPENTRYID FAR *lppMsgEntryID); |
| | |
| /* C runtime substitutes */ | | /* C runtime substitutes */ |
| | |
| STDAPI_(LPTSTR) SzFindCh(LPCTSTR lpsz, USHORT ch);
/* strchr */ | | STDAPI_(LPTSTR) SzFindCh(LPCTSTR lpsz, USHORT ch);
/* strchr */ |
| STDAPI_(LPTSTR) SzFindLastCh(LPCTSTR lpsz, USHORT ch); /
* strrchr */ | | STDAPI_(LPTSTR) SzFindLastCh(LPCTSTR lpsz, USHORT ch); /
* strrchr */ |
| STDAPI_(LPTSTR) SzFindSz(LPCTSTR lpsz, LPCTSTR lpszKey);
/*strstr */ | | STDAPI_(LPTSTR) SzFindSz(LPCTSTR lpsz, LPCTSTR lpszKey);
/*strstr */ |
| STDAPI_(unsigned int) UFromSz(LPCTSTR lpsz); /
* atoi */ | | STDAPI_(unsigned int) UFromSz(LPCTSTR lpsz); /
* atoi */ |
| | |
|
| STDAPI_(SCODE) ScUNCFromLocalPath(LPSTR lpszLocal, LPSTR lpszUNC
, | | STDAPI_(SCODE) ScUNCFromLocalPath(__in LPSTR lpszLocal, __in LPS
TR lpszUNC, |
| UINT cchUNC); | | UINT cchUNC); |
|
| STDAPI_(SCODE) ScLocalPathFromUNC(LPSTR lpszUNC, LPSTR lpszLocal
, | | STDAPI_(SCODE) ScLocalPathFromUNC(__in LPSTR lpszUNC, __in LPSTR
lpszLocal, |
| UINT cchLocal); | | UINT cchLocal); |
| | |
| /* 64-bit arithmetic with times */ | | /* 64-bit arithmetic with times */ |
| | |
| STDAPI_(FILETIME) FtAddFt(FILETIME ftAddend1, FILETIME ftAddend2); | | STDAPI_(FILETIME) FtAddFt(FILETIME ftAddend1, FILETIME ftAddend2); |
| STDAPI_(FILETIME) FtMulDwDw(DWORD ftMultiplicand, DWORD ftMultiplie
r); | | STDAPI_(FILETIME) FtMulDwDw(DWORD ftMultiplicand, DWORD ftMultiplie
r); |
| STDAPI_(FILETIME) FtMulDw(DWORD ftMultiplier, FILETIME ftMultiplica
nd); | | STDAPI_(FILETIME) FtMulDw(DWORD ftMultiplier, FILETIME ftMultiplica
nd); |
| STDAPI_(FILETIME) FtSubFt(FILETIME ftMinuend, FILETIME ftSubtrahend
); | | STDAPI_(FILETIME) FtSubFt(FILETIME ftMinuend, FILETIME ftSubtrahend
); |
| STDAPI_(FILETIME) FtNegFt(FILETIME ft); | | STDAPI_(FILETIME) FtNegFt(FILETIME ft); |
| | |
| /* Message composition */ | | /* Message composition */ |
| | |
| STDAPI_(SCODE) ScCreateConversationIndex (ULONG cbParent, | | STDAPI_(SCODE) ScCreateConversationIndex (ULONG cbParent, |
| LPBYTE lpbParent, | | LPBYTE lpbParent, |
| ULONG FAR * lpcbConvI
ndex, | | ULONG FAR * lpcbConvI
ndex, |
| LPBYTE FAR * lppbConvInde
x); | | LPBYTE FAR * lppbConvInde
x); |
| | |
| /* Store support */ | | /* Store support */ |
| | |
|
| STDAPI WrapStoreEntryID (ULONG ulFlags, LPTSTR lpszDLLName, ULONG cbOrigEntry, | | STDAPI WrapStoreEntryID (ULONG ulFlags, __in LPTSTR lpszDLLName, ULONG cbOrigEnt
ry, |
| LPENTRYID lpOrigEntry, ULONG *lpcbWrappedEntry, LPENTRYID *lppWrappedEntr
y); | | LPENTRYID lpOrigEntry, ULONG *lpcbWrappedEntry, LPENTRYID *lppWrappedEntr
y); |
| | |
| /* RTF Sync Utilities */ | | /* RTF Sync Utilities */ |
| | |
| #define RTF_SYNC_RTF_CHANGED ((ULONG) 0x00000001) | | #define RTF_SYNC_RTF_CHANGED ((ULONG) 0x00000001) |
| #define RTF_SYNC_BODY_CHANGED ((ULONG) 0x00000002) | | #define RTF_SYNC_BODY_CHANGED ((ULONG) 0x00000002) |
| | |
| STDAPI_(HRESULT) | | STDAPI_(HRESULT) |
|
| RTFSync (LPMESSAGE lpMessage, ULONG ulFlags, BOOL FAR * lpfMessageUpdated); | | RTFSync (LPMESSAGE lpMessage, ULONG ulFlags, __out BOOL FAR * lpfMessageUpdated)
; |
| | |
| /* Flags for WrapCompressedRTFStream() */ | | /* Flags for WrapCompressedRTFStream() */ |
| | |
| /****** MAPI_MODIFY ((ULONG) 0x00000001) mapidefs.h *
/ | | /****** MAPI_MODIFY ((ULONG) 0x00000001) mapidefs.h *
/ |
| /****** STORE_UNCOMPRESSED_RTF ((ULONG) 0x00008000) mapidefs.h */ | | /****** STORE_UNCOMPRESSED_RTF ((ULONG) 0x00008000) mapidefs.h */ |
| | |
| STDAPI_(HRESULT) | | STDAPI_(HRESULT) |
|
| WrapCompressedRTFStream (LPSTREAM lpCompressedRTFStream, | | WrapCompressedRTFStream (__in LPSTREAM lpCompressedRTFStream, |
| ULONG ulFlags, LPSTREAM FAR * lpUncompressedRTFStream); | | ULONG ulFlags, __out LPSTREAM FAR * lpUncompressedRTFStream); |
| | |
| /* Storage on Stream */ | | /* Storage on Stream */ |
| | |
| #if defined(_WIN32) || defined(WIN16) | | #if defined(_WIN32) || defined(WIN16) |
| STDAPI_(HRESULT) | | STDAPI_(HRESULT) |
| HrIStorageFromStream (LPUNKNOWN lpUnkIn, | | HrIStorageFromStream (LPUNKNOWN lpUnkIn, |
| LPCIID lpInterface, ULONG ulFlags, LPSTORAGE FAR * lppStorageOut); | | LPCIID lpInterface, ULONG ulFlags, LPSTORAGE FAR * lppStorageOut); |
| #endif | | #endif |
| | |
| /* | | /* |
| | |
| End of changes. 12 change blocks. |
|---|
| 18 lines changed or deleted | | 18 lines changed or added |
|---|
|
| mapival.h (1.0.2536.0-Windows 5.0) | | mapival.h (1.0.2536.0-Windows 6.0) |
|---|
| | |
| skipping to change at line 274 | | skipping to change at line 274 |
|---|
| && ( offsetof( ADRLIST, aEntries) \ | | && ( offsetof( ADRLIST, aEntries) \ |
| == offsetof( SRowSet, aRow)) \ | | == offsetof( SRowSet, aRow)) \ |
| && ( offsetof( ADRENTRY, cValues) \ | | && ( offsetof( ADRENTRY, cValues) \ |
| == offsetof( SRow, cValues)) \ | | == offsetof( SRow, cValues)) \ |
| && ( offsetof( ADRENTRY, rgPropVals) \ | | && ( offsetof( ADRENTRY, rgPropVals) \ |
| == offsetof( SRow, lpProps)) \ | | == offsetof( SRow, lpProps)) \ |
| , "ADRLIST doesn't match SRowSet") \ | | , "ADRLIST doesn't match SRowSet") \ |
| || FBadRowSet( (LPSRowSet) lpAdrList)) | | || FBadRowSet( (LPSRowSet) lpAdrList)) |
| | |
| STDAPI_(BOOL) | | STDAPI_(BOOL) |
|
| FBadRglpszW( LPWSTR FAR *lppszW, | | FBadRglpszW(__in LPWSTR FAR *lppszW, |
| ULONG cStrings); | | ULONG cStrings); |
| | |
| STDAPI_(BOOL) | | STDAPI_(BOOL) |
| FBadRowSet( LPSRowSet lpRowSet); | | FBadRowSet( LPSRowSet lpRowSet); |
| | |
| STDAPI_(BOOL) | | STDAPI_(BOOL) |
| FBadRglpNameID( LPMAPINAMEID FAR * lppNameId, | | FBadRglpNameID( LPMAPINAMEID FAR * lppNameId, |
| ULONG cNames); | | ULONG cNames); |
| | |
| STDAPI_(BOOL) | | STDAPI_(BOOL) |
| | |
| End of changes. 1 change blocks. |
|---|
| 1 lines changed or deleted | | 1 lines changed or added |
|---|
|
| mapix.h (1.0.2536.0-Windows 5.0) | | mapix.h (1.0.2536.0-Windows 6.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, |
|
| LPTSTR lpszProfileName, | | __in LPTSTR lpszProfileName, |
| LPTSTR lpszPassword, | | __in 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 |
| | |
| End of changes. 1 change blocks. |
|---|
| 2 lines changed or deleted | | 2 lines changed or added |
|---|
|
| tnef.h (1.0.2536.0-Windows 5.0) | | tnef.h (1.0.2536.0-Windows 6.0) |
|---|
| | |
| skipping to change at line 127 | | skipping to change at line 127 |
|---|
| DECLARE_MAPI_INTERFACE_(ITnef, IUnknown) | | DECLARE_MAPI_INTERFACE_(ITnef, IUnknown) |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| MAPI_IUNKNOWN_METHODS(PURE) | | MAPI_IUNKNOWN_METHODS(PURE) |
| MAPI_ITNEF_METHODS(PURE) | | MAPI_ITNEF_METHODS(PURE) |
| }; | | }; |
| | |
| STDMETHODIMP OpenTnefStream( | | STDMETHODIMP OpenTnefStream( |
| LPVOID lpvSupport, | | LPVOID lpvSupport, |
| LPSTREAM lpStream, | | LPSTREAM lpStream, |
|
| LPTSTR lpszStreamName, | | __in LPTSTR lpszStreamName, |
| ULONG ulFlags, | | ULONG ulFlags, |
| LPMESSAGE lpMessage, | | LPMESSAGE lpMessage, |
| WORD wKeyVal, | | WORD wKeyVal, |
| LPITNEF FAR * lppTNEF); | | LPITNEF FAR * lppTNEF); |
| | |
| typedef HRESULT (STDMETHODCALLTYPE FAR * LPOPENTNEFSTREAM) ( | | typedef HRESULT (STDMETHODCALLTYPE FAR * LPOPENTNEFSTREAM) ( |
| LPVOID lpvSupport, | | LPVOID lpvSupport, |
| LPSTREAM lpStream, | | LPSTREAM lpStream, |
|
| LPTSTR lpszStreamName, | | __in LPTSTR lpszStreamName, |
| ULONG ulFlags, | | ULONG ulFlags, |
| LPMESSAGE lpMessage, | | LPMESSAGE lpMessage, |
| WORD wKeyVal, | | WORD wKeyVal, |
| LPITNEF FAR * lppTNEF); | | LPITNEF FAR * lppTNEF); |
| | |
| STDMETHODIMP OpenTnefStreamEx( | | STDMETHODIMP OpenTnefStreamEx( |
| LPVOID lpvSupport, | | LPVOID lpvSupport, |
| LPSTREAM lpStream, | | LPSTREAM lpStream, |
|
| LPTSTR lpszStreamName, | | __in LPTSTR lpszStreamName, |
| ULONG ulFlags, | | ULONG ulFlags, |
| LPMESSAGE lpMessage, | | LPMESSAGE lpMessage, |
| WORD wKeyVal, | | WORD wKeyVal, |
| LPADRBOOK lpAdressBook, | | LPADRBOOK lpAdressBook, |
| LPITNEF FAR * lppTNEF); | | LPITNEF FAR * lppTNEF); |
| | |
| typedef HRESULT (STDMETHODCALLTYPE FAR * LPOPENTNEFSTREAMEX) ( | | typedef HRESULT (STDMETHODCALLTYPE FAR * LPOPENTNEFSTREAMEX) ( |
| LPVOID lpvSupport, | | LPVOID lpvSupport, |
| LPSTREAM lpStream, | | LPSTREAM lpStream, |
|
| LPTSTR lpszStreamName, | | __in LPTSTR lpszStreamName, |
| ULONG ulFlags, | | ULONG ulFlags, |
| LPMESSAGE lpMessage, | | LPMESSAGE lpMessage, |
| WORD wKeyVal, | | WORD wKeyVal, |
| LPADRBOOK lpAdressBook, | | LPADRBOOK lpAdressBook, |
| LPITNEF FAR * lppTNEF); | | LPITNEF FAR * lppTNEF); |
| | |
| STDMETHODIMP GetTnefStreamCodepage ( | | STDMETHODIMP GetTnefStreamCodepage ( |
| LPSTREAM lpStream, | | LPSTREAM lpStream, |
| ULONG FAR * lpulCodepage, | | ULONG FAR * lpulCodepage, |
| ULONG FAR * lpulSubCodepage); | | ULONG FAR * lpulSubCodepage); |
| | |
| End of changes. 4 change blocks. |
|---|
| 4 lines changed or deleted | | 4 lines changed or added |
|---|
|
This html diff was produced by rfcdiff 1.41. |