https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3276824586fefd531f4473046618fa2724442a53
commit 3276824586fefd531f4473046618fa2724442a53
Author: Paweł Cholewa <dam...@protonmail.com>
AuthorDate: Thu Aug 15 19:07:05 2019 +0200
Commit: Mark Jansen <mark.jan...@reactos.org>
CommitDate: Thu Aug 15 19:07:05 2019 +0200
[TASKMGR] Implement proper process tree ending
* Implement ShutdownProcessTree in endproc.c which recursively kills
process trees
* Include tlhelp32.h in precomp.h
* Check if the child process can be shut down
---
base/applications/taskmgr/endproc.c | 53 ++++++++++++++++++++++++++++++++++++-
base/applications/taskmgr/precomp.h | 1 +
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/base/applications/taskmgr/endproc.c
b/base/applications/taskmgr/endproc.c
index 04d194cafa2..74ce95f3480 100644
--- a/base/applications/taskmgr/endproc.c
+++ b/base/applications/taskmgr/endproc.c
@@ -107,6 +107,57 @@ BOOL IsCriticalProcess(HANDLE hProcess)
return FALSE;
}
+BOOL ShutdownProcessTreeHelper(HANDLE hSnapshot, HANDLE hParentProcess, DWORD
dwParentPID)
+{
+ HANDLE hChildHandle;
+ PROCESSENTRY32W ProcessEntry = {0};
+ ProcessEntry.dwSize = sizeof(ProcessEntry);
+
+ if (Process32FirstW(hSnapshot, &ProcessEntry))
+ {
+ do
+ {
+ if (ProcessEntry.th32ParentProcessID == dwParentPID)
+ {
+ hChildHandle = OpenProcess(PROCESS_TERMINATE |
PROCESS_QUERY_INFORMATION,
+ FALSE,
+ ProcessEntry.th32ProcessID);
+ if (!hChildHandle || IsCriticalProcess(hChildHandle))
+ {
+ if (hChildHandle)
+ {
+ CloseHandle(hChildHandle);
+ }
+ continue;
+ }
+ if (!ShutdownProcessTreeHelper(hSnapshot, hChildHandle,
ProcessEntry.th32ProcessID))
+ {
+ CloseHandle(hChildHandle);
+ return FALSE;
+ }
+ CloseHandle(hChildHandle);
+ }
+ } while (Process32NextW(hSnapshot, &ProcessEntry));
+ }
+
+ return TerminateProcess(hParentProcess, 0);
+}
+
+BOOL ShutdownProcessTree(HANDLE hParentProcess, DWORD dwParentPID)
+{
+ HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+ BOOL bResult;
+
+ if (!hSnapshot)
+ {
+ return FALSE;
+ }
+
+ bResult = ShutdownProcessTreeHelper(hSnapshot, hParentProcess,
dwParentPID);
+ CloseHandle(hSnapshot);
+ return bResult;
+}
+
void ProcessPage_OnEndProcessTree(void)
{
DWORD dwProcessId;
@@ -147,7 +198,7 @@ void ProcessPage_OnEndProcessTree(void)
return;
}
- if (!TerminateProcess(hProcess, 0))
+ if (!ShutdownProcessTree(hProcess, dwProcessId))
{
GetLastErrorText(strErrorText, 260);
LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256);
diff --git a/base/applications/taskmgr/precomp.h
b/base/applications/taskmgr/precomp.h
index f6bc6813170..d929d4c33f6 100644
--- a/base/applications/taskmgr/precomp.h
+++ b/base/applications/taskmgr/precomp.h
@@ -18,6 +18,7 @@
#include <winreg.h>
#include <commctrl.h>
#include <shellapi.h>
+#include <tlhelp32.h>
#include "column.h"
#include "taskmgr.h"
