Merge pull request #21489 from godotengine/revert-21236-windows-graceful-close

Revert "Try closing gracefully before terminating process"

6 files changed, 11 insertions, 39 deletions

diff --git a/core/os/os.h b/core/os/os.h
index 6f9a72d451..100af95ef1 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -256,7 +256,7 @@ public:
 
 	virtual String get_executable_path() const;
 	virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false) = 0;
-	virtual Error kill(const ProcessID &p_pid, const int p_max_wait_msec = -1) = 0;
+	virtual Error kill(const ProcessID &p_pid) = 0;
 	virtual int get_process_id() const;
 
 	virtual Error shell_open(String p_uri);
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 8aab4cb521..05dfd69f58 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -329,7 +329,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo
 	return OK;
 }
 
-Error OS_Unix::kill(const ProcessID &p_pid, const int p_max_wait_msec) {
+Error OS_Unix::kill(const ProcessID &p_pid) {
 
 	int ret = ::kill(p_pid, SIGKILL);
 	if (!ret) {
diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h
index c5240231fa..95b74d23ff 100644
--- a/drivers/unix/os_unix.h
+++ b/drivers/unix/os_unix.h
@@ -91,7 +91,7 @@ public:
 	virtual uint64_t get_ticks_usec() const;
 
 	virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false);
-	virtual Error kill(const ProcessID &p_pid, const int p_max_wait_msec = -1);
+	virtual Error kill(const ProcessID &p_pid);
 	virtual int get_process_id() const;
 
 	virtual bool has_environment(const String &p_var) const;
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index bbd18306a2..62870ab35c 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -196,8 +196,8 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
 void EditorRun::stop() {
 
 	if (status != STATUS_STOP && pid != 0) {
-		const int max_wait_msec = GLOBAL_DEF("editor/stop_max_wait_msec", 10000);
-		OS::get_singleton()->kill(pid, max_wait_msec);
+
+		OS::get_singleton()->kill(pid);
 	}
 
 	status = STATUS_STOP;
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 03f2199954..7009df8e57 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -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();
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 243d4bb328..c9fa46052a 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -259,7 +259,7 @@ public:
 	virtual uint64_t get_ticks_usec() const;
 
 	virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false);
-	virtual Error kill(const ProcessID &p_pid, const int p_stop_max_wait_msec = -1);
+	virtual Error kill(const ProcessID &p_pid);
 	virtual int get_process_id() const;
 
 	virtual bool has_environment(const String &p_var) const;