diff --git a/src/lib.rs b/src/lib.rs index dbbed8d..88ac8bf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,5 +4,6 @@ mod error; /// types and methods to ease the r/w of a process's memory pub mod process; +mod sys; pub use error::Error; diff --git a/src/process/process.rs b/src/process.rs similarity index 88% rename from src/process/process.rs rename to src/process.rs index c918d10..3bc33cf 100644 --- a/src/process/process.rs +++ b/src/process.rs @@ -1,5 +1,5 @@ use crate::{ - process::{handle::Handle, memory, snapshot, Module}, + sys::{handle::Handle, memory, snapshot}, Error, }; use derive_more::derive::Display; @@ -111,3 +111,18 @@ impl Process { Ok(()) } } + +#[derive(Debug, Default)] +/// a module running within a process +pub struct Module { + /// the parent process id (th32ProcessID) + pub process_id: u32, + /// the module name (szModule) + pub name: String, + /// the module executable path (szExePath) + pub path: String, + /// the module base address (modBaseAddr) + pub base_address: usize, + /// the module base size (modBaseSize) + pub base_size: usize, +} diff --git a/src/process/mod.rs b/src/process/mod.rs deleted file mode 100644 index 1d269cb..0000000 --- a/src/process/mod.rs +++ /dev/null @@ -1,10 +0,0 @@ -#![allow(clippy::module_inception)] - -mod handle; -mod memory; -mod module; -mod process; -mod snapshot; - -pub use module::Module; -pub use process::{Identifier, Process}; diff --git a/src/process/module.rs b/src/process/module.rs deleted file mode 100644 index 1a68913..0000000 --- a/src/process/module.rs +++ /dev/null @@ -1,14 +0,0 @@ -#[derive(Debug, Default)] -/// a module running within a process -pub struct Module { - /// the parent process id (th32ProcessID) - pub process_id: u32, - /// the module name (szModule) - pub name: String, - /// the module executable path (szExePath) - pub path: String, - /// the module base address (modBaseAddr) - pub base_address: usize, - /// the module base size (modBaseSize) - pub base_size: usize, -} diff --git a/src/sys.rs b/src/sys.rs new file mode 100644 index 0000000..82e9bd2 --- /dev/null +++ b/src/sys.rs @@ -0,0 +1,3 @@ +pub(crate) mod handle; +pub(crate) mod memory; +pub(crate) mod snapshot; diff --git a/src/process/handle.rs b/src/sys/handle.rs similarity index 100% rename from src/process/handle.rs rename to src/sys/handle.rs diff --git a/src/process/memory.rs b/src/sys/memory.rs similarity index 95% rename from src/process/memory.rs rename to src/sys/memory.rs index 3313977..560b2dd 100644 --- a/src/process/memory.rs +++ b/src/sys/memory.rs @@ -1,4 +1,4 @@ -use crate::{process::handle::Handle, Error}; +use crate::{sys::handle::Handle, Error}; use std::{ffi::c_void, ptr}; use windows::Win32::System::Diagnostics::Debug::{ReadProcessMemory, WriteProcessMemory}; diff --git a/src/process/snapshot.rs b/src/sys/snapshot.rs similarity index 98% rename from src/process/snapshot.rs rename to src/sys/snapshot.rs index 59179b6..22e1c4c 100644 --- a/src/process/snapshot.rs +++ b/src/sys/snapshot.rs @@ -1,5 +1,3 @@ -#![allow(clippy::module_name_repetitions)] - use crate::Error; use windows::Win32::System::Diagnostics::ToolHelp::{ CreateToolhelp32Snapshot, Module32FirstW, Module32NextW, Process32FirstW, Process32NextW,