Revise C++ coding style using clang-format-6.0

Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.

8 files changed, 46 insertions, 41 deletions

diff --git a/Tests/MFC/mfc1/ChildFrm.cpp b/Tests/MFC/mfc1/ChildFrm.cpp
index ddb19c6..a415229 100644
--- a/Tests/MFC/mfc1/ChildFrm.cpp
+++ b/Tests/MFC/mfc1/ChildFrm.cpp
@@ -8,7 +8,7 @@
 #include "ChildFrm.h"
 
 #ifdef _DEBUG
-#define new DEBUG_NEW
+#  define new DEBUG_NEW
 #endif
 
 // CChildFrame
diff --git a/Tests/MFC/mfc1/MainFrm.cpp b/Tests/MFC/mfc1/MainFrm.cpp
index c551065..6bd2b3d 100644
--- a/Tests/MFC/mfc1/MainFrm.cpp
+++ b/Tests/MFC/mfc1/MainFrm.cpp
@@ -8,7 +8,7 @@
 #include "MainFrm.h"
 
 #ifdef _DEBUG
-#define new DEBUG_NEW
+#  define new DEBUG_NEW
 #endif
 
 // CMainFrame
@@ -21,7 +21,9 @@ END_MESSAGE_MAP()
 
 static UINT indicators[] = {
   ID_SEPARATOR, // status line indicator
-  ID_INDICATOR_CAPS, ID_INDICATOR_NUM, ID_INDICATOR_SCRL,
+  ID_INDICATOR_CAPS,
+  ID_INDICATOR_NUM,
+  ID_INDICATOR_SCRL,
 };
 
 // CMainFrame construction/destruction
@@ -40,9 +42,10 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
   if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1)
     return -1;
 
-  if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE |
-                               CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS |
-                               CBRS_FLYBY | CBRS_SIZE_DYNAMIC) ||
+  if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT,
+                             WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER |
+                               CBRS_TOOLTIPS | CBRS_FLYBY |
+                               CBRS_SIZE_DYNAMIC) ||
       !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)) {
     TRACE0("Failed to create toolbar\n");
     return -1; // fail to create
diff --git a/Tests/MFC/mfc1/Resource.h b/Tests/MFC/mfc1/Resource.h
index 7184e30..e3a04f1 100644
--- a/Tests/MFC/mfc1/Resource.h
+++ b/Tests/MFC/mfc1/Resource.h
@@ -11,10 +11,10 @@
 // Next default values for new objects
 //
 #ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 130
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 32771
-#endif
+#  ifndef APSTUDIO_READONLY_SYMBOLS
+#    define _APS_NEXT_RESOURCE_VALUE 130
+#    define _APS_NEXT_CONTROL_VALUE 1000
+#    define _APS_NEXT_SYMED_VALUE 101
+#    define _APS_NEXT_COMMAND_VALUE 32771
+#  endif
 #endif
diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp
index 664c6c4..892a89d 100644
--- a/Tests/MFC/mfc1/mfc1.cpp
+++ b/Tests/MFC/mfc1/mfc1.cpp
@@ -11,7 +11,7 @@
 #include "mfc1View.h"
 
 #ifdef _DEBUG
-#define new DEBUG_NEW
+#  define new DEBUG_NEW
 #endif
 
 // Cmfc1App
diff --git a/Tests/MFC/mfc1/mfc1.h b/Tests/MFC/mfc1/mfc1.h
index 15e970b..f4fcadb 100644
--- a/Tests/MFC/mfc1/mfc1.h
+++ b/Tests/MFC/mfc1/mfc1.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #ifndef __AFXWIN_H__
-#error include 'stdafx.h' before including this file for PCH
+#  error include 'stdafx.h' before including this file for PCH
 #endif
 
 #include "resource.h" // main symbols
diff --git a/Tests/MFC/mfc1/mfc1Doc.cpp b/Tests/MFC/mfc1/mfc1Doc.cpp
index 08ab158..e69b61c 100644
--- a/Tests/MFC/mfc1/mfc1Doc.cpp
+++ b/Tests/MFC/mfc1/mfc1Doc.cpp
@@ -8,7 +8,7 @@
 #include "mfc1Doc.h"
 
 #ifdef _DEBUG
-#define new DEBUG_NEW
+#  define new DEBUG_NEW
 #endif
 
 // Cmfc1Doc
diff --git a/Tests/MFC/mfc1/mfc1View.cpp b/Tests/MFC/mfc1/mfc1View.cpp
index 6169ce5..3de55cf 100644
--- a/Tests/MFC/mfc1/mfc1View.cpp
+++ b/Tests/MFC/mfc1/mfc1View.cpp
@@ -9,7 +9,7 @@
 #include "mfc1View.h"
 
 #ifdef _DEBUG
-#define new DEBUG_NEW
+#  define new DEBUG_NEW
 #endif
 
 // Cmfc1View
diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h
index 56f8a6a..2680f26 100644
--- a/Tests/MFC/mfc1/stdafx.h
+++ b/Tests/MFC/mfc1/stdafx.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#  define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
 #endif
 
 // See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx for more info
@@ -17,39 +17,41 @@
 // platforms.
 #ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4
                // or later.
-#if _MSC_VER < 1600
-#define WINVER                                                                \
-  0x0400 // Change this to the appropriate value to target Windows 98 and
-         // Windows 2000 or later.
-#else
-#define WINVER 0x0501 // Target Windows XP and later with VS 10 and later
-#endif
+#  if _MSC_VER < 1600
+#    define WINVER                                                            \
+      0x0400 // Change this to the appropriate value to target Windows 98 and
+             // Windows 2000 or later.
+#  else
+#    define WINVER 0x0501 // Target Windows XP and later with VS 10 and later
+#  endif
 #endif
 
 #ifndef _WIN32_WINNT // Allow use of features specific to Windows NT 4 or
                      // later.
-#if _MSC_VER < 1600
-#define _WIN32_WINNT                                                          \
-  0x0400 // Change this to the appropriate value to target Windows 98 and
-         // Windows 2000 or later.
-#else
-#define _WIN32_WINNT 0x0501 // Target Windows XP and later with VS 10 and later
-#endif
+#  if _MSC_VER < 1600
+#    define _WIN32_WINNT                                                      \
+      0x0400 // Change this to the appropriate value to target Windows 98 and
+             // Windows 2000 or later.
+#  else
+#    define _WIN32_WINNT                                                      \
+      0x0501 // Target Windows XP and later with VS 10 and later
+#  endif
 #endif
 
 #ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or
                        // later.
-#if _MSC_VER < 1600
-#define _WIN32_WINDOWS                                                        \
-  0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
+#  if _MSC_VER < 1600
+#    define _WIN32_WINDOWS                                                    \
+      0x0410 // Change this to the appropriate value to target Windows Me or
+             // later.
+#  endif
 #endif
 
 #ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later.
-#if _MSC_VER < 1600
-#define _WIN32_IE                                                             \
-  0x0400 // Change this to the appropriate value to target IE 5.0 or later.
-#endif
+#  if _MSC_VER < 1600
+#    define _WIN32_IE                                                         \
+      0x0400 // Change this to the appropriate value to target IE 5.0 or later.
+#  endif
 #endif
 
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be
@@ -65,5 +67,5 @@
 
 #include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
 #ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif              // _AFX_NO_AFXCMN_SUPPORT
+#  include <afxcmn.h> // MFC support for Windows Common Controls
+#endif                // _AFX_NO_AFXCMN_SUPPORT