Enabled /permissive- and c++17 standard usage

CrashRpt · Jun 9, 2018 · 733692b · 733692b
1 parent 4ca9302
commit 733692b
Show file tree

Hide file tree

Showing 26 changed files with 2,681 additions and 2,623 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,8 +15,15 @@ option(CRASHRPT_BUILD_SHARED_LIBS "If set (default), CrashRpt modules are built
 option(CRASHRPT_LINK_CRT_AS_DLL "If set (default), CrashRpt modules link C run-time (CRT) as multi-threaded dynamic libraries, otherwise as multi-threaded static libs." ON)
 option(CRASHRPT_BUILD_DEMOS "If set (default), CrashRpt builds the demo projects." ON)
 option(CRASHRPT_BUILD_TESTS "If set (default), CrashRpt builds the test projects." ON)
+IF(MSVC AND ${MSVC_VERSION} GREATER 1910)
+  option(CRASHRPT_BUILD_CPP17 "If set (default), CrashRpt builds using /std:c++17 mode." ON)
+ENDIF()
 
 ADD_DEFINITIONS("/W4 /wd4456 /wd4458 /MP /Oy- /EHsc")
+IF(MSVC AND ${MSVC_VERSION} GREATER 1910 AND CRASHRPT_BUILD_CPP17)
+  MESSAGE("Using /std:c++17 mode and /permissive-")
+  ADD_DEFINITIONS("/std:c++17 /permissive-")
+ENDIF()
 
 if(MSVC_VERSION LESS 1910 )
   set( DBGHELP_USE_INSTALLED_SDK True )

diff --git a/demos/WTLDemo/stdafx.h b/demos/WTLDemo/stdafx.h
@@ -16,10 +16,10 @@ be found in the Authors.txt file in the root of the source tree.
 #pragma once
 
 // Change these values to use different versions
-#define WINVER		0x0500
+#define WINVER		0x0501
 #define _WIN32_WINNT	0x0501
-#define _WIN32_IE	0x0501
-#define _RICHEDIT_VER	0x0200
+#define _WIN32_IE	0x0600
+#define _RICHEDIT_VER	0x0300
 
 #include <atldef.h>
 #if ( _ATL_VER < 0x0800 )

diff --git a/processing/crashrptprobe/CrashRptProbe.cpp b/processing/crashrptprobe/CrashRptProbe.cpp
@@ -28,9 +28,9 @@ CComAutoCriticalSection g_crp_cs; // Critical section for thread-safe accessing
 std::map<DWORD, CString> g_crp_sErrorMsg; // Last error messages for each calling thread.
 
 // Funtion prototype
-int crpSetErrorMsg(PTSTR pszErrorMsg);
+int crpSetErrorMsg(LPCTSTR pszErrorMsg);
 
-TCHAR* exctypes[13] =
+const TCHAR* exctypes[13] =
 {
     _T("SEH exception"),
     _T("terminate call"),
@@ -880,7 +880,7 @@ crpGetPropertyW(
             _ULTOT_S(pDmpReader->m_DumpData.m_uProcessorArchitecture, szBuff, BUFF_SIZE, 10);
             _TCSCAT_S(szBuff, BUFF_SIZE, _T(" "));
 
-            TCHAR* szDescription = _T("unknown processor type");
+            const TCHAR* szDescription = _T("unknown processor type");
             if(pDmpReader->m_DumpData.m_uProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64)
                 szDescription = _T("x64 (AMD or Intel)");
             if(pDmpReader->m_DumpData.m_uProcessorArchitecture==PROCESSOR_ARCHITECTURE_IA32_ON_WIN64)
@@ -904,7 +904,7 @@ crpGetPropertyW(
             _ULTOT_S(pDmpReader->m_DumpData.m_uchProductType, szBuff, BUFF_SIZE, 10);
             _TCSCAT_S(szBuff, BUFF_SIZE, _T(" "));
 
-            TCHAR* szDescription = _T("unknown product type");
+            const TCHAR* szDescription = _T("unknown product type");
             if(pDmpReader->m_DumpData.m_uchProductType==VER_NT_DOMAIN_CONTROLLER)
                 szDescription = _T("domain controller");
             if(pDmpReader->m_DumpData.m_uchProductType==VER_NT_SERVER)
@@ -1374,7 +1374,7 @@ crpGetLastErrorMsgA(
     return res;
 }
 
-int crpSetErrorMsg(PTSTR pszErrorMsg)
+int crpSetErrorMsg(LPCTSTR pszErrorMsg)
 {
     g_crp_cs.Lock();
     DWORD dwThreadId = GetCurrentThreadId();