fixed getmodulehandle with null param

sha0coder · sha0coder · commit 9bb41e1a4606 · 2025-08-29T12:23:04.000+02:00
diff --git a/crates/libmwemu/src/emu/loaders.rs b/crates/libmwemu/src/emu/loaders.rs
@@ -19,11 +19,11 @@ impl Emu {
         let mut pe32 = PE32::load(filename);
         let base: u32;
 
-        println!("loading pe32 {}", filename);
+        log::info!("loading pe32 {}", filename);
 
         /* .rsrc extraction tests
         if set_entry {
-            println!("get_resource_by_id");
+            log::info!("get_resource_by_id");
             pe32.get_resource(Some(3), Some(0), None, None);
         }*/
 
@@ -97,12 +97,12 @@ impl Emu {
                 );
             }
 
-            println!("base: 0x{:x}", base);
+            log::info!("base: 0x{:x}", base);
         }
 
 
         // 4. map pe and then sections
-        println!("mapeando PE de {}", filename2);
+        log::info!("mapeando PE de {}", filename2);
         let pemap = self
             .maps
             .create_map(
@@ -247,7 +247,7 @@ impl Emu {
                     self.regs().rip
                 );
             }
-            println!("base: 0x{:x}", base);
+            log::info!("base: 0x{:x}", base);
         }
 
         // 4. map pe and then sections
@@ -371,24 +371,23 @@ impl Emu {
         if text_addr == 0 {
             panic!(".text not found on this elf64");
         }
-        log::info!("text_addr: 0x{:x}", text_addr);
 
         // entry point logic:
 
         // 1. Configured entry point
         if self.cfg.entry_point != constants::CFG_DEFAULT_BASE {
-            println!("forcing entry point to 0x{:x}", self.cfg.entry_point);
+            log::info!("forcing entry point to 0x{:x}", self.cfg.entry_point);
             self.regs_mut().rip = self.cfg.entry_point;
 
         // 2. Entry point pointing inside .text
         } else if elf64.elf_hdr.e_entry >= text_addr && elf64.elf_hdr.e_entry < text_addr+text_sz {
-            println!("Entry point pointing to .text 0x{:x}", elf64.elf_hdr.e_entry);
+            log::info!("Entry point pointing to .text 0x{:x}", elf64.elf_hdr.e_entry);
             self.regs_mut().rip = elf64.elf_hdr.e_entry;
 
         // 3. Entry point points above .text, relative entry point
         } else if elf64.elf_hdr.e_entry < text_addr {
             self.regs_mut().rip = elf64.elf_hdr.e_entry + elf64.base; //text_addr;
-            println!("relative entry point: 0x{:x}  fixed: 0x{:x}",  elf64.elf_hdr.e_entry, self.regs().rip);
+            log::info!("relative entry point: 0x{:x}  fixed: 0x{:x}",  elf64.elf_hdr.e_entry, self.regs().rip);
 
         // 4. Entry point points below .text, weird case.
         } else {
diff --git a/crates/libmwemu/src/winapi/winapi32/kernel32/get_module_handle_a.rs b/crates/libmwemu/src/winapi/winapi32/kernel32/get_module_handle_a.rs
@@ -1,4 +1,6 @@
 use crate::emu;
+use crate::peb;
+use crate::constants;
 use crate::winapi::helper;
 
 pub fn GetModuleHandleA(emu: &mut emu::Emu) {
@@ -10,11 +12,30 @@ pub fn GetModuleHandleA(emu: &mut emu::Emu) {
     let mod_name: String;
 
     if mod_name_ptr == 0 {
-        mod_name = "self".to_string();
-        emu.regs_mut().rax = match emu.maps.get_base() {
-            Some(base) => base,
+
+        let caller_rip = emu.regs().rip;
+        mod_name = match emu.maps.get_addr_name(caller_rip) {
+            Some(n) => n,
+            None => {
+                log::info!("kernel32!GetModuleHandleA called from weird place 0x{:x}", caller_rip);
+                constants::EXE_NAME
+            }
+        }.to_string();
+
+        let base = match peb::peb64::get_module_base(&mod_name, emu) {
+            Some(b) => b,
             None => helper::handler_create(&mod_name),
-        }
+        };
+
+        log_red!(
+            emu,
+            "kernel32!GetModuleHandleA `{}` {:x}",
+            mod_name,
+            base
+        );
+
+        emu.regs_mut().rax = base;
+
     } else {
         mod_name = emu.maps.read_string(mod_name_ptr).to_lowercase();
         let mod_mem = match emu.maps.get_mem2(mod_name.as_str()) {
@@ -34,5 +55,6 @@ pub fn GetModuleHandleA(emu: &mut emu::Emu) {
         mod_name
     );
 
+
     emu.stack_pop32(false);
-}
+}
diff --git a/crates/libmwemu/src/winapi/winapi32/kernel32/get_module_handle_w.rs b/crates/libmwemu/src/winapi/winapi32/kernel32/get_module_handle_w.rs
@@ -1,4 +1,6 @@
 use crate::emu;
+use crate::peb;
+use crate::constants;
 use crate::winapi::helper;
 
 pub fn GetModuleHandleW(emu: &mut emu::Emu) {
@@ -8,13 +10,16 @@ pub fn GetModuleHandleW(emu: &mut emu::Emu) {
         .expect("kernel32!GetModuleHandleW cannot read mod_name_ptr") as u64;
 
     let mod_name: String;
+    let base;
 
     if mod_name_ptr == 0 {
-        mod_name = "self".to_string();
-        emu.regs_mut().rax = match emu.maps.get_base() {
-            Some(base) => base,
+
+        mod_name = constants::EXE_NAME.to_string();
+        base = match peb::peb64::get_module_base(&mod_name, emu) {
+            Some(b) => b,
             None => helper::handler_create(&mod_name),
-        }
+        };
+
     } else {
         mod_name = emu.maps.read_wide_string(mod_name_ptr).to_lowercase();
         let mod_mem = match emu.maps.get_mem2(&mod_name) {
@@ -24,14 +29,17 @@ pub fn GetModuleHandleW(emu: &mut emu::Emu) {
                 return;
             }
         };
-        emu.regs_mut().rax = mod_mem.get_base();
+        base = mod_mem.get_base();
     }
 
     log_red!(
         emu,
-        "kernel32!GetModuleHandleW '{}'",
-        mod_name
+        "kernel32!GetModuleHandleW '{}' 0x{:x}",
+        mod_name,
+        base
     );
 
+    emu.regs_mut().rax = base;
+
     emu.stack_pop32(false);
-}
+}
diff --git a/crates/libmwemu/src/winapi/winapi64/kernel32/get_module_handle_a.rs b/crates/libmwemu/src/winapi/winapi64/kernel32/get_module_handle_a.rs
@@ -1,27 +1,22 @@
 
 use crate::emu;
+use crate::peb;
+use crate::constants;
 use crate::winapi::helper;
 
 pub fn GetModuleHandleA(emu: &mut emu::Emu) {
     let module_name_ptr = emu.regs().rcx;
     let module_name: String;
+    let base;
 
     if module_name_ptr == 0 {
-        module_name = "self".to_string();
-
-        let base = match emu.maps.get_base() {
-            Some(base) => base,
+    
+        module_name = constants::EXE_NAME.to_string();
+        base = match peb::peb64::get_module_base(&module_name, emu) {
+            Some(b) => b,
             None => helper::handler_create(&module_name),
         };
 
-        log_red!(
-            emu,
-            "kernel32!GetModuleHandleA `{}` {:x}",
-            module_name,
-            base
-        );
-        
-        emu.regs_mut().rax = base;
     } else {
         module_name = emu.maps.read_string(module_name_ptr);
 
@@ -32,17 +27,16 @@ pub fn GetModuleHandleA(emu: &mut emu::Emu) {
                 return;
             }
         };
-        let base = mod_mem.get_base();
-
-        log_red!(
-            emu,
-            "kernel32!GetModuleHandleA `{}` {:x}",
-            module_name,
-            base
-        );
+        base = mod_mem.get_base();
 
-        emu.regs_mut().rax = base;
     }
 
+    log_red!(
+        emu,
+        "kernel32!GetModuleHandleA `{}` {:x}",
+        module_name,
+        base
+    );
     
+    emu.regs_mut().rax = base;
 }
diff --git a/crates/libmwemu/src/winapi/winapi64/kernel32/get_module_handle_w.rs b/crates/libmwemu/src/winapi/winapi64/kernel32/get_module_handle_w.rs
@@ -1,33 +1,41 @@
 
 use crate::emu;
+use crate::peb;
+use crate::constants;
 use crate::winapi::helper;
 
 pub fn GetModuleHandleW(emu: &mut emu::Emu) {
     let module_name_ptr = emu.regs().rcx;
     let module_name: String;
+    let base;
 
     if module_name_ptr == 0 {
-        module_name = "self".to_string();
-        emu.regs_mut().rax = match emu.maps.get_base() {
-            Some(base) => base,
+
+        module_name = constants::EXE_NAME.to_string();
+        base = match peb::peb64::get_module_base(&module_name, emu) {
+            Some(b) => b,
             None => helper::handler_create(&module_name),
-        }
+        };
+
     } else {
         module_name = emu.maps.read_wide_string(module_name_ptr).to_lowercase();
-        let mod_mem = match emu.maps.get_mem2(&module_name) {
+        let mod_mem = match emu.maps.get_mem2(&module_name.to_lowercase().replace(".dll",".pe")) {
             Some(m) => m,
             None => {
                 emu.regs_mut().rax = 0;
                 return;
             }
         };
 
-        emu.regs_mut().rax = mod_mem.get_base();
+        base = mod_mem.get_base();
     }
 
     log_red!(
         emu,
-        "kernel32!GetModuleHandleW `{}`",
-        module_name
+        "kernel32!GetModuleHandleW `{}` 0x{:x}",
+        module_name,
+        base
     );
-}
+
+    emu.regs_mut().rax = base;
+}
