Merge pull request #92 from fedddddd/dependabot/submodules/deps/GSL-b39e7e4

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

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -0,0 +1,45 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches:
+      - "*"
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build binaries
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        configuration:
+          - Debug
+          - Release
+    steps:
+      - name: Check out files
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+          lfs: false
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.1.3
+
+      - name: Generate project files
+        run: tools/premake5 vs2022
+
+      - name: Set up problem matching
+        uses: ammaraskar/msvc-problem-matcher@master
+
+      - name: Build ${{matrix.configuration}} binaries
+        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
+        with:
+          name: ${{matrix.configuration}} binaries
+          path: |
+            build/bin/${{matrix.configuration}}/iw5-gsc-utils.dll

.gitmodules

@@ -8,3 +8,9 @@
 	path = deps/json
 	url = https://github.com/nlohmann/json.git
 	branch = develop
+[submodule "deps/gsc-tool"]
+	path = deps/gsc-tool
+	url = https://github.com/xensik/gsc-tool.git
+[submodule "deps/zlib"]
+	path = deps/zlib
+	url = https://github.com/madler/zlib.git

deps/GSL

@@ -1 +1 @@
-Subproject commit c31a9ad5e8e99da8567237a7ba51a7d8f419e5bf
+Subproject commit b39e7e4b0987859f5b19ff7686b149c916588658

deps/gsc-tool

@@ -0,0 +1 @@
+Subproject commit 0e6238a6ab8643df6404f7c0280242df2812f6c8

deps/json

@@ -1 +1 @@
-Subproject commit e4643d1f1b03fc7a1d7b65f17e012ca93680cad8
+Subproject commit 0457de21cffb298c22b629e538036bfeb96130b7

deps/minhook

@@ -1 +1 @@
-Subproject commit 423d1e45af2ed2719a5c31e990e935ef301ed9c3
+Subproject commit f5485b8454544c2f034c78f8f127c1d03dea3636

deps/premake/gsc-tool.lua

@@ -0,0 +1,62 @@
+gsc_tool = {
+	source = path.join(dependencies.basePath, "gsc-tool"),
+}
+
+function gsc_tool.import()
+	links { "xsk-gsc-iw5-pc", "xsk-gsc-utils" }
+	gsc_tool.includes()
+end
+
+function gsc_tool.includes()
+	includedirs {
+		path.join(gsc_tool.source, "include"),
+	}
+end
+
+function gsc_tool.project()
+	project "xsk-gsc-utils"
+		kind "StaticLib"
+		language "C++"
+
+		files {
+			path.join(gsc_tool.source, "include/xsk/utils/*.hpp"),
+			path.join(gsc_tool.source, "src/utils/*.cpp"),
+		}
+
+		includedirs {
+			path.join(gsc_tool.source, "include"),
+		}
+
+		zlib.includes()
+
+	project "xsk-gsc-iw5-pc"
+		kind "StaticLib"
+		language "C++"
+
+		filter "action:vs*"
+			buildoptions "/Zc:__cplusplus"
+		filter {}
+
+		files {
+			path.join(gsc_tool.source, "include/xsk/stdinc.hpp"),
+
+			path.join(gsc_tool.source, "include/xsk/gsc/engine/iw5_pc.hpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_code.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_func.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_meth.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_token.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/*.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/common/*.cpp"),
+			path.join(gsc_tool.source, "include/xsk/gsc/common/*.hpp"),
+		}
+
+		includedirs {
+			path.join(gsc_tool.source, "include"),
+		}
+end
+
+table.insert(dependencies, gsc_tool)

deps/premake/zlib.lua

@@ -0,0 +1,39 @@
+zlib = {
+	source = path.join(dependencies.basePath, "zlib"),
+}
+
+function zlib.import()
+	links { "zlib" }
+	zlib.includes()
+end
+
+function zlib.includes()
+	includedirs {
+		zlib.source
+	}
+
+	defines {
+		"ZLIB_CONST",
+	}
+end
+
+function zlib.project()
+	project "zlib"
+		language "C"
+
+		zlib.includes()
+
+		files {
+			path.join(zlib.source, "*.h"),
+			path.join(zlib.source, "*.c"),
+		}
+
+		defines {
+			"_CRT_SECURE_NO_DEPRECATE",
+		}
+
+		warnings "Off"
+		kind "StaticLib"
+end
+
+table.insert(dependencies, zlib)

deps/zlib

@@ -0,0 +1 @@
+Subproject commit 5c42a230b7b468dff011f444161c0145b5efae59

generate.bat

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

src/component/gsc.cpp

@@ -21,7 +21,7 @@ namespace gsc
 	{
 		std::string method_name(unsigned int id)
 		{
-			const auto& map = *game::plutonium::method_map_rev;
+			const auto& map = (*game::plutonium::gsc_ctx)->meth_map();
 
 			for (const auto& function : map)
 			{
@@ -36,7 +36,7 @@ namespace gsc
 
 		std::string function_name(unsigned int id)
 		{
-			const auto& map = *game::plutonium::function_map_rev;
+			const auto& map = (*game::plutonium::gsc_ctx)->func_map();
 
 			for (const auto& function : map)
 			{
@@ -248,11 +248,21 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_function& func)
 		{
-			const auto index = function_map_start++;
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
+			
+			if (ctx->func_exists(name))
+			{
+				printf("[iw5-gsc-utils] Warning: function '%s' already defined\n", name.data());
+				index = ctx->func_id(name);
+			}
+			else
+			{
+				index = function_map_start++;
+				ctx->func_add(name, index);
+			}
 
-			functions[index] = func;
+			functions.insert(std::make_pair(index, func));
-			const auto name_view = utils::memory::get_allocator()->duplicate_string(name);
-			(*game::plutonium::function_map_rev)[name_view] = index;
 		}
 	}
 
@@ -260,11 +270,21 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_method& func)
 		{
-			const auto index = method_map_start++;
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
 
-			methods[index] = func;
+			if (ctx->meth_exists(name))
-			const auto name_view = utils::memory::get_allocator()->duplicate_string(name);
+			{
-			(*game::plutonium::method_map_rev)[name_view] = index;
+				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));
 		}
 	}
 
@@ -274,25 +294,13 @@ namespace gsc
 			const std::function<scripting::script_value(unsigned int entnum)>& getter,
 			const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter)
 		{
-			uint16_t token_id{};
-			auto& token_map = *game::plutonium::token_map_rev;
-			if (token_map.find(name) != token_map.end())
-			{
-				token_id = token_map.at(name);
-			}
-			else
-			{
-				token_id = token_map_start++;
-				token_map.insert(std::make_pair(name, token_id));
-			}
-
 			const auto offset = field_offset_start++;
 			custom_fields[classnum][offset] = {name, getter, setter};
 
-			post_load_callbacks.push_back([classnum, name, token_id, offset]()
+			post_load_callbacks.push_back([=]()
 			{
 				const auto name_str = game::SL_GetString(name.data(), 0);
-				game::Scr_AddClassField(classnum, name_str, token_id, offset);
+				game::Scr_AddClassField(classnum, name_str, game::SL_GetCanonicalString(name.data()), offset);
 			});
 		}
 	}

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/scripting.cpp

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

src/component/signatures.cpp

@@ -35,11 +35,18 @@ namespace signatures
 		const auto base = reinterpret_cast<size_t>(GetModuleHandle("plutonium-bootstrapper-win32.exe"));
 		utils::hook::signature signature(base, get_image_size() - base);
 
+		auto found = false;
 		signature.add({
 			string,
 			mask,
 			[&](char* address)
 			{
+				if (found)
+				{
+					return;
+				}
+
+				found = true;
 				string_ptr = address;
 			}
 		});
@@ -61,18 +68,17 @@ namespace signatures
 		return find_string_ptr({bytes, 4});
 	}
 
-	bool process_maps()
+	bool process_gsc_ctx()
 	{
-		const auto string_ref = find_string_ref("couldn't resolve builtin function id for name '%s'!");
+		const auto string_ref = find_string_ref("in call to builtin %s \"%s\"");
 		if (!string_ref)
 		{
 			return false;
 		}
-
+		
-		const auto map_ptr = *reinterpret_cast<size_t*>(string_ref - 0x2B);
+		const auto gsc_ctx_ptr = *reinterpret_cast<size_t*>(string_ref - 0xAD);
-		game::plutonium::function_map_rev.set(map_ptr);
+		OutputDebugString(utils::string::va("gsc_ctx_ptr: %p\n", gsc_ctx_ptr));
-		game::plutonium::method_map_rev.set(map_ptr + 0x20);
+		game::plutonium::gsc_ctx.set(gsc_ctx_ptr);
-		game::plutonium::token_map_rev.set(map_ptr + 0xBC);
 		return true;
 	}
 
@@ -85,7 +91,9 @@ namespace signatures
 		}
 
 		const auto offset = *reinterpret_cast<size_t*>(string_ref + 5);
-		game::plutonium::printf.set(string_ref + 4 + 5 + offset);
+		const auto printf_ptr = string_ref + 4 + 5 + offset;
+		OutputDebugString(utils::string::va("printf_ptr: %p\n", printf_ptr));
+		game::plutonium::printf.set(printf_ptr);
 
 		return true;
 	}
@@ -93,6 +101,6 @@ namespace signatures
 	bool process()
 	{
 		load_function_tables();
-		return process_printf() && process_maps();
+		return process_printf() && process_gsc_ctx();
 	}
 }

src/component/userinfo.cpp

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

src/game/scripting/functions.cpp

@@ -7,51 +7,20 @@ namespace scripting
 {
 	namespace
 	{
-		std::unordered_map<std::string, uint16_t> lowercase_map(
+		int find_function_index(const std::string& name, [[maybe_unused]] const bool prefer_global)
-			const std::unordered_map<std::string_view, uint16_t>& old_map)
-		{
-			std::unordered_map<std::string, uint16_t> new_map{};
-			for (auto& entry : old_map)
-			{
-				new_map[utils::string::to_lower(entry.first.data())] = entry.second;
-			}
-
-			return new_map;
-		}
-
-		const std::unordered_map<std::string, uint16_t>& get_methods()
-		{
-			static auto methods = lowercase_map(*game::plutonium::method_map_rev);
-			return methods;
-		}
-
-		const std::unordered_map<std::string, uint16_t>& get_functions()
-		{
-			static auto function = lowercase_map(*game::plutonium::function_map_rev);
-			return function;
-		}
-
-		int find_function_index(const std::string& name, const bool prefer_global)
 		{
 			const auto target = utils::string::to_lower(name);
+			auto const& first = (*game::plutonium::gsc_ctx)->func_map();
+			auto const& second = (*game::plutonium::gsc_ctx)->meth_map();
 
-			const auto& primary_map = prefer_global
+			if (const auto itr = first.find(name); itr != first.end())
-				                          ? get_functions()
-				                          : get_methods();
-			const auto& secondary_map = !prefer_global
-				                            ? get_functions()
-				                            : get_methods();
-
-			auto function_entry = primary_map.find(target);
-			if (function_entry != primary_map.end())
 			{
-				return function_entry->second;
+				return static_cast<int>(itr->second);
 			}
 
-			function_entry = secondary_map.find(target);
+			if (const auto itr = second.find(name); itr != second.end())
-			if (function_entry != secondary_map.end())
 			{
-				return function_entry->second;
+				return static_cast<int>(itr->second);
 			}
 
 			return -1;
@@ -73,16 +42,7 @@ namespace scripting
 
 	std::string find_token(unsigned int id)
 	{
-		const auto& token_map = *game::plutonium::token_map_rev;
+		return (*game::plutonium::gsc_ctx)->token_name(id);
-		for (const auto& token : token_map)
-		{
-			if (token.second == id)
-			{
-				return token.first;
-			}
-		}
-
-		return {};
 	}
 
 	std::string find_file(unsigned int id)
@@ -92,21 +52,16 @@ namespace scripting
 
 	int find_token_id(const std::string& name)
 	{
-		const auto& token_map = *game::plutonium::token_map_rev;
+		return (*game::plutonium::gsc_ctx)->token_id(name);
-		const auto result = token_map.find(name);
-
-		if (result != token_map.end())
-		{
-			return result->second;
-		}
-
-		return -1;
 	}
 
 	script_function find_function(const std::string& name, const bool prefer_global)
 	{
 		const auto index = find_function_index(name, prefer_global);
-		if (index < 0) return nullptr;
+		if (index < 0)
+		{
+			return nullptr;
+		}
 
 		return get_function_by_index(index);
 	}

src/game/symbols.hpp

@@ -86,9 +86,7 @@ namespace game
 
 	namespace plutonium
 	{
-		WEAK symbol<std::unordered_map<std::string_view, std::uint16_t>> function_map_rev{0};
+		WEAK symbol<std::unique_ptr<xsk::gsc::iw5_pc::context>> gsc_ctx{0};
-		WEAK symbol<std::unordered_map<std::string_view, std::uint16_t>> method_map_rev{0};
-		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> token_map_rev{0};
 		WEAK symbol<int(const char* fmt, ...)> printf{0};
 		WEAK symbol<void*> function_table{0};
 		WEAK symbol<void*> method_table{0};

src/stdinc.hpp

@@ -8,6 +8,8 @@
 #pragma warning(disable: 4996)
 #pragma warning(disable: 26812)
 
+#include <xsk/gsc/engine/iw5_pc.hpp>
+
 #define DLL_EXPORT extern "C" __declspec(dllexport)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -37,6 +39,7 @@ using namespace std::literals;
 #include <gsl/gsl>
 #include <MinHook.h>
 
+
 #include "utils/memory.hpp"
 #include "utils/string.hpp"
 #include "utils/hook.hpp"
@@ -46,4 +49,4 @@ using namespace std::literals;
 #include "utils/http.hpp"
 
 #include "game/structs.hpp"
-#include "game/game.hpp"
+#include "game/game.hpp"