Code cleanup from VC++ suggestions

Author: randomascii

UIforETW/ChildProcess.cpp

@@ -105,7 +105,7 @@ DWORD ChildProcess::ListenerThread()
 				bool lastWasCR = false;
 				for (int in = 0, out = 0; /**/; /**/)
 				{
-					char c = buffer[in++];
+					const char c = buffer[in++];
 					// Edit controls on older versions of Windows (and by default on newer
 					// versions) need \r\n line endings, \n is not sufficient.
 					if (c == '\n' && !lastWasCR)
@@ -166,7 +166,7 @@ bool ChildProcess::Run(bool showCommand, string_type args)
 	startupInfo.dwFlags = STARTF_USESTDHANDLES;
 
 	PROCESS_INFORMATION processInfo = {};
-	const DWORD flags = CREATE_NO_WINDOW;
+	constexpr DWORD flags = CREATE_NO_WINDOW;
 	// Wacky CreateProcess rules say args has to be writable!
 	std::vector<_TCHAR> argsCopy(args.size() + 1);
 	_tcscpy_s(&argsCopy[0], argsCopy.size(), args.c_str());
@@ -186,15 +186,16 @@ bool ChildProcess::Run(bool showCommand, string_type args)
 	return false;
 }
 
-DWORD ChildProcess::GetExitCode()
+DWORD ChildProcess::GetExitCode() noexcept
 {
 	if (!hProcess_)
 		return 0;
 	// Don't allow getting the exit code unless the process has exited.
 	WaitForCompletion(true);
 	DWORD result;
-	(void)GetExitCodeProcess(hProcess_, &result);
-	return result;
+	if (GetExitCodeProcess(hProcess_, &result))
+		return result;
+	return 0;
 }
 
 ChildProcess::string_type ChildProcess::GetOutput()

UIforETW/ChildProcess.h

@@ -53,7 +53,7 @@ class ChildProcess
 	// it will return zero. If the process is still running it
 	// will wait until the process returns and then get the exit code.
 	// This function will print output as it arrives with outputPrintf.
-	DWORD GetExitCode();
+	DWORD GetExitCode() noexcept;
 
 	// Normally all output is printed as it is received. If this function
 	// is called after Run() then all output will be returned, and not

UIforETW/UIforETWDlg.cpp

@@ -37,8 +37,8 @@ limitations under the License.
 #define new DEBUG_NEW
 #endif
 
-const int kRecordTraceHotKey = 1234;
-const int kTimerID = 5678;
+constexpr int kRecordTraceHotKey = 1234;
+constexpr int kTimerID = 5678;
 
 // This static pointer to the main window is used by the global
 // outputPrintf function.
@@ -47,7 +47,7 @@ static CUIforETWDlg* pMainWindow;
 // This convenient hack function is so that the ChildProcess code can
 // print to the main output window. This function can only be called
 // from the main thread.
-void outputPrintf(_Printf_format_string_ const wchar_t* pFormat, ...)
+void outputPrintf(_Printf_format_string_ const wchar_t* pFormat, ...) noexcept
 {
 	va_list args;
 	va_start(args, pFormat);
@@ -324,7 +324,7 @@ void CUIforETWDlg::CheckSymbolDLLs()
 
 	// Previous versions of symsrv.dll may not be multithreading safe and therefore can't
 	// be used with the latest WPA.
-	const int64_t requiredSymsrvVersion = (10llu << 48) + 0 + (14321llu << 16) + (1024llu << 0);
+	constexpr int64_t requiredSymsrvVersion = (10llu << 48) + 0 + (14321llu << 16) + (1024llu << 0);
 	const auto symsrvVersion = GetFileVersion(symsrv_path);
 	if (symsrvVersion < requiredSymsrvVersion)
 	{
@@ -436,9 +436,9 @@ BOOL CUIforETWDlg::OnInitDialog()
 	}
 
 	auto xperfVersion = GetFileVersion(GetXperfPath());
-	const int64_t requiredXperfVersion = (10llu << 48) + 0 + (10586llu << 16) + (15llu << 0);
+	constexpr int64_t requiredXperfVersion = (10llu << 48) + 0 + (10586llu << 16) + (15llu << 0);
 	// Windows 10 spring 2019 version, 10.0.18362.1 - requires Windows 8 or higher?
-	const int64_t preferredXperfVersion = (10llu << 48) + 0 + (18362llu << 16) + (1llu << 0);
+	constexpr int64_t preferredXperfVersion = (10llu << 48) + 0 + (18362llu << 16) + (1llu << 0);
 
 	wchar_t systemDir[MAX_PATH];
 	systemDir[0] = 0;
@@ -692,7 +692,7 @@ BOOL CUIforETWDlg::OnInitDialog()
 	if (bVersionChecks_)
 		versionCheckerThread_.StartVersionCheckerThread(this);
 
-	const UINT flags = SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOACTIVATE;
+	constexpr UINT flags = SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOACTIVATE;
 	// Resize our window per the previous dimensions if we have them
 	SetWindowPos(nullptr, 0, 0, previousWidth_, previousHeight_, flags);
 
@@ -1086,7 +1086,7 @@ void CUIforETWDlg::OnBnClickedStarttracing()
 	// This should also make the UI Delays and window-in-focus graphs more
 	// reliable, by not having them lose messages so frequently, although it is not
 	// clear that it actually helps.
-	const uint64_t kCritFlags = 0x0200000010000000;
+	constexpr uint64_t kCritFlags = 0x0200000010000000;
 	std::wstring userProviders = stringPrintf(L"Microsoft-Windows-Win32k:0x%llx", ~kCritFlags);
 	if (IsWindowsVistaOrLesser())
 		userProviders = L"Microsoft-Windows-LUA"; // Because Microsoft-Windows-Win32k doesn't work on Vista.
@@ -1765,7 +1765,7 @@ void CUIforETWDlg::OnSize(UINT nType, int /*cx*/, int /*cy*/)
 		lastHeight_ += yDelta;
 		previousHeight_ = lastHeight_;
 
-		const UINT flags = SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOACTIVATE;
+		constexpr UINT flags = SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOACTIVATE;
 
 		// Resize the output window, trace list, and notes control.
 

UIforETW/Version.h

@@ -3,7 +3,7 @@
 // const float in a header file can lead to duplication of the storage
 // but I don't really care in this case. Just don't do it with a header
 // that is included hundreds of times.
-const float kCurrentVersion = 1.54f;
+constexpr float kCurrentVersion = 1.54f;
 
 // Put a "#define VERSION_SUFFIX 'b'" line here to add a minor version
 // increment that won't trigger the new-version checks, handy for minor

UIforETW/stdafx.h

@@ -59,7 +59,7 @@ limitations under the License.
 #include <VersionHelpers.h>
 
 // Global function for printing to the dialog output window.
-void outputPrintf(_Printf_format_string_ const wchar_t* pFormat, ...);
+void outputPrintf(_Printf_format_string_ const wchar_t* pFormat, ...) noexcept;
 // Needed for int64_t and friends
 #include <inttypes.h>
 
@@ -71,9 +71,9 @@ void CheckProcesses();
 #undef max
 
 // Send this when the list of traces needs to be updated.
-const int WM_UPDATETRACELIST = WM_USER + 10;
+constexpr int WM_UPDATETRACELIST = WM_USER + 10;
 // Send this when a new version is detected.
-const int WM_NEWVERSIONAVAILABLE = WM_USER + 11;
+constexpr int WM_NEWVERSIONAVAILABLE = WM_USER + 11;
 
 // Disable "warning C6054: String 'buffer' might not be zero-terminated." because
 // these warnings are spurious. They are caused by incorrect annotations on

include/ETWProviders/etwprof.h

@@ -41,7 +41,7 @@ typedef long long int64;
 
 // Flag to indicate that a mouse-down actually corresponds to a double-click.
 // Add this to the button number.
-const int kFlagDoubleClick = 100;
+constexpr int kFlagDoubleClick = 100;
 
 #ifdef	ETW_MARKS_ENABLED