ntmemoryapi 2.2.1__tar.gz → 2.2.3__tar.gz

{ntmemoryapi-2.2.1 → ntmemoryapi-2.2.3}/PKG-INFO

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

{ntmemoryapi-2.2.1 → ntmemoryapi-2.2.3}/pyproject.toml

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

{ntmemoryapi-2.2.1 → ntmemoryapi-2.2.3}/src/ntmemoryapi/__init__.py

@@ -489,7 +489,7 @@ class Process:
 
         return memory_old_protect.value or 0
 
-    def pattern_scan(self, pattern: str, allowed_states: list[int] = [MEM_COMMIT], allowed_protects: list[int] = [PAGE_READWRITE], allowed_types: list[int] = [], start_address: int | None = None, end_address: int | None = None, return_first: int | None = None, memory_regions_filter: typing.Callable[[MEMORY_BASIC_INFORMATION], bool] | None = None) -> list[int]:
+    def pattern_scan(self, pattern: str, allowed_states: list[int] = [MEM_COMMIT], allowed_protects: list[int] = [PAGE_READWRITE], allowed_types: list[int] = [], start_address: int | None = None, end_address: int | None = None, return_first: int | None = None, memory_regions_filter: typing.Callable[[MEMORY_BASIC_INFORMATION], bool] | None = None, finalize_regions_callback: typing.Callable[[list[MEMORY_BASIC_INFORMATION]], None] | None = None) -> list[int]:
         """Scan process and return address that validates given pattern hex byte mask, use `??` to wildcard byte, for example - "14 00 00 00 DB FF ?? ?? FF FF 00 00"."""
 
         # Validate given pattern
@@ -527,25 +527,25 @@ class Process:
             if end_address is not None and region_start >= end_address:
                 continue
 
-            # Scan params
-            scan_adderss = max(region_start, start_address) if start_address is not None else region_start
-            scan_size = min(region_end, end_address) - scan_adderss if end_address is not None else region_end - scan_adderss
-
             # Save region information to scan later
-            to_scan_regions.append((scan_adderss, scan_size))
+            to_scan_regions.append(region)
 
         # If no regions to scan presented
         if not to_scan_regions:
             return []
 
+        # If finalize scan regions callback is provided
+        if finalize_regions_callback:
+            finalize_regions_callback(to_scan_regions)
+
         # Result list of found addresses
         found_addresses = []
 
         # Pre-allocated buffer to hold read memory
-        read_memory_buffer = (ctypes.c_byte * (max(item[-1] for item in to_scan_regions) + 1))()
+        read_memory_buffer = (ctypes.c_byte * (max(item.size for item in to_scan_regions) + 1))()
 
         # Iterate regions to scan read them and find pattern
-        for scan_adderss, scan_size in to_scan_regions:
+        for region in to_scan_regions:
 
             # If required amount of addresses found
             if return_first is not None and return_first <= 0:
@@ -554,13 +554,13 @@ class Process:
             try:
 
                 # Read bytes into pre-allocated buffer
-                self.read_into_buffer(scan_adderss, scan_size, ctypes.addressof(read_memory_buffer))
+                self.read_into_buffer(region.base_address, region.size, ctypes.c_void_p(ctypes.addressof(read_memory_buffer)))
 
             except Exception:
                 pass
 
             # Pattern scan region using SIMD KMP algorithm
-            self.__kmp.scanAOB(ctypes.addressof(read_memory_buffer), scan_size, pattern.strip().encode(), ctypes.c_uint64(scan_adderss), ctypes.c_uint64(return_first if return_first is not None else 0), ctypes.byref(scan_result := PatternScanBuffer()))
+            self.__kmp.scanAOB(ctypes.c_void_p(ctypes.addressof(read_memory_buffer)), region.size, pattern.strip().encode(), ctypes.c_uint64(region.base_address), ctypes.c_uint64(return_first if return_first is not None else 0), ctypes.byref(scan_result := PatternScanBuffer()))
 
             # Read result addresses
             addresses = scan_result.read()