Fix small naming inconsistencies

This commit is contained in:
a2x
2024-04-06 12:47:06 +10:00
parent a59331af1f
commit 6d72c517ed
6 changed files with 31 additions and 22 deletions

View File

@@ -42,13 +42,14 @@ fn read_buttons(
) -> Result<Vec<Button>> {
let mut buttons = Vec::new();
let mut key_ptr = Pointer64::<KeyButton>::from(process.read_addr64(list_addr)?);
let mut cur_button = Pointer64::<KeyButton>::from(process.read_addr64(list_addr)?);
while !key_ptr.is_null() {
let key = key_ptr.read(process)?;
let name = key.name.read_string(process)?.to_string();
while !cur_button.is_null() {
let button = cur_button.read(process)?;
let name = button.name.read_string(process)?.to_string();
let value = ((key_ptr.address() - module.base) + offset_of!(KeyButton.state) as i64) as u32;
let value =
((cur_button.address() - module.base) + offset_of!(KeyButton.state) as i64) as u32;
debug!(
"found button: {} at {:#X} ({} + {:#X})",
@@ -60,7 +61,7 @@ fn read_buttons(
buttons.push(Button { name, value });
key_ptr = key.next;
cur_button = button.next;
}
// Sort buttons by name.

View File

@@ -185,7 +185,7 @@ fn read_class_binding_metadata(
let var_value = network_value.u.var_value;
let name = var_value.name.read_string(process)?.to_string();
let type_name = var_value.ty.read_string(process)?.replace(" ", "");
let type_name = var_value.type_name.read_string(process)?.replace(" ", "");
ClassMetadata::NetworkVarNames { name, type_name }
},
@@ -305,6 +305,14 @@ fn read_type_scopes(
.filter_map(|ptr| read_enum_binding(process, *ptr).ok())
.collect();
debug!(
"found type scope: {} at {:#X} (classes count: {}) (enums count: {})",
name,
type_scope_ptr.to_umem(),
classes.len(),
enums.len()
);
Ok(TypeScope {
name,
classes,