Update build.yml

Bump deps/GSL from `f1a494c` to `b39e7e4`

.github/workflows/build.yml

@@ -19,14 +19,14 @@ jobs:
           - Release
     steps:
       - name: Check out files
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
           lfs: false
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1.3
+        uses: microsoft/setup-msbuild@v2
 
       - name: Generate project files
         run: tools/premake5 vs2022
@@ -38,7 +38,7 @@ jobs:
         run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:PlatformTarget=x86 build/iw5-gsc-utils.sln
 
       - name: Upload ${{matrix.configuration}} binaries
-        uses: actions/upload-artifact@v3.1.0
+        uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.configuration}} binaries
           path: |

.gitmodules

@@ -14,3 +14,6 @@
 [submodule "deps/zlib"]
 	path = deps/zlib
 	url = https://github.com/madler/zlib.git
+[submodule "deps/plutonium-sdk"]
+	path = deps/plutonium-sdk
+	url = https://github.com/plutoniummod/plutonium-sdk.git

deps/premake/plutonium-sdk.lua

@@ -0,0 +1,18 @@
+plutonium_sdk = {
+    source = path.join(dependencies.basePath, "plutonium-sdk"),
+}
+
+function plutonium_sdk.import()
+    plutonium_sdk.includes()
+end
+
+function plutonium_sdk.includes()
+    includedirs {
+        plutonium_sdk.source,
+    }
+end
+
+function plutonium_sdk.project()
+end
+
+table.insert(dependencies, plutonium_sdk)

generate.bat

@@ -1,4 +1,3 @@
 @echo off
 call git submodule update --init --recursive
-tools\windows\premake5.exe vs2022
-pause
+tools\premake5.exe vs2022

src/component/gsc.cpp

@@ -248,16 +248,21 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_function& func)
 		{
-			try
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
+			
+			if (ctx->func_exists(name))
 			{
-				const auto index = function_map_start++;
-				functions[index] = func;
-				(*game::plutonium::gsc_ctx)->func_add(name, index);
+				printf("[iw5-gsc-utils] Warning: function '%s' already defined\n", name.data());
+				index = ctx->func_id(name);
 			}
-			catch (const std::exception& e)
+			else
 			{
-				printf("[iw5-gsc-utils] failed to add function \"%s\": %s\n", name.data(), e.what());
+				index = function_map_start++;
+				ctx->func_add(name, index);
 			}
+
+			functions.insert(std::make_pair(index, func));
 		}
 	}
 
@@ -265,16 +270,26 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_method& func)
 		{
-			try
+			if (true)
 			{
-				const auto index = method_map_start++;
-				methods[index] = func;
-				(*game::plutonium::gsc_ctx)->meth_add(name, index);
+				return;
 			}
-			catch (const std::exception& e)
+
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
+
+			if (ctx->meth_exists(name))
 			{
-				printf("[iw5-gsc-utils] failed to add method \"%s\": %s\n", name.data(), e.what());
+				printf("[iw5-gsc-utils] Warning: method '%s' already defined\n", name.data());
+				index = ctx->meth_id(name);
 			}
+			else
+			{
+				index = method_map_start++;
+				ctx->meth_add(name, index);
+			}
+
+			methods.insert(std::make_pair(index, func));
 		}
 	}
 

src/component/io.cpp

@@ -179,4 +179,4 @@ namespace io
 	};
 }
 
-REGISTER_COMPONENT(io::component)
+//REGISTER_COMPONENT(io::component)

src/component/json.cpp

@@ -194,4 +194,4 @@ namespace json
 	};
 }
 
-REGISTER_COMPONENT(json::component)
+//REGISTER_COMPONENT(json::component)

src/component/notifies.cpp

@@ -71,4 +71,4 @@ namespace notifies
 	};
 }
 
-REGISTER_COMPONENT(notifies::component)
+//REGISTER_COMPONENT(notifies::component)

src/component/scheduler.cpp

@@ -144,4 +144,4 @@ namespace scheduler
 	};
 }
 
-REGISTER_COMPONENT(scheduler::component)
+//REGISTER_COMPONENT(scheduler::component)

src/component/scripting.cpp

@@ -136,4 +136,4 @@ namespace scripting
 	};
 }
 
-REGISTER_COMPONENT(scripting::component)
+//REGISTER_COMPONENT(scripting::component)

src/component/signatures.cpp

@@ -34,12 +34,19 @@ namespace signatures
 		std::string mask(string.size(), 'x');
 		const auto base = reinterpret_cast<size_t>(GetModuleHandle("plutonium-bootstrapper-win32.exe"));
 		utils::hook::signature signature(base, get_image_size() - base);
-
+		OutputDebugString(utils::string::va("%p %p\n", base, get_image_size()));
+		auto found = false;
 		signature.add({
 			string,
 			mask,
 			[&](char* address)
 			{
+				if (found)
+				{
+					return;
+				}
+
+				found = true;
 				string_ptr = address;
 			}
 		});
@@ -63,34 +70,23 @@ namespace signatures
 
 	bool process_gsc_ctx()
 	{
-		const auto string_ref = find_string_ref("in call to builtin %s");
+		OutputDebugString("HELLOOO");
+
+		const auto string_ref = find_string_ref("in call to builtin %s \"%s\"");
 		if (!string_ref)
 		{
 			return false;
 		}
-		
-		const auto gsc_ctx_ptr = *reinterpret_cast<size_t*>(string_ref - 0x8C);
+
+		const auto gsc_ctx_ptr = *reinterpret_cast<size_t*>(string_ref + 215);
+		OutputDebugString(utils::string::va("gsc_ctx_ptr: %p\n", gsc_ctx_ptr));
 		game::plutonium::gsc_ctx.set(gsc_ctx_ptr);
 		return true;
 	}
 
-	bool process_printf()
-	{
-		const auto string_ref = find_string_ref("A critical exception occured!\n");
-		if (!string_ref)
-		{
-			return false;
-		}
-
-		const auto offset = *reinterpret_cast<size_t*>(string_ref + 5);
-		game::plutonium::printf.set(string_ref + 4 + 5 + offset);
-
-		return true;
-	}
-
 	bool process()
 	{
 		load_function_tables();
-		return process_printf() && process_gsc_ctx();
+		return process_gsc_ctx();
 	}
 }

src/component/string.cpp

@@ -43,4 +43,4 @@ namespace string
 	};
 }
 
-REGISTER_COMPONENT(string::component)
+//REGISTER_COMPONENT(string::component)

src/component/userinfo.cpp

@@ -193,4 +193,4 @@ namespace userinfo
 	};
 }
 
-REGISTER_COMPONENT(userinfo::component)
+//REGISTER_COMPONENT(userinfo::component)

src/dllmain.cpp

@@ -1,28 +1,23 @@
 #include <stdinc.hpp>
 #include "loader/component_loader.hpp"
 
-#include "component/signatures.hpp"
+#include "plugin.hpp"
+
+PLUTONIUM_API plutonium::sdk::plugin* PLUTONIUM_CALLBACK on_initialize()
+{
+    return plugin::get();
+}
 
 BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
 {
     if (ul_reason_for_call == DLL_PROCESS_ATTACH)
     {
-        if (!signatures::process())
-        {
-            MessageBoxA(NULL,
-                "This version of iw5-gsc-utils is outdated.\n" \
-                "Download the latest dll from here: https://github.com/fedddddd/iw5-gsc-utils/releases",
-                "ERROR", MB_ICONERROR);
 
-            return FALSE;
-        }
+    }
 
-        if (game::plutonium::printf.get() != nullptr)
-        {
-            utils::hook::jump(reinterpret_cast<uintptr_t>(&printf), game::plutonium::printf);
-        }
-
-        component_loader::post_unpack();
+    if (ul_reason_for_call == DLL_PROCESS_DETACH)
+    {
+        component_loader::pre_destroy();
     }
 
     return TRUE;

src/game/scripting/array.cpp

@@ -212,8 +212,6 @@ namespace scripting
 		{
 			return this->get(key.as<std::string>());
 		}
-
-		return {};
 	}
 
 	script_value array::get(const std::string& key) const

src/game/symbols.hpp

@@ -87,7 +87,6 @@ namespace game
 	namespace plutonium
 	{
 		WEAK symbol<std::unique_ptr<xsk::gsc::iw5_pc::context>> gsc_ctx{0};
-		WEAK symbol<int(const char* fmt, ...)> printf{0};
 		WEAK symbol<void*> function_table{0};
 		WEAK symbol<void*> method_table{0};
 	}

src/plugin.cpp

@@ -0,0 +1,84 @@
+#include <stdinc.hpp>
+#include "loader/component_loader.hpp"
+
+#include "plugin.hpp"
+
+#include "component/signatures.hpp"
+
+#include <utils/hook.hpp>
+#include <utils/string.hpp>
+
+namespace plugin
+{
+	namespace
+	{
+		void printf_stub(const char* fmt, ...)
+		{
+			char buffer[0x2000] = {};
+
+			va_list ap;
+			va_start(ap, fmt);
+
+			vsnprintf_s(buffer, sizeof(buffer), _TRUNCATE, fmt, ap);
+
+			va_end(ap);
+
+			get()->get_interface()->logging()->info(buffer);
+		}
+	}
+
+	std::uint32_t plugin::plugin_version()
+	{
+		return 1;
+	}
+
+	const char* plugin::plugin_name()
+	{
+		return "iw5-gsc-utils";
+	}
+
+	bool  plugin::is_game_supported([[maybe_unused]] plutonium::sdk::game game)
+	{
+		return game == plutonium::sdk::game::iw5;
+	}
+
+	void plugin::on_startup(plutonium::sdk::iinterface* interface_ptr, plutonium::sdk::game game)
+	{
+		this->interface_ = interface_ptr;
+		this->game_ = game;
+		utils::hook::jump(reinterpret_cast<uintptr_t>(&printf), printf_stub);
+
+		if (!signatures::process())
+		{
+			MessageBoxA(NULL,
+				"This version of iw5-gsc-utils is outdated.\n" \
+				"Download the latest dll from here: https://github.com/alicealys/iw5-gsc-utils/releases",
+				"ERROR", MB_ICONERROR);
+		}
+		else
+		{
+			component_loader::post_unpack();
+		}
+	}
+
+	void plugin::on_shutdown()
+	{
+		component_loader::pre_destroy();
+	}
+
+	plutonium::sdk::iinterface* plugin::get_interface()
+	{
+		return this->interface_;
+	}
+
+	plutonium::sdk::game plugin::get_game()
+	{
+		return this->game_;
+	}
+
+	plugin* get()
+	{
+		static plugin instance;
+		return &instance;
+	}
+}

src/plugin.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <plutonium_sdk.hpp>
+
+namespace plugin
+{
+	class plugin : public plutonium::sdk::plugin
+	{
+	public:
+		~plugin() = default;
+
+		std::uint32_t plugin_version() override;
+		const char* plugin_name() override;
+
+		bool is_game_supported([[maybe_unused]] plutonium::sdk::game game) override;
+
+		void on_startup(plutonium::sdk::iinterface* interface_ptr, plutonium::sdk::game game) override;
+		void on_shutdown() override;
+
+		plutonium::sdk::iinterface* get_interface();
+		plutonium::sdk::game get_game();
+
+	private:
+		plutonium::sdk::iinterface* interface_{};
+		plutonium::sdk::game game_{};
+
+	};
+
+	plugin* get();
+}