getacp

Author: brandonros

libmwemu/src/emu/winapi32/kernel32.rs

@@ -9,6 +9,17 @@ use crate::emu::winapi32::helper;
 use lazy_static::lazy_static;
 use std::sync::Mutex;
 
+macro_rules! log_red {
+    ($emu:expr, $($arg:tt)*) => {
+        log::info!(
+            "{}{}{}",
+            $emu.colors.light_red,
+            format!($($arg)*),
+            $emu.colors.nc
+        );
+    };
+}
+
 pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
     let api = guess_api_name(emu, addr);
     match api.as_str() {
@@ -2366,13 +2377,10 @@ fn TlsGetValue(emu: &mut emu::Emu) {
         emu.regs.set_eax(emu.tls32[idx as usize] as u64);
     }
 
-    log::info!(
-        "{}** {} kernel32!TlsGetValue idx: {} =0x{:x} {}",
-        emu.colors.light_red,
+    log_red!(emu, "** {} kernel32!TlsGetValue idx: {} =0x{:x}", 
         emu.pos,
         idx,
-        emu.regs.get_eax() as u32,
-        emu.colors.nc
+        emu.regs.get_eax() as u32
     );
 }
 

libmwemu/src/emu/winapi64/kernel32.rs

@@ -10,6 +10,17 @@ use crate::emu::context64;
 use lazy_static::lazy_static;
 use std::sync::Mutex;
 
+macro_rules! log_red {
+    ($emu:expr, $($arg:tt)*) => {
+        log::info!(
+            "{}{}{}",
+            $emu.colors.light_red,
+            format!($($arg)*),
+            $emu.colors.nc
+        );
+    };
+}
+
 // a in RCX, b in RDX, c in R8, d in R9, then e pushed on stack
 
 pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
@@ -141,6 +152,7 @@ pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
         "TlsSetValue" => TlsSetValue(emu),
         "TlsGetValue" => TlsGetValue(emu),
         "TlsFree" => TlsFree(emu),
+        "GetACP" => GetACP(emu),
 
         _ => {
             unimplemented!(
@@ -2923,12 +2935,23 @@ fn TlsGetValue(emu: &mut emu::Emu) {
 
     emu.regs.rax = val;
 
+    log_red!(emu, "** {} kernel32!TlsGetValue idx: {} =0x{:x}", 
+        emu.pos,
+        idx,
+        val
+    );
+}
+
+/*
+UINT GetACP();
+*/
+// TODO: there is GetAcp and GetACP?
+fn GetACP(emu: &mut emu::Emu) {
     log::info!(
-        "{}** {} kernel32!TlsGetValue idx: {} =0x{:x} {}",
+        "{}** {} kernel32!GetACP {}",
         emu.colors.light_red,
         emu.pos,
-        idx,
-        val,
         emu.colors.nc
     );
-}
+    emu.regs.rax = 0x00000409;
+}