diff --git a/src/process/mod.rs b/src/process/mod.rs index dfdc1aa..1d269cb 100644 --- a/src/process/mod.rs +++ b/src/process/mod.rs @@ -1,5 +1,4 @@ #![allow(clippy::module_inception)] -#![allow(clippy::module_name_repetitions)] mod handle; mod memory; @@ -9,6 +8,3 @@ mod snapshot; pub use module::Module; pub use process::{Identifier, Process}; - -type ProcessSnapshot = snapshot::Process; -type ModuleSnapshot = snapshot::Module; diff --git a/src/process/process.rs b/src/process/process.rs index 5d2419e..dda229e 100644 --- a/src/process/process.rs +++ b/src/process/process.rs @@ -1,4 +1,4 @@ -use super::{handle::Handle, memory, module::Module, ModuleSnapshot, ProcessSnapshot}; +use super::{handle::Handle, memory, module::Module, snapshot}; use derive_more::derive::Display; @@ -35,10 +35,10 @@ impl Process { pub fn from>(identifier: T) -> Result { let identifier = identifier.into(); let Some(snapshot) = (match identifier { - Identifier::Pid(pid) => ProcessSnapshot::get_processes()? + Identifier::Pid(pid) => snapshot::ProcessSnapshot::get_processes()? .into_iter() .find(|snapshot| snapshot.id == pid), - Identifier::Name(ref name) => ProcessSnapshot::get_processes()? + Identifier::Name(ref name) => snapshot::ProcessSnapshot::get_processes()? .into_iter() .find(|snapshot| snapshot.name == *name), }) else { @@ -57,7 +57,7 @@ impl Process { } pub fn module(&self, name: &str) -> Result { - let Some(snapshot) = ModuleSnapshot::get_modules(self.id)? + let Some(snapshot) = snapshot::ModuleSnapshot::get_modules(self.id)? .into_iter() .find(|snapshot| snapshot.name == name) else { diff --git a/src/process/snapshot.rs b/src/process/snapshot.rs index e52d389..a1443f7 100644 --- a/src/process/snapshot.rs +++ b/src/process/snapshot.rs @@ -1,15 +1,17 @@ +#![allow(clippy::module_name_repetitions)] + use windows::Win32::System::Diagnostics::ToolHelp::{ CreateToolhelp32Snapshot, Module32FirstW, Module32NextW, Process32FirstW, Process32NextW, MODULEENTRY32W, PROCESSENTRY32W, TH32CS_SNAPMODULE, TH32CS_SNAPMODULE32, TH32CS_SNAPPROCESS, }; #[derive(Debug)] -pub struct Process { +pub struct ProcessSnapshot { pub id: u32, pub name: String, } -impl Process { +impl ProcessSnapshot { pub fn get_processes() -> Result, crate::Error> { let snapshot = unsafe { match CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0) { @@ -56,14 +58,14 @@ impl Process { } #[derive(Debug)] -pub struct Module { +pub struct ModuleSnapshot { pub name: String, pub path: String, pub base_address: usize, pub base_size: usize, } -impl Module { +impl ModuleSnapshot { pub fn get_modules(pid: u32) -> Result, crate::Error> { let snapshot = unsafe { match CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, pid) {