Fix up annotations

microsoft · Apr 4, 2019 · 21b8962 · 21b8962
1 parent f1f87af
commit 21b8962
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/MrMapi/MMFolder.h b/MrMapi/MMFolder.h
@@ -8,4 +8,4 @@ void DoSearchState(_In_ LPMAPIFOLDER lpFolder);
 
 LPMAPIFOLDER MAPIOpenFolderExW(
 	_In_ LPMDB lpMdb, // Open message store
-	_In_z_ const std::wstring& lpszFolderPath); // folder path
+	_In_ const std::wstring& lpszFolderPath); // folder path
diff --git a/core/interpret/sid.cpp b/core/interpret/sid.cpp
@@ -13,11 +13,14 @@ namespace sid
 		return !domain.empty() ? domain : strings::formatmessage(IDS_NODOMAIN);
 	}
 
-	std::wstring SidAccount::getName() const { return !name.empty() ? name : strings::formatmessage(IDS_NONAME); }
+	_Check_return_ std::wstring SidAccount::getName() const
+	{
+		return !name.empty() ? name : strings::formatmessage(IDS_NONAME);
+	}
 
 	// [MS-DTYP] 2.4.2.2 SID--Packet Representation
 	// https://msdn.microsoft.com/en-us/library/gg465313.aspx
-	std::wstring GetTextualSid(_In_ PSID pSid)
+	_Check_return_ std::wstring GetTextualSid(_In_ PSID pSid)
 	{
 		// Validate the binary SID.
 		if (!IsValidSid(pSid)) return {};

diff --git a/core/mapi/mapiFunctions.cpp b/core/mapi/mapiFunctions.cpp
@@ -687,7 +687,7 @@ namespace mapi
 	}
 
 	// Gets entry IDs of the messages in the source folder and copies to destination using a single call to CopyMessage
-	_Check_return_ void CopyMessagesBatch(
+	void CopyMessagesBatch(
 		_In_ LPMAPIFOLDER lpSrcFolder,
 		_In_ LPMAPIFOLDER lpDestFolder,
 		bool bCopyAssociatedContents,
@@ -753,7 +753,7 @@ namespace mapi
 
 	// Copies message from source folder to destination using multiple calls to CopyMessage
 	// Gets entry IDs of the messages in the source folder and copies to destination using a single call to CopyMessage
-	_Check_return_ void CopyMessagesIterate(
+	void CopyMessagesIterate(
 		_In_ LPMAPIFOLDER lpSrcFolder,
 		_In_ LPMAPIFOLDER lpDestFolder,
 		bool bCopyAssociatedContents,
@@ -801,7 +801,7 @@ namespace mapi
 	// May not behave correctly if lpSrcFolder == lpDestFolder
 	// We can check that the pointers aren't equal, but they could be different
 	// and still refer to the same folder.
-	_Check_return_ void CopyFolderContents(
+	void CopyFolderContents(
 		_In_ LPMAPIFOLDER lpSrcFolder,
 		_In_ LPMAPIFOLDER lpDestFolder,
 		bool bCopyAssociatedContents,

diff --git a/core/mapi/mapiFunctions.h b/core/mapi/mapiFunctions.h
@@ -191,7 +191,7 @@ namespace mapi
 		_In_ LPMAPIPROP lpTargetPropObj,
 		ULONG ulSourceTag,
 		ULONG ulTargetTag);
-	_Check_return_ void CopyFolderContents(
+	void CopyFolderContents(
 		_In_ LPMAPIFOLDER lpSrcFolder,
 		_In_ LPMAPIFOLDER lpDestFolder,
 		bool bCopyAssociatedContents,

diff --git a/core/smartview/VerbStream.cpp b/core/smartview/VerbStream.cpp
@@ -60,7 +60,7 @@ namespace smartview
 		}
 	}
 
-	_Check_return_ void VerbStream::parseBlocks()
+	void VerbStream::parseBlocks()
 	{
 		setRoot(L"Verb Stream\r\n");
 		addChild(m_Version, L"Version = 0x%1!04X!\r\n", m_Version->getData());