Skip to content

Commit efde18f

Browse files
clang formatting changes (#731)
* clang formatting changes * remove custom clang script * try different clang runner * fix runner * add intentional clang break * fix one clang - add another for additional test * go to zero local clang format issues
1 parent 651ec19 commit efde18f

File tree

11 files changed

+29
-27
lines changed

11 files changed

+29
-27
lines changed

.github/workflows/clang.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ permissions:
1010

1111
jobs:
1212
check-formatting:
13-
runs-on: windows-latest
14-
13+
name: Formatting Check
14+
runs-on: ubuntu-latest
1515
steps:
16-
- name: Harden Runner
17-
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
18-
with:
19-
egress-policy: audit
20-
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
- name: Harden Runner
17+
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
18+
with:
19+
egress-policy: audit
2220

23-
- name: clang-format (w/ diff)
24-
uses: egor-tensin/clang-format@5ee263e007725df60d02ef2e6fd3d0dd92f048a0 # v1.0.1
25-
with:
26-
# :-separated list of excluded files and directories
27-
exclude: include:mapistub
21+
- uses: actions/checkout@v4
22+
- name: Run clang-format style check for C/C++ programs.
23+
uses: jidicula/clang-format-action@v4.13.0
24+
with:
25+
clang-format-version: '17'
26+
exclude-regex: 'mapistub/*'
27+
fallback-style: 'Microsoft'

StdAfx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
// A bug in annotations in shobjidl.h forces us to disable 6387 to include afxwin.h
4242
#pragma warning(push)
4343
#pragma warning( \
44-
disable : 6387) // Warning C6387 'argument' may be 'value': this does not adhere to the specification for the function 'function name': Lines: x, y
44+
disable : 6387) // Warning C6387 'argument' may be 'value': this does not adhere to the specification for the function 'function name': Lines: x, y
4545
#include <afxwin.h> // MFC core and standard components
4646
#pragma warning(pop)
4747
#include <afxcmn.h> // MFC support for Windows Common Controls

UI/Controls/SortList/ContentsTableListCtrl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace controls::sortlistctrl
6060
BEGIN_MESSAGE_MAP(CContentsTableListCtrl, CSortListCtrl)
6161
#pragma warning(push)
6262
#pragma warning( \
63-
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
63+
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
6464
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
6565
#pragma warning(pop)
6666
ON_WM_KEYDOWN()

UI/Controls/SortList/SingleMAPIPropListCtrl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ namespace controls::sortlistctrl
9898
BEGIN_MESSAGE_MAP(CSingleMAPIPropListCtrl, CSortListCtrl)
9999
#pragma warning(push)
100100
#pragma warning( \
101-
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
101+
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
102102
ON_NOTIFY_REFLECT(NM_DBLCLK, OnDblclk)
103103
#pragma warning(pop)
104104
ON_WM_KEYDOWN()

UI/Controls/SortList/SortHeader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace controls::sortlistctrl
1616
ON_MESSAGE(WM_MFCMAPI_SAVECOLUMNORDERHEADER, msgOnSaveColumnOrder)
1717
#pragma warning(push)
1818
#pragma warning( \
19-
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
19+
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
2020
ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw)
2121
#pragma warning(pop)
2222
END_MESSAGE_MAP()

UI/Controls/SortList/SortListCtrl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace controls::sortlistctrl
4949
ON_WM_DRAWITEM()
5050
#pragma warning(push)
5151
#pragma warning( \
52-
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
52+
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
5353
ON_NOTIFY_REFLECT(LVN_DELETEALLITEMS, OnDeleteAllItems)
5454
ON_NOTIFY_REFLECT(LVN_DELETEITEM, OnDeleteItem)
5555
ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw)

UI/Controls/StyleTree/StyleTreeCtrl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace controls
2424
BEGIN_MESSAGE_MAP(StyleTreeCtrl, CTreeCtrl)
2525
#pragma warning(push)
2626
#pragma warning( \
27-
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
27+
disable : 26454) // Warning C26454 Arithmetic overflow: 'operator' operation produces a negative unsigned result at compile time
2828
ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw)
2929
ON_NOTIFY_REFLECT(NM_RCLICK, OnRightClick)
3030
ON_NOTIFY_REFLECT(TVN_GETDISPINFO, OnGetDispInfo)

core/mapi/mapiFile.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ namespace file
150150
LPITNEF lpTNEF = nullptr;
151151
#pragma warning(push)
152152
#pragma warning( \
153-
disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason
153+
disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason
154154
//GetTickCount is OK for what we're doing
155155
static auto wKeyVal = static_cast<WORD>(GetTickCount() + 1);
156156
#pragma warning(pop)
@@ -583,7 +583,7 @@ namespace file
583583

584584
#pragma warning(push)
585585
#pragma warning( \
586-
disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason
586+
disable : 28159) // Warning C28159 Consider using *function_name_1* instead of *function_name_2*. Reason: reason
587587
//GetTickCount is OK for what we're doing
588588
static auto wKeyVal = static_cast<WORD>(GetTickCount() + 1);
589589
#pragma warning(pop)

core/mapi/mapiFunctions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ namespace mapi
361361

362362
#pragma warning(push)
363363
#pragma warning( \
364-
disable : 26476) // Warning C26476 Expression/symbol '' uses a naked union '' with multiple type pointers: Use variant instead (type.7).
364+
disable : 26476) // Warning C26476 Expression/symbol '' uses a naked union '' with multiple type pointers: Use variant instead (type.7).
365365
inline const SBinary& getBin(_In_ const _SPropValue* prop) noexcept
366366
{
367367
if (!prop) assert(false);

mapistub

0 commit comments

Comments
 (0)