SAL v2 migrate deprecated and conflicting annotations

include/MAPI.h

@@ -192,8 +192,8 @@ typedef struct
 
 typedef ULONG (FAR PASCAL MAPILOGON)(
 	ULONG_PTR ulUIParam,
-	/*OFFICEDEV add _opt*/ __in_opt LPSTR lpszProfileName,
-	/*OFFICEDEV add _opt*/ __in_opt LPSTR lpszPassword,
+	/*OFFICEDEV add _opt*/ _In_opt_ LPSTR lpszProfileName,
+	/*OFFICEDEV add _opt*/ _In_opt_ LPSTR lpszPassword,
 	FLAGS flFlags,
 	ULONG ulReserved,
 	LPLHANDLE lplhSession
@@ -224,9 +224,9 @@ MAPISENDMAIL MAPISendMail;
 
 typedef ULONG (FAR PASCAL MAPISENDDOCUMENTS)(
 	ULONG_PTR ulUIParam,
-	__in LPSTR lpszDelimChar,
-	__in LPSTR lpszFilePaths,
-	__in LPSTR lpszFileNames,
+	_In_ LPSTR lpszDelimChar,
+	_In_ LPSTR lpszFilePaths,
+	_In_ LPSTR lpszFileNames,
 	ULONG ulReserved
 );
 typedef MAPISENDDOCUMENTS FAR *LPMAPISENDDOCUMENTS;
@@ -236,19 +236,19 @@ MAPISENDDOCUMENTS MAPISendDocuments;
 typedef ULONG (FAR PASCAL MAPIFINDNEXT)(
 	LHANDLE lhSession,
 	ULONG_PTR ulUIParam,
-	__in LPSTR lpszMessageType,
-	__in LPSTR lpszSeedMessageID,
+	_In_ LPSTR lpszMessageType,
+	_In_ LPSTR lpszSeedMessageID,
 	FLAGS flFlags,
 	ULONG ulReserved,
-	__in LPSTR lpszMessageID
+	_In_ LPSTR lpszMessageID
 );
 typedef MAPIFINDNEXT FAR *LPMAPIFINDNEXT;
 MAPIFINDNEXT MAPIFindNext;
 
 typedef ULONG (FAR PASCAL MAPIREADMAIL)(
 	LHANDLE lhSession,
 	ULONG_PTR ulUIParam,
-	__in LPSTR lpszMessageID,
+	_In_ LPSTR lpszMessageID,
 	FLAGS flFlags,
 	ULONG ulReserved,
 	lpMapiMessage FAR *lppMessage
@@ -262,15 +262,15 @@ typedef ULONG (FAR PASCAL MAPISAVEMAIL)(
 	lpMapiMessage lpMessage,
 	FLAGS flFlags,
 	ULONG ulReserved,
-	__in LPSTR lpszMessageID
+	_In_ LPSTR lpszMessageID
 );
 typedef MAPISAVEMAIL FAR *LPMAPISAVEMAIL;
 MAPISAVEMAIL MAPISaveMail;
 
 typedef ULONG (FAR PASCAL MAPIDELETEMAIL)(
 	LHANDLE lhSession,
 	ULONG_PTR ulUIParam,
-	__in LPSTR lpszMessageID,
+	_In_ LPSTR lpszMessageID,
 	FLAGS flFlags,
 	ULONG ulReserved
 );
@@ -287,9 +287,9 @@ ULONG FAR PASCAL MAPIFreeBuffer(LPVOID pv);
 typedef ULONG (FAR PASCAL MAPIADDRESS)(
 	LHANDLE lhSession,
 	ULONG_PTR ulUIParam,
-	__in LPSTR lpszCaption,
+	_In_ LPSTR lpszCaption,
 	ULONG nEditFields,
-	__in LPSTR lpszLabels,
+	_In_ LPSTR lpszLabels,
 	ULONG nRecips,
 	lpMapiRecipDesc lpRecips,
 	FLAGS flFlags,
@@ -313,7 +313,7 @@ MAPIDETAILS MAPIDetails;
 typedef ULONG (FAR PASCAL MAPIRESOLVENAME)(
 	LHANDLE lhSession,
 	ULONG_PTR ulUIParam,
-	__in LPSTR lpszName,
+	_In_ LPSTR lpszName,
 	FLAGS flFlags,
 	ULONG ulReserved,
 	lpMapiRecipDesc FAR *lppRecip

include/MAPISPI.h

@@ -554,7 +554,7 @@ DECLARE_MAPI_INTERFACE_PTR(IXPLogon, LPXPLOGON);
 	MAPIMETHOD(TransportLogon)											\
 		(THIS_	LPMAPISUP					lpMAPISup,					\
 				ULONG_PTR					ulUIParam,					\
-				__in LPTSTR						lpszProfileName,			\
+				_In_ LPTSTR						lpszProfileName,			\
 				ULONG FAR *					lpulFlags,					\
                 LPMAPIERROR FAR *			lppMAPIError,				\
 				LPXPLOGON FAR *				lppXPLogon) IPURE;			\
@@ -645,7 +645,7 @@ typedef SCODE (STDMAPIINITCALLTYPE OPTIONCALLBACK)(
 	MAPIMETHOD(AddressTypes)											\
 		(THIS_	ULONG FAR *					lpulFlags,					\
 				ULONG FAR *					lpcAdrType,					\
-				__deref_out_ecount_full(*lpcAdrType) LPTSTR FAR * FAR *			lpppAdrTypeArray,			\
+				_Outptr_result_buffer_(*lpcAdrType) LPTSTR FAR * FAR *			lpppAdrTypeArray,			\
 				ULONG FAR *					lpcMAPIUID,					\
 				LPMAPIUID FAR * FAR *		lpppUIDArray) IPURE;		\
 	MAPIMETHOD(RegisterOptions)											\

include/MAPIUtil.h

@@ -489,16 +489,16 @@ STDMETHODIMP OpenStreamOnFile(
 	LPALLOCATEBUFFER	lpAllocateBuffer,
 	LPFREEBUFFER		lpFreeBuffer,
 	ULONG				ulFlags,
-	__in LPCTSTR		lpszFileName,
-	__in_opt LPCTSTR	lpszPrefix,
+	_In_ LPCTSTR		lpszFileName,
+	_In_opt_ LPCTSTR	lpszPrefix,
 	LPSTREAM FAR *		lppStream);
 
 typedef HRESULT (STDMETHODCALLTYPE FAR * LPOPENSTREAMONFILE) (
 	LPALLOCATEBUFFER	lpAllocateBuffer,
 	LPFREEBUFFER		lpFreeBuffer,
 	ULONG				ulFlags,
-	__in LPCTSTR		lpszFileName,
-	__in_opt LPCTSTR	lpszPrefix,
+	_In_ LPCTSTR		lpszFileName,
+	_In_opt_ LPCTSTR	lpszPrefix,
 	LPSTREAM FAR *		lppStream);
 
 #if defined(_WIN64) || defined(_WIN32) || defined(_M_ARM)
@@ -739,16 +739,16 @@ STDAPI					HrValidateIPMSubtree(LPMDB lpMDB, ULONG ulFlags,
 
 /* Encoding and decoding strings */
 
-STDAPI_(BOOL)			FBinFromHex(__in LPTSTR lpsz, LPBYTE lpb);
-STDAPI_(SCODE)			ScBinFromHexBounded(__in LPTSTR lpsz, LPBYTE lpb, ULONG cb);
-STDAPI_(void)			HexFromBin(LPBYTE lpb, int cb, __in LPTSTR lpsz);
+STDAPI_(BOOL)			FBinFromHex(_In_ LPTSTR lpsz, LPBYTE lpb);
+STDAPI_(SCODE)			ScBinFromHexBounded(_In_ LPTSTR lpsz, LPBYTE lpb, ULONG cb);
+STDAPI_(void)			HexFromBin(LPBYTE lpb, int cb, _In_ LPTSTR lpsz);
 STDAPI_(ULONG)			UlFromSzHex(LPCTSTR lpsz);
 
 /* Encoding and decoding entry IDs */
-STDAPI					HrEntryIDFromSz(__in LPTSTR lpsz, ULONG FAR *lpcb,
+STDAPI					HrEntryIDFromSz(_In_ LPTSTR lpsz, ULONG FAR *lpcb,
 						LPENTRYID FAR *lppEntryID);
 STDAPI					HrSzFromEntryID(ULONG cb, LPENTRYID lpEntryID,
-						__in LPTSTR FAR *lpsz);
+						_In_ LPTSTR FAR *lpsz);
 STDAPI					HrComposeEID(LPMAPISESSION lpSession,
 						ULONG cbStoreRecordKey, LPBYTE lpStoreRecordKey,
 						ULONG cbMsgEntryID, LPENTRYID lpMsgEntryID,
@@ -762,9 +762,9 @@ STDAPI					HrDecomposeEID(LPMAPISESSION lpSession,
 STDAPI					HrComposeMsgID(LPMAPISESSION lpSession,
 						ULONG cbStoreSearchKey, LPBYTE pStoreSearchKey,
 						ULONG cbMsgEntryID, LPENTRYID lpMsgEntryID,
-						__in LPTSTR FAR *lpszMsgID);
+						_In_ LPTSTR FAR *lpszMsgID);
 STDAPI					HrDecomposeMsgID(LPMAPISESSION lpSession,
-						__in LPTSTR lpszMsgID,
+						_In_ LPTSTR lpszMsgID,
 						ULONG FAR *lpcbStoreEntryID,
 						LPENTRYID FAR *lppStoreEntryID,
 						ULONG FAR *lppcbMsgEntryID,
@@ -778,9 +778,9 @@ STDAPI_(LPTSTR)			SzFindLastCh(LPCTSTR lpsz, USHORT ch);	/* strrchr */
 STDAPI_(LPTSTR)			SzFindSz(LPCTSTR lpsz, LPCTSTR lpszKey); /*strstr */
 STDAPI_(unsigned int)	UFromSz(LPCTSTR lpsz);					/* atoi */
 
-STDAPI_(SCODE)			ScUNCFromLocalPath(__in LPSTR lpszLocal, __in LPSTR lpszUNC,
+STDAPI_(SCODE)			ScUNCFromLocalPath(_In_ LPSTR lpszLocal, _In_ LPSTR lpszUNC,
 						UINT cchUNC);
-STDAPI_(SCODE)			ScLocalPathFromUNC(__in LPSTR lpszUNC, __in LPSTR lpszLocal,
+STDAPI_(SCODE)			ScLocalPathFromUNC(_In_ LPSTR lpszUNC, _In_ LPSTR lpszLocal,
 						UINT cchLocal);
 
 /* 64-bit arithmetic with times */
@@ -800,7 +800,7 @@ STDAPI_(SCODE)			ScCreateConversationIndex (ULONG cbParent,
 
 /* Store support */
 
-STDAPI WrapStoreEntryID (ULONG ulFlags, __in LPTSTR lpszDLLName, ULONG cbOrigEntry,
+STDAPI WrapStoreEntryID (ULONG ulFlags, _In_ LPTSTR lpszDLLName, ULONG cbOrigEntry,
 	LPENTRYID lpOrigEntry, ULONG *lpcbWrappedEntry, LPENTRYID *lppWrappedEntry);
 
 /* RTF Sync Utilities */
@@ -809,7 +809,7 @@ STDAPI WrapStoreEntryID (ULONG ulFlags, __in LPTSTR lpszDLLName, ULONG cbOrigEnt
 #define RTF_SYNC_BODY_CHANGED	((ULONG) 0x00000002)
 
 STDAPI_(HRESULT)
-RTFSync (LPMESSAGE lpMessage, ULONG ulFlags, __out BOOL FAR * lpfMessageUpdated);
+RTFSync (LPMESSAGE lpMessage, ULONG ulFlags, _Out_ BOOL FAR * lpfMessageUpdated);
 
 
 /* Flags for WrapCompressedRTFStream() */
@@ -818,8 +818,8 @@ RTFSync (LPMESSAGE lpMessage, ULONG ulFlags, __out BOOL FAR * lpfMessageUpdated)
 /****** STORE_UNCOMPRESSED_RTF	((ULONG) 0x00008000) mapidefs.h */
 
 STDAPI_(HRESULT)
-WrapCompressedRTFStream (__in LPSTREAM lpCompressedRTFStream,
-		ULONG ulFlags, __out LPSTREAM FAR * lpUncompressedRTFStream);
+WrapCompressedRTFStream (_In_ LPSTREAM lpCompressedRTFStream,
+		ULONG ulFlags, _Out_ LPSTREAM FAR * lpUncompressedRTFStream);
 
 /* Storage on Stream */
 

include/MAPIVal.h

@@ -277,7 +277,7 @@ typedef enum _tagMethods
 		 || FBadRowSet( (LPSRowSet) lpAdrList))
 
 STDAPI_(BOOL)
-FBadRglpszW(__in LPWSTR FAR	*lppszW,
+FBadRglpszW(_In_ LPWSTR FAR	*lppszW,
 			 ULONG		cStrings);
 
 STDAPI_(BOOL)

include/MAPIX.h

@@ -102,8 +102,8 @@ MAPIUNINITIALIZE	MAPIUninitialize;
 
 typedef HRESULT (STDMETHODCALLTYPE MAPILOGONEX)(
 	ULONG_PTR ulUIParam,
-	/*OFFICEDEV add _opt*/ __in_opt LPTSTR lpszProfileName,
-	/*OFFICEDEV add _opt*/ __in_opt LPTSTR lpszPassword,
+	/*OFFICEDEV add _opt*/ _In_opt_ LPTSTR lpszProfileName,
+	/*OFFICEDEV add _opt*/ _In_opt_ LPTSTR lpszPassword,
 	ULONG ulFlags,   /*  ulFlags takes all that SimpleMAPI does + MAPI_UNICODE */
 	LPMAPISESSION FAR * lppSession
 );

library/mapiStubLibrary.cpp

@@ -1294,7 +1294,7 @@ DEFINE_STUB_FUNCTION_3(
 	STDAPICALLTYPE,
 	ScBinFromHexBounded,
 	ExpandFunction(ScBinFromHexBounded, 12),
-	__in LPTSTR,
+	_In_ LPTSTR,
 	LPBYTE,
 	ULONG,
 	MAPI_E_CALL_FAILED)
@@ -1305,7 +1305,7 @@ DEFINE_STUB_FUNCTION_2(
 	STDAPICALLTYPE,
 	FBinFromHex,
 	ExpandFunction(FBinFromHex, 8),
-	__in LPTSTR,
+	_In_ LPTSTR,
 	LPBYTE,
 	FALSE)
 
@@ -1316,7 +1316,7 @@ DEFINE_STUB_FUNCTION_V3(
 	ExpandFunction(HexFromBin, 12),
 	LPBYTE,
 	int,
-	__in LPTSTR)
+	_In_ LPTSTR)
 
 DEFINE_STUB_FUNCTION_5(
 	LINKAGE_EXTERN_C,
@@ -1525,7 +1525,7 @@ DEFINE_STUB_FUNCTION_6(
 	WrapStoreEntryID,
 	ExpandFunction(WrapStoreEntryID, 24),
 	ULONG,
-	__in LPTSTR,
+	_In_ LPTSTR,
 	ULONG,
 	LPENTRYID,
 	ULONG*,
@@ -1800,7 +1800,7 @@ DEFINE_STUB_FUNCTION_3(
 	ExpandFunction(HrSzFromEntryID, 12),
 	ULONG,
 	LPENTRYID,
-	__in LPTSTR FAR*,
+	_In_ LPTSTR FAR*,
 	MAPI_E_CALL_FAILED)
 
 DEFINE_STUB_FUNCTION_3(
@@ -1809,7 +1809,7 @@ DEFINE_STUB_FUNCTION_3(
 	STDAPICALLTYPE,
 	HrEntryIDFromSz,
 	ExpandFunction(HrEntryIDFromSz, 12),
-	__in LPTSTR,
+	_In_ LPTSTR,
 	ULONG FAR*,
 	LPENTRYID FAR*,
 	MAPI_E_CALL_FAILED)
@@ -1855,7 +1855,7 @@ DEFINE_STUB_FUNCTION_6(
 	LPBYTE,
 	ULONG,
 	LPENTRYID,
-	__in LPTSTR FAR*,
+	_In_ LPTSTR FAR*,
 	MAPI_E_CALL_FAILED)
 
 DEFINE_STUB_FUNCTION_6(
@@ -1865,7 +1865,7 @@ DEFINE_STUB_FUNCTION_6(
 	HrDecomposeMsgID,
 	ExpandFunction(HrDecomposeMsgID, 24),
 	LPMAPISESSION,
-	__in LPTSTR,
+	_In_ LPTSTR,
 	ULONG FAR*,
 	LPENTRYID FAR*,
 	ULONG FAR*,
@@ -1881,8 +1881,8 @@ DEFINE_STUB_FUNCTION_6(
 	LPALLOCATEBUFFER,
 	LPFREEBUFFER,
 	ULONG,
-	__in LPCTSTR,
-	__in_opt LPCTSTR,
+	_In_ LPCTSTR,
+	_In_opt_ LPCTSTR,
 	LPSTREAM FAR*,
 	MAPI_E_CALL_FAILED)
 
@@ -1895,7 +1895,7 @@ DEFINE_STUB_FUNCTION_7(
 	ExpandFunction(OpenTnefStream, 28),
 	LPVOID,
 	LPSTREAM,
-	__in LPTSTR,
+	_In_ LPTSTR,
 	ULONG,
 	LPMESSAGE,
 	WORD,
@@ -1910,7 +1910,7 @@ DEFINE_STUB_FUNCTION_8(
 	ExpandFunction(OpenTnefStreamEx, 32),
 	LPVOID,
 	LPSTREAM,
-	__in LPTSTR,
+	_In_ LPTSTR,
 	ULONG,
 	LPMESSAGE,
 	WORD,
@@ -1926,7 +1926,7 @@ DEFINE_STUB_FUNCTION_7(
 	ExpandFunction(OpenTnefStream, 28),
 	LPVOID,
 	LPSTREAM,
-	__in LPTSTR,
+	_In_ LPTSTR,
 	ULONG,
 	LPMESSAGE,
 	WORD,
@@ -1941,7 +1941,7 @@ DEFINE_STUB_FUNCTION_8(
 	ExpandFunction(OpenTnefStreamEx, 32),
 	LPVOID,
 	LPSTREAM,
-	__in LPTSTR,
+	_In_ LPTSTR,
 	ULONG,
 	LPMESSAGE,
 	WORD,
@@ -2064,7 +2064,7 @@ DEFINE_STUB_FUNCTION_2(
 	STDAPICALLTYPE,
 	FBadRglpszW,
 	ExpandFunction(FBadRglpszW, 8),
-	__in LPWSTR FAR*,
+	_In_ LPWSTR FAR*,
 	ULONG,
 	TRUE)
 
@@ -2124,7 +2124,7 @@ DEFINE_STUB_FUNCTION_3(
 	ExpandFunction(RTFSync, 12),
 	LPMESSAGE,
 	ULONG,
-	__out BOOL FAR*,
+	_Out_ BOOL FAR*,
 	MAPI_E_CALL_FAILED)
 
 DEFINE_STUB_FUNCTION_3(
@@ -2133,9 +2133,9 @@ DEFINE_STUB_FUNCTION_3(
 	STDAPICALLTYPE,
 	WrapCompressedRTFStream,
 	ExpandFunction(WrapCompressedRTFStream, 12),
-	__in LPSTREAM,
+	_In_ LPSTREAM,
 	ULONG,
-	__out LPSTREAM FAR*,
+	_Out_ LPSTREAM FAR*,
 	MAPI_E_CALL_FAILED)
 
 DEFINE_STUB_FUNCTION_2(
@@ -2201,8 +2201,8 @@ DEFINE_STUB_FUNCTION_3(
 	STDAPICALLTYPE,
 	ScUNCFromLocalPath,
 	ExpandFunction(ScUNCFromLocalPath, 12),
-	__in LPSTR,
-	__in LPSTR,
+	_In_ LPSTR,
+	_In_ LPSTR,
 	UINT,
 	MAPI_E_CALL_FAILED)
 
@@ -2212,8 +2212,8 @@ DEFINE_STUB_FUNCTION_3(
 	STDAPICALLTYPE,
 	ScLocalPathFromUNC,
 	ExpandFunction(ScLocalPathFromUNC, 12),
-	__in LPSTR,
-	__in LPSTR,
+	_In_ LPSTR,
+	_In_ LPSTR,
 	UINT,
 	MAPI_E_CALL_FAILED)