asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #71269 from bruvzg/win_kill

Browse source 
[Windows] Allow OS::kill method to terminate non-child processes.
This commit is contained in:
Rémi Verschelde 2023-01-12 15:00:36 +01:00
commit 1baddad599
No known key found for this signature in database
GPG key ID: C3336907360768E1
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) {
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;
process_map->erase(p_pid);
ret = TerminateProcess(pi.hProcess, 0);
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(pi.hThread);
CloseHandle(hProcess);
}
}
return ret != 0 ? OK : FAILED;
}