Merge remote-tracking branch 'acheron2302/main'

Author: acheron2302

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "libmwemu"
-version = "0.22.1"
+version = "0.22.2"
 edition = "2018"
 authors = ["sha0coder"]
 license = "MIT"

crates/libmwemu/Cargo.toml

@@ -43,6 +43,15 @@ pub const ERROR_BUFFER_OVERFLOW: u64 = 0x6f;
 pub const ERROR_INVALID_PARAMETER: u64 = 0x57;
 pub const ERROR_INSUFFICIENT_BUFFER: u64 = 0x7a;
 
+
+pub const HRESULT_E_INVALID_ARG: u64 = 0x80070057;
+/*
+ * HRESULT STRUCTURE:
+ * 0x8 -> severity: error
+ * 0x007 -> facility: FACILITY_WIN32
+ * 0x0057 -> ERROR_INVALID_PARAMETER
+*/
+
 pub const CP_UTF7: u64 = 65000;
 pub const CP_UTF8: u64 = 65001;
 

crates/libmwemu/src/constants.rs

@@ -82,13 +82,13 @@ fn getaddrinfo(emu: &mut emu::Emu) {
         .expect("ws2_32!getaddrinfo cannot read result_ptr_ptr");
 
     let node_name = if node_name_ptr != 0 {
-        emu.maps.read_string(node_name_ptr)
+        emu.maps.read_string(node_name_ptr as u64)
     } else {
         "NULL".to_string()
     };
 
     let service_name = if service_name_ptr != 0 {
-        emu.maps.read_string(service_name_ptr)
+        emu.maps.read_string(service_name_ptr as u64)
     } else {
         "NULL".to_string()
     };
@@ -102,10 +102,10 @@ fn getaddrinfo(emu: &mut emu::Emu) {
     let mut hints_protocol = 0;
 
     if hints_ptr != 0 {
-        hints_flags = emu.maps.read_dword(hints_ptr).unwrap_or(0) as i32;
-        hints_family = emu.maps.read_dword(hints_ptr + 4).unwrap_or(0) as i32;
-        hints_socktype = emu.maps.read_dword(hints_ptr + 8).unwrap_or(0) as i32;
-        hints_protocol = emu.maps.read_dword(hints_ptr + 12).unwrap_or(0) as i32;
+        hints_flags = emu.maps.read_dword(hints_ptr as u64).unwrap_or(0) as i32;
+        hints_family = emu.maps.read_dword((hints_ptr + 4) as u64).unwrap_or(0) as i32;
+        hints_socktype = emu.maps.read_dword((hints_ptr + 8) as u64).unwrap_or(0) as i32;
+        hints_protocol = emu.maps.read_dword((hints_ptr + 12) as u64).unwrap_or(0) as i32;
     }
 
     // Create a dummy ADDRINFO structure
@@ -167,7 +167,7 @@ fn getaddrinfo(emu: &mut emu::Emu) {
     emu.maps.write_qword(addrinfo_addr + 40, 0);
 
     // Store the result pointer in the ppResult parameter
-    emu.maps.write_qword(result_ptr_ptr, addrinfo_addr);
+    emu.maps.write_qword(result_ptr_ptr as u64, addrinfo_addr);
 
     log::info!("\tcreated dummy ADDRINFO for {}:{} at 0x{:x}", node_name, service_name, addrinfo_addr);
     log::info!("\tsockaddr at 0x{:x}, canonname at 0x{:x}", sockaddr_addr, canonname_addr);

crates/libmwemu/src/winapi/winapi32/ws2_32.rs

@@ -0,0 +1,16 @@
+use crate::emu;
+use crate::constants;
+
+pub fn api_DeviceIoControl(emu: &mut emu::Emu) {
+    let hDevice = emu.regs().rcx;
+    let dwIoControlCode = emu.regs().rdx;
+    let lpInBuffer = emu.regs().r8;
+    let lpOutBuffer = emu.regs().r9;
+    let rsp = emu.regs().rsp;
+    let nOutBufferSize = emu.maps.read_qword(rsp + 0x20).expect("DeviceIoControl arg6 stack error.");
+    let lpBytesReturned = emu.maps.read_qword(rsp + 0x28).expect("DeviceIoControl arg7 stack error.");
+
+    log_red!(emu, "kernel32!DeviceIoControl hDev: 0x{:x} code: 0x{:x} buff: 0x{:x}", hDevice, dwIoControlCode, lpInBuffer);
+
+    emu.regs_mut().rax = constants::TRUE;
+}

crates/libmwemu/src/winapi/winapi64/kernel32/device_io_control.rs

@@ -3,6 +3,7 @@ use std::sync::Mutex;
 
 use crate::constants;
 use crate::emu;
+use crate::emu::Emu;
 use crate::peb::peb64;
 use crate::serialization;
 
@@ -178,6 +179,7 @@ pub mod win_exec;
 pub mod write_console_w;
 pub mod write_file;
 pub mod write_process_memory;
+pub mod device_io_control;
 mod local_free;
 
 // Re-export all functions
@@ -354,7 +356,8 @@ pub use write_console_w::WriteConsoleW;
 pub use write_file::WriteFile;
 pub use write_process_memory::WriteProcessMemory;
 pub use local_free::LocalFree;
-use crate::emu::Emu;
+pub use device_io_control::api_DeviceIoControl;
+
 // a in RCX, b in RDX, c in R8, d in R9, then e pushed on stack
 
 pub fn clear_last_error(emu: &mut emu::Emu) {
@@ -540,6 +543,7 @@ pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
         "WriteConsoleW" => WriteConsoleW(emu),
         "WriteFile" => WriteFile(emu),
         "WriteProcessMemory" => WriteProcessMemory(emu),
+        "DeviceIoControl" => api_DeviceIoControl(emu),
         _ => {
             if emu.cfg.skip_unimplemented == false {
                 if emu.cfg.dump_on_exit && emu.cfg.dump_filename.is_some() {

crates/libmwemu/src/winapi/winapi64/kernel32/mod.rs

@@ -7,7 +7,6 @@ use crate::console::Console;
 use crate::constants;
 use crate::context::context64::Context64;
 use crate::emu;
-use crate::emu::Emu;
 use crate::maps::mem64::Permission;
 use crate::serialization;
 use crate::structures;
@@ -1025,10 +1024,8 @@ fn NtReadFile(emu: &mut emu::Emu) {
 
     emu.maps.memset(buff, 0x90, len);
 
-    // TODO: fix path duplication!!!!
-    if filename == "\\??\\c:\\cwd\\c:\\cwd\\version.dll" {
-        let local_path = "/tmp/version2.dll";
-        let mut file = File::open(local_path).unwrap();
+    if filename == "\\??\\c:\\cwd" {
+        let mut file = File::open(&emu.filename).unwrap();
         file.seek(SeekFrom::Start(file_offset));
         let mut file_buffer = vec![0u8; len];
         let bytes_read = file.read(&mut file_buffer).unwrap();
@@ -1052,6 +1049,8 @@ fn NtReadFile(emu: &mut emu::Emu) {
         panic!("TODO: read {}", filename);
     }
 
+
+
     emu.regs_mut().rax = constants::STATUS_SUCCESS;
 }
 

crates/libmwemu/src/winapi/winapi64/ntdll.rs

@@ -298,7 +298,7 @@ fn VariantClear(emu: &mut emu::Emu) {
     // Basic validation
     if pvarg == 0 || !emu.maps.is_mapped(pvarg) {
         log_red!(emu, "VariantClear: Invalid pvarg pointer");
-        emu.regs_mut().rax = 0x80070057; // E_INVALIDARG
+        emu.regs_mut().rax = constants::HRESULT_E_INVALID_ARG; 
         return;
     }
 

crates/libmwemu/src/winapi/winapi64/oleaut32.rs

@@ -135,6 +135,7 @@ fn main() {
         .arg(clap_arg!("call", "", "call", "enable call tracer"))
         .arg(clap_arg!("cmd", "", "cmd", "launch a console command", "COMMAND"))
         .arg(clap_arg!("entropy", "", "entropy", "display changes in the entropy"))
+        .arg(clap_arg!("multithread", "", "multithread", "enable multithread emulation"))
         .get_matches();
 
     if !matches.is_present("filename") {
@@ -340,6 +341,10 @@ fn main() {
         emu.fpu_mut().mxcsr = value as u32;
     }
 
+    if matches.is_present("multithread") {
+        emu.cfg.enable_threading = true;
+    }
+
     // endpoint
     if matches.is_present("endpoint") {
         //TODO: emu::endpoint::warning();