test MR 103

.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: CLEO 5 Release Build
+
+on:
+  push:
+    branch:
+      - gh
+
+jobs:
+  build:
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1
+
+      - name: Build Projects
+        shell: cmd
+        run: |
+          set PLUGIN_SDK_DIR=%GITHUB_WORKSPACE%\third-party\plugin-sdk
+          msbuild -m CLEO4.sln /property:Configuration=Release /property:Platform=GTASA
+
+      - name: VirusTotal Scan
+        uses: crazy-max/ghaction-virustotal@v4
+        with:
+          vt_api_key: ${{ secrets.VT_KEY }}
+          files: |
+            ./.output/Release/CLEO.asi
+            ./output/Release/CLEO.asi

CLEO4.vcxproj

@@ -90,14 +90,14 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

source/CDebug.h

@@ -24,6 +24,12 @@ class CDebug
     CDebug() : m_hFile(szLogFileName)
     {
         Trace("Log started.");
+
+#ifdef _DEBUG
+        Trace("CLEO v%s DEBUG", CLEO_VERSION_DOT_STR);
+#else
+        Trace("CLEO v%s", CLEO_VERSION_DOT_STR);
+#endif
     }
 
     ~CDebug()

third-party/plugin-sdk/injector/assembly.hpp

@@ -0,0 +1,178 @@
+/*
+ *  Injectors - Useful Assembly Stuff
+ *
+ *  Copyright (C) 2012-2014 LINK/2012 <[email protected]>
+ *
+ *  This software is provided 'as-is', without any express or implied
+ *  warranty. In no event will the authors be held liable for any damages
+ *  arising from the use of this software.
+ * 
+ *  Permission is granted to anyone to use this software for any purpose,
+ *  including commercial applications, and to alter it and redistribute it
+ *  freely, subject to the following restrictions:
+ * 
+ *     1. The origin of this software must not be misrepresented; you must not
+ *     claim that you wrote the original software. If you use this software
+ *     in a product, an acknowledgment in the product documentation would be
+ *     appreciated but is not required.
+ * 
+ *     2. Altered source versions must be plainly marked as such, and must not be
+ *     misrepresented as being the original software.
+ * 
+ *     3. This notice may not be removed or altered from any source
+ *     distribution.
+ *
+ */
+#pragma once
+
+// This header is very restrict about compiler and architecture
+#ifndef _MSC_VER    // MSVC is much more flexible when we're talking about inline assembly
+#error  Cannot use this header in another compiler other than MSVC
+#endif
+#ifndef _M_IX86
+#error  Supported only in x86
+#endif
+
+//
+#include "injector.hpp"
+
+namespace injector
+{
+    struct reg_pack
+    {
+        // The ordering is very important, don't change
+        // The first field is the last to be pushed and first to be poped
+
+        // PUSHFD / POPFD
+        uint32_t ef;
+
+        // PUSHAD/POPAD -- must be the lastest fields (because of esp)
+        union
+        {
+            uint32_t arr[8];
+            struct { uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax; };
+        };
+
+        enum reg_name {
+            reg_edi, reg_esi, reg_ebp, reg_esp, reg_ebx, reg_edx, reg_ecx, reg_eax 
+        };
+
+        enum ef_flag {
+            carry_flag = 0, parity_flag = 2, adjust_flag = 4, zero_flag = 6, sign_flag = 7,
+            direction_flag = 10, overflow_flag = 11
+        };
+
+        uint32_t& operator[](size_t i)
+        { return this->arr[i]; }
+        const uint32_t& operator[](size_t i) const
+        { return this->arr[i]; }
+
+        template<uint32_t bit>   // bit starts from 0, use ef_flag enum
+        bool flag()
+        {
+            return (this->ef & (1 << bit)) != 0;
+        }
+
+        bool jnb()
+        {
+            return flag<carry_flag>() == false;
+        }
+    };
+
+    // Lowest level stuff (actual assembly) goes on the following namespace
+    // PRIVATE! Skip this, not interesting for you.
+    namespace injector_asm
+    {
+        // Wrapper functor, so the assembly can use some templating
+        template<class T>
+        struct wrapper
+        {
+            static void call(reg_pack* regs)
+            {
+                T fun; fun(*regs);
+            }
+        };
+
+        // Constructs a reg_pack and calls the wrapper functor
+        template<class W>   // where W is of type wrapper
+        inline void __declspec(naked) make_reg_pack_and_call()
+        {
+            _asm
+            {
+                // Construct the reg_pack structure on the stack
+                pushad              // Pushes general purposes registers to reg_pack
+                add [esp+12], 4     // Add 4 to reg_pack::esp 'cuz of our return pointer, let it be as before this func is called
+                pushfd              // Pushes EFLAGS to reg_pack
+
+                // Call wrapper sending reg_pack as parameter
+                push esp
+                call W::call
+                add esp, 4
+
+                // Destructs the reg_pack from the stack
+                sub [esp+12+4], 4   // Fix reg_pack::esp before popping it (doesn't make a difference though) (+4 because eflags)
+                popfd               // Warning: Do not use any instruction that changes EFLAGS after this (-> sub affects EF!! <-)
+                popad
+
+                // Back to normal flow
+                ret
+            }
+        }
+    };
+
+
+    /*
+     *  MakeInline
+     *      Makes inline assembly (but not assembly, an actual functor of type FuncT) at address
+     */
+    template<class FuncT>
+    void MakeInline(memory_pointer_tr at)
+    {
+        typedef injector_asm::wrapper<FuncT> functor;
+        if(false) functor::call(nullptr);   // To instantiate the template, if not done _asm will fail
+        MakeCALL(at, injector_asm::make_reg_pack_and_call<functor>);
+    }
+
+    /*
+     *  MakeInline
+     *      Same as above, but it NOPs everything between at and end (exclusive), then performs MakeInline
+     */
+    template<class FuncT>
+    void MakeInline(memory_pointer_tr at, memory_pointer_tr end)
+    {
+        MakeRangedNOP(at, end);
+        MakeInline<FuncT>(at);
+    }
+
+    /*
+     *  MakeInline
+     *      Same as above, but (at,end) are template parameters.
+     *      On this case the functor can be passed as argument since there will be one func instance for each at,end not just for each FuncT
+     */
+    template<uintptr_t at, uintptr_t end, class FuncT>
+    void MakeInline(FuncT func)
+    {
+        static std::unique_ptr<FuncT> static_func;
+        static_func.reset(new FuncT(std::move(func)));
+
+        // Encapsulates the call to static_func
+        struct Caps
+        {
+            void operator()(reg_pack& regs)
+            { (*static_func)(regs); }
+        };
+
+        // Does the actual MakeInline
+        return MakeInline<Caps>(lazy_pointer<at>::get(), lazy_pointer<end>::get());
+    }
+
+    /*
+     *  MakeInline
+     *      Same as above, but (end) is calculated by the length of a call instruction
+     */
+    template<uintptr_t at, class FuncT>
+    void MakeInline(FuncT func)
+    {
+        return MakeInline<at, at+5, FuncT>(func);
+    }
+};

third-party/plugin-sdk/injector/calling.hpp

@@ -0,0 +1,127 @@
+/*
+ *  Injectors - Function Calls Using Variadic Templates
+ *
+ *  Copyright (C) 2014 LINK/2012 <[email protected]>
+ *
+ *  This software is provided 'as-is', without any express or implied
+ *  warranty. In no event will the authors be held liable for any damages
+ *  arising from the use of this software.
+ * 
+ *  Permission is granted to anyone to use this software for any purpose,
+ *  including commercial applications, and to alter it and redistribute it
+ *  freely, subject to the following restrictions:
+ * 
+ *     1. The origin of this software must not be misrepresented; you must not
+ *     claim that you wrote the original software. If you use this software
+ *     in a product, an acknowledgment in the product documentation would be
+ *     appreciated but is not required.
+ * 
+ *     2. Altered source versions must be plainly marked as such, and must not be
+ *     misrepresented as being the original software.
+ * 
+ *     3. This notice may not be removed or altered from any source
+ *     distribution.
+ *
+ */
+#pragma once
+#include "injector.hpp"
+#include <utility>
+#include <tuple>
+
+#if __cplusplus >= 201103L || _MSC_VER >= 1800   // MSVC 2013
+#else
+#error "This feature is not supported on this compiler"
+#endif
+
+namespace injector
+{
+    template<class Prototype>
+    struct cstd;
+
+    template<class Ret, class ...Args>
+    struct cstd<Ret(Args...)>
+    {
+        // Call function at @p returning @Ret with args @Args
+        static Ret call(memory_pointer_tr p, Args... a)
+        {
+            auto fn = (Ret(*)(Args...)) p.get<void>();
+            return fn(std::forward<Args>(a)...);
+        }
+
+        template<uintptr_t addr>    // Uses lazy pointer
+        static Ret call(Args... a)
+        {
+            return call(lazy_pointer<addr>::get(), std::forward<Args>(a)...);
+        }
+    };
+
+    template<class Prototype>
+    struct stdcall;
+
+    template<class Ret, class ...Args>
+    struct stdcall<Ret(Args...)>
+    {
+        // Call function at @p returning @Ret with args @Args
+        static Ret call(memory_pointer_tr p, Args... a)
+        {
+            auto fn = (Ret(__stdcall *)(Args...)) p.get<void>();
+            return fn(std::forward<Args>(a)...);
+        }
+
+        template<uintptr_t addr>    // Uses lazy pointer
+        static Ret call(Args... a)
+        {
+            return call(lazy_pointer<addr>::get(), std::forward<Args>(a)...);
+        }
+    };
+
+    template<class Prototype>
+    struct fastcall;
+
+    template<class Ret, class ...Args>
+    struct fastcall<Ret(Args...)>
+    {
+        // Call function at @p returning @Ret with args @Args
+        static Ret call(memory_pointer_tr p, Args... a)
+        {
+            auto fn = (Ret(__fastcall *)(Args...)) p.get<void>();;
+            return fn(std::forward<Args>(a)...);
+        }
+
+        template<uintptr_t addr>    // Uses lazy pointer
+        static Ret call(Args... a)
+        {
+            return call(lazy_pointer<addr>::get(), std::forward<Args>(a)...);
+        }
+    };
+
+    template<class Prototype>
+    struct thiscall;
+
+    template<class Ret, class ...Args>
+    struct thiscall<Ret(Args...)>
+    {
+        // Call function at @p returning @Ret with args @Args
+        static Ret call(memory_pointer_tr p, Args... a)
+        {
+            auto fn = (Ret(__thiscall *)(Args...)) p.get<void>();
+            return fn(std::forward<Args>(a)...);
+        }
+
+        // Call function at the index @i from the vtable of the object @a[0]
+        template<size_t i>
+        static Ret vtbl(Args... a)
+        {
+            auto obj = raw_ptr(std::get<0>(std::forward_as_tuple(a...)));
+            auto p   = raw_ptr( (*obj.template get<void**>()) [i] );
+            return call(p, std::forward<Args>(a)...);
+        }
+
+        template<uintptr_t addr>    // Uses lazy pointer
+        static Ret call(Args... a)
+        {
+            return call(lazy_pointer<addr>::get(), std::forward<Args>(a)...);
+        }
+    };
+} 
+