Module: wine Branch: master Commit: fbcf44aa23f748bb63eb26656e610cbfc3356375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcf44aa23f748bb63eb26656e...
Author: Andrew Nguyen anguyen@codeweavers.com Date: Mon Oct 11 05:13:43 2010 -0500
taskkill: Disallow process self-termination.
---
programs/taskkill/En.rc | 1 + programs/taskkill/taskkill.c | 30 ++++++++++++++++++++++++++++++ programs/taskkill/taskkill.h | 1 + 3 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/programs/taskkill/En.rc b/programs/taskkill/En.rc index f7fcfd6..b4baabe 100644 --- a/programs/taskkill/En.rc +++ b/programs/taskkill/En.rc @@ -38,4 +38,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Error: Could not find process "%s".\n" STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" STRING_TERMINATE_FAILED, "Error: Unable to terminate process "%s".\n" + STRING_SELF_TERMINATION, "Error: Process self-termination is not permitted.\n" } diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 8dffdcd..1dc1fcc 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -204,6 +204,7 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) static int send_close_messages(void) { DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0;
@@ -234,6 +235,13 @@ static int send_close_messages(void) DWORD pid = atoiW(task_list[i]); struct pid_close_info info = { pid };
+ if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + EnumWindows(pid_enum_proc, (LPARAM)&info); if (info.found) taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); @@ -258,6 +266,13 @@ static int send_close_messages(void) struct pid_close_info info = { pid_list[index] };
found_process = TRUE; + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + EnumWindows(pid_enum_proc, (LPARAM)&info); taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); } @@ -278,6 +293,7 @@ static int send_close_messages(void) static int terminate_processes(void) { DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0;
@@ -308,6 +324,13 @@ static int terminate_processes(void) DWORD pid = atoiW(task_list[i]); HANDLE process;
+ if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (!process) { @@ -341,6 +364,13 @@ static int terminate_processes(void) { HANDLE process;
+ if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); if (!process) { diff --git a/programs/taskkill/taskkill.h b/programs/taskkill/taskkill.h index e535a01..7972a15 100644 --- a/programs/taskkill/taskkill.h +++ b/programs/taskkill/taskkill.h @@ -34,3 +34,4 @@ #define STRING_SEARCH_FAILED 111 #define STRING_ENUM_FAILED 112 #define STRING_TERMINATE_FAILED 113 +#define STRING_SELF_TERMINATION 114
-
Alexandre Julliard