godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

[Windows] Allow OS::kill method to terminate non-child processes.

This commit is contained in:
bruvzg 2023-01-12 14:41:57 +02:00
parent caf94f244e
commit 01adf738fa
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform/windows/os_windows.cpp
View File

@ -718,15 +718,23 @@ Error OS_Windows::create_process(const String &p_path, const List<String> &p_arg
} }
Error OS_Windows::kill(const ProcessID &p_pid) { Error OS_Windows::kill(const ProcessID &p_pid) {
ERR_FAIL_COND_V(!process_map->has(p_pid), FAILED); int ret = 0;
if (process_map->has(p_pid)) {
const PROCESS_INFORMATION pi = (*process_map)[p_pid].pi;
process_map->erase(p_pid);
const PROCESS_INFORMATION pi = (*process_map)[p_pid].pi; ret = TerminateProcess(pi.hProcess, 0);
process_map->erase(p_pid);
const int ret = TerminateProcess(pi.hProcess, 0); CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
} else {
HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, false, (DWORD)p_pid);
if (hProcess != NULL) {
ret = TerminateProcess(hProcess, 0);
CloseHandle(pi.hProcess); CloseHandle(hProcess);
CloseHandle(pi.hThread); }
}
return ret != 0 ? OK : FAILED; return ret != 0 ? OK : FAILED;
} }