Skip to content

Commit 97e7efc

Browse files
khanhnt2HBelusca
authored andcommitted
[TASKKILL] Implement /t (tree) parameter (reactos#2403)
CORE-15998
1 parent 49c40a2 commit 97e7efc

File tree

12 files changed

+285
-158
lines changed

12 files changed

+285
-158
lines changed

base/applications/cmdutils/taskkill/lang/de-DE.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
22

33
STRINGTABLE
44
{
5-
STRING_USAGE, "Usage: taskkill [/?] [/f] [/im Prozess Name | /pid Prozess ID]\n"
5+
STRING_USAGE, "Usage: taskkill [/?] [/f] [/im Prozess Name | /pid Prozess ID] [/t]\n"
66
STRING_INVALID_OPTION, "Fehler: Unbekannte oder ungülige Kommandozeilenoption angegeben.\n"
77
STRING_INVALID_PARAM, "Fehler: Ungültiger Kommandozeilenparameter angegeben.\n"
88
STRING_MISSING_OPTION, "Fehler: Eine der Optionen /im oder /pid muss angegeben werden.\n"
@@ -16,6 +16,9 @@ STRINGTABLE
1616
STRING_ENUM_FAILED, "Fehler: Prozessliste kann nicht aufgebaut werden.\n"
1717
STRING_TERMINATE_FAILED, "Fehler: Prozess ""%1"" kann nicht beendet werden.\n"
1818
STRING_SELF_TERMINATION, "Fehler: Der Prozess kann sich nicht selbst beenden.\n"
19+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
20+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
21+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
1922
STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
2023
STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
2124
}

base/applications/cmdutils/taskkill/lang/en-US.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
22

33
STRINGTABLE
44
{
5-
STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n"
5+
STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID] [/t]\n"
66
STRING_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n"
77
STRING_INVALID_PARAM, "Error: Invalid command line parameter specified.\n"
88
STRING_MISSING_OPTION, "Error: One of options /im or /pid must be specified.\n"
@@ -16,6 +16,9 @@ STRINGTABLE
1616
STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n"
1717
STRING_TERMINATE_FAILED, "Error: Unable to terminate process ""%1"".\n"
1818
STRING_SELF_TERMINATION, "Error: Process self-termination is not permitted.\n"
19+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
20+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
21+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
1922
STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
2023
STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
2124
}

base/applications/cmdutils/taskkill/lang/it-IT.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
99

1010
STRINGTABLE
1111
{
12-
STRING_USAGE, "Uso: taskkill [/?] [/f] [/im NomeProcesso | /pid IDProcesso]\n"
12+
STRING_USAGE, "Uso: taskkill [/?] [/f] [/im NomeProcesso | /pid IDProcesso] [/t]\n"
1313
STRING_INVALID_OPTION, "Errore: L'opzione specificata è invalida o sconosciuta.\n"
1414
STRING_INVALID_PARAM, "Errore: Il parametro di comando a riga è invalido.\n"
1515
STRING_MISSING_OPTION, "Errore: Specifica una delle opzioni /im oppure /pid.\n"
@@ -23,6 +23,9 @@ STRINGTABLE
2323
STRING_ENUM_FAILED, "Errore: Impossibile enumerare la lista dei processi.\n"
2424
STRING_TERMINATE_FAILED, "Errore: Impossibile terminare il processo ""%1"".\n"
2525
STRING_SELF_TERMINATION, "Errore: L'auto-terminazione non è consentita.\n"
26+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
27+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
28+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2629
STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
2730
STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
2831
}

base/applications/cmdutils/taskkill/lang/pl-PL.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
99

1010
STRINGTABLE
1111
{
12-
STRING_USAGE, "Sposób użycia: taskkill [/?] [/f] [/im nazwa_procesu | /pid id_procesu]\n"
12+
STRING_USAGE, "Sposób użycia: taskkill [/?] [/f] [/im nazwa_procesu | /pid id_procesu] [/t]\n"
1313
STRING_INVALID_OPTION, "Błąd: Określono nieznaną lub nieprawidłową opcję.\n"
1414
STRING_INVALID_PARAM, "Błąd: Nieprawidłowy parametr.\n"
1515
STRING_MISSING_OPTION, "Błąd: Nie określono opcji /im ani /pid.\n"
@@ -23,6 +23,9 @@ STRINGTABLE
2323
STRING_ENUM_FAILED, "Błąd: Nie można wyliczyć listy procesów.\n"
2424
STRING_TERMINATE_FAILED, "Błąd: Nie można zakończyć procesu ""%1"".\n"
2525
STRING_SELF_TERMINATION, "Błąd: Proces nie może zakończyć sam siebie.\n"
26+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
27+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
28+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2629
STRING_PARAM_TOO_MUCH, "Błąd: Nieprawidłowa składnia. Opcja '%1' nie jest dozwolona więcej niż '%2!d!' razy.\n"
2730
STRING_INVALID_SYNTAX, "Błąd: Nieprawidłowa składnia.\n"
2831
}

base/applications/cmdutils/taskkill/lang/ro-RO.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
1010

1111
STRINGTABLE
1212
{
13-
STRING_USAGE, "Utilizare: taskkill [/?] [/f] [/im NumeProces | /pid IdProces]\n"
13+
STRING_USAGE, "Utilizare: taskkill [/?] [/f] [/im NumeProces | /pid IdProces] [/t]\n"
1414
STRING_INVALID_OPTION, "Eroare: Opțiune specificată nevalidă sau necunoscută.\n"
1515
STRING_INVALID_PARAM, "Eroare: Parametrul de comandă specificat este nevalid.\n"
1616
STRING_MISSING_OPTION, "Eroare: Trebuie specificată una dintre opțiunile /im sau /pid.\n"
@@ -24,6 +24,9 @@ STRINGTABLE
2424
STRING_ENUM_FAILED, "Eroare: Nu se poate enumera lista de procese.\n"
2525
STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n"
2626
STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n"
27+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
28+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
29+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2730
STRING_PARAM_TOO_MUCH, "Eroare: Sintaxă nevalidă. Opțiunea '%1' nu este permisă mai mult de '%2!d!' dată(dăți).\n"
2831
STRING_INVALID_SYNTAX, "Eroare: Sintaxă nevalidă.\n"
2932
}

base/applications/cmdutils/taskkill/lang/ru-RU.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
44

55
STRINGTABLE
66
{
7-
STRING_USAGE, "Использование: TASKKILL [/F] [/IM <образ> | /PID <процесс>]\n"
7+
STRING_USAGE, "Использование: TASKKILL [/F] [/IM <образ> | /PID <процесс>] [/t]\n"
88
STRING_INVALID_OPTION, "Ошибка: Указаны неверные параметры командной строки.\n"
99
STRING_INVALID_PARAM, "Ошибка: Указаны неверные параметры командной строки.\n"
1010
STRING_MISSING_OPTION, "Ошибка: Должен быть указан параметр /im или /pid.\n"
@@ -18,6 +18,9 @@ STRINGTABLE
1818
STRING_ENUM_FAILED, "Ошибка: Не удается получить список процессов.\n"
1919
STRING_TERMINATE_FAILED, "Ошибка: Не удается завершить процесс ""%1"".\n"
2020
STRING_SELF_TERMINATION, "Ошибка: Процесс не может завершить сам себя.\n"
21+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
22+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
23+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2124
STRING_PARAM_TOO_MUCH, "Ошибка: Неверный синтаксис. Нельзя использовать опцию '%1' больше '%2!d!' раз(а).\n"
2225
STRING_INVALID_SYNTAX, "Ошибка: Неверный синтаксис.\n"
2326
}

base/applications/cmdutils/taskkill/lang/sq-AL.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
66

77
STRINGTABLE
88
{
9-
STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n"
9+
STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID] [/t]\n"
1010
STRING_INVALID_OPTION, "Gabim: Panjohur ose i pavlefshëm opsioni linjes komandes i specifikuar.\n"
1111
STRING_INVALID_PARAM, "Gabim: Pavlefshëm parametri i specifikuar ne linjen e komandes.\n"
1212
STRING_MISSING_OPTION, "Gabim: Njera nga opsionet /im ose /pid duhet te specifikohet.\n"
@@ -20,6 +20,9 @@ STRINGTABLE
2020
STRING_ENUM_FAILED, "Gabim: Në pamundësi për të numëruar listën proceseve.\n"
2121
STRING_TERMINATE_FAILED, "Gabim: Pamundur mbyllja e proceseve ""%1"".\n"
2222
STRING_SELF_TERMINATION, "Gabim: Procesi vetë-përfundimi nuk është i lejuar.\n"
23+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
24+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
25+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2326
STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
2427
STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
2528
}

base/applications/cmdutils/taskkill/lang/tr-TR.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
44

55
STRINGTABLE
66
{
7-
STRING_USAGE, "Kullanım: taskkill [/?] [/f] [/im işlem adı | /pid işlem kimliği]\n"
7+
STRING_USAGE, "Kullanım: taskkill [/?] [/f] [/im işlem adı | /pid işlem kimliği] [/t]\n"
88
STRING_INVALID_OPTION, "Hata: Bilinmeyen veya geçersiz komut satırı seçeneği belirtildi.\n"
99
STRING_INVALID_PARAM, "Hata: Geçersiz komut satırı değişkeni belirtildi.\n"
1010
STRING_MISSING_OPTION, "Hata: /im ve /pid seçeneklerinden biri belirtilmeli.\n"
@@ -18,6 +18,9 @@ STRINGTABLE
1818
STRING_ENUM_FAILED, "Hata: İşlem numaralandırılamıyor.\n"
1919
STRING_TERMINATE_FAILED, "Hata: ""%1"" işlemi sonlandırılamıyor.\n"
2020
STRING_SELF_TERMINATION, "Hata: İşlemi kendi kendine sonlandırmaya izin verilmedi.\n"
21+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
22+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
23+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2124
STRING_PARAM_TOO_MUCH, "Hata: Geçersiz sözdizimi. '%1' seçeneğine '%2!d!'den fazla kez izin verilmiyor..\n"
2225
STRING_INVALID_SYNTAX, "Hata: Geçersiz sözdizimi.\n"
2326
}

base/applications/cmdutils/taskkill/lang/zh-CN.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
77

88
STRINGTABLE
99
{
10-
STRING_USAGE, "用法:taskkill [/?] [/f] [/im 进程名称 | /pid 进程 ID]\n"
10+
STRING_USAGE, "用法:taskkill [/?] [/f] [/im 进程名称 | /pid 进程 ID] [/t]\n"
1111
STRING_INVALID_OPTION, "错误:指定了未知或无效的命令行选项。\n"
1212
STRING_INVALID_PARAM, "错误:指定了无效的命令行参数。\n"
1313
STRING_MISSING_OPTION, "错误:必须指定选项 /im 或 /pid。\n"
@@ -21,6 +21,9 @@ STRINGTABLE
2121
STRING_ENUM_FAILED, "错误:无法枚举进程列表。\n"
2222
STRING_TERMINATE_FAILED, "错误:无法终止进程“%1”。\n"
2323
STRING_SELF_TERMINATION, "错误:不允许终止自身。\n"
24+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
25+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
26+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2427
STRING_PARAM_TOO_MUCH, "错误:无效语法。选项“%1”不允许超过“%2!d!”次。\n"
2528
STRING_INVALID_SYNTAX, "错误:无效语法。\n"
2629
}

base/applications/cmdutils/taskkill/lang/zh-TW.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
1111

1212
STRINGTABLE
1313
{
14-
STRING_USAGE, "用法: taskkill [/?] [/f] [/im 處理程序名稱 | /pid PID]\n"
14+
STRING_USAGE, "用法: taskkill [/?] [/f] [/im 處理程序名稱 | /pid PID] [/t]\n"
1515
STRING_INVALID_OPTION, "錯誤: 指定了不明或不正確的命令列選項。\n"
1616
STRING_INVALID_PARAM, "錯誤: 指定了不正確的命令列參數。\n"
1717
STRING_MISSING_OPTION, "錯誤: 必須指定選項 /im 或 /pid 的其中之一。\n"
@@ -25,6 +25,9 @@ STRINGTABLE
2525
STRING_ENUM_FAILED, "錯誤: 無法列舉處理程序清單。\n"
2626
STRING_TERMINATE_FAILED, "錯誤: 無法終止處理程序 '%1'。\n"
2727
STRING_SELF_TERMINATION, "錯誤: 處理程序不允許自我終止。\n"
28+
STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
29+
STRING_TERM_CHILD, "Process with PID %1!u! was forcibly terminated, child of PID %2!u!.\n"
30+
STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
2831
STRING_PARAM_TOO_MUCH, "錯誤: 無效的語法。'%1' 選項不允許超過 '%2!d!' 次。\n"
2932
STRING_INVALID_SYNTAX, "錯誤: 無效的語法。\n"
3033
}

0 commit comments

Comments
 (0)