feat: misc updates

Author: qudix

include/SFSE/API.h

@@ -18,7 +18,6 @@ namespace SFSE
 		const char* logPattern{ nullptr };
 		bool        trampoline{ false };
 		std::size_t trampolineSize{ 0 };
-		bool        trampolineSFSE{ true };
 		bool        hook{ true };
 	};
 
@@ -42,7 +41,8 @@ namespace SFSE
 
 namespace SFSE
 {
+	// DEPRECATED
 	void Init(const LoadInterface* a_intfc, bool a_log) noexcept;
-
+	// DEPRECATED
 	void AllocTrampoline(std::size_t a_size, bool a_trySFSEReserve = true) noexcept;
 }

include/SFSE/Interfaces.h

@@ -344,6 +344,10 @@ namespace SFSE
 	static_assert(sizeof(PluginVersionData) == 0x25C);
 }
 
-#define SFSEPluginPreload(...) extern "C" [[maybe_unused]] __declspec(dllexport) bool SFSEPlugin_Preload(__VA_ARGS__)
-#define SFSEPluginLoad(...) extern "C" [[maybe_unused]] __declspec(dllexport) bool SFSEPlugin_Load(__VA_ARGS__)
-#define SFSEPluginVersion extern "C" [[maybe_unused]] __declspec(dllexport) constinit SFSE::PluginVersionData SFSEPlugin_Version
+#define SFSE_EXPORT extern "C" [[maybe_unused]] __declspec(dllexport)
+#define SFSE_PLUGIN_PRELOAD(...) SFSE_EXPORT bool SFSEPlugin_Preload(__VA_ARGS__)
+#define SFSE_PLUGIN_LOAD(...) SFSE_EXPORT bool SFSEPlugin_Load(__VA_ARGS__)
+#define SFSE_PLUGIN_VERSION SFSE_EXPORT constinit SFSE::PluginVersionData SFSEPlugin_Version
+#define SFSEPluginPreload OBSE_PLUGIN_PRELOAD
+#define SFSEPluginLoad OBSE_PLUGIN_LOAD
+#define SFSEPluginVersion OBSE_PLUGIN_VERSION

src/SFSE/API.cpp

@@ -108,8 +108,7 @@ namespace SFSE
 					}
 
 					auto& trampoline = REL::GetTrampoline();
-					if (const auto intfc = GetTrampolineInterface();
-						intfc && info.trampolineSFSE) {
+					if (const auto intfc = GetTrampolineInterface()) {
 						if (const auto mem = intfc->AllocateFromBranchPool(info.trampolineSize))
 							trampoline.set_trampoline(mem, info.trampolineSize);
 						else
@@ -250,12 +249,11 @@ namespace SFSE
 		Init(a_intfc, { .log = a_log });
 	}
 
-	void AllocTrampoline(std::size_t a_size, bool a_trySFSEReserve) noexcept
+	void AllocTrampoline(std::size_t a_size, bool) noexcept
 	{
 		auto api = Impl::API::GetSingleton();
 		api->info.trampoline = true;
 		api->info.trampolineSize = a_size;
-		api->info.trampolineSFSE = a_trySFSEReserve;
 		api->InitTrampoline();
 	}
 }

xmake-rules.lua

@@ -15,12 +15,7 @@
 
 local PLUGIN_FILE = [[
 #include <SFSE/SFSE.h>
-#include <REL/Relocation.h>
-
-using namespace std::literals;
-
-extern "C" __declspec(dllexport)
-constinit auto SFSEPlugin_Version = []() noexcept {
+SFSE_EXPORT constinit auto SFSEPlugin_Version = []() noexcept {
     SFSE::PluginVersionData v{};
     v.PluginVersion({ ${PLUGIN_VERSION_MAJOR}, ${PLUGIN_VERSION_MINOR}, ${PLUGIN_VERSION_PATCH} });
     v.PluginName("${PLUGIN_NAME}");