hxuanyu/cs2-dumper
1
0
Fork 0
mirror of https://github.com/a2x/cs2-dumper.git synced 2025-10-07 22:50:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove Address struct

Browse Source
This commit is contained in:
a2x
2024-03-02 01:21:34 +10:00
parent 0bc7cf7b20
commit 7d5de35805
13 changed files with 67 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dumper/interfaces.rs
View File

@@ -8,7 +8,7 @@ use simplelog::{debug, info};
use super::{generate_files, Entries, Entry};
use crate::builder::FileBuilderEnum;
use crate::os::{Address, Process};
use crate::os::Process;
#[derive(Debug)]
#[repr(C)]
@@ -19,7 +19,7 @@ struct InterfaceNode {
}
impl InterfaceNode {
fn instance(&self, process: &Process) -> Result<Address> {
fn instance(&self, process: &Process) -> Result<usize> {
process
.read_memory::<usize>(
(self as *const _ as usize + offset_of!(InterfaceNode, create_fn)).into(),

14
src/dumper/offsets.rs
View File

@@ -52,11 +52,7 @@ pub fn dump_offsets(
let size = size.unwrap_or(8);
for _ in 0..times {
process.read_memory_raw(
address,
&mut address.0 as *mut _ as *mut _,
size,
)?;
process.read_memory_raw(address, &mut address as *mut _ as *mut _, size)?;
}
}
Jmp { offset, length } => {
@@ -69,7 +65,7 @@ pub fn dump_offsets(
let mut result: usize = 0;
process.read_memory_raw(
address.add(start),
address + start,
&mut result as *mut _ as *mut _,
end - start,
)?;
@@ -86,17 +82,17 @@ pub fn dump_offsets(
signature.name, address
);
(signature.name, address.0)
(signature.name, address)
} else {
debug!(
"Found <bright-yellow>{}</> @ <bright-magenta>{:#X}</> (<blue>{}</> + <bright-blue>{:#X}</>)",
signature.name,
address,
signature.module,
address.sub(module.base().0)
address - module.base()
);
(signature.name, address.sub(module.base().0).0)
(signature.name, address - module.base())
};
if name == "dwBuildNumber" {