implement ExitThread

evmar · Sep 22, 2024 · 88cde64 · 88cde64
1 parent faba6df
commit 88cde64
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -195,7 +195,7 @@ fn main() -> anyhow::Result<ExitCode> {
                 machine.dump_state(0);
             }
             x86::CPUState::Exit(_) => {}
-            x86::CPUState::Running | x86::CPUState::Blocked(_) | x86::CPUState::SysCall => {
+            x86::CPUState::Running | x86::CPUState::Blocked(_) | x86::CPUState::SysCall | x86::CPUState::Free => {
                 unreachable!()
             }
             x86::CPUState::DebugBreak => todo!(),

diff --git a/win32/dll/kernel32.dll b/win32/dll/kernel32.dll
diff --git a/win32/src/winapi/builtin.rs b/win32/src/winapi/builtin.rs
@@ -1945,6 +1945,11 @@ pub mod kernel32 {
             let uExitCode = <u32>::from_stack(mem, esp + 4u32);
             winapi::kernel32::ExitProcess(machine, uExitCode).to_raw()
         }
+        pub unsafe fn ExitThread(machine: &mut Machine, esp: u32) -> u32 {
+            let mem = machine.mem().detach();
+            let dwExitCode = <u32>::from_stack(mem, esp + 4u32);
+            winapi::kernel32::ExitThread(machine, dwExitCode).to_raw()
+        }
         pub unsafe fn FileTimeToSystemTime(machine: &mut Machine, esp: u32) -> u32 {
             let mem = machine.mem().detach();
             let lpFileTime = <Option<&FILETIME>>::from_stack(mem, esp + 4u32);
@@ -3119,6 +3124,10 @@ pub mod kernel32 {
             name: "ExitProcess",
             func: crate::shims::Handler::Sync(impls::ExitProcess),
         };
+        pub const ExitThread: Shim = Shim {
+            name: "ExitThread",
+            func: crate::shims::Handler::Sync(impls::ExitThread),
+        };
         pub const FileTimeToSystemTime: Shim = Shim {
             name: "FileTimeToSystemTime",
             func: crate::shims::Handler::Sync(impls::FileTimeToSystemTime),
@@ -3728,7 +3737,7 @@ pub mod kernel32 {
             func: crate::shims::Handler::Async(impls::retrowin32_thread_main),
         };
     }
-    const SHIMS: [Shim; 167usize] = [
+    const SHIMS: [Shim; 168usize] = [
         shims::AcquireSRWLockExclusive,
         shims::AcquireSRWLockShared,
         shims::AddVectoredExceptionHandler,
@@ -3744,6 +3753,7 @@ pub mod kernel32 {
         shims::DisableThreadLibraryCalls,
         shims::EnterCriticalSection,
         shims::ExitProcess,
+        shims::ExitThread,
         shims::FileTimeToSystemTime,
         shims::FindClose,
         shims::FindFirstFileA,

diff --git a/win32/src/winapi/kernel32/init.rs b/win32/src/winapi/kernel32/init.rs
@@ -504,7 +504,6 @@ pub async fn retrowin32_main(machine: &mut Machine, entry_point: u32) -> u32 {
 #[win32_derive::dllexport]
 pub async fn retrowin32_thread_main(machine: &mut Machine, entry_point: u32, param: u32) -> u32 {
     machine.call_x86(entry_point, vec![param]).await;
-    log::warn!("TODO: thread exiting, but we don't have a way to stop a single thread yet");
-    kernel32::exit_process(machine, 0);
+    machine.emu.x86.cpu_mut().state = x86::CPUState::Free;
     0
 }
diff --git a/win32/src/winapi/kernel32/thread.rs b/win32/src/winapi/kernel32/thread.rs
@@ -101,6 +101,21 @@ pub async fn CreateThread(
     }
 }
 
+#[win32_derive::dllexport]
+pub fn ExitThread(machine: &mut Machine, dwExitCode: u32) {
+    if machine.emu.x86.cur_cpu == 0 {
+        panic!("ExitThread called on main thread");
+    }
+
+    log::info!(
+        "ExitThread({}) on cpu {}",
+        dwExitCode,
+        machine.emu.x86.cur_cpu
+    );
+
+    machine.emu.x86.cpu_mut().state = x86::CPUState::Free;
+}
+
 #[win32_derive::dllexport]
 pub fn ResumeThread(_machine: &mut Machine, hThread: HTHREAD) -> u32 {
     1

diff --git a/x86/src/x86.rs b/x86/src/x86.rs
@@ -21,6 +21,7 @@ pub enum CPUState {
     SysCall,
     Error(String),
     Exit(u32),
+    Free,
 }
 
 impl CPUState {
@@ -245,7 +246,7 @@ impl X86 {
         let mut soonest = None;
         for (i, cpu) in self.cpus.iter().enumerate() {
             match cpu.state {
-                CPUState::Running => {}
+                CPUState::Running | CPUState::Free => {}
                 CPUState::DebugBreak
                 | CPUState::Error(_)
                 | CPUState::Exit(_)