Merge pull request #566 from GameTechDev/version_updates

Version updates

Author: planetchili

ETLTrimmer/ETLTrimmer.vcxproj

@@ -82,6 +82,7 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

IntelPresentMon/AppCef/AppCef.rc

@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "flask.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,5,0
- PRODUCTVERSION 2,4,0,0
+ FILEVERSION PM_VER_FILE_NUM
+ PRODUCTVERSION PM_VER_PRODUCT_NUM
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Intel(R) Corporation"
             VALUE "FileDescription", "Intel(R) PresentMon application"
-            VALUE "FileVersion", "1.0.5.0"
+            VALUE "FileVersion", PM_VER_FILE_STR
             VALUE "InternalName", "CefNano.exe"
-            VALUE "LegalCopyright", "Copyright (C) 2017-2025"
+            VALUE "LegalCopyright", PM_VER_COPYRIGHT
             VALUE "OriginalFilename", "CefNano.exe"
             VALUE "ProductName", "Intel(R) PresentMon"
-            VALUE "ProductVersion", "2.4.0.0"
+            VALUE "ProductVersion", PM_VER_PRODUCT_STR
         END
     END
     BLOCK "VarFileInfo"

IntelPresentMon/AppCef/CefNano.vcxproj

@@ -194,6 +194,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..;Cef\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

IntelPresentMon/AppCef/ipm-ui-vue/BlockLists/TargetBlockList.txt

@@ -98,6 +98,7 @@ hxoutlook.exe
 icue.exe
 iexplore.exe
 imagemonitor.exe
+intelgraphicssoftware.exe
 ipitting.livecompanion.exe
 javaw.exe
 jetbrains-toolbox.exe
@@ -175,6 +176,7 @@ perftune.exe
 photosapp.exe
 photoshop.exe
 playnite.desktopapp.exe
+pix.exe
 plex.exe
 plitch.exe
 powerpnt.exe

IntelPresentMon/Common.props

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)..\Version.props" Condition="Exists('$(MSBuildThisFileDirectory)..\Version.props') and '$(VersionPropsImported)'==''" />
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -15,6 +16,9 @@
       <PreprocessorDefinitions>CEREAL_THREAD_SAFE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <ResourceCompile>
+        <PreprocessorDefinitions>PM_VER_FILE_NUM=$(PresentMonFileVersionNumbers);PM_VER_PRODUCT_NUM=$(PresentMonProductVersionNumbers);PM_VER_FILE_STR=\"$(PresentMonFileVersion)\";PM_VER_PRODUCT_STR=\"$(PresentMonProductVersion)\";PM_VER_COPYRIGHT=\"$(PresentMonCopyright)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj

@@ -355,6 +355,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <ExceptionHandling>Async</ExceptionHandling>
       <AdditionalIncludeDirectories>../..;$(vcSiblingIncludeDirectory);$(vcInstalledIncludeDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>
       <SubSystem>

IntelPresentMon/CommonUtilities/file/SecureSubdirectory.cpp

@@ -195,7 +195,7 @@ namespace pmon::util::file
                 Remove();
             }
             catch (...) {
-                pmlog_error("failed removing secure subdir").pmwatch(path_.string());
+                pmquell(pmlog_error("failed removing secure subdir").pmwatch(path_.string()));
             }
         }
     }

IntelPresentMon/CommonUtilities/file/TempFile.cpp

@@ -5,6 +5,7 @@
 #include "../str/String.h"
 #include "../Exception.h"
 #include "../Memory.h"
+#include "../log/Log.h"
 #include <fstream>
 #include <random>
 #include <format>
@@ -21,7 +22,10 @@ namespace pmon::util::file
 	TempFile::~TempFile()
 	{
 		if (!Empty()) {
-			fs::remove(path_);
+			try { fs::remove(path_); }
+			catch (...) {
+				pmlog_warn(util::ReportException("TempFile dtor cleanup"));
+			}
 		}
 	}
 	TempFile TempFile::Create()

IntelPresentMon/CommonUtilities/log/Level.cpp

@@ -6,12 +6,12 @@ using namespace std::literals;
 
 namespace pmon::util::log
 {
-	std::string GetLevelName(Level lv) noexcept
+	std::string GetLevelName(Level lv)
 	{
 		return std::string{ reflect::enum_name<Level, "Unknown", 0, int(Level::EndOfEnumKeys)>(lv)};
 	}
 
-	std::map<std::string, Level> GetLevelMapNarrow() noexcept
+	std::map<std::string, Level> GetLevelMapNarrow()
 	{
 		using namespace pmon::util::str;
 		std::map<std::string, Level> map;

IntelPresentMon/CommonUtilities/log/Level.h

@@ -18,6 +18,6 @@ namespace pmon::util::log
 		EndOfEnumKeys,
 	};
 
-	std::string GetLevelName(Level) noexcept;
-	std::map<std::string, Level> GetLevelMapNarrow() noexcept;
+	std::string GetLevelName(Level);
+	std::map<std::string, Level> GetLevelMapNarrow();
 }