fix: broken logging under Wine (#559)

* fix: broken logging under Wine

* feat: `IsExported` added to `Module`

src/core/logger/LogSink.cpp

@@ -4,6 +4,8 @@
 
 #include <format>
 
+#include "core/util/Wine.hpp"
+
 namespace YimMenu
 {
 	LogColor LogSink::GetColor(const eLogLevel level)
@@ -29,6 +31,12 @@ namespace YimMenu
 	{
 		std::stringstream out;
 
+		static std::optional<bool> simplified = std::nullopt;
+		if (!simplified.has_value())
+			simplified = InWine();
+		if (simplified.value_or(false))
+			return FormatFile(msg);
+
 		const auto timestamp = std::format("{0:%H:%M:%S}", msg->Timestamp());
 		const auto& location = msg->Location();
 		const auto level = msg->Level();

src/core/memory/Module.hpp

@@ -2,10 +2,15 @@
 #include "PointerCalculator.hpp"
 #include "common.hpp"
 
+#include <type_traits>
+
 #include <winternl.h>
 
 namespace YimMenu
 {
+	template<typename T>
+	concept Symbol = std::is_convertible_v<T, int> || std::is_convertible_v<T, std::string_view>;
+
 	class Module
 	{
 	public:
@@ -20,13 +25,37 @@ namespace YimMenu
 		/**
 		 * @brief Parses the EAT of the module for the requested symbol name
 		 * 
-		 * @param symbolName 
+		 * @param symbolName The function name
 		 * @return void* Function address of the exported function
 		 */
-		template<typename T = void*>
-		T GetExport(const std::string_view symbolName) const;
-		template<typename T = void*>
-		T GetExport(int ordinal) const;
+		template<typename R = void*>
+		R GetExport(const std::string_view symbolName) const;
+		/**
+		 * @brief Parses the EAT of the module for the requested symbol ordinal
+		 * 
+		 * @param ordinal The function ordinal
+		 * @return void* Function address of the exported function
+		 */
+		template<typename R = void*>
+		R GetExport(const int ordinal) const;
+		/**
+		 * @brief Checks if the module exports a function with the given name
+		 * 
+		 * @param symbolName The function name
+		 * @return true If the function is exported
+		 * @return false If the function is not exported
+		 */
+		[[nodiscard]]
+		bool IsExported(const std::string_view symbolName) const;
+		/**
+		 * @brief Checks if the module exports a function with the given ordinal
+		 * 
+		 * @param ordinal The function ordinal
+		 * @return true If the function is exported
+		 * @return false If the function is not exported
+		 */
+		[[nodiscard]]
+		bool IsExported(const int ordinal) const;
 		/**
 		 * @brief Gets the address of the import function
 		 * 
@@ -40,6 +69,10 @@ namespace YimMenu
 
 		IMAGE_NT_HEADERS* GetNtHeader() const;
 
+	private:
+		template<typename R = void*, Symbol T>
+		R GetExportImpl(const T symbol) const;
+
 	private:
 		const std::filesystem::path m_Path;
 		const std::string m_Name;
@@ -62,8 +95,40 @@ namespace YimMenu
 		return Base() + m_Size;
 	}
 
-	template<typename T>
-	inline T Module::GetExport(const std::string_view symbolName) const
+	template<typename R>
+	inline R Module::GetExport(const std::string_view name) const
+	{
+		auto result = GetExportImpl<R, typeof(name)>(name);
+		if (result)
+			return result;
+
+		LOG(FATAL) << "Cannot find export: " << name;
+		return nullptr;
+	}
+
+	template<typename R>
+	inline R Module::GetExport(const int ordinal) const
+	{
+		auto result = GetExportImpl<R, typeof(ordinal)>(ordinal);
+		if (result)
+			return result;
+
+		LOG(FATAL) << "Cannot find export: " << ordinal;
+		return nullptr;
+	}
+
+	inline bool Module::IsExported(const std::string_view symbolName) const
+	{
+		return GetExportImpl<void*, typeof(symbolName)>(symbolName) != nullptr;
+	}
+
+	inline bool Module::IsExported(const int ordinal) const
+	{
+		return GetExportImpl<void*, typeof(ordinal)>(ordinal) != nullptr;
+	}
+
+	template<typename R, Symbol T>
+	inline R Module::GetExportImpl(const T symbol) const
 	{
 		const auto ntHeader = GetNtHeader();
 		if (!ntHeader)
@@ -72,42 +137,32 @@ namespace YimMenu
 		const auto imageDataDirectory = ntHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT];
 		const auto exportDirectory = m_Base.Add(imageDataDirectory.VirtualAddress).As<IMAGE_EXPORT_DIRECTORY*>();
 		const auto namesOffsets = m_Base.Add(exportDirectory->AddressOfNames).As<DWORD*>();
-		const auto funcOffsets = m_Base.Add(exportDirectory->AddressOfFunctions).As<DWORD*>();
-
-		for (std::size_t i = 0; i < exportDirectory->NumberOfFunctions; i++)
-		{
-			const auto functionName = m_Base.Add(namesOffsets[i]).As<const char*>();
-			if (strcmp(functionName, symbolName.data()))
-				continue;
-
-			return m_Base.Add(funcOffsets[i]).As<T>();
-		}
-
-		LOG(FATAL) << "Cannot find export: " << symbolName;
-		return nullptr;
-	}
-
-	template<typename T>
-	inline T Module::GetExport(int ordinal) const
-	{
-		const auto ntHeader = GetNtHeader();
-		if (!ntHeader)
-			return nullptr;
-
-		const auto imageDataDirectory = ntHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT];
-		const auto exportDirectory = m_Base.Add(imageDataDirectory.VirtualAddress).As<IMAGE_EXPORT_DIRECTORY*>();
 		const auto ordinalOffsets = m_Base.Add(exportDirectory->AddressOfNameOrdinals).As<uint16_t*>();
 		const auto funcOffsets = m_Base.Add(exportDirectory->AddressOfFunctions).As<DWORD*>();
 
 		for (std::size_t i = 0; i < exportDirectory->NumberOfFunctions; i++)
 		{
-			if (ordinalOffsets[i] != ordinal)
+			if constexpr (std::is_convertible_v<T, int>)
+			{
+				if (ordinalOffsets[i] != symbol)
 					continue;
 
-			return m_Base.Add(funcOffsets[i]).As<T>();
+				return m_Base.Add(funcOffsets[i]).As<R>();
+			}
+			else if constexpr (std::is_convertible_v<T, std::string_view>)
+			{
+				const auto functionName = m_Base.Add(namesOffsets[i]).As<const char*>();
+				if (strcmp(functionName, symbol.data()))
+					continue;
+
+				return m_Base.Add(funcOffsets[i]).As<R>();
+			}
+			else
+			{
+				static_assert(false, "Unsupported symbol type");
+			}
 		}
 
-		LOG(FATAL) << "Cannot find export: " << ordinal;
 		return nullptr;
 	}
 }

src/core/util/Wine.hpp

@@ -0,0 +1,14 @@
+#include "core/memory/ModuleMgr.hpp"
+#include "Joaat.hpp"
+
+#include <optional>
+
+namespace YimMenu {
+    inline std::optional<bool> InWine()
+    {
+        auto module = ModuleMgr.Get("ntdll.dll"_J);
+        if (!module)
+            return std::nullopt;
+        return module->IsExported("wine_get_version");
+    }
+}

src/main.cpp

@@ -10,6 +10,7 @@
 #include "core/hooking/CallHook.hpp"
 #include "core/memory/ModuleMgr.hpp"
 #include "core/renderer/Renderer.hpp"
+#include "core/util/Wine.hpp"
 #include "core/scripting/LuaManager.hpp"
 #include "game/backend/AnticheatBypass.hpp"
 #include "game/backend/Players.hpp"
@@ -84,6 +85,9 @@ namespace YimMenu
 
 		Notifications::Show("YimMenuV2", "Loaded succesfully", NotificationType::Success);
 
+		if (InWine().value_or(false))
+		    LOG(INFO) << "Running in Wine!";
+
 		while (g_Running)
 		{
 			Settings::Tick();