ntmemoryapi 2.1.2__tar.gz → 2.1.5__tar.gz

{ntmemoryapi-2.1.2 → ntmemoryapi-2.1.5}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: ntmemoryapi
-Version: 2.1.2
-Summary: Simple library for Windows to manipulate process virtual memory with stelthy syscall wraps
+Version: 2.1.5
+Summary: Simple library for Windows to manipulate process virtual memory with stelthy syscall wraps.
 Author: Xenely
 Requires-Dist: psutil>=7.1.3
 Requires-Python: >=3.10

{ntmemoryapi-2.1.2 → ntmemoryapi-2.1.5}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "ntmemoryapi"
-version = "2.1.2"
-description = "Simple library for Windows to manipulate process virtual memory with stelthy syscall wraps"
+version = "2.1.5"
+description = "Simple library for Windows to manipulate process virtual memory with stelthy syscall wraps."
 authors = [
     {name = "Xenely"}
 ]

{ntmemoryapi-2.1.2 → ntmemoryapi-2.1.5}/src/ntmemoryapi/__init__.py

@@ -120,7 +120,7 @@ class MODULEENTRY32(ctypes.Structure):
     def base(self) -> int:
         """Process module base address."""
 
-        return self.mod_base_addr or 0
+        return self.mod_base_addr
 
     @property
     def size(self) -> int:
@@ -147,13 +147,13 @@ class MEMORY_BASIC_INFORMATION(ctypes.Structure):
     def base_address(self) -> int:
         """Memory region base address."""
 
-        return self.m_base_address or 0
+        return self.m_base_address
 
     @property
     def allocation_base(self) -> int:
         """Memory region allocation base."""
 
-        return self.m_allocation_base or 0
+        return self.m_allocation_base
 
     @property
     def allocation_protect(self) -> int:
@@ -200,7 +200,7 @@ class PatternScanBuffer(ctypes.Structure):
         ("size", ctypes.c_size_t),
     ]
 
-    def read(self) -> list:
+    def read(self) -> list[int]:
         """Read all of the values located at buffer array."""
 
         return list((ctypes.c_size_t * self.size).from_address(self.pointer))

{ntmemoryapi-2.1.2 → ntmemoryapi-2.1.5}/src/ntmemoryapi/errors.py

@@ -5,8 +5,11 @@
 # | Discord: xenely                     |
 # +-------------------------------------+
 
+import typing
+
+
 # ==-------------------------------------------------------------------== #
-# Classes                                                                 #
+# Base errors classes                                                     #
 # ==-------------------------------------------------------------------== #
 class NtError(Exception):
     """Exception that raises on `nt` functions calls fails."""
@@ -40,6 +43,30 @@ class NtError(Exception):
         return "%s%08x" % (hex_prefix if hex_prefix is not None else "", self.status)
 
 
+class MemoryError(NtError):
+    """Exception that raises on virtual memory read fail."""
+
+    # ==--------------------------------== #
+    # Public methods                       #
+    # ==--------------------------------== #
+    def __init__(self, status: int, address: int, operation: typing.Literal["read", "write"]):
+
+        # Save initializer arguments as an attributes
+        self.address = address
+        self.operation = operation
+
+        # Call initializer of parrent class
+        super().__init__(None, status)
+
+    def __str__(self) -> str:
+        """Overload triggered on `str` cast calls"""
+
+        return "Unalble to %s memory at `0x%08x` address, `nt` function failed with `%s` status" % (self.operation, self.address, self.get_hex_status())
+
+
+# ==-------------------------------------------------------------------== #
+# Errors classes                                                          #
+# ==-------------------------------------------------------------------== #
 class OpenProcessError(NtError):
     """Exception that raises on process open fail."""
 
@@ -63,7 +90,7 @@ class OpenProcessError(NtError):
         return "Unable to open process: %s" % self.message
 
 
-class MemoryReadError(NtError):
+class MemoryReadError(MemoryError):
     """Exception that raises on virtual memory read fail."""
 
     # ==--------------------------------== #
@@ -71,19 +98,11 @@ class MemoryReadError(NtError):
     # ==--------------------------------== #
     def __init__(self, status: int, address: int):
 
-        # Save initializer arguments as an attributes
-        self.address = address
-
         # Call initializer of parrent class
-        super().__init__(None, status)
-
-    def __str__(self) -> str:
-        """Overload triggered on `str` cast calls"""
+        super().__init__(status, address, "read")
 
-        return "Unalble to read memory at `0x%08x` address, `nt` function failed with `%s` status" % (self.address, self.get_hex_status())
 
-
-class MemoryWriteError(NtError):
+class MemoryWriteError(MemoryError):
     """Exception that raises on virtual memory read fail."""
 
     # ==--------------------------------== #
@@ -91,13 +110,5 @@ class MemoryWriteError(NtError):
     # ==--------------------------------== #
     def __init__(self, status: int, address: int):
 
-        # Save initializer arguments as an attributes
-        self.address = address
-
         # Call initializer of parrent class
-        super().__init__(None, status)
-
-    def __str__(self) -> str:
-        """Overload triggered on `str` cast calls"""
-
-        return "Unalble to write memory at `0x%08x` address, `nt` function failed with `%s` status" % (self.address, self.get_hex_status())
+        super().__init__(status, address, "write")

{ntmemoryapi-2.1.2 → ntmemoryapi-2.1.5}/src/ntmemoryapi/misc.py

@@ -110,7 +110,7 @@ class DirectSyscallWrapper:
             B8 %s %s 00 00
             0F 05
             C3
-        """ % tuple([*syscall_id_bytes]))
+        """ % tuple(syscall_id_bytes))
 
         # Allocate buffer for function machine code
         if not (shellcode_buffer := _VirtualAlloc(0, len(shellcode), 0x1000 | 0x2000, 0x04)):