Merge branch 'main' into injection-rainbow-side

planetchili · planetchili · commit 4fd92f6e37c6 · 2025-10-03T15:40:49.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -58,4 +58,7 @@ PresentMon/ddETWExternalEvents.rc
 
 PresentMon/ddETWExternalEventsTEMP.BIN
 
-Directory.Build.props
+# Local runsettings files (user-specific test configurations)
+*.local.runsettings
+
+Directory.Build.props
diff --git a/ETLTrimmer/main.cpp b/ETLTrimmer/main.cpp
@@ -297,8 +297,15 @@ class TempFile
     }
     ~TempFile()
     {
-        std::filesystem::remove((const wchar_t*)name_);
+        pmquell(std::filesystem::remove((const wchar_t*)name_))
     }
+
+    TempFile() = default;
+    TempFile(const TempFile&) = delete;
+    TempFile& operator=(const TempFile&) = delete;
+    TempFile(TempFile&&) = delete;
+    TempFile& operator=(TempFile&&) = delete;
+
 private:
     CComBSTR name_ = "null-log.etl.tmp";
 };
diff --git a/IntelPresentMon/CommonUtilities/PrecisionWaiter.cpp b/IntelPresentMon/CommonUtilities/PrecisionWaiter.cpp
@@ -11,14 +11,16 @@ namespace pmon::util
 		:
 		defaultWaitBuffer_{ waitBuffer }
 	{
-		waitableTimer_ = win::Handle(CreateWaitableTimerExW(
-			nullptr,
-			nullptr,
-			CREATE_WAITABLE_TIMER_HIGH_RESOLUTION,
-			TIMER_ALL_ACCESS
-		));
-		if (!waitableTimer_) {
-			pmlog_error("Failed creating high resolution timer").hr();
+		try {
+			waitableTimer_ = win::Handle(CreateWaitableTimerExW(
+				nullptr,
+				nullptr,
+				CREATE_WAITABLE_TIMER_HIGH_RESOLUTION,
+				TIMER_ALL_ACCESS
+			));
+		}
+		catch (...) {
+			pmlog_error(ReportException("Failed creating timer"));
 		}
 	}
 	void PrecisionWaiter::Wait(double seconds, bool alertable) noexcept
diff --git a/IntelPresentMon/CommonUtilities/win/MessageBox.h b/IntelPresentMon/CommonUtilities/win/MessageBox.h
@@ -10,6 +10,12 @@ namespace pmon::util::win
 		MsgBox();
 		MsgBox(std::string message);
 		~MsgBox();
+
+		MsgBox(const MsgBox&) = delete;
+		MsgBox & operator=(const MsgBox&) = delete;
+		MsgBox(MsgBox&&) = delete;
+		MsgBox & operator=(MsgBox&&) = delete;
+
 		MsgBox& WithMessage(std::string message);
 		MsgBox& WithTitle(std::string title);
 		MsgBox& AsError();
diff --git a/IntelPresentMon/CommonUtilities/win/Privileges.cpp b/IntelPresentMon/CommonUtilities/win/Privileges.cpp
@@ -1,5 +1,6 @@
 ﻿#include "Privileges.h"
 #include "HrError.h"
+#include "../log/Log.h"
 #include <format>
 #include "../Memory.h"
 
@@ -116,9 +117,15 @@ namespace pmon::util::win
 	}
 	bool WeAreElevated() noexcept
 	{
-		auto hToken = OpenCurrentProcessToken(TOKEN_QUERY);
-		TOKEN_ELEVATION elev{}; DWORD len = 0;
-		GetTokenInformation(hToken, TokenElevation, &elev, sizeof(elev), &len);
-		return bool(elev.TokenIsElevated);
+		try {
+			auto hToken = OpenCurrentProcessToken(TOKEN_QUERY);
+			TOKEN_ELEVATION elev{}; DWORD len = 0;
+			GetTokenInformation(hToken, TokenElevation, &elev, sizeof(elev), &len);
+			return bool(elev.TokenIsElevated);
+		}
+		catch (...) {
+			pmlog_error("Error checking elevation");
+			return false;
+		}
 	}
 }
diff --git a/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.cpp b/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.cpp
@@ -13,10 +13,13 @@ AmdCheckerToken chk;
 AmdResultGrabber::AmdResultGrabber(int result,
                                    std::source_location loc) noexcept
     : result_(result), loc_(loc) {}
-int operator>>(AmdResultGrabber g, AmdCheckerToken) {
+int operator>>(AmdResultGrabber g, AmdCheckerToken) noexcept {
   if (g.result_ != ADL_OK) {
-    LOG(INFO) << "Failed Telemetry Query: " << g.loc_.file_name() << " "
+      try {
+          LOG(INFO) << "Failed Telemetry Query: " << g.loc_.file_name() << " "
               << g.loc_.line() << " " << g.result_;
+      }
+      catch (...) {}
   }
   return g.result_;
 }
diff --git a/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.h b/IntelPresentMon/ControlLib/AmdPowerTelemetryAdapter.h
@@ -16,7 +16,7 @@ struct AmdResultGrabber {
   int result_;
   std::source_location loc_;
 };
-int operator>>(AmdResultGrabber, AmdCheckerToken);
+int operator>>(AmdResultGrabber, AmdCheckerToken) noexcept;
 
 class AmdPowerTelemetryAdapter : public PowerTelemetryAdapter {
  public:
diff --git a/IntelPresentMon/Core/source/kernel/InjectorComplex.cpp b/IntelPresentMon/Core/source/kernel/InjectorComplex.cpp
@@ -101,12 +101,11 @@ namespace p2c::kern
 	void InjectorComplex::InjectorModule_::UpdateConfig(const GfxLayer::Extension::OverlayConfig& cfg)
 	{
 		config_ = cfg;
-		if (injectionPointClient_) {
-			PushConfig_();
-		}
-	}void InjectorComplex::InjectorModule_::ChangeTarget(std::optional<std::string> targetModuleName)
+		PushConfig_();
+	}
+	void InjectorComplex::InjectorModule_::ChangeTarget(std::optional<std::string> targetModuleName)
 	{
-		// Drop any prior action client (as you had)
+		// Drop any prior action client
 		{
 			std::lock_guard lk{ actionClientMutex_ };
 			injectionPointClient_.reset();
diff --git a/IntelPresentMon/FlashInjectorLibrary/Extension/OverlayRenderer.h b/IntelPresentMon/FlashInjectorLibrary/Extension/OverlayRenderer.h
@@ -79,8 +79,8 @@ namespace GfxLayer::Extension
 		using clock = std::chrono::high_resolution_clock;
 		OverlayConfig			m_currentConfig;
 		ComPtr<IDXGISwapChain3>	m_pSwapChain;
-		unsigned m_width;
-		unsigned m_height;
+		unsigned m_width = 0;
+		unsigned m_height = 0;
 		std::optional<clock::time_point> m_flashStartTime;
 		bool m_clickHoldoff = false;
 		size_t m_rainbowFrameIndex = 0;
diff --git a/IntelPresentMon/Interprocess/source/act/SymmetricActionClient.h b/IntelPresentMon/Interprocess/source/act/SymmetricActionClient.h
@@ -42,7 +42,12 @@ namespace pmon::ipc::act
         SymmetricActionClient& operator=(SymmetricActionClient&&) = delete;
         ~SymmetricActionClient()
         {
-            ioctx_.stop();
+            try {
+                ioctx_.stop();
+            }
+            catch (...) {
+                pmlog_error("Failed to stop ioctx");
+            }
         }
 
         template<class Params>
diff --git a/IntelPresentMon/PresentMonAPI2Loader/Implementation.cpp b/IntelPresentMon/PresentMonAPI2Loader/Implementation.cpp
@@ -107,96 +107,94 @@ PRESENTMON_API2_EXPORT PM_STATUS LoadLibrary_(bool versionOnly = false)
 {
 	// ensure following routine is only run once
 	// concurrent calls will block until the first one completes
-	{
-		std::lock_guard lk{ middlewareLoadMtx_ };
-		if (middlewareLoadResult_) {
-			// we were not first, return the same result as the first call
-			return *middlewareLoadResult_;
-		}
-		try {
-			// load module if not already done
+	std::lock_guard lk{ middlewareLoadMtx_ };
+	if (middlewareLoadResult_) {
+		// we were not first, return the same result as the first call
+		return *middlewareLoadResult_;
+	}
+	try {
+		// load module if not already done
+		if (!hMod_) {
+			// get path to middleware dll from the registry if not already overridden
+			if (middlewareDllPath_.empty()) {
+				// discover the full path of the middleware dll using registry
+				Reg::SetReadonly();
+				middlewareDllPath_ = Reg::Get().middlewarePath;
+			}
+			// attempt to load the dll
+			hMod_ = LoadLibraryA(middlewareDllPath_.c_str());
 			if (!hMod_) {
-				// get path to middleware dll from the registry if not already overridden
-				if (middlewareDllPath_.empty()) {
-					// discover the full path of the middleware dll using registry
-					Reg::SetReadonly();
-					middlewareDllPath_ = Reg::Get().middlewarePath;
-				}
-				// attempt to load the dll
-				hMod_ = LoadLibraryA(middlewareDllPath_.c_str());
-				if (!hMod_) {
-					throw LoaderExcept_(PM_STATUS_NONEXISTENT_FILE_PATH, "Middleware Loader could not find DLL");
-				}
+				throw LoaderExcept_(PM_STATUS_NONEXISTENT_FILE_PATH, "Middleware Loader could not find DLL");
 			}
+		}
 #define RESOLVE(f) pFunc_##f##_ = reinterpret_cast<decltype(pFunc_##f##_)>(GetProcAddress_(hMod_, #f))
 #define RESOLVE_CPP(f) pFunc_##f##_ = GetCppProcAddress_<decltype(pFunc_##f##_)>(hMod_, #f)
-			// resolve version endpoint first as it is needed here
-			RESOLVE(pmGetApiVersion);
-			// if this load operation was instigated by calling version, don't do version check or load other endpoints
-			if (versionOnly) {
-				return PM_STATUS_SUCCESS;
+		// resolve version endpoint first as it is needed here
+		RESOLVE(pmGetApiVersion);
+		// if this load operation was instigated by calling version, don't do version check or load other endpoints
+		if (versionOnly) {
+			return PM_STATUS_SUCCESS;
+		}
+		// first check version before attempting to resolve all endpoints
+		{
+			PM_VERSION dllVersion{};
+			if (pFunc_pmGetApiVersion_(&dllVersion) != PM_STATUS_SUCCESS) {
+				throw LoaderExcept_(PM_STATUS_FAILURE, "Failed API version discovery");
 			}
-			// first check version before attempting to resolve all endpoints
-			{
-				PM_VERSION dllVersion{};
-				if (pFunc_pmGetApiVersion_(&dllVersion) != PM_STATUS_SUCCESS) {
-					throw LoaderExcept_(PM_STATUS_FAILURE, "Failed API version discovery");
-				}
-				const auto buildVersion = pmon::bid::GetApiVersion();
-				if (dllVersion.major > buildVersion.major) {
-					throw LoaderExcept_(PM_STATUS_MIDDLEWARE_VERSION_HIGH);
-				}
-				if (dllVersion.major < buildVersion.major || dllVersion.minor < buildVersion.minor) {
-					throw LoaderExcept_(PM_STATUS_MIDDLEWARE_VERSION_LOW);
-				}
+			const auto buildVersion = pmon::bid::GetApiVersion();
+			if (dllVersion.major > buildVersion.major) {
+				throw LoaderExcept_(PM_STATUS_MIDDLEWARE_VERSION_HIGH);
+			}
+			if (dllVersion.major < buildVersion.major || dllVersion.minor < buildVersion.minor) {
+				throw LoaderExcept_(PM_STATUS_MIDDLEWARE_VERSION_LOW);
 			}
-			// core
-			RESOLVE(pmOpenSession);
-			RESOLVE(pmOpenSessionWithPipe);
-			RESOLVE(pmCloseSession);
-			RESOLVE(pmStartTrackingProcess);
-			RESOLVE(pmStopTrackingProcess);
-			RESOLVE(pmGetIntrospectionRoot);
-			RESOLVE(pmFreeIntrospectionRoot);
-			RESOLVE(pmSetTelemetryPollingPeriod);
-			RESOLVE(pmSetEtwFlushPeriod);
-			RESOLVE(pmRegisterDynamicQuery);
-			RESOLVE(pmFreeDynamicQuery);
-			RESOLVE(pmPollDynamicQuery);
-			RESOLVE(pmPollStaticQuery);
-			RESOLVE(pmRegisterFrameQuery);
-			RESOLVE(pmConsumeFrames);
-			RESOLVE(pmFreeFrameQuery);
-			// diagnostics
-			RESOLVE(pmDiagnosticSetup);
-			RESOLVE(pmDiagnosticGetQueuedMessageCount);
-			RESOLVE(pmDiagnosticGetMaxQueuedMessages);
-			RESOLVE(pmDiagnosticSetMaxQueuedMessages);
-			RESOLVE(pmDiagnosticGetDiscardedMessageCount);
-			RESOLVE(pmDiagnosticDequeueMessage);
-			RESOLVE(pmDiagnosticEnqueueMessage);
-			RESOLVE(pmDiagnosticFreeMessage);
-			RESOLVE(pmDiagnosticWaitForMessage);
-			RESOLVE(pmDiagnosticUnblockWaitingThread);
-			// internal
-			RESOLVE_CPP(pmCreateHeapCheckpoint_);
-			RESOLVE_CPP(pmLinkLogging_);
-			RESOLVE_CPP(pmFlushEntryPoint_);
-			RESOLVE_CPP(pmSetupODSLogging_);
-			RESOLVE_CPP(pmSetupFileLogging_);
-			RESOLVE_CPP(pmStopPlayback_);
-			// if we make it here then we have succeeded
-			middlewareLoadResult_ = PM_STATUS_SUCCESS;
-		}
-		catch (const pmon::ipc::PmStatusError& ex) {
-			middlewareLoadResult_ = ex.GeneratePmStatus();
-		}
-		catch (const winreg::RegException&) {
-			middlewareLoadResult_ = PM_STATUS_MIDDLEWARE_MISSING_PATH;
-		}
-		catch (...) {
-			middlewareLoadResult_ = PM_STATUS_FAILURE;
 		}
+		// core
+		RESOLVE(pmOpenSession);
+		RESOLVE(pmOpenSessionWithPipe);
+		RESOLVE(pmCloseSession);
+		RESOLVE(pmStartTrackingProcess);
+		RESOLVE(pmStopTrackingProcess);
+		RESOLVE(pmGetIntrospectionRoot);
+		RESOLVE(pmFreeIntrospectionRoot);
+		RESOLVE(pmSetTelemetryPollingPeriod);
+		RESOLVE(pmSetEtwFlushPeriod);
+		RESOLVE(pmRegisterDynamicQuery);
+		RESOLVE(pmFreeDynamicQuery);
+		RESOLVE(pmPollDynamicQuery);
+		RESOLVE(pmPollStaticQuery);
+		RESOLVE(pmRegisterFrameQuery);
+		RESOLVE(pmConsumeFrames);
+		RESOLVE(pmFreeFrameQuery);
+		// diagnostics
+		RESOLVE(pmDiagnosticSetup);
+		RESOLVE(pmDiagnosticGetQueuedMessageCount);
+		RESOLVE(pmDiagnosticGetMaxQueuedMessages);
+		RESOLVE(pmDiagnosticSetMaxQueuedMessages);
+		RESOLVE(pmDiagnosticGetDiscardedMessageCount);
+		RESOLVE(pmDiagnosticDequeueMessage);
+		RESOLVE(pmDiagnosticEnqueueMessage);
+		RESOLVE(pmDiagnosticFreeMessage);
+		RESOLVE(pmDiagnosticWaitForMessage);
+		RESOLVE(pmDiagnosticUnblockWaitingThread);
+		// internal
+		RESOLVE_CPP(pmCreateHeapCheckpoint_);
+		RESOLVE_CPP(pmLinkLogging_);
+		RESOLVE_CPP(pmFlushEntryPoint_);
+		RESOLVE_CPP(pmSetupODSLogging_);
+		RESOLVE_CPP(pmSetupFileLogging_);
+		RESOLVE_CPP(pmStopPlayback_);
+		// if we make it here then we have succeeded
+		middlewareLoadResult_ = PM_STATUS_SUCCESS;
+	}
+	catch (const pmon::ipc::PmStatusError& ex) {
+		middlewareLoadResult_ = ex.GeneratePmStatus();
+	}
+	catch (const winreg::RegException&) {
+		middlewareLoadResult_ = PM_STATUS_MIDDLEWARE_MISSING_PATH;
+	}
+	catch (...) {
+		middlewareLoadResult_ = PM_STATUS_FAILURE;
 	}
 	middlewareLoadedSuccessfully_ = *middlewareLoadResult_ == PM_STATUS_SUCCESS;
 	return *middlewareLoadResult_;
diff --git a/IntelPresentMon/PresentMonAPI2Tests/CsvHelper.h b/IntelPresentMon/PresentMonAPI2Tests/CsvHelper.h
@@ -694,9 +694,6 @@ bool CsvParser::VerifyBlobAgainstCsv(const std::string& processName, const unsig
             case Header_MsPCLatency:
                 if (v2MetricRow_.msPcLatency.has_value()) {
                     columnsMatch = Validate(v2MetricRow_.msPcLatency.value(), msPcLatency);
-                    if (!columnsMatch) {
-                        OutputDebugStringA("What!?\n");
-                    }
                 }
                 else
                 {
diff --git a/IntelPresentMon/PresentMonMiddleware/LogSetup.cpp b/IntelPresentMon/PresentMonMiddleware/LogSetup.cpp
@@ -142,13 +142,18 @@ namespace pmon::util::log
 	{
 		// create / replace diagnostic driver
 		std::lock_guard lk{ diagnosticsMtx_ };
-		pDiagnostics_ = std::make_shared<log::DiagnosticDriver>(pConfig);
-		// attach to existing channel if present
-		InjectDefaultChannel(MakeDiagnosticChannel_(pDiagnostics_));
-		// set global logging policy based on the configuration
-		GlobalPolicy::Get().SetLogLevel((Level)pConfig->filterLevel);
-		if (!pConfig->enableTrace) {
-			GlobalPolicy::Get().SetTraceLevel(Level::None);
+		try {
+			pDiagnostics_ = std::make_shared<log::DiagnosticDriver>(pConfig);
+			// attach to existing channel if present
+			InjectDefaultChannel(MakeDiagnosticChannel_(pDiagnostics_));
+			// set global logging policy based on the configuration
+			GlobalPolicy::Get().SetLogLevel((Level)pConfig->filterLevel);
+			if (!pConfig->enableTrace) {
+				GlobalPolicy::Get().SetTraceLevel(Level::None);
+			}
+		}
+		catch (...) {
+			pmlog_error(ReportException("Failed to create diagnostic driver"));
 		}
 	}
 
diff --git a/PresentData/PresentMonTraceConsumer.cpp b/PresentData/PresentMonTraceConsumer.cpp
@@ -2723,7 +2723,7 @@ void PMTraceConsumer::SetAppTimingData(const EVENT_RECORD* pEventRecord) {
         } else {
             auto ij = mAppTimingDataByAppFrameId.find(key);
             if (ij != mAppTimingDataByAppFrameId.end()) {
-                ij->second.AppSleepEndTime = timestamp;
+                ij->second.AppSleepStartTime = timestamp;
             } else {
                 AppTimingData data;
                 data.AppSleepStartTime = timestamp;
diff --git a/PresentData/PresentMonTraceSession.cpp b/PresentData/PresentMonTraceSession.cpp
@@ -138,6 +138,11 @@ struct FilteredProvider {
         }
     }
 
+    FilteredProvider(const FilteredProvider&) = delete;
+    FilteredProvider & operator=(const FilteredProvider&) = delete;
+    FilteredProvider(FilteredProvider&&) = delete;
+    FilteredProvider & operator=(FilteredProvider&&) = delete;
+
     void ClearFilter()
     {
         if (filterDesc_.Ptr != 0) {
diff --git a/PresentMon/OutputThread.cpp b/PresentMon/OutputThread.cpp
diff --git a/Tests/PresentMonTests.cpp b/Tests/PresentMonTests.cpp
diff --git a/Tests/PresentMonTests.runsettings.template b/Tests/PresentMonTests.runsettings.template
diff --git a/Tests/README.md b/Tests/README.md

Original file line number	Diff line number	Diff line change
`@@ -297,8 +297,15 @@ class TempFile`
`297`	`297`	`}`
`298`	`298`	`~TempFile()`
`299`	`299`	`{`
`300`		`- std::filesystem::remove((const wchar_t*)name_);`
	`300`	`+ pmquell(std::filesystem::remove((const wchar_t*)name_))`
`301`	`301`	`}`
	`302`	`+`
	`303`	`+ TempFile() = default;`
	`304`	`+ TempFile(const TempFile&) = delete;`
	`305`	`+ TempFile& operator=(const TempFile&) = delete;`
	`306`	`+ TempFile(TempFile&&) = delete;`
	`307`	`+ TempFile& operator=(TempFile&&) = delete;`
	`308`	`+`
`302`	`309`	`private:`
`303`	`310`	`CComBSTR name_ = "null-log.etl.tmp";`
`304`	`311`	`};`
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,11 @@ namespace p2c::kern`
`101`	`101`	`void InjectorComplex::InjectorModule_::UpdateConfig(const GfxLayer::Extension::OverlayConfig& cfg)`
`102`	`102`	`{`
`103`	`103`	`config_ = cfg;`
`104`		`- if (injectionPointClient_) {`
`105`		`- PushConfig_();`
`106`		`- }`
`107`		`- }void InjectorComplex::InjectorModule_::ChangeTarget(std::optional<std::string> targetModuleName)`
	`104`	`+ PushConfig_();`
	`105`	`+ }`
	`106`	`+ void InjectorComplex::InjectorModule_::ChangeTarget(std::optional<std::string> targetModuleName)`
`108`	`107`	`{`
`109`		`- // Drop any prior action client (as you had)`
	`108`	`+ // Drop any prior action client`
`110`	`109`	`{`
`111`	`110`	`std::lock_guard lk{ actionClientMutex_ };`
`112`	`111`	`injectionPointClient_.reset();`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,12 @@ namespace pmon::ipc::act`
`42`	`42`	`SymmetricActionClient& operator=(SymmetricActionClient&&) = delete;`
`43`	`43`	`~SymmetricActionClient()`
`44`	`44`	`{`
`45`		`- ioctx_.stop();`
	`45`	`+ try {`
	`46`	`+ ioctx_.stop();`
	`47`	`+ }`
	`48`	`+ catch (...) {`
	`49`	`+ pmlog_error("Failed to stop ioctx");`
	`50`	`+ }`
`46`	`51`	`}`
`47`	`52`
`48`	`53`	`template<class Params>`