make sure the length of the short build hash stays below 8 characters

Author: planetchili

IntelPresentMon/CommonUtilities/log/Log.h

@@ -34,10 +34,11 @@ namespace pmon::util::log
 #endif
 #endif
 
-#define pmlog_(lvl) ((PMLOG_BUILD_LEVEL_ < lvl) || (::pmon::util::log::GlobalPolicy::Get().GetLogLevel() < lvl)) \
-	? (void)0 : ::pmon::util::log::Voidifier_{} & ::pmon::util::log::EntryBuilder{ lvl, __FILE__, __FUNCTION__, __LINE__ } \
+#define pmlog_from_(lvl, file, function, line) ((PMLOG_BUILD_LEVEL_ < lvl) || (::pmon::util::log::GlobalPolicy::Get().GetLogLevel() < lvl)) \
+	? (void)0 : ::pmon::util::log::Voidifier_{} & ::pmon::util::log::EntryBuilder{ lvl, file, function, line } \
 	.subsys(::pmon::util::log::GlobalPolicy::Get().GetSubsystem()) \
 	.to(::pmon::util::log::GetDefaultChannel())
+#define pmlog_(lvl) pmlog_from_(lvl, __FILE__, __FUNCTION__, __LINE__)
 #define pmlog_fatal	pmlog_(::pmon::util::log::Level::Fatal).note
 #define pmlog_error	pmlog_(::pmon::util::log::Level::Error).note
 #define pmlog_warn	pmlog_(::pmon::util::log::Level::Warning).note

IntelPresentMon/Core/source/infra/LogSetup.cpp

@@ -73,19 +73,41 @@ namespace p2c
 	using namespace pmon::util;
 	using namespace pmon::util::log;
 
+	_invalid_parameter_handler pOriginalInvalidParameterHandler_ = nullptr;
+
+	namespace {
+		void InvalidParameterHandler_(
+			const wchar_t* expression,
+			const wchar_t* function,
+			const wchar_t* file,
+			unsigned int line,
+			uintptr_t pReserved)
+		{
+			// convert to narrow and log the assertion content
+			const auto narrowFunction = str::ToNarrow(function);
+			const auto narrowFile = str::ToNarrow(file);
+			pmlog_from_(Level::Fatal, narrowFile.c_str(), narrowFunction.c_str(), (int)line)
+				.note(std::format("CRT assertion: {}", str::ToNarrow(expression)));
+			// flush the default channel
+			if (auto pChan = GetDefaultChannel()) {
+				pChan->Flush();
+			}
+			// invoke the original handler
+			if (pOriginalInvalidParameterHandler_) {
+				pOriginalInvalidParameterHandler_(expression, function, file, line, pReserved);
+			}
+		}
+	}
+
 	void ConfigureLogging() noexcept
 	{
 		try {
 			auto pChan = GetDefaultChannel();
+			// setup CRT assert handler
+			pOriginalInvalidParameterHandler_ = _set_invalid_parameter_handler(InvalidParameterHandler_);
 			// shortcut for command line
 			const auto& opt = cli::Options::Get();
 			const auto render = opt.cefType && *opt.cefType == "renderer";
-			// connect dll channel and id table to exe, get access to global settings in dll
-			LoggingSingletons getters;
-			if (render && opt.logMiddlewareCopy) {
-				getters = pmLinkLogging_(pChan, []() -> IdentificationTable& {
-					return IdentificationTable::Get_(); });
-			}
 
 			// determine log folder path
 			std::filesystem::path logFolder;
@@ -103,6 +125,12 @@ namespace p2c
 			pChan->AttachComponent(std::make_shared<BasicFileDriver>(std::make_shared<TextFormatter>(),
 				std::make_shared<SimpleFileStrategy>(logfilePathClient)), "drv:file");
 			auto&& pol = GlobalPolicy::Get();
+			// connect dll channel and id table to exe, get access to global settings in dll
+			LoggingSingletons getters;
+			if (render && opt.logMiddlewareCopy) {
+				getters = pmLinkLogging_(pChan, []() -> IdentificationTable& {
+					return IdentificationTable::Get_(); });
+			}
 			// set the global policy settings
 			if (opt.logLevel) {
 				pol.SetLogLevel(*opt.logLevel);

IntelPresentMon/Versioning/scripts/pre-build.ps1

@@ -117,9 +117,8 @@ Write-Host "[build_id_gen] Generating new build_id.h..."
 
 # Get the current git commit hash
 $gitHash       = (git rev-parse HEAD)        | Out-String
-$gitHashShort  = (git rev-parse --short HEAD)| Out-String
 $gitHash       = $gitHash.Trim()
-$gitHashShort  = $gitHashShort.Trim()
+$gitHashShort  = $gitHash.Substring(0, 7)
 
 # Format: yyyy.M.d.HH:mm:ss (e.g., 2025.1.8.12:20:11)
 $dateTime = Get-Date -Format 'yyyy.M.d.HH:mm:ss'