From 58b03044f98c1d0c859185500b09859021de0338 Mon Sep 17 00:00:00 2001 From: Stephen Griffin Date: Mon, 17 Jun 2024 11:12:12 -0400 Subject: [PATCH] clang formatting changes --- StdAfx.h | 2 +- UI/Controls/SortList/ContentsTableListCtrl.cpp | 2 +- UI/Controls/SortList/SingleMAPIPropListCtrl.cpp | 2 +- UI/Controls/SortList/SortHeader.cpp | 2 +- UI/Controls/SortList/SortListCtrl.cpp | 2 +- UI/Controls/StyleTree/StyleTreeCtrl.cpp | 2 +- core/mapi/mapiFile.cpp | 4 ++-- core/mapi/mapiFunctions.h | 2 +- mapistub | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/StdAfx.h b/StdAfx.h index 08df68b7a..417dc20da 100644 --- a/StdAfx.h +++ b/StdAfx.h @@ -41,7 +41,7 @@ // A bug in annotations in shobjidl.h forces us to disable 6387 to include afxwin.h #pragma warning(push) #pragma warning( \ - disable : 6387) // Warning C6387 'argument' may be 'value': this does not adhere to the specification for the function 'function name': Lines: x, y + disable : 6387) // Warning C6387 'argument' may be 'value': this does not adhere to the specification for the function 'function name': Lines: x, y #include // MFC core and standard components #pragma warning(pop) #include // MFC support for Windows Common Controls diff --git a/UI/Controls/SortList/ContentsTableListCtrl.cpp b/UI/Controls/SortList/ContentsTableListCtrl.cpp index 07351b09c..c316c76ab 100644 --- a/UI/Controls/SortList/ContentsTableListCtrl.cpp +++ b/UI/Controls/SortList/ContentsTableListCtrl.cpp @@ -60,7 +60,7 @@ namespace controls::sortlistctrl BEGIN_MESSAGE_MAP(CContentsTableListCtrl, CSortListCtrl) #pragma warning(push) #pragma warning( \ - disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time + disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) #pragma warning(pop) ON_WM_KEYDOWN() diff --git a/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp b/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp index 3f95a435c..1a2f21f51 100644 --- a/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp +++ b/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp @@ -98,7 +98,7 @@ namespace controls::sortlistctrl BEGIN_MESSAGE_MAP(CSingleMAPIPropListCtrl, CSortListCtrl) #pragma warning(push) #pragma warning( \ - disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time + disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time ON_NOTIFY_REFLECT(NM_DBLCLK, OnDblclk) #pragma warning(pop) ON_WM_KEYDOWN() diff --git a/UI/Controls/SortList/SortHeader.cpp b/UI/Controls/SortList/SortHeader.cpp index 308549b1c..d74207718 100644 --- a/UI/Controls/SortList/SortHeader.cpp +++ b/UI/Controls/SortList/SortHeader.cpp @@ -16,7 +16,7 @@ namespace controls::sortlistctrl ON_MESSAGE(WM_MFCMAPI_SAVECOLUMNORDERHEADER, msgOnSaveColumnOrder) #pragma warning(push) #pragma warning( \ - disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time + disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw) #pragma warning(pop) END_MESSAGE_MAP() diff --git a/UI/Controls/SortList/SortListCtrl.cpp b/UI/Controls/SortList/SortListCtrl.cpp index e5b37ef1b..aa4e8e3eb 100644 --- a/UI/Controls/SortList/SortListCtrl.cpp +++ b/UI/Controls/SortList/SortListCtrl.cpp @@ -49,7 +49,7 @@ namespace controls::sortlistctrl ON_WM_DRAWITEM() #pragma warning(push) #pragma warning( \ - disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time + disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time ON_NOTIFY_REFLECT(LVN_DELETEALLITEMS, OnDeleteAllItems) ON_NOTIFY_REFLECT(LVN_DELETEITEM, OnDeleteItem) ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw) diff --git a/UI/Controls/StyleTree/StyleTreeCtrl.cpp b/UI/Controls/StyleTree/StyleTreeCtrl.cpp index ca802046e..1b8d8d122 100644 --- a/UI/Controls/StyleTree/StyleTreeCtrl.cpp +++ b/UI/Controls/StyleTree/StyleTreeCtrl.cpp @@ -24,7 +24,7 @@ namespace controls BEGIN_MESSAGE_MAP(StyleTreeCtrl, CTreeCtrl) #pragma warning(push) #pragma warning( \ - disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time + disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw) ON_NOTIFY_REFLECT(NM_RCLICK, OnRightClick) ON_NOTIFY_REFLECT(TVN_GETDISPINFO, OnGetDispInfo) diff --git a/core/mapi/mapiFile.cpp b/core/mapi/mapiFile.cpp index cc05fbdc3..4a20a0a14 100644 --- a/core/mapi/mapiFile.cpp +++ b/core/mapi/mapiFile.cpp @@ -150,7 +150,7 @@ namespace file LPITNEF lpTNEF = nullptr; #pragma warning(push) #pragma warning( \ - disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason + disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason //GetTickCount is OK for what we're doing static auto wKeyVal = static_cast(GetTickCount() + 1); #pragma warning(pop) @@ -583,7 +583,7 @@ namespace file #pragma warning(push) #pragma warning( \ - disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason + disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason //GetTickCount is OK for what we're doing static auto wKeyVal = static_cast(GetTickCount() + 1); #pragma warning(pop) diff --git a/core/mapi/mapiFunctions.h b/core/mapi/mapiFunctions.h index 06acacc92..7e3f168f9 100644 --- a/core/mapi/mapiFunctions.h +++ b/core/mapi/mapiFunctions.h @@ -361,7 +361,7 @@ namespace mapi #pragma warning(push) #pragma warning( \ - disable : 26476) // Warning C26476 Expression/symbol '' uses a naked union '' with multiple type pointers: Use variant instead (type.7). + disable : 26476) // Warning C26476 Expression/symbol '' uses a naked union '' with multiple type pointers: Use variant instead (type.7). inline const SBinary& getBin(_In_ const _SPropValue* prop) noexcept { if (!prop) assert(false); diff --git a/mapistub b/mapistub index a888542d2..9646eb248 160000 --- a/mapistub +++ b/mapistub @@ -1 +1 @@ -Subproject commit a888542d2e2630bf0da3b3855d198773b61c700e +Subproject commit 9646eb248f405c83f72afa96ba9234cc84b06eea