diff --git a/reactos/base/shell/cmd/cmdtable.c b/reactos/base/shell/cmd/cmdtable.c index 3aa28c6a6a9..21b8abf6e85 100644 --- a/reactos/base/shell/cmd/cmdtable.c +++ b/reactos/base/shell/cmd/cmdtable.c @@ -245,7 +245,7 @@ COMMAND cmds[] = }; -VOID PrintCommandList (VOID) +VOID PrintCommandList(VOID) { LPCOMMAND cmdptr; INT y; @@ -258,7 +258,7 @@ VOID PrintCommandList (VOID) { if (++y == 8) { - ConOutPuts (cmdptr->name); + ConOutPuts(cmdptr->name); y = 0; } else @@ -271,13 +271,13 @@ VOID PrintCommandList (VOID) } if (y != 0) - ConOutChar ('\n'); + ConOutChar('\n'); } -VOID PrintCommandListDetail (VOID) +VOID PrintCommandListDetail(VOID) { - ConOutResPaging(TRUE,STRING_HELP1); - ConOutResPaging(FALSE,STRING_HELP2); + ConOutResPaging(TRUE , STRING_HELP1); + ConOutResPaging(FALSE, STRING_HELP2); } /* EOF */ diff --git a/reactos/base/shell/cmd/internal.c b/reactos/base/shell/cmd/internal.c index 90b27b1ac66..d1ca1ecb606 100644 --- a/reactos/base/shell/cmd/internal.c +++ b/reactos/base/shell/cmd/internal.c @@ -543,13 +543,20 @@ INT CommandRem (LPTSTR param) INT CommandShowCommands (LPTSTR param) { - PrintCommandList (); + PrintCommandList(); return 0; } -INT CommandShowCommandsDetail (LPTSTR param) +INT CommandShowCommandsDetail(LPTSTR param) { - /* If a param was send, display help of correspondent command */ + /* We display help for the help command */ + if (!_tcsncmp(param, _T("/?"), 2)) + { + ConOutResPaging(TRUE, STRING_HELP_HELP1); + return 0; + } + + /* If a param was send, display help of corresponding command */ if (_tcslen(param)) { DoCommand(param, _T("/?"), NULL); @@ -557,7 +564,7 @@ INT CommandShowCommandsDetail (LPTSTR param) /* Else, display detailed commands list */ else { - PrintCommandListDetail (); + PrintCommandListDetail(); } return 0; } diff --git a/reactos/base/shell/cmd/lang/de-DE.rc b/reactos/base/shell/cmd/lang/de-DE.rc index 0342a38de01..ddb38d9ec35 100644 --- a/reactos/base/shell/cmd/lang/de-DE.rc +++ b/reactos/base/shell/cmd/lang/de-DE.rc @@ -267,6 +267,10 @@ GOTO Marke\n\n\ Marke Definiert eine Zeichenfolge als Marke in einem Batchprogramm.\n\n\ Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Verarbeitet Ausdrücke in einer Batchdatei abhängig von Bedingungen.\n\n\ IF [NOT] ERRORLEVEL Nummer Befehl\n\ IF [NOT] variable1==variable2 Befehl\n\ diff --git a/reactos/base/shell/cmd/lang/el-GR.rc b/reactos/base/shell/cmd/lang/el-GR.rc index 039da722aa5..8d0400f314b 100644 --- a/reactos/base/shell/cmd/lang/el-GR.rc +++ b/reactos/base/shell/cmd/lang/el-GR.rc @@ -271,6 +271,10 @@ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ diff --git a/reactos/base/shell/cmd/lang/en-US.rc b/reactos/base/shell/cmd/lang/en-US.rc index 1daebcffff5..73ae5795112 100644 --- a/reactos/base/shell/cmd/lang/en-US.rc +++ b/reactos/base/shell/cmd/lang/en-US.rc @@ -271,6 +271,10 @@ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ diff --git a/reactos/base/shell/cmd/lang/es-ES.rc b/reactos/base/shell/cmd/lang/es-ES.rc index e8155549659..511c5abb731 100644 --- a/reactos/base/shell/cmd/lang/es-ES.rc +++ b/reactos/base/shell/cmd/lang/es-ES.rc @@ -272,6 +272,10 @@ GOTO etiqueta\n\n\ etiqueta Especifica la cadena de texto usada en el archivo por lotes como etiqueta.\n\n\ Escriba la etiqueta en la linea misma, empezando con dos puntos." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Ejecuta procesos condicionales en archivos por lotes.\n\n\ IF [NOT] ERRORLEVEL número comando\n\ IF [NOT] string1==string2 comando\n\ diff --git a/reactos/base/shell/cmd/lang/fr-FR.rc b/reactos/base/shell/cmd/lang/fr-FR.rc index 418bdbef9d9..68dd0ba7d41 100644 --- a/reactos/base/shell/cmd/lang/fr-FR.rc +++ b/reactos/base/shell/cmd/lang/fr-FR.rc @@ -286,6 +286,10 @@ GOTO label\n\n\ label Spécifie un champ texte utilisé dans un script batch comme un label.\n\n\ Vous écrivez un label seul sur une ligne commençant par un deux-points.\n" +STRING_HELP_HELP1, "Fournit des informations d'aide pour les commandes de ReactOS.\n\n\ +HELP [commande]\n\n\ + commande - Affiche des informations d'aide sur cette commande.\n" + STRING_IF_HELP1, "Exécute un traitement conditionnel dans des programmes batch.\n\n\ IF [NOT] ERRORLEVEL nombre commande\n\ IF [NOT] chaine1==chaine2 commande\n\ diff --git a/reactos/base/shell/cmd/lang/hu-HU.rc b/reactos/base/shell/cmd/lang/hu-HU.rc index be532a295b6..ee89dc697f0 100644 --- a/reactos/base/shell/cmd/lang/hu-HU.rc +++ b/reactos/base/shell/cmd/lang/hu-HU.rc @@ -256,6 +256,10 @@ GOTO címke\n\n\ címke A megadott címkére fog ugrani az értelmezõ.\n\n\ Egy címkét egy sorban lehet megadni, ':' -tal kezdve." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ diff --git a/reactos/base/shell/cmd/lang/id-ID.rc b/reactos/base/shell/cmd/lang/id-ID.rc index 696cb603cb9..8eb79b84d2a 100644 --- a/reactos/base/shell/cmd/lang/id-ID.rc +++ b/reactos/base/shell/cmd/lang/id-ID.rc @@ -272,6 +272,10 @@ GOTO label\n\n\ label Menetapkan string teks yang digunakan dalam naskah batch sebagai label.\n\n\ Anda mengetik label pada sebuah baris, dimulai dengan titik dua." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Melakukan pemrosesan kondisional dalam program batch.\n\n\ IF [NOT] ERRORLEVEL nomor perintah\n\ IF [NOT] string1==string2 perintah\n\ diff --git a/reactos/base/shell/cmd/lang/it-IT.rc b/reactos/base/shell/cmd/lang/it-IT.rc index b1cadf25d9a..ea693b5abb1 100644 --- a/reactos/base/shell/cmd/lang/it-IT.rc +++ b/reactos/base/shell/cmd/lang/it-IT.rc @@ -270,6 +270,10 @@ GOTO etichetta\n\n\ etichetta Indica il testo utilizzato come etichetta in un batch.\n\n\ Nel batch questa deve trovarsi da sola in una linea con davanti due punti :.\n" +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Esegue una elaborazione condizionale nei batch.\n\n\ IF [NOT] ERRORLEVEL numero comando\n\ IF [NOT] stringa1==stringa2 comando\n\ diff --git a/reactos/base/shell/cmd/lang/ja-JP.rc b/reactos/base/shell/cmd/lang/ja-JP.rc index 6046fc3b010..a29340ab720 100644 --- a/reactos/base/shell/cmd/lang/ja-JP.rc +++ b/reactos/base/shell/cmd/lang/ja-JP.rc @@ -277,6 +277,10 @@ GOTO ラベル\n\n\ ラベルの先頭には : (コロン) を指定し、ラベルだけを単独で 1 行に入力してくだ\n\ さい。" +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "バッチ プログラム中で条件処理を実行します。\n\n\ IF [NOT] ERRORLEVEL 番号 コマンド\n\ IF [NOT] 文字列1==文字列2 コマンド\n\ diff --git a/reactos/base/shell/cmd/lang/no-NO.rc b/reactos/base/shell/cmd/lang/no-NO.rc index 73e94b40eee..dc0559c2e12 100644 --- a/reactos/base/shell/cmd/lang/no-NO.rc +++ b/reactos/base/shell/cmd/lang/no-NO.rc @@ -267,6 +267,10 @@ GOTO merke\n\n\ merke angir en tekst streng brukt i en satsvis skript.\n\n\ Et merke opprettes på egen linje ved å skrive kolon fulgt av navn på merke." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Utføre betinget behandling i satsvise programmer.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ IF [NOT] streng1==streng2 kommando\n\ diff --git a/reactos/base/shell/cmd/lang/pl-PL.rc b/reactos/base/shell/cmd/lang/pl-PL.rc index 9b8b1c4e2dd..0b2dc7e0e22 100644 --- a/reactos/base/shell/cmd/lang/pl-PL.rc +++ b/reactos/base/shell/cmd/lang/pl-PL.rc @@ -275,6 +275,10 @@ GOTO etykieta\n\n\ etykieta Ciąg znaków, użyty w programie wsadowym do oznaczenia linii.\n\n\ Możesz oznaczyć linie dowolną etykietą, zaczynając od dwukropka." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Wykonuje przetwarzanie warunkowe w programach wsadowych.\n\n\ IF [NOT] ERRORLEVEL numer komenda\n\ IF [NOT] ciąg_znaków1==ciąg_znaków2 komenda\n\ diff --git a/reactos/base/shell/cmd/lang/ro-RO.rc b/reactos/base/shell/cmd/lang/ro-RO.rc index a1f4d6fd470..79c79b7f3ac 100644 --- a/reactos/base/shell/cmd/lang/ro-RO.rc +++ b/reactos/base/shell/cmd/lang/ro-RO.rc @@ -300,6 +300,10 @@ GOTO etichetă\n\n\ fișierele de comenzi.\n\n\ O etichetă se va defini pe un rând întreg, începând cu două puncte (:)\n" +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Realizează execuția condiționată a comenzilor într-un fișier de comenzi.\n\n\ IF [NOT] ERRORLEVEL număr comandă\n\ IF [NOT] șir1==șir2 comandă\n\ diff --git a/reactos/base/shell/cmd/lang/ru-RU.rc b/reactos/base/shell/cmd/lang/ru-RU.rc index a7c5a406081..276ea5324e2 100644 --- a/reactos/base/shell/cmd/lang/ru-RU.rc +++ b/reactos/base/shell/cmd/lang/ru-RU.rc @@ -272,6 +272,10 @@ GOTO метка\n\n\ label Строка пакетного файла, оформленная как метка.\n\n\ Метка должна находиться в отдельной строке и начинаться с двоеточия." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Оператор условного выполнения команд в пакетном файле.\n\n\ IF [NOT] ERRORLEVEL число команда\n\ IF [NOT] строка1==строка2 команда\n\ diff --git a/reactos/base/shell/cmd/lang/sk-SK.rc b/reactos/base/shell/cmd/lang/sk-SK.rc index ae007bcddab..f365b2bf71f 100644 --- a/reactos/base/shell/cmd/lang/sk-SK.rc +++ b/reactos/base/shell/cmd/lang/sk-SK.rc @@ -275,6 +275,10 @@ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ diff --git a/reactos/base/shell/cmd/lang/sv-SE.rc b/reactos/base/shell/cmd/lang/sv-SE.rc index ffe1d8d2033..b51bb460787 100644 --- a/reactos/base/shell/cmd/lang/sv-SE.rc +++ b/reactos/base/shell/cmd/lang/sv-SE.rc @@ -267,6 +267,10 @@ GOTO etikett\n\n\ etikett Anger en text sträng använt i ett batchprogram.\n\n\ En etikett skapas på en egen rad genom att skriva kolon följt av namn på etiketten." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Utför villkorsstyrd bearbetning i batchprogram.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ IF [NOT] sträng1==sträng2 kommando\n\ diff --git a/reactos/base/shell/cmd/lang/uk-UA.rc b/reactos/base/shell/cmd/lang/uk-UA.rc index f2f17c299a3..b77535db256 100644 --- a/reactos/base/shell/cmd/lang/uk-UA.rc +++ b/reactos/base/shell/cmd/lang/uk-UA.rc @@ -278,6 +278,10 @@ GOTO мiтка\n\n\ label рядок пакетного файлу, визначений як мiтка.\n\n\ Мітка повинна знаходитися в окремому рядку i починатися з двокрапки." +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "Оператор умовного виконання команд у пакетному файлi.\n\n\ IF [NOT] ERRORLEVEL число команда\n\ IF [NOT] рядок1==рядок2 команда\n\ diff --git a/reactos/base/shell/cmd/lang/zh-CN.rc b/reactos/base/shell/cmd/lang/zh-CN.rc index b64cca29b34..f2b0c2f10bc 100644 --- a/reactos/base/shell/cmd/lang/zh-CN.rc +++ b/reactos/base/shell/cmd/lang/zh-CN.rc @@ -259,6 +259,10 @@ GOTO 标签\n\n\ 标签 在批处理脚本中被用作标签的文本字符串。\n\n\ 使用冒号开头的一行就作为一个标签。" +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + STRING_IF_HELP1, "在批处理文件中执行条件控制处理。\n\n\ IF [NOT] ERRORLEVEL 数字 命令\n\ IF [NOT] 字符串1==字符串2 命令\n\ diff --git a/reactos/base/shell/cmd/resource.h b/reactos/base/shell/cmd/resource.h index c089a49b826..c44ccddb59f 100644 --- a/reactos/base/shell/cmd/resource.h +++ b/reactos/base/shell/cmd/resource.h @@ -137,72 +137,74 @@ #define STRING_GOTO_HELP1 659 -#define STRING_LABEL_HELP1 660 -#define STRING_LABEL_HELP2 661 -#define STRING_LABEL_HELP3 662 -#define STRING_LABEL_HELP4 663 -#define STRING_LABEL_HELP5 664 +#define STRING_HELP_HELP1 660 -#define STRING_LOCALE_HELP1 665 +#define STRING_LABEL_HELP1 661 +#define STRING_LABEL_HELP2 662 +#define STRING_LABEL_HELP3 663 +#define STRING_LABEL_HELP4 664 +#define STRING_LABEL_HELP5 665 -#define STRING_MKDIR_HELP 666 +#define STRING_LOCALE_HELP1 666 -#define STRING_MEMMORY_HELP1 667 -#define STRING_MEMMORY_HELP2 668 +#define STRING_MKDIR_HELP 667 -#define STRING_MISC_HELP1 669 +#define STRING_MEMMORY_HELP1 668 +#define STRING_MEMMORY_HELP2 669 -#define STRING_MOVE_HELP1 670 -#define STRING_MOVE_HELP2 671 +#define STRING_MISC_HELP1 670 -#define STRING_MSGBOX_HELP 672 +#define STRING_MOVE_HELP1 671 +#define STRING_MOVE_HELP2 672 -#define STRING_PATH_HELP1 673 +#define STRING_MSGBOX_HELP 673 -#define STRING_PAUSE_HELP1 674 +#define STRING_PATH_HELP1 674 -#define STRING_PROMPT_HELP1 675 -#define STRING_PROMPT_HELP2 676 -#define STRING_PROMPT_HELP3 677 +#define STRING_PAUSE_HELP1 675 -#define STRING_REM_HELP 678 +#define STRING_PROMPT_HELP1 676 +#define STRING_PROMPT_HELP2 677 +#define STRING_PROMPT_HELP3 678 -#define STRING_REN_HELP1 679 -#define STRING_REN_HELP2 680 -#define STRING_REN_HELP3 681 +#define STRING_REM_HELP 679 -#define STRING_RMDIR_HELP 682 +#define STRING_REN_HELP1 680 +#define STRING_REN_HELP2 681 +#define STRING_REN_HELP3 682 -#define STRING_SCREEN_HELP 683 +#define STRING_RMDIR_HELP 683 -#define STRING_SHIFT_HELP 684 +#define STRING_SCREEN_HELP 684 -#define STRING_SET_HELP 685 +#define STRING_SHIFT_HELP 685 -#define STRING_START_HELP1 686 +#define STRING_SET_HELP 686 -#define STRING_TITLE_HELP 687 +#define STRING_START_HELP1 687 -#define STRING_TIME_HELP1 688 -#define STRING_TIME_HELP2 689 +#define STRING_TITLE_HELP 688 -#define STRING_TIMER_HELP1 690 -#define STRING_TIMER_HELP2 691 -#define STRING_TIMER_HELP3 692 +#define STRING_TIME_HELP1 689 +#define STRING_TIME_HELP2 690 -#define STRING_TYPE_HELP1 693 +#define STRING_TIMER_HELP1 691 +#define STRING_TIMER_HELP2 692 +#define STRING_TIMER_HELP3 693 -#define STRING_VERIFY_HELP1 694 -#define STRING_VERIFY_HELP2 695 -#define STRING_VERIFY_HELP3 696 +#define STRING_TYPE_HELP1 694 -#define STRING_VERSION_HELP1 697 -#define STRING_VERSION_HELP2 698 -#define STRING_VERSION_HELP3 699 -#define STRING_VERSION_HELP4 700 -#define STRING_VERSION_HELP5 701 -#define STRING_VERSION_HELP6 702 -#define STRING_VERSION_HELP7 703 +#define STRING_VERIFY_HELP1 695 +#define STRING_VERIFY_HELP2 696 +#define STRING_VERIFY_HELP3 697 + +#define STRING_VERSION_HELP1 698 +#define STRING_VERSION_HELP2 699 +#define STRING_VERSION_HELP3 700 +#define STRING_VERSION_HELP4 701 +#define STRING_VERSION_HELP5 702 +#define STRING_VERSION_HELP6 703 +#define STRING_VERSION_HELP7 704 #define STRING_VERSION_RUNVER 705 #define STRING_VOL_HELP1 706