Skip to content

Commit

Permalink
Merge branch 'main' of github.com:memflow/memflow-win32
Browse files Browse the repository at this point in the history
  • Loading branch information
ko1N committed Mar 28, 2024
2 parents 9031433 + 6cd4a58 commit 69bcbdc
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 61 deletions.
96 changes: 43 additions & 53 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions memflow-win32-defs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "memflow-win32-defs"
version = "0.2.0-beta11"
version = "0.2.0"
authors = ["ko1N <[email protected]>", "Aurimas Blažulionis <[email protected]>"]
edition = "2018"
description = "static offset templates for "
Expand All @@ -13,7 +13,7 @@ keywords = [ "memflow", "introspection", "memory", "dma" ]
categories = [ "api-bindings", "memory-management", "os" ]

[dependencies]
memflow = { version = "=0.2.0-beta11", default-features = false }
memflow = { version = "0.2", default-features = false }
log = { version = "^0.4.14", default-features = false }
no-std-compat = { version = "^0.4.1", features = ["alloc"] }
serde = { version = "^1.0.133", default-features = false, optional = true, features = ["derive"] }
Expand Down
10 changes: 5 additions & 5 deletions memflow-win32/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "memflow-win32"
version = "0.2.0-beta11"
version = "0.2.0"
authors = ["ko1N <[email protected]>", "Aurimas Blažulionis <[email protected]>"]
edition = "2021"
rust-version = "1.65"
Expand All @@ -21,13 +21,13 @@ codecov = { repository = "github", branch = "master", service = "github" }
crate-type = ["lib", "cdylib"]

[dependencies]
memflow = { version = "=0.2.0-beta11", default-features = false }
memflow = { version = "0.2", default-features = false }
log = { version = "^0.4.14", default-features = false }
pelite = { version = "^0.10.0", default-features = false }
widestring = { version = "^1.0.2", default-features = false, features = ["alloc"] }
no-std-compat = { version = "^0.4.1", features = ["alloc"] }
serde = { version = "^1.0.133", default-features = false, optional = true, features = ["derive"] }
memflow-win32-defs = { version = "0.2.0-beta11", path = "../memflow-win32-defs", default-features = false }
memflow-win32-defs = { version = "0.2", path = "../memflow-win32-defs", default-features = false }

# will be replaced by our own signature scanner
regex = { version = "^1.5.0", optional = true }
Expand All @@ -42,8 +42,8 @@ toml = "^0.7.3"
[build_dependencies]
toml = "^0.7.3"
serde = { version = "^1.0.133", default-features = false, features = ["derive", "alloc"] }
memflow = { version = "=0.2.0-beta11", default-features = false }
memflow-win32-defs = { version = "0.2.0-beta11", path = "../memflow-win32-defs", features = ["symstore"] }
memflow = { version = "0.2", default-features = false }
memflow-win32-defs = { version = "0.2", path = "../memflow-win32-defs", features = ["symstore"] }

[features]
default = ["std", "serde_derive", "embed_offsets", "symstore", "download_progress", "regex", "memflow/default"]
Expand Down
2 changes: 1 addition & 1 deletion memflow-win32/src/kernel/start_block/aarch64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn find_pt(addr: Address, mem: &[u8]) -> Option<Address> {
mem[0x800..]
.chunks(8)
.map(|c| u64::from_le_bytes(c.try_into().unwrap()))
.filter(|a| (a & 0xfff) == 0x703)
.filter(|a| (a & 0xff) == 0x03)
.nth(5)?;

Some(addr)
Expand Down

0 comments on commit 69bcbdc

Please sign in to comment.