Added support for newer version of VS2022 + ignore the same warnings in "Release...

diff --git a/MUtilities_VS2019.vcxproj b/MUtilities_VS2019.vcxproj
index a2e192e..834013e 100644 (file)
--- a/MUtilities_VS2019.vcxproj
+++ b/MUtilities_VS2019.vcxproj
@@ -199,6 +199,7 @@
       <MinimalRebuild>false</MinimalRebuild>
       <ControlFlowGuard>false</ControlFlowGuard>
       <WholeProgramOptimization>true</WholeProgramOptimization>
+      <DisableSpecificWarnings>4714;4324;4127</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/MUtilities_VS2022.vcxproj b/MUtilities_VS2022.vcxproj
index 207c499..fe8b2fe 100644 (file)
--- a/MUtilities_VS2022.vcxproj
+++ b/MUtilities_VS2022.vcxproj
@@ -199,6 +199,7 @@
       <MinimalRebuild>false</MinimalRebuild>
       <ControlFlowGuard>false</ControlFlowGuard>
       <WholeProgramOptimization>true</WholeProgramOptimization>
+      <DisableSpecificWarnings>4714;4324;4127</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/include/MUtils/Version.h b/include/MUtils/Version.h
index 16ea2ed..0d0f9d6 100644 (file)
--- a/include/MUtils/Version.h
+++ b/include/MUtils/Version.h
@@ -67,7 +67,11 @@ namespace MUtils
                                                #error Compiler is not supported!
                                        #endif
                                #elif defined(_MSC_VER)
-                                       #if (_MSC_VER == 1930)
+                                       #if (_MSC_VER == 1932)
+                                               "MSVC 2022.2";
+                                       #elif (_MSC_VER == 1931)
+                                               "MSVC 2022.1";
+                                       #elif (_MSC_VER == 1930)
                                                #if (_MSC_FULL_VER <= 193030706)
                                                        "MSVC 2022.0";
                                                #else

diff --git a/src/Terminal_Win32.cpp b/src/Terminal_Win32.cpp
index bdc5e60..b2b510e 100644 (file)
--- a/src/Terminal_Win32.cpp
+++ b/src/Terminal_Win32.cpp
@@ -427,7 +427,7 @@ void MUtils::Terminal::set_icon(const QIcon &icon)
                        bool success = false;
                        if (const SetConsoleIconFun pSetConsoleIconFun = MUtils::Win32Utils::resolve<SetConsoleIconFun>(QLatin1String("kernel32"), QLatin1String("SetConsoleIcon")))
                        {
-                               const DWORD before = GetLastError();
+                               //const DWORD before = GetLastError();
                                if (pSetConsoleIconFun(hIcon))
                                {
                                        success = true;