Fixed an issue that universally broke portable builds on windows 10. oops.

(cherry picked from commit c182fc7)

Author: PazerOP

tf2_bot_detector/Platform/Windows/Windows.cpp

@@ -97,14 +97,14 @@ static const tf2_bot_detector::WinRT* GetWinRTInterface()
 {
 	struct WinRTHelper
 	{
-		WinRTHelper()
+		WinRTHelper(const tf2_bot_detector::WinRT* fallbackInterface)
 		{
 			constexpr char WINRT_DLL_NAME[] = "tf2_bot_detector_winrt.dll";
 			m_Module = mh_ensure(LoadLibraryA(WINRT_DLL_NAME));
 
 			CreateWinRTInterfaceFn func = reinterpret_cast<CreateWinRTInterfaceFn>(GetProcAddressHelper(WINRT_DLL_NAME, "CreateWinRTInterface"));
 
-			m_WinRT.reset(func());
+			m_WinRT.reset(func(fallbackInterface));
 
 			struct DummyType {};
 			m_ExceptionDetailsHandler = mh::exception_details::add_handler(
@@ -147,14 +147,14 @@ static const tf2_bot_detector::WinRT* GetWinRTInterface()
 
 	static const tf2_bot_detector::WinRT* s_Value = []() -> const tf2_bot_detector::WinRT*
 	{
+		static const FallbackWinRTInterface s_FallbackInterface;
 		if (IsReallyWindows10OrGreater())
 		{
-			static WinRTHelper s_Helper;
+			static WinRTHelper s_Helper(&s_FallbackInterface);
 			return s_Helper.m_WinRT.get();
 		}
 		else
 		{
-			static const FallbackWinRTInterface s_FallbackInterface;
 			return &s_FallbackInterface;
 		}
 	}();

tf2_bot_detector_winrt/tf2_bot_detector_winrt.cpp

@@ -15,36 +15,62 @@ namespace
 	class WinRTImpl final : public tf2_bot_detector::WinRT
 	{
 	public:
+		WinRTImpl(const tf2_bot_detector::WinRT* fallback) : m_Fallback(fallback) {}
+
 		std::filesystem::path GetLocalAppDataDir() const override;
 		std::filesystem::path GetRoamingAppDataDir() const override;
 		std::filesystem::path GetTempDir() const override;
 		std::wstring GetCurrentPackageFamilyName() const override;
 
 		const mh::exception_details_handler& GetWinRTExceptionDetailsHandler() const override;
+
+	private:
+		const tf2_bot_detector::WinRT* m_Fallback{};
 	};
 
-	std::filesystem::path WinRTImpl::GetLocalAppDataDir() const
+	std::filesystem::path WinRTImpl::GetLocalAppDataDir() const try
 	{
 		auto appData = winrt::Windows::Storage::ApplicationData::Current();
 		auto path = appData.LocalFolder().Path();
 		return std::filesystem::path(path.begin(), path.end());
 	}
+	catch (...)
+	{
+		if (m_Fallback)
+			return m_Fallback->GetLocalAppDataDir();
+
+		throw;
+	}
 
-	std::filesystem::path WinRTImpl::GetRoamingAppDataDir() const
+	std::filesystem::path WinRTImpl::GetRoamingAppDataDir() const try
 	{
 		auto appData = winrt::Windows::Storage::ApplicationData::Current();
 		auto path = appData.RoamingFolder().Path();
 		return std::filesystem::path(path.begin(), path.end());
 	}
+	catch (...)
+	{
+		if (m_Fallback)
+			return m_Fallback->GetRoamingAppDataDir();
+
+		throw;
+	}
 
-	std::filesystem::path WinRTImpl::GetTempDir() const
+	std::filesystem::path WinRTImpl::GetTempDir() const try
 	{
 		auto appData = winrt::Windows::Storage::ApplicationData::Current();
 		auto path = appData.TemporaryFolder().Path();
 		return std::filesystem::path(path.begin(), path.end());
 	}
+	catch (...)
+	{
+		if (m_Fallback)
+			return m_Fallback->GetTempDir();
 
-	std::wstring WinRTImpl::GetCurrentPackageFamilyName() const
+		throw;
+	}
+
+	std::wstring WinRTImpl::GetCurrentPackageFamilyName() const try
 	{
 		static const std::wstring s_CurrentPackageFamilyName = []() -> std::wstring
 		{
@@ -73,8 +99,15 @@ namespace
 
 		return s_CurrentPackageFamilyName;
 	}
+	catch (...)
+	{
+		if (m_Fallback)
+			return m_Fallback->GetCurrentPackageFamilyName();
+
+		throw;
+	}
 
-	const mh::exception_details_handler& WinRTImpl::GetWinRTExceptionDetailsHandler() const
+	const mh::exception_details_handler& WinRTImpl::GetWinRTExceptionDetailsHandler() const try
 	{
 		class Handler final : public mh::exception_details_handler
 		{
@@ -83,7 +116,7 @@ namespace
 			{
 				const auto FormatHRMessage = [](const winrt::hresult_error& hr)
 				{
-					return mh::format(MH_FMT_STRING("{:#x}: "),
+					return mh::format(MH_FMT_STRING("{:#x}: {}"),
 						hr.code(), mh::change_encoding<char>(hr.message().c_str()));
 				};
 
@@ -122,9 +155,16 @@ namespace
 
 		return s_Handler;
 	}
+	catch (...)
+	{
+		if (m_Fallback)
+			return m_Fallback->GetWinRTExceptionDetailsHandler();
+
+		throw;
+	}
 }
 
-extern "C" TF2_BOT_DETECTOR_WINRT_EXPORT tf2_bot_detector::WinRT* CreateWinRTInterface()
+extern "C" TF2_BOT_DETECTOR_WINRT_EXPORT tf2_bot_detector::WinRT* CreateWinRTInterface(const tf2_bot_detector::WinRT* fallback)
 {
-	return new WinRTImpl();
+	return new WinRTImpl(fallback);
 }

tf2_bot_detector_winrt/tf2_bot_detector_winrt.h

@@ -22,5 +22,5 @@ namespace tf2_bot_detector
 		virtual const mh::exception_details_handler& GetWinRTExceptionDetailsHandler() const = 0;
 	};
 
-	using CreateWinRTInterfaceFn = WinRT*(*)();
+	using CreateWinRTInterfaceFn = WinRT*(*)(const WinRT* fallback);
 }