Merge pull request #551 from stephenegriffin/clang

Create clang.yml
microsoft · Aug 4, 2022 · 349e565 · 349e565
2 parents 64dd3a5 + b01ff56
commit 349e565
Show file tree

Hide file tree

Showing 35 changed files with 175 additions and 130 deletions.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -0,0 +1,22 @@
+name: Clang-format
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+  workflow_dispatch:
+
+jobs:
+  check-formatting:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: clang-format (w/ diff)
+        uses: egor-tensin/clang-format@v1
+        with:
+          # :-separated list of excluded files and directories
+          exclude: include:mapistub
diff --git a/Deploy/clang.bat b/Deploy/clang.bat
diff --git a/MrMapi/MMContents.cpp b/MrMapi/MMContents.cpp
@@ -25,10 +25,12 @@ void DumpContentsTable(
 		output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Outputting Contents\n");
 	if (cli::switchAssociatedContents.isSet())
 		output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Outputting Associated Contents\n");
-	if (cli::switchMSG.isSet()) output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Outputting as MSG\n");
+	if (cli::switchMSG.isSet())
+		output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Outputting as MSG\n");
 	if (cli::switchMoreProperties.isSet())
 		output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Will retry stream properties\n");
-	if (cli::switchSkip.isSet()) output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Will skip attachments\n");
+	if (cli::switchSkip.isSet())
+		output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Will skip attachments\n");
 	if (cli::switchList.isSet()) output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: List only mode\n");
 	if (ulCount)
 		output::DebugPrint(output::dbgLevel::Generic, L"DumpContentsTable: Limiting output to %u messages.\n", ulCount);

diff --git a/MrMapi/mmcli.cpp b/MrMapi/mmcli.cpp
@@ -264,7 +264,11 @@ namespace cli
 			switchSearchState.name(),
 			switchFolder.name(),
 			switchProfile.name());
-		wprintf(L"   MrMAPI -%ws [-%ws <profile>] [-%ws <path to output file>]\n", switchNamedProps.name(), switchProfile.name(), switchOutput.name());
+		wprintf(
+			L"   MrMAPI -%ws [-%ws <profile>] [-%ws <path to output file>]\n",
+			switchNamedProps.name(),
+			switchProfile.name(),
+			switchOutput.name());
 		wprintf(
 			L"   MrMAPI -%ws [-%ws] [-%ws <profile>]\n",
 			switchAccounts.name(),

diff --git a/UI/Controls/SortList/ContentsTableListCtrl.h b/UI/Controls/SortList/ContentsTableListCtrl.h
@@ -41,8 +41,7 @@ namespace controls::sortlistctrl
 
 		// Selected item accessors
 		_Check_return_ void CopyRows() const;
-		_Check_return_ LPENTRYLIST
-			GetSelectedItemEIDs() const;
+		_Check_return_ LPENTRYLIST GetSelectedItemEIDs() const;
 		_Check_return_ sortlistdata::sortListData* GetSortListData(int iItem) const;
 		_Check_return_ LPMAPIPROP OpenNextSelectedItemProp(_Inout_opt_ int* iCurItem, modifyType bModify) const;
 		_Check_return_ std::vector<int> GetSelectedItemNums() const;

diff --git a/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp b/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp
@@ -916,7 +916,7 @@ namespace controls::sortlistctrl
 		output::outputRestriction(output::dbgLevel::Generic, nullptr, lpResIn, lpPropBag->GetMAPIProp());
 		dialog::editor::RestrictEditor MyResEditor(
 			this,
-			m_lpMapiObjects, 
+			m_lpMapiObjects,
 			nullptr, // No alloc parent - we must MAPIFreeBuffer the result
 			lpResIn);
 		if (MyResEditor.DisplayDialog())
@@ -1036,7 +1036,15 @@ namespace controls::sortlistctrl
 			if (PROP_TYPE(ulPropTag) == PT_UNSPECIFIED && lpEditProp) ulPropTag = lpEditProp->ulPropTag;
 
 			const auto propEditor = dialog::editor::DisplayPropertyEditor(
-				this, m_lpMapiObjects, IDS_PROPEDITOR, name, lpPropBag->IsAB(), lpSourceObj, ulPropTag, false, lpEditProp);
+				this,
+				m_lpMapiObjects,
+				IDS_PROPEDITOR,
+				name,
+				lpPropBag->IsAB(),
+				lpSourceObj,
+				ulPropTag,
+				false,
+				lpEditProp);
 			if (propEditor)
 			{
 				const auto lpModProp = propEditor->getValue();

diff --git a/UI/Controls/SortList/SortHeader.cpp b/UI/Controls/SortList/SortHeader.cpp
@@ -26,8 +26,7 @@ namespace controls::sortlistctrl
 
 		if (!SubclassWindow(pHeader->GetSafeHwnd()))
 		{
-			output::DebugPrint(
-				output::dbgLevel::UI, L"CSortHeader::Init Unable to subclass existing header!\n");
+			output::DebugPrint(output::dbgLevel::UI, L"CSortHeader::Init Unable to subclass existing header!\n");
 			return false;
 		}
 		m_hwndParent = hwndParent;

diff --git a/UI/Dialogs/BaseDialog.cpp b/UI/Dialogs/BaseDialog.cpp
@@ -550,7 +550,8 @@ namespace dialog
 
 			if (m_lpFakeSplitter && m_lpFakeSplitter.m_hWnd)
 			{
-				hdwp = ui::DeferWindowPos(hdwp, m_lpFakeSplitter.m_hWnd, 0, 0, cx, iNewCY, L"CBaseDialog::OnSize::fakesplitter");
+				hdwp = ui::DeferWindowPos(
+					hdwp, m_lpFakeSplitter.m_hWnd, 0, 0, cx, iNewCY, L"CBaseDialog::OnSize::fakesplitter");
 			}
 
 			WC_B_S(EndDeferWindowPos(hdwp));

diff --git a/UI/Dialogs/Editors/StreamEditor.cpp b/UI/Dialogs/Editors/StreamEditor.cpp
@@ -128,9 +128,10 @@ namespace dialog::editor
 		}
 
 		if (bEditPropAsRTF)
-			m_ulEditorType = m_bUseWrapEx && ulOutCodePage == CP_UNICODE && !(m_ulStreamFlags & MAPI_NATIVE_BODY_TYPE_RTF)
-								 ? EDITOR_RTF_UNICODE
-								 : EDITOR_RTF;
+			m_ulEditorType =
+				m_bUseWrapEx && ulOutCodePage == CP_UNICODE && !(m_ulStreamFlags & MAPI_NATIVE_BODY_TYPE_RTF)
+					? EDITOR_RTF_UNICODE
+					: EDITOR_RTF;
 		else
 		{
 			switch (PROP_TYPE(m_ulPropTag))

diff --git a/UI/Dialogs/Editors/restriction/ResAndOrEditor.cpp b/UI/Dialogs/Editors/restriction/ResAndOrEditor.cpp
@@ -103,7 +103,7 @@ namespace dialog::editor
 		const auto lpSourceRes = res->getCurrentRes();
 
 		RestrictEditor MyResEditor(this, m_lpMapiObjects, m_lpAllocParent,
-									lpSourceRes); // pass source res into editor
+								   lpSourceRes); // pass source res into editor
 		if (!MyResEditor.DisplayDialog()) return false;
 		// Since lpData->data.Res.lpNewRes was owned by an m_lpAllocParent, we don't free it directly
 		const auto newRes = MyResEditor.DetachModifiedSRestriction();

diff --git a/UI/Dialogs/Editors/restriction/ResCommentEditor.cpp b/UI/Dialogs/Editors/restriction/ResCommentEditor.cpp
@@ -111,7 +111,7 @@ namespace dialog::editor
 		const auto lpSourceRes = GetSourceRes();
 
 		RestrictEditor MyResEditor(this, m_lpMapiObjects, m_lpAllocParent,
-									lpSourceRes); // pass source res into editor
+								   lpSourceRes); // pass source res into editor
 		if (!MyResEditor.DisplayDialog()) return;
 
 		// Since m_lpNewCommentRes was owned by an m_lpAllocParent, we don't free it directly

diff --git a/UI/Dialogs/Editors/restriction/RestrictEditor.cpp b/UI/Dialogs/Editors/restriction/RestrictEditor.cpp
@@ -238,7 +238,7 @@ namespace dialog::editor
 	HRESULT RestrictEditor::EditAndOr(const _SRestriction* lpSourceRes)
 	{
 		ResAndOrEditor MyResEditor(this, m_lpMapiObjects, lpSourceRes,
-									m_lpAllocParent); // pass source res into editor
+								   m_lpAllocParent); // pass source res into editor
 		if (MyResEditor.DisplayDialog())
 		{
 			m_lpOutputRes->rt = lpSourceRes->rt;

diff --git a/UI/MAPIFormFunctions.cpp b/UI/MAPIFormFunctions.cpp
@@ -123,8 +123,8 @@ namespace mapi::mapiui
 			EID,
 			NUM_COLS
 		};
-		static const SizedSPropTagArray(NUM_COLS, sptaShowForm) = {NUM_COLS,
-																   {PR_MESSAGE_FLAGS, PR_MESSAGE_CLASS_A, PR_ENTRYID}};
+		static const SizedSPropTagArray(NUM_COLS, sptaShowForm) = {
+			NUM_COLS, {PR_MESSAGE_FLAGS, PR_MESSAGE_CLASS_A, PR_ENTRYID}};
 
 		if (!lpMessage || !lpMAPISession || !lpSourceFolder) return MAPI_E_INVALID_PARAMETER;
 

diff --git a/UI/MySecInfo.cpp b/UI/MySecInfo.cpp
@@ -46,10 +46,8 @@ namespace mapi::mapiui
 
 	GENERIC_MAPPING gmFolders = {frightsReadAny, frightsEditOwned | frightsDeleteOwned, rightsNone, rightsAll};
 
-	GENERIC_MAPPING gmMessages = {msgrightsGenericRead,
-								  msgrightsGenericWrite,
-								  msgrightsGenericExecute,
-								  msgrightsGenericAll};
+	GENERIC_MAPPING gmMessages =
+		{msgrightsGenericRead, msgrightsGenericWrite, msgrightsGenericExecute, msgrightsGenericAll};
 
 	CMySecInfo::CMySecInfo(_In_ const LPMAPIPROP lpMAPIProp, const ULONG ulPropTag)
 	{

diff --git a/UI/file/exporter.cpp b/UI/file/exporter.cpp
@@ -23,12 +23,13 @@ namespace file
 		dialog::editor::CEditor MyData(
 			pParentWnd, IDS_SAVEMESSAGETOFILE, IDS_SAVEMESSAGETOFILEPROMPT, CEDITOR_BUTTON_OK | CEDITOR_BUTTON_CANCEL);
 
-		UINT uidDropDown[] = {IDS_DDTEXTFILE,
-							  IDS_DDMSGFILEANSI,
-							  IDS_DDMSGFILEUNICODE,
-							  IDS_DDEMLFILE,
-							  IDS_DDEMLFILEUSINGICONVERTERSESSION,
-							  IDS_DDTNEFFILE};
+		UINT uidDropDown[] = {
+			IDS_DDTEXTFILE,
+			IDS_DDMSGFILEANSI,
+			IDS_DDMSGFILEUNICODE,
+			IDS_DDEMLFILE,
+			IDS_DDEMLFILEUSINGICONVERTERSESSION,
+			IDS_DDTNEFFILE};
 		MyData.AddPane(
 			viewpane::DropDownPane::Create(0, IDS_FORMATTOSAVEMESSAGE, _countof(uidDropDown), uidDropDown, true));
 		if (bMultiSelect)

diff --git a/UI/mapiui.cpp b/UI/mapiui.cpp
@@ -67,13 +67,14 @@ namespace ui::mapiui
 
 		const auto progress = hWnd ? mapi::mapiui::GetMAPIProgress(L"CopyTo", hWnd) : LPMAPIPROGRESS{};
 
-		return {true,
-				MyData.GetHex(1) | (progress ? MAPI_DIALOG : 0),
-				guid::StringToGUID(MyData.GetStringW(0)),
-				progress,
-				progress ? reinterpret_cast<ULONG_PTR>(hWnd) : NULL,
-				GetExcludedTags(lpTagArray, lpSource, bIsAB),
-				true};
+		return {
+			true,
+			MyData.GetHex(1) | (progress ? MAPI_DIALOG : 0),
+			guid::StringToGUID(MyData.GetStringW(0)),
+			progress,
+			progress ? reinterpret_cast<ULONG_PTR>(hWnd) : NULL,
+			GetExcludedTags(lpTagArray, lpSource, bIsAB),
+			true};
 	}
 
 	void ExportMessages(_In_ LPMAPIFOLDER lpFolder, HWND hWnd)
@@ -113,8 +114,8 @@ namespace ui::mapiui
 						fldNUM_COLS
 					};
 
-					static const SizedSPropTagArray(fldNUM_COLS, fldCols) = {fldNUM_COLS,
-																			 {PR_ENTRYID, PR_SUBJECT_W, PR_RECORD_KEY}};
+					static const SizedSPropTagArray(fldNUM_COLS, fldCols) = {
+						fldNUM_COLS, {PR_ENTRYID, PR_SUBJECT_W, PR_RECORD_KEY}};
 
 					hRes = WC_MAPI(lpTable->SetColumns(LPSPropTagArray(&fldCols), TBL_ASYNC));
 

diff --git a/UnitTest/tests/flagtest.cpp b/UnitTest/tests/flagtest.cpp
@@ -38,7 +38,8 @@ namespace flagtest
 			unittest::AreEqualEx(
 				L"MAPI_SUBMITTED | 0x5", flags::InterpretFlags(PROP_ID(PR_RECIPIENT_TYPE), MAPI_SUBMITTED | 0x5));
 			unittest::AreEqualEx(
-				L"MAPI_SUBMITTED | 0x20000000 | 0x5", flags::InterpretFlags(PROP_ID(PR_RECIPIENT_TYPE), MAPI_SUBMITTED | 0x20000005));
+				L"MAPI_SUBMITTED | 0x20000000 | 0x5",
+				flags::InterpretFlags(PROP_ID(PR_RECIPIENT_TYPE), MAPI_SUBMITTED | 0x20000005));
 
 			// flagFLAG with no null
 			unittest::AreEqualEx(L"0x0", flags::InterpretFlags(PROP_ID(PR_SUBMIT_FLAGS), 0));

diff --git a/core/interpret/sid.cpp b/core/interpret/sid.cpp
@@ -114,8 +114,8 @@ namespace sid
 		if (cchSidName && sidNameBuf.back() == L'\0') sidNameBuf.pop_back();
 		if (cchSidDomain && sidDomainBuf.back() == L'\0') sidDomainBuf.pop_back();
 
-		return SidAccount{std::wstring(sidDomainBuf.begin(), sidDomainBuf.end()),
-						  std::wstring(sidNameBuf.begin(), sidNameBuf.end())};
+		return SidAccount{
+			std::wstring(sidDomainBuf.begin(), sidDomainBuf.end()), std::wstring(sidNameBuf.begin(), sidNameBuf.end())};
 	}
 
 	_Check_return_ SidAccount LookupAccountSid(std::vector<BYTE> buf)
@@ -250,7 +250,8 @@ namespace sid
 			}
 		}
 
-		return SecurityDescriptor{strings::join(sdString, L"\r\n"),
-								  flags::InterpretFlags(flagSecurityInfo, SECURITY_INFORMATION_OF(buf.data()))};
+		return SecurityDescriptor{
+			strings::join(sdString, L"\r\n"),
+			flags::InterpretFlags(flagSecurityInfo, SECURITY_INFORMATION_OF(buf.data()))};
 	}
 } // namespace sid
diff --git a/core/mapi/cache/namedPropCache.cpp b/core/mapi/cache/namedPropCache.cpp
@@ -269,18 +269,13 @@ namespace cache
 		return cache;
 	}
 
-	_Check_return_ std::shared_ptr<namedPropCacheEntry> namedPropCache::find(
-		const std::shared_ptr<cache::namedPropCacheEntry>& entry,
-		bool bMatchID,
-		bool bMatchName)
+	_Check_return_ std::shared_ptr<namedPropCacheEntry>
+	namedPropCache::find(const std::shared_ptr<cache::namedPropCacheEntry>& entry, bool bMatchID, bool bMatchName)
 	{
 		if (fIsSet(output::dbgLevel::NamedPropCache))
 		{
 			output::DebugPrint(
-				output::dbgLevel::NamedPropCache,
-				L"find: bMatchID=%d, bMatchName=%d\n",
-				bMatchID,
-				bMatchName);
+				output::dbgLevel::NamedPropCache, L"find: bMatchID=%d, bMatchName=%d\n", bMatchID, bMatchName);
 			entry->output();
 		}
 

diff --git a/core/mapi/cache/namedPropCache.h b/core/mapi/cache/namedPropCache.h
@@ -11,15 +11,15 @@ namespace cache
 			_In_ LPMAPIPROP lpMAPIProp,
 			_In_opt_ LPSPropTagArray lpPropTags,
 			ULONG ulFlags,
-			std::vector<std::shared_ptr<namedPropCacheEntry>> &names);
+			std::vector<std::shared_ptr<namedPropCacheEntry>>& names);
 
 		// Returns a vector of tags for the input names
 		// Sourced directly from MAPI
 		_Check_return_ LPSPropTagArray
 		GetIDsFromNames(_In_ LPMAPIPROP lpMAPIProp, std::vector<MAPINAMEID> nameIDs, ULONG ulFlags);
 
 		template <typename TMapiObj>
-		inline HRESULT GetRootFolder(TMapiObj* pMapiObj, LPMAPIFOLDER *lppMAPIFolder) noexcept
+		inline HRESULT GetRootFolder(TMapiObj* pMapiObj, LPMAPIFOLDER* lppMAPIFolder) noexcept
 		{
 			ULONG objt = 0;
 			return pMapiObj->OpenEntry(