hresult constant

Author: sha0coder

crates/libmwemu/src/constants.rs

@@ -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/winapi/winapi64/ntdll.rs

@@ -986,10 +986,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();
@@ -1013,6 +1011,8 @@ fn NtReadFile(emu: &mut emu::Emu) {
         panic!("TODO: read {}", filename);
     }
 
+
+
     emu.regs_mut().rax = constants::STATUS_SUCCESS;
 }
 

crates/libmwemu/src/winapi/winapi64/oleaut32.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;
     }