trainerbase 3.3.0__tar.gz → 3.4.0__tar.gz

{trainerbase-3.3.0 → trainerbase-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainerbase
-Version: 3.3.0
+Version: 3.4.0
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 License: MIT

{trainerbase-3.3.0 → trainerbase-3.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trainerbase"
-version = "3.3.0"
+version = "3.4.0"
 description = "Framework for creating game trainers/mods"
 authors = ["v01d <v01d@v01d.ru>", "doomayka <zd@doomayka.ru>"]
 license = "MIT"

{trainerbase-3.3.0 → trainerbase-3.4.0}/trainerbase/codeinjection.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from subprocess import DEVNULL
 from subprocess import run as run_executable
 from tempfile import TemporaryDirectory
-from typing import Self, override
+from typing import Never, Self, override
 
 from pymem.exception import MemoryWriteError
 
@@ -65,28 +65,40 @@ class AllocatingCodeInjection(AbstractCodeInjection):  # pylint: disable=too-man
         code_to_inject: Code,
         original_code_length: int = 0,
         new_memory_size: int = 1024,
-        is_long_x64_jump_needed: bool = False,
+        is_long_x64_jump_needed: Never = Never,
     ):
+        if is_long_x64_jump_needed is not Never:
+            raise Exception(
+                "Since TrainerBase 3.4.0 is_long_x64_jump_needed has been deprecated."
+                " Now there is not need to manually pop and push rax. That's why you must"
+                " rewrite injections based on manual pop rax, push rax and then remove is_long_x64_jump_needed"
+                " argument"
+            )
+
         self.address = ensure_address(address)
+
         self.code_to_inject = compile_asm(code_to_inject)
+
+        if not pm.is_WoW64:
+            self.code_to_inject = compile_asm("pop rax") + self.code_to_inject + compile_asm("push rax")
+
         self.original_code: bytes = b""
 
         self.original_code_length = original_code_length
         self.new_memory_size = new_memory_size
         self.new_memory_address: int = 0
-        self.is_long_x64_jump_needed = is_long_x64_jump_needed
 
     @override
     def inject(self):
         self.original_code = pm.read_bytes(self.address.resolve(), self.original_code_length)
         self.new_memory_address: int = pm.allocate(self.new_memory_size)
 
-        if self.is_long_x64_jump_needed:
-            new_mem_jump_code_generator = get_long_x64_jump_to_new_mem_code
-            jump_back_code_generator = get_long_x64_jump_back_code
-        else:
+        if pm.is_WoW64:
             new_mem_jump_code_generator = get_simple_jump_code
             jump_back_code_generator = get_simple_jump_code
+        else:
+            new_mem_jump_code_generator = get_long_x64_jump_to_new_mem_code
+            jump_back_code_generator = get_long_x64_jump_back_code
 
         jump_to_new_mem = compile_asm(new_mem_jump_code_generator(self.new_memory_address))
         jumper_length = len(jump_to_new_mem)
@@ -97,7 +109,7 @@ class AllocatingCodeInjection(AbstractCodeInjection):  # pylint: disable=too-man
             raise ValueError(f"Jumper length > original code length: {jumper_length} > {self.original_code_length}")
 
         jump_back_address = self.address.resolve() + jumper_length
-        if self.is_long_x64_jump_needed:
+        if not pm.is_WoW64:
             jump_back_address -= 1
 
         jump_back = compile_asm(jump_back_code_generator(jump_back_address))

{trainerbase-3.3.0 → trainerbase-3.4.0}/trainerbase/memory.py

@@ -154,3 +154,7 @@ def ensure_address(obj: ConvertibleToAddress) -> AbstractAddress:
             return AOBScan(obj)
         case _:
             raise TypeError(f"Cannot create AbstractAddress from {type(obj)}")
+
+
+def allocate_pointer() -> int:
+    return pm.allocate(POINTER_SIZE)