Merge pull request #61 from brandonros/main

fxrstor
sha0coder · Dec 30, 2024 · ea17856 · ea17856
2 parents 2dd81df + 19a9aa5
commit ea17856
Show file tree

Hide file tree

Showing 46 changed files with 542 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ x
 test/
 .venv/
 emu.bin
+emu.bin*
diff --git a/libmwemu/src/constants.rs b/libmwemu/src/constants.rs
@@ -19,6 +19,11 @@ pub const STATUS_ACCESS_VIOLATION: u64 = 0xC0000005;
 pub const STATUS_INVALID_PARAMETER: u64 = 0xC000000D;
 
 pub const ERROR_SUCCESS: u64 = 0;
+pub const ERROR_INVALID_PARAMETER: u64 = 0x57;
+pub const ERROR_INSUFFICIENT_BUFFER: u64 = 122;
+
+pub const CP_UTF7: u64 = 65000;
+pub const CP_UTF8: u64 = 65001;
 
 pub const NUM_BYTES_TRACE: usize = 16;
 pub const VERSION: u64 = 0x1db10106;
@@ -732,6 +737,20 @@ pub const ARCH_SET_FS: u64 = 0x1002;
 pub const ARCH_GET_FS: u64 = 0x1003;
 pub const ARCH_GET_GS: u64 = 0x1004;
 
+pub const LOCALE_USER_DEFAULT: u64 = 0x400;
+pub const LOCALE_SABBREVMONTHNAME1 : u64 = 68;
+pub const LOCALE_SABBREVMONTHNAME2 : u64 = 69;
+pub const LOCALE_SABBREVMONTHNAME3 : u64 = 70;
+pub const LOCALE_SABBREVMONTHNAME4 : u64 = 71;
+pub const LOCALE_SABBREVMONTHNAME5 : u64 = 72;
+pub const LOCALE_SABBREVMONTHNAME6 : u64 = 73;
+pub const LOCALE_SABBREVMONTHNAME7 : u64 = 74;
+pub const LOCALE_SABBREVMONTHNAME8 : u64 = 75;
+pub const LOCALE_SABBREVMONTHNAME9 : u64 = 76;
+pub const LOCALE_SABBREVMONTHNAME10: u64 = 77;
+pub const LOCALE_SABBREVMONTHNAME11: u64 = 78;
+pub const LOCALE_SABBREVMONTHNAME12: u64 = 79;
+
 pub const UTSNAME: [u8; 390] = [
     0x4c, 0x69, 0x6e, 0x75, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

diff --git a/libmwemu/src/emu.rs b/libmwemu/src/emu.rs
@@ -513,7 +513,7 @@ impl Emu {
         winapi32::kernel32::load_library(self, "iphlpapi.dll");
         winapi32::kernel32::load_library(self, "ws2_32.dll");
         winapi32::kernel32::load_library(self, "advapi32.dll");
-        //winapi32::kernel32::load_library(self, "comctl64.dll");
+        //winapi32::kernel32::load_library(self, "comctl32.dll");
         winapi32::kernel32::load_library(self, "winhttp.dll");
         winapi32::kernel32::load_library(self, "wininet.dll");
         //winapi32::kernel32::load_library(self, "dnsapi.dll");
@@ -610,7 +610,7 @@ impl Emu {
         winapi64::kernel32::load_library(self, "iphlpapi.dll");
         winapi64::kernel32::load_library(self, "ws2_32.dll");
         winapi64::kernel32::load_library(self, "advapi32.dll");
-        winapi64::kernel32::load_library(self, "comctl64.dll");
+        winapi64::kernel32::load_library(self, "comctl32.dll");
         winapi64::kernel32::load_library(self, "winhttp.dll");
         winapi64::kernel32::load_library(self, "wininet.dll");
         winapi64::kernel32::load_library(self, "dnsapi.dll");

diff --git a/libmwemu/src/engine/mod.rs b/libmwemu/src/engine/mod.rs
@@ -2,6 +2,7 @@ pub mod logic;
 
 use iced_x86::{Instruction, Mnemonic, Register};
 use crate::emu::Emu;
+use crate::fpu::FPUState;
 use crate::regs64;
 use crate::exception;
 use crate::inline;
@@ -4585,6 +4586,19 @@ pub fn emulate_instruction(
             state.save(addr, emu);
         }
 
+        Mnemonic::Fxrstor => {
+            emu.show_instruction(&emu.colors.green, ins);
+
+            let addr = match emu.get_operand_value(ins, 0, false) {
+                Some(v) => v,
+                None => return false,
+            };
+
+            let state = FPUState::load(addr, emu);
+
+            emu.fpu.fxrstor(state);
+        }
+
         Mnemonic::Fistp => {
             emu.show_instruction(&emu.colors.green, ins);
 

diff --git a/libmwemu/src/fpu.rs b/libmwemu/src/fpu.rs
@@ -34,6 +34,19 @@ impl FPUState {
         }
     }
 
+    pub fn load(addr: u64, emu: &mut emu::Emu) -> FPUState {
+        let mut state = FPUState::new();
+        state.fpu_control_word = emu.maps.read_word(addr).unwrap();
+        state.fpu_status_word = emu.maps.read_word(addr + 2).unwrap();
+        state.fpu_tag_word = emu.maps.read_word(addr + 4).unwrap();
+        state.fpu_opcode = emu.maps.read_word(addr + 6).unwrap();
+        state.rip = emu.maps.read_qword(addr + 8).unwrap();
+        state.rdp = emu.maps.read_qword(addr + 16).unwrap();
+        state.mxcsr = emu.maps.read_dword(addr + 24).unwrap();
+        state.mxcsr_mask = emu.maps.read_dword(addr + 28).unwrap();
+        state
+    }
+
     pub fn save(&self, addr: u64, emu: &mut emu::Emu) {
         emu.maps.write_word(addr, self.fpu_control_word);          // FCW (offset 0)
         emu.maps.write_word(addr + 2, self.fpu_status_word);       // FSW (offset 2)
@@ -328,4 +341,22 @@ impl FPU {
         state.xmm = self.xmm.clone();
         return state;
     }
+
+    pub fn fxrstor(&mut self, state: FPUState) {
+        self.fpu_control_word = state.fpu_control_word;
+        self.stat = state.fpu_status_word;
+        self.tag = state.fpu_tag_word;
+        self.opcode = state.fpu_opcode;
+        self.ip = state.rip;
+        self.operand_ptr = state.rdp;
+        self.mxcsr = state.mxcsr;
+
+        // Convert the packed 128-bit ST registers back to f64 values
+        for i in 0..8 {
+            let low_bits = (state.st[i] & 0xFFFFFFFFFFFFFFFF) as u64;
+            self.st[i] = f64::from_bits(low_bits);
+        }
+
+        self.xmm = state.xmm;
+    }
 }
diff --git a/libmwemu/src/macros.rs b/libmwemu/src/macros.rs
@@ -113,3 +113,15 @@ macro_rules! to32 {
     };
 }
 
+#[macro_export]
+macro_rules! log_red {
+    ($emu:expr, $($arg:tt)*) => {
+        log::info!(
+            "{}{}{}",
+            $emu.colors.light_red,
+            format!($($arg)*),
+            $emu.colors.nc
+        );
+    };
+}
+
diff --git a/libmwemu/src/winapi32/advapi32.rs b/libmwemu/src/winapi32/advapi32.rs
@@ -34,7 +34,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/crypt32.rs b/libmwemu/src/winapi32/crypt32.rs
@@ -22,7 +22,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/dnsapi.rs b/libmwemu/src/winapi32/dnsapi.rs
@@ -20,7 +20,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/iphlpapi.rs b/libmwemu/src/winapi32/iphlpapi.rs
@@ -13,7 +13,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/kernel32.rs b/libmwemu/src/winapi32/kernel32.rs
@@ -10,17 +10,6 @@ use crate::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() {
@@ -198,7 +187,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }
@@ -421,9 +410,7 @@ fn GetProcAddress(emu: &mut emu::Emu) {
         }
     }
     emu.regs.rax = 0;
-    if emu.cfg.verbose >= 1 {
-        log::info!("kernel32!GetProcAddress error searching {}", func);
-    }
+    log::warn!("kernel32!GetProcAddress error searching {}", func);
 }
 
 pub fn load_library(emu: &mut emu::Emu, libname: &str) -> u64 {
@@ -476,14 +463,7 @@ fn LoadLibraryA(emu: &mut emu::Emu) {
 
     emu.regs.rax = load_library(emu, &dll);
 
-    log::info!(
-        "{}** {} kernel32!LoadLibraryA  '{}' =0x{:x} {}",
-        emu.colors.light_red,
-        emu.pos,
-        &dll,
-        emu.regs.get_eax() as u32,
-        emu.colors.nc
-    );
+    log_red!(emu, "** {} kernel32!LoadLibraryA  '{}' =0x{:x} rip: 0x{:x}", emu.pos, &dll, emu.regs.get_eax() as u32, emu.regs.rip);
 
     emu.stack_pop32(false);
 

diff --git a/libmwemu/src/winapi32/kernelbase.rs b/libmwemu/src/winapi32/kernelbase.rs
@@ -26,7 +26,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/libgcc.rs b/libmwemu/src/winapi32/libgcc.rs
@@ -18,7 +18,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/mscoree.rs b/libmwemu/src/winapi32/mscoree.rs
@@ -15,7 +15,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/msvcrt.rs b/libmwemu/src/winapi32/msvcrt.rs
@@ -33,7 +33,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/ntdll.rs b/libmwemu/src/winapi32/ntdll.rs
@@ -52,7 +52,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/oleaut32.rs b/libmwemu/src/winapi32/oleaut32.rs
@@ -17,7 +17,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/shlwapi.rs b/libmwemu/src/winapi32/shlwapi.rs
@@ -15,7 +15,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/user32.rs b/libmwemu/src/winapi32/user32.rs
@@ -21,7 +21,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/wincrt.rs b/libmwemu/src/winapi32/wincrt.rs
@@ -17,7 +17,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/wininet.rs b/libmwemu/src/winapi32/wininet.rs
@@ -35,7 +35,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi32/ws2_32.rs b/libmwemu/src/winapi32/ws2_32.rs
@@ -42,7 +42,7 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi64/advapi32.rs b/libmwemu/src/winapi64/advapi32.rs
@@ -21,7 +21,7 @@ pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }

diff --git a/libmwemu/src/winapi64/comctl32.rs b/libmwemu/src/winapi64/comctl32.rs
@@ -0,0 +1,20 @@
+use crate::emu;
+use crate::serialization;
+use crate::winapi64;
+
+pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
+    let api = winapi64::kernel32::guess_api_name(emu, addr);
+    match api.as_str() {
+        _ => {
+            if emu.cfg.skip_unimplemented == false {
+                if emu.cfg.dump_on_exit && emu.cfg.dump_filename.is_some() {
+                    serialization::Serialization::dump_to_file(&emu, emu.cfg.dump_filename.as_ref().unwrap());
+                }
+
+                unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
+            }
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
+            return api;
+        }
+    }
+}
diff --git a/libmwemu/src/winapi64/comctl64.rs b/libmwemu/src/winapi64/comctl64.rs
@@ -1,9 +1,10 @@
 use crate::emu;
 use crate::serialization;
-use crate::winapi64;
+use crate::winapi64::kernel32;
+//use crate::winapi32::helper;
 
 pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
-    let api = winapi64::kernel32::guess_api_name(emu, addr);
+    let api = kernel32::guess_api_name(emu, addr);
     match api.as_str() {
         _ => {
             if emu.cfg.skip_unimplemented == false {
@@ -13,8 +14,10 @@ pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }
-}
+
+    String::new()
+}
diff --git a/libmwemu/src/winapi64/dnsapi.rs b/libmwemu/src/winapi64/dnsapi.rs
@@ -13,7 +13,7 @@ pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
 
                 unimplemented!("atemmpt to call unimplemented API 0x{:x} {}", addr, api);
             }
-            log::warn!("calling unimplemented API 0x{:x} {}", addr, api);
+            log::warn!("calling unimplemented API 0x{:x} {} at 0x{:x}", addr, api, emu.regs.rip);
             return api;
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ x @@
     test/
     .venv/
     emu.bin
+    emu.bin*