Merge remote-tracking branch 'sha0coder/main'

Author: acheron2302

crates/libmwemu/src/emu/loaders.rs

@@ -100,7 +100,6 @@ impl Emu {
         }
 
         // 4. map pe and then sections
-        log::info!("mapeando PE de {}", filename2);
         let pemap = self
             .maps
             .create_map(

crates/libmwemu/src/emu/winapi.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 
 impl Emu {
-    //TODO: check this, this is used only on pyscemu
+    //TODO: check this, this is used only on pymwemu
     /// Call a winapi by addess.
     pub fn handle_winapi(&mut self, addr: u64) {
         if self.cfg.is_64bits {

crates/libmwemu/src/peb/peb64.rs

@@ -480,7 +480,7 @@ pub fn create_ldr_entry(
     let mut image_sz = 0;
     if base > 0 {
         let pe_hdr = emu.maps.read_dword(base + 0x3c).unwrap() as u64;
-        image_sz = emu.maps.read_qword(base + pe_hdr + 0x50).unwrap() as u64;
+        image_sz = emu.maps.read_dword(base + pe_hdr + 0x50).unwrap();
         base_addr = base;
     } else {
         base_addr = space_addr

crates/libmwemu/src/serialization/minidump_converter.rs

@@ -5,6 +5,7 @@ use std::cell::RefCell;
 use std::collections::BTreeMap;
 use std::error::Error;
 use std::ops::Deref;
+use minidump::format::MemoryProtection;
 
 use crate::maps::mem64::{Mem64, Permission};
 use crate::maps::tlb::TLB;
@@ -15,6 +16,7 @@ use crate::serialization::maps::SerializableMaps;
 use crate::serialization::pe32::SerializablePE32;
 use crate::serialization::pe64::SerializablePE64;
 
+
 pub struct MinidumpConverter;
 
 impl MinidumpConverter {
@@ -91,13 +93,13 @@ impl MinidumpConverter {
             for info in memory_info.iter() {
                 let base_addr = info.raw.base_address;
                 let size = info.raw.region_size;
-                let permission = match info.protection {
-                    PAGE_NOACCESS => Permission::NONE,
-                    PAGE_READWRITE => Permission::READ_WRITE,
-                    PAGE_READONLY => Permission::READ,
-                    PAGE_EXECUTE => Permission::EXECUTE,
-                    PAGE_EXECUTE_READ => Permission::READ_EXECUTE,
-                    PAGE_EXECUTE_READWRITE => Permission::READ_WRITE_EXECUTE,
+                let permission = match info.protection.bits() & MemoryProtection::ACCESS_MASK.bits() {
+                    x if x == MemoryProtection::PAGE_NOACCESS.bits() => Permission::NONE,
+                    x if x == MemoryProtection::PAGE_READONLY.bits() => Permission::READ,
+                    x if x == MemoryProtection::PAGE_READWRITE.bits() => Permission::READ_WRITE,
+                    x if x == MemoryProtection::PAGE_EXECUTE.bits() => Permission::EXECUTE,
+                    x if x == MemoryProtection::PAGE_EXECUTE_READ.bits() => Permission::READ_EXECUTE,
+                    x if x == MemoryProtection::PAGE_EXECUTE_READWRITE.bits() => Permission::READ_WRITE_EXECUTE,
                     _ => Permission::READ_WRITE_EXECUTE,
                 };