improved GetThreadId witha a handle search, but handles have to be rethinked

Author: sha0coder

crates/libmwemu/src/serialization/thread_context.rs

@@ -30,6 +30,7 @@ pub struct SerializableThreadContext {
     pub fls: Vec<u32>,
     pub fs: BTreeMap<u64, u64>,
     pub call_stack: Vec<(u64, u64)>, // the first address is the source of the call location and the second address is the destination of the call
+    pub handle: u64
 }
 
 impl From<&ThreadContext> for SerializableThreadContext {
@@ -56,6 +57,7 @@ impl From<&ThreadContext> for SerializableThreadContext {
             fls: thread.fls.clone(),
             fs: thread.fs.clone(),
             call_stack: thread.call_stack.clone(),
+            handle: thread.handle
         }
     }
 }
@@ -84,6 +86,7 @@ impl From<SerializableThreadContext> for ThreadContext {
             fls: serialized.fls,
             fs: serialized.fs,
             call_stack: serialized.call_stack,
+            handle: serialized.handle,
         }
     }
 }

crates/libmwemu/src/thread_context.rs

@@ -25,6 +25,7 @@ pub struct ThreadContext {
     pub fls: Vec<u32>,
     pub fs: BTreeMap<u64, u64>,
     pub call_stack: Vec<(u64, u64)>,
+    pub handle: u64,
 }
 
 impl ThreadContext {
@@ -51,6 +52,7 @@ impl ThreadContext {
             fls: Vec::new(),
             fs: BTreeMap::new(),
             call_stack: Vec::with_capacity(10000),
+            handle: 0
         }
     }
 }

crates/libmwemu/src/winapi/winapi32/kernel32/mod.rs

@@ -548,8 +548,23 @@ pub fn gateway(addr: u32, emu: &mut emu::Emu) -> String {
 }
 
 fn GetThreadId(emu: &mut Emu) {
+    let hndl = emu
+        .maps
+        .read_dword(emu.regs().get_esp() + 4)
+        .expect("kernel32!GetThreadId bad handle parameter") as u64;
+
     emu.stack_pop32(false);
-    emu.regs_mut().rax = 0x2c2878;
+
+
+    for i in 0..emu.threads.len() {
+        if emu.threads[i].handle == hndl {
+            emu.regs_mut().rax = emu.threads[i].id;
+            log_red!(emu, "kernel32!GetThreadId hndl:{} (requested handle exists and its tid {})", hndl, emu.threads[i].id);
+            return;
+        }
+    }
+    log_red!(emu, "kernel32!GetThreadId hndl:{} (requested handle doesn't exist, returning a fake handle for now but should return zero.)", hndl);
+    emu.regs_mut().rax = 0x2c2878; // if handle not found should return zero.
 }
 
 lazy_static! {

crates/libmwemu/src/winapi/winapi64/kernel32/mod.rs

@@ -568,11 +568,24 @@ pub fn gateway(addr: u64, emu: &mut emu::Emu) -> String {
     String::new()
 }
 
+
 fn GetThreadId(emu: &mut Emu) {
-    let hThread = emu.regs().rcx;
-    emu.regs_mut().rax = 0x2c2878;
+    let hndl = emu.regs().rcx;
+
+    for i in 0..emu.threads.len() {
+        if emu.threads[i].handle == hndl {
+            emu.regs_mut().rax = emu.threads[i].id;
+            log_red!(emu, "kernel32!GetThreadId hndl:{} (requested handle exists and its tid {})", hndl, emu.threads[i].id);
+            return;
+        }
+    }
+    log_red!(emu, "kernel32!GetThreadId hndl:{} (requested handle doesn't exist, returning a fake handle for now but should return zero.)", hndl);
+    emu.regs_mut().rax = 0x2c2878; // if handle not found should return zero.
 }
 
+
+
+
 lazy_static! {
     pub static ref COUNT_READ: Mutex<u32> = Mutex::new(0);
     pub static ref COUNT_WRITE: Mutex<u32> = Mutex::new(0);