seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Try closing gracefully before terminating process"

Browse Source
This commit is contained in:
Rémi Verschelde
2018-08-27 17:32:43 +02:00
committed by GitHub
parent c1f687c681
commit 72996df656
6 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
platform/windows/os_windows.cpp
View File

@ -190,28 +190,6 @@ BOOL WINAPI HandlerRoutine(_In_ DWORD dwCtrlType) {
}
}
BOOL CALLBACK _CloseWindowsEnum(HWND hWnd, LPARAM lParam) {
DWORD dwID;
GetWindowThreadProcessId(hWnd, &dwID);
if (dwID == (DWORD)lParam) {
PostMessage(hWnd, WM_CLOSE, 0, 0);
}
return TRUE;
}
bool _close_gracefully(const PROCESS_INFORMATION &pi, const DWORD dwStopWaitMsec) {
if (!EnumWindows(_CloseWindowsEnum, pi.dwProcessId))
return false;
if (WaitForSingleObject(pi.hProcess, dwStopWaitMsec) != WAIT_OBJECT_0)
return false;
return true;
}
void OS_Windows::initialize_debugging() {
SetConsoleCtrlHandler(HandlerRoutine, TRUE);
@ -2464,26 +2442,20 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,
return OK;
};
Error OS_Windows::kill(const ProcessID &p_pid, const int p_max_wait_msec) {
Error OS_Windows::kill(const ProcessID &p_pid) {
ERR_FAIL_COND_V(!process_map->has(p_pid), FAILED);
const PROCESS_INFORMATION pi = (*process_map)[p_pid].pi;
process_map->erase(p_pid);
Error result;
if (p_max_wait_msec != -1 && _close_gracefully(pi, p_max_wait_msec)) {
result = OK;
} else {
const int ret = TerminateProcess(pi.hProcess, 0);
result = ret != 0 ? OK : FAILED;
}
const int ret = TerminateProcess(pi.hProcess, 0);
CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
return result;
}
return ret != 0 ? OK : FAILED;
};
int OS_Windows::get_process_id() const {
return _getpid();