Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [NET] Move HRELPMSG, LOVALGROUP and NAME command syntax and help texts into a message table.
by Eric Kohl 24 Dec '18

24 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e560fa27418495df9e7bf… commit e560fa27418495df9e7bf35ac6c65fc9ef345f9d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 24 00:13:16 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 24 00:13:16 2018 +0100 [NET] Move HRELPMSG, LOVALGROUP and NAME command syntax and help texts into a message table. --- base/applications/network/net/cmdHelpMsg.c | 9 +- base/applications/network/net/cmdLocalGroup.c | 12 +- base/applications/network/net/help.c | 19 +- base/applications/network/net/lang/en-US.rc | 32 -- base/applications/network/net/lang/es-ES.rc | 31 -- base/applications/network/net/lang/pl-PL.rc | 34 --- base/applications/network/net/lang/ro-RO.rc | 31 -- base/applications/network/net/lang/ru-RU.rc | 31 -- base/applications/network/net/lang/tr-TR.rc | 31 -- base/applications/network/net/lang/zh-CN.rc | 31 -- base/applications/network/net/lang/zh-TW.rc | 31 -- base/applications/network/net/resource.h | 13 - sdk/include/reactos/mc/net_msg.mc | 405 ++++++++++++++++++++++++++ 13 files changed, 418 insertions(+), 292 deletions(-) diff --git a/base/applications/network/net/cmdHelpMsg.c b/base/applications/network/net/cmdHelpMsg.c index faa54d2b6e..c2250ef9ef 100644 --- a/base/applications/network/net/cmdHelpMsg.c +++ b/base/applications/network/net/cmdHelpMsg.c @@ -24,7 +24,7 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) if (argc < 3) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_HELPMSG_SYNTAX); + PrintNetMessage(MSG_HELPMSG_SYNTAX); return 1; } @@ -33,9 +33,8 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) if (_wcsicmp(argv[i], L"/help") == 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_HELPMSG_SYNTAX); - ConResPuts(StdOut, IDS_HELPMSG_HELP_1); - ConResPuts(StdOut, IDS_HELPMSG_HELP_2); + PrintNetMessage(MSG_HELPMSG_SYNTAX); + PrintNetMessage(MSG_HELPMSG_HELP); return 1; } } @@ -44,7 +43,7 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) if (*endptr != 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_HELPMSG_SYNTAX); + PrintNetMessage(MSG_HELPMSG_SYNTAX); return 1; } diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index e6970926ee..8be27ef8ca 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -243,14 +243,8 @@ cmdLocalGroup( if (_wcsicmp(argv[i], L"/help") == 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_LOCALGROUP_SYNTAX); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_1); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_2); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_3); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_4); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_5); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_6); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_7); + PrintNetMessage(MSG_LOCALGROUP_SYNTAX); + PrintNetMessage(MSG_LOCALGROUP_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -388,7 +382,7 @@ done: if (result != 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_LOCALGROUP_SYNTAX); + PrintNetMessage(MSG_LOCALGROUP_SYNTAX); } return result; diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index 6b5903d735..ae36e3d536 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -77,30 +77,23 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"HELPMSG") == 0) { - ConResPuts(StdOut, IDS_HELPMSG_SYNTAX); - ConResPuts(StdOut, IDS_HELPMSG_HELP_1); - ConResPuts(StdOut, IDS_HELPMSG_HELP_2); + PrintNetMessage(MSG_HELPMSG_SYNTAX); + PrintNetMessage(MSG_HELPMSG_HELP); return 0; } if (_wcsicmp(argv[2], L"LOCALGROUP") == 0) { - ConResPuts(StdOut, IDS_LOCALGROUP_SYNTAX); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_1); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_2); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_3); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_4); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_5); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_6); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP_7); + PrintNetMessage(MSG_LOCALGROUP_SYNTAX); + PrintNetMessage(MSG_LOCALGROUP_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } if (_wcsicmp(argv[2], L"NAME") == 0) { - ConResPuts(StdOut, IDS_NAME_SYNTAX); - ConResPuts(StdOut, IDS_NAME_HELP); + PrintNetMessage(MSG_NAME_SYNTAX); + PrintNetMessage(MSG_NAME_HELP); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 89db1ce57d..b9c6eed84c 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,38 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG message#\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ -error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ -error (for example, ""net helpmsg 2182""), you will get information about the\n\ -message and suggested actions you can take to solve the problem.\n\n" - IDS_HELPMSG_HELP_2 "message# Is the numerical error with which you need help.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname name [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ -used without parameters, it displays the local groups on the computer.\n\n" - IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ - delete. Supply only a groupname to view a list of\n\ - users or global groups in a local group.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ - remove from a local group. Separate multiple entries with\n\ - a space. Names may be users or global groups, but not\n\ - other local groups. If a user is from another doamin,\n\ - preface the username with the domain name (for\n\ - example, SALES\\RALPHR).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ - must be established for users or global groups added to a\n\ - local group with this command.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" - - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 151249b825..1baf4f450c 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,37 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG <código de error>\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ -error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ -error (for example, ""net helpmsg 2182""), you will get information about the\n\ -message and suggested actions you can take to solve the problem.\n\n" - IDS_HELPMSG_HELP_2 "message# Is the numerical error with which you need help.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [grupo [/COMMENT:""texto""]] [/DOMAIN]\n\ - grupo {/ADD [/COMMENT:""texto""] | /DELETE} [/DOMAIN]\n\ - grupo nombre [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ -used without parameters, it displays the local groups on the computer.\n\n" - IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ - delete. Supply only a groupname to view a list of\n\ - users or global groups in a local group.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add to or\n\ - remove from a local group. Separate multiple entries with\n\ - a space. Names may be users or global groups, but not\n\ - other local groups. If a user is from another doamin,\n\ - preface the username with the domain name (for\n\ - example, SALES\\RALPHR).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ - must be established for users or global groups added to a\n\ - local group with this command.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE <nombre del servicio>\n\n" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index e0e38d717d..5b220b6a33 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,40 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG komunikat#\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG wyświetla informacje o komunikatach sieci (takich\n\ -jak błąd, ostrzeżenie lub alarm). Gdy wpiszesz NET HELPMSG i błąd numeryczny\n\ -(na przykład ""net helpmsg 2182""), system\n\ -objaśni komunikat i zasugeruje rozwiązanie problemu.\n\n" - IDS_HELPMSG_HELP_2 "komunikat# Numeryczny błąd systemu, o którym chcesz uzyskać informacje.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [nazwa_grupy [/COMMENT:""tekst""]] [/DOMAIN]\n\ - nazwa_grupy {/ADD [/COMMENT:""tekst""] | /DELETE} [/DOMAIN]\n\ - nazwa_grupy nazwa [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP dodaje, wyświetla, lub modyfikuje grupy lokalne na komputerach\n\ -Polecenie użyte bez parametrów wyświetla grupy lokalne na komputerze.\n\n" - IDS_LOCALGROUP_HELP_2 "nazwa_grupy Nazwa grupy dodawanej, rozszerzanej lub usuwanej.\n\ - Aby zobaczyć listę użytkowników lub grup globalnych\n\ - w grupie lokalnej, podaj tylko nazwę grupy.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""tekst"" Dodaje komentarz dla nowej lub istniejącej grupy.\n\ - Tekst musi być ujęty w cudzysłów.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Wykonuje operację na kontrolerze bieżącej domeny.\n\ - Bez tego przełącznika operacje są wykonywane na\n\ - komputerze lokalnym.\n" - IDS_LOCALGROUP_HELP_5 "nazwa[ ...] Lista zawierająca nazwy jednego lub kilku użytkowników\n\ - lub grup, dodawanych lub usuwanych z grupy lokalnej.\n\ - Rozdziel kolejne wpisy znakiem spacji. Lista może zawierać\n\ - nazwy użytkowników lub grup globalnych, lecz nie może\n\ - zawierać nazw innych grup lokalnych. Podając nazwę\n\ - użytkownika z innej domeny poprzedź ją nazwą domeny\n\ - (na przykład: WARSZAWA\\PIOTRS).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Dodaje nazwę grupy lub użytkownika do grupy lokalnej.\n\ - Dla użytkowników lub grup globalnych dodawanych tym\n\ - poleceniem do grupy lokalnej należy wcześniej utworzyć\n\ - odpowiednie konto.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Usuwa nazwę grupy lub użytkownika z grupy lokalnej.\n\n" - - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE usługa\n\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 103400fbc0..d492608b3d 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,37 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG <Error Code>\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ -error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ -error (for example, ""net helpmsg 2182""), you will get information about the\n\ -message and suggested actions you can take to solve the problem.\n\n" - IDS_HELPMSG_HELP_2 "message# Is the numerical error with which you need help.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [nume-de-grup [/COMMENT:""text""]] [/DOMAIN]\n\ - nume-de-grup {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - nume-de-grup nume [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ -used without parameters, it displays the local groups on the computer.\n\n" - IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ - delete. Supply only a groupname to view a list of\n\ - users or global groups in a local group.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ - remove from a local group. Separate multiple entries with\n\ - a space. Names may be users or global groups, but not\n\ - other local groups. If a user is from another doamin,\n\ - preface the username with the domain name (for\n\ - example, SALES\\RALPHR).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ - must be established for users or global groups added to a\n\ - local group with this command.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE <nume serviciu>\n\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 49f4fb34a5..e52cc2a30f 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,37 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG <Код ошибки>\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ -error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ -error (for example, ""net helpmsg 2182""), you will get information about the\n\ -message and suggested actions you can take to solve the problem.\n\n" - IDS_HELPMSG_HELP_2 "message# Is the numerical error with which you need help.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [имя_группы [/COMMENT:""текст""]] [/DOMAIN]\n\ - имя_группы {/ADD [/COMMENT:""текст""] | /DELETE} [/DOMAIN]\n\ - имя_группы имя [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ -used without parameters, it displays the local groups on the computer.\n\n" - IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ - delete. Supply only a groupname to view a list of\n\ - users or global groups in a local group.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ - remove from a local group. Separate multiple entries with\n\ - a space. Names may be users or global groups, but not\n\ - other local groups. If a user is from another doamin,\n\ - preface the username with the domain name (for\n\ - example, SALES\\RALPHR).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ - must be established for users or global groups added to a\n\ - local group with this command.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE <имя_службы>\n\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 6647f4fd3c..215df1ed0f 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,37 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG <Yanlışlık Kodu>\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ -error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ -error (for example, ""net helpmsg 2182""), you will get information about the\n\ -message and suggested actions you can take to solve the problem.\n\n" - IDS_HELPMSG_HELP_2 "message# Is the numerical error with which you need help.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [takım adı [/COMMENT:""metin""]] [/DOMAIN]\n\ - takım adı {/ADD [/COMMENT:""metin""] | /DELETE} [/DOMAIN]\n\ - takım adı ad [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ -used without parameters, it displays the local groups on the computer.\n\n" - IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ - delete. Supply only a groupname to view a list of\n\ - users or global groups in a local group.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ - remove from a local group. Separate multiple entries with\n\ - a space. Names may be users or global groups, but not\n\ - other local groups. If a user is from another doamin,\n\ - preface the username with the domain name (for\n\ - example, SALES\\RALPHR).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ - must be established for users or global groups added to a\n\ - local group with this command.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 08181b3e45..5bc5bdf5a0 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,37 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG message#\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ -error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ -error (for example, ""net helpmsg 2182""), you will get information about the\n\ -message and suggested actions you can take to solve the problem.\n\n" - IDS_HELPMSG_HELP_2 "message# Is the numerical error with which you need help.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname name [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ -used without parameters, it displays the local groups on the computer.\n\n" - IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ - delete. Supply only a groupname to view a list of\n\ - users or global groups in a local group.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ - remove from a local group. Separate multiple entries with\n\ - a space. Names may be users or global groups, but not\n\ - other local groups. If a user is from another doamin,\n\ - preface the username with the domain name (for\n\ - example, SALES\\RALPHR).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ - must be established for users or global groups added to a\n\ - local group with this command.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE service\n\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index ecb1a0e7b1..f3232457df 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,37 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_HELPMSG_SYNTAX "NET HELPMSG <錯誤程式碼>\n\n" - IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ -error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ -error (for example, ""net helpmsg 2182""), you will get information about the\n\ -message and suggested actions you can take to solve the problem.\n\n" - IDS_HELPMSG_HELP_2 "message# Is the numerical error with which you need help.\n\n" - IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [組名 [/COMMENT:""文字""]] [/DOMAIN]\n\ - 組名 {/ADD [/COMMENT:""文字""] | /DELETE} [/DOMAIN]\n\ - 組名稱 [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ -used without parameters, it displays the local groups on the computer.\n\n" - IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ - delete. Supply only a groupname to view a list of\n\ - users or global groups in a local group.\n" - IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ - remove from a local group. Separate multiple entries with\n\ - a space. Names may be users or global groups, but not\n\ - other local groups. If a user is from another doamin,\n\ - preface the username with the domain name (for\n\ - example, SALES\\RALPHR).\n" - IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ - must be established for users or global groups added to a\n\ - local group with this command.\n" - IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" - IDS_NAME_SYNTAX "NET NAME ...\n\n" - IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" IDS_PRINT_HELP "PRINT\n...\n\n" IDS_PAUSE_SYNTAX "NET PAUSE <服務名稱>\n\n" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 0b304a56fd..888494f4b8 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,18 +1,5 @@ #pragma once -#define IDS_HELPMSG_SYNTAX 139 -#define IDS_HELPMSG_HELP_1 140 -#define IDS_HELPMSG_HELP_2 141 -#define IDS_LOCALGROUP_SYNTAX 142 -#define IDS_LOCALGROUP_HELP_1 143 -#define IDS_LOCALGROUP_HELP_2 144 -#define IDS_LOCALGROUP_HELP_3 145 -#define IDS_LOCALGROUP_HELP_4 146 -#define IDS_LOCALGROUP_HELP_5 147 -#define IDS_LOCALGROUP_HELP_6 148 -#define IDS_LOCALGROUP_HELP_7 149 -#define IDS_NAME_SYNTAX 150 -#define IDS_NAME_HELP 151 #define IDS_PAUSE_SYNTAX 152 #define IDS_PAUSE_HELP_1 153 #define IDS_PAUSE_HELP_2 154 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index d9ea9de23a..8b61d17a55 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1367,3 +1367,408 @@ Language=Taiwanese ... . + +MessageId=10016 +SymbolicName=MSG_HELPMSG_SYNTAX +Severity=Success +Facility=System +Language=English +NET HELPMSG message# +. +Language=Polish +NET HELPMSG komunikat# +. +Language=Romanian +NET HELPMSG <Error Code> +. +Language=Russian +NET HELPMSG <Код ошибки> +. +Language=Spanish +NET HELPMSG <código de error> +. +Language=Turkish +NET HELPMSG <Yanlışlık Kodu> +. +Language=Chinese +NET HELPMSG message# +. +Language=Taiwanese +NET HELPMSG <錯誤程式碼> +. + + +MessageId=10017 +SymbolicName=MSG_HELPMSG_HELP +Severity=Success +Facility=System +Language=English +NET HELPMSG displays information about network messages (such as +error, warning and alert messages). When you type NET HELPMSG and the numeric +error (for example, "net helpmsg 2182"), you will get information about the +message and suggested actions you can take to solve the problem. + +message# Is the numerical error with which you need help. +. +Language=Polish +NET HELPMSG wyświetla informacje o komunikatach sieci (takich +jak błąd, ostrzeżenie lub alarm). Gdy wpiszesz NET HELPMSG i błąd numeryczny +(na przykład "net helpmsg 2182"), system +objaśni komunikat i zasugeruje rozwiązanie problemu. + +komunikat# Numeryczny błąd systemu, o którym chcesz uzyskać informacje. +. +Language=Romanian +NET HELPMSG displays information about network messages (such as +error, warning and alert messages). When you type NET HELPMSG and the numeric +error (for example, "net helpmsg 2182"), you will get information about the +message and suggested actions you can take to solve the problem. + +message# Is the numerical error with which you need help. +. +Language=Russian +NET HELPMSG displays information about network messages (such as +error, warning and alert messages). When you type NET HELPMSG and the numeric +error (for example, "net helpmsg 2182"), you will get information about the +message and suggested actions you can take to solve the problem. + +message# Is the numerical error with which you need help. +. +Language=Spanish +NET HELPMSG displays information about network messages (such as +error, warning and alert messages). When you type NET HELPMSG and the numeric +error (for example, "net helpmsg 2182"), you will get information about the +message and suggested actions you can take to solve the problem. + +message# Is the numerical error with which you need help. +. +Language=Turkish +NET HELPMSG displays information about network messages (such as +error, warning and alert messages). When you type NET HELPMSG and the numeric +error (for example, "net helpmsg 2182"), you will get information about the +message and suggested actions you can take to solve the problem. + +message# Is the numerical error with which you need help. +. +Language=Chinese +NET HELPMSG displays information about network messages (such as +error, warning and alert messages). When you type NET HELPMSG and the numeric +error (for example, "net helpmsg 2182"), you will get information about the +message and suggested actions you can take to solve the problem. + +message# Is the numerical error with which you need help. +. +Language=Taiwanese +NET HELPMSG displays information about network messages (such as +error, warning and alert messages). When you type NET HELPMSG and the numeric +error (for example, "net helpmsg 2182"), you will get information about the +message and suggested actions you can take to solve the problem. + +message# Is the numerical error with which you need help. +. + + +MessageId=10018 +SymbolicName=MSG_LOCALGROUP_SYNTAX +Severity=Success +Facility=System +Language=English +NET LOCALGROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname name [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Polish +NET LOCALGROUP [nazwa_grupy [/COMMENT:"tekst"]] [/DOMAIN] + nazwa_grupy {/ADD [/COMMENT:"tekst"] | /DELETE} [/DOMAIN] + nazwa_grupy nazwa [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Romanian +NET LOCALGROUP [nume-de-grup [/COMMENT:"text"]] [/DOMAIN] + nume-de-grup {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + nume-de-grup nume [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Russian +NET LOCALGROUP [имя_группы [/COMMENT:"текст"]] [/DOMAIN] + имя_группы {/ADD [/COMMENT:"текст"] | /DELETE} [/DOMAIN] + имя_группы имя [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Spanish +NET LOCALGROUP [grupo [/COMMENT:"texto"]] [/DOMAIN] + grupo {/ADD [/COMMENT:"texto"] | /DELETE} [/DOMAIN] + grupo nombre [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Turkish +NET LOCALGROUP [takım adı [/COMMENT:"metin"]] [/DOMAIN] + takım adı {/ADD [/COMMENT:"metin"] | /DELETE} [/DOMAIN] + takım adı ad [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Chinese +NET LOCALGROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname name [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Taiwanese +NET LOCALGROUP [組名 [/COMMENT:"文字"]] [/DOMAIN] + 組名 {/ADD [/COMMENT:"文字"] | /DELETE} [/DOMAIN] + 組名稱 [...] {/ADD | /DELETE} [/DOMAIN] +. + + +MessageId=10019 +SymbolicName=MSG_LOCALGROUP_HELP +Severity=Success +Facility=System +Language=English +NET LOCALGROUP adds, displays or modifies local groups on computers. When +used without parameters, it displays the local groups on the computer. + +groupname Is the name of the local group to add, expand, or + delete. Supply only a groupname to view a list of + users or global groups in a local group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +name[ ...] List one or more usernames or groupnams to add to or + remove from a local group. Separate multiple entries with + a space. Names may be users or global groups, but not + other local groups. If a user is from another doamin, + preface the username with the domain name (for + example, SALES\RALPHR). +/ADD Adds a groupname or username to a local group. An account + must be established for users or global groups added to a + local group with this command. +/DELETE Removes a groupname or username from a local group. +. +Language=Polish +NET LOCALGROUP dodaje, wyświetla, lub modyfikuje grupy lokalne na komputerach +Polecenie użyte bez parametrów wyświetla grupy lokalne na komputerze. + +nazwa_grupy Nazwa grupy dodawanej, rozszerzanej lub usuwanej. + Aby zobaczyć listę użytkowników lub grup globalnych + w grupie lokalnej, podaj tylko nazwę grupy. +/COMMENT:"tekst" Dodaje komentarz dla nowej lub istniejącej grupy. + Tekst musi być ujęty w cudzysłów. +/DOMAIN Wykonuje operację na kontrolerze bieżącej domeny. + Bez tego przełącznika operacje są wykonywane na + komputerze lokalnym. +nazwa[ ...] Lista zawierająca nazwy jednego lub kilku użytkowników + lub grup, dodawanych lub usuwanych z grupy lokalnej. + Rozdziel kolejne wpisy znakiem spacji. Lista może zawierać + nazwy użytkowników lub grup globalnych, lecz nie może + zawierać nazw innych grup lokalnych. Podając nazwę + użytkownika z innej domeny poprzedź ją nazwą domeny + (na przykład: WARSZAWA\PIOTRS). +/ADD Dodaje nazwę grupy lub użytkownika do grupy lokalnej. + Dla użytkowników lub grup globalnych dodawanych tym + poleceniem do grupy lokalnej należy wcześniej utworzyć + odpowiednie konto. +/DELETE Usuwa nazwę grupy lub użytkownika z grupy lokalnej. +. +Language=Romanian +NET LOCALGROUP adds, displays or modifies local groups on computers. When +used without parameters, it displays the local groups on the computer. + +groupname Is the name of the local group to add, expand, or + delete. Supply only a groupname to view a list of + users or global groups in a local group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +name[ ...] List one or more usernames or groupnams to add to or + remove from a local group. Separate multiple entries with + a space. Names may be users or global groups, but not + other local groups. If a user is from another doamin, + preface the username with the domain name (for + example, SALES\RALPHR). +/ADD Adds a groupname or username to a local group. An account + must be established for users or global groups added to a + local group with this command. +/DELETE Removes a groupname or username from a local group. +. +Language=Russian +NET LOCALGROUP adds, displays or modifies local groups on computers. When +used without parameters, it displays the local groups on the computer. + +groupname Is the name of the local group to add, expand, or + delete. Supply only a groupname to view a list of + users or global groups in a local group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +name[ ...] List one or more usernames or groupnams to add to or + remove from a local group. Separate multiple entries with + a space. Names may be users or global groups, but not + other local groups. If a user is from another doamin, + preface the username with the domain name (for + example, SALES\RALPHR). +/ADD Adds a groupname or username to a local group. An account + must be established for users or global groups added to a + local group with this command. +/DELETE Removes a groupname or username from a local group. +. +Language=Spanish +NET LOCALGROUP adds, displays or modifies local groups on computers. When +used without parameters, it displays the local groups on the computer. + +groupname Is the name of the local group to add, expand, or + delete. Supply only a groupname to view a list of + users or global groups in a local group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +name [ ...] List one or more usernames or groupnams to add to or + remove from a local group. Separate multiple entries with + a space. Names may be users or global groups, but not + other local groups. If a user is from another doamin, + preface the username with the domain name (for + example, SALES\RALPHR). +/ADD Adds a groupname or username to a local group. An account + must be established for users or global groups added to a + local group with this command. +/DELETE Removes a groupname or username from a local group. +. +Language=Turkish +NET LOCALGROUP adds, displays or modifies local groups on computers. When +used without parameters, it displays the local groups on the computer. + +groupname Is the name of the local group to add, expand, or + delete. Supply only a groupname to view a list of + users or global groups in a local group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +name[ ...] List one or more usernames or groupnams to add to or + remove from a local group. Separate multiple entries with + a space. Names may be users or global groups, but not + other local groups. If a user is from another doamin, + preface the username with the domain name (for + example, SALES\RALPHR). +/ADD Adds a groupname or username to a local group. An account + must be established for users or global groups added to a + local group with this command. +/DELETE Removes a groupname or username from a local group. +. +Language=Chinese +NET LOCALGROUP adds, displays or modifies local groups on computers. When +used without parameters, it displays the local groups on the computer. + +groupname Is the name of the local group to add, expand, or + delete. Supply only a groupname to view a list of + users or global groups in a local group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +name[ ...] List one or more usernames or groupnams to add to or + remove from a local group. Separate multiple entries with + a space. Names may be users or global groups, but not + other local groups. If a user is from another doamin, + preface the username with the domain name (for + example, SALES\RALPHR). +/ADD Adds a groupname or username to a local group. An account + must be established for users or global groups added to a + local group with this command. +/DELETE Removes a groupname or username from a local group. +. +Language=Taiwanese +NET LOCALGROUP adds, displays or modifies local groups on computers. When +used without parameters, it displays the local groups on the computer. + +groupname Is the name of the local group to add, expand, or + delete. Supply only a groupname to view a list of + users or global groups in a local group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +name[ ...] List one or more usernames or groupnams to add to or + remove from a local group. Separate multiple entries with + a space. Names may be users or global groups, but not + other local groups. If a user is from another doamin, + preface the username with the domain name (for + example, SALES\RALPHR). +/ADD Adds a groupname or username to a local group. An account + must be established for users or global groups added to a + local group with this command. +/DELETE Removes a groupname or username from a local group. +. + + +MessageId=10020 +SymbolicName=MSG_NAME_SYNTAX +Severity=Success +Facility=System +Language=English +NET NAME ... +. +Language=Polish +NET NAME ... +. +Language=Romanian +NET NAME ... +. +Language=Russian +NET NAME ... +. +Language=Spanish +NET NAME ... +. +Language=Turkish +NET NAME ... +. +Language=Chinese +NET NAME ... +. +Language=Taiwanese +NET NAME ... +. + + +MessageId=10021 +SymbolicName=MSG_NAME_HELP +Severity=Success +Facility=System +Language=English +NAME +... +. +Language=Polish +NAME +... +. +Language=Romanian +NAME +... +. +Language=Russian +NAME +... +. +Language=Spanish +NAME +... +. +Language=Turkish +NAME +... +. +Language=Chinese +NAME +... +. +Language=Taiwanese +NAME +... +.

1 0

[reactos] 01/01: [NET] Move FILE, GROUP and HELP command syntax and help texts into a message table.
by Eric Kohl 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1824b5bd31b55f8e37c9… commit e1824b5bd31b55f8e37c937423d5f4a50c38f1dd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 23 21:41:27 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 23 21:42:49 2018 +0100 [NET] Move FILE, GROUP and HELP command syntax and help texts into a message table. --- base/applications/network/net/cmdGroup.c | 12 +- base/applications/network/net/help.c | 19 +- base/applications/network/net/lang/en-US.rc | 30 -- base/applications/network/net/lang/es-ES.rc | 30 -- base/applications/network/net/lang/pl-PL.rc | 31 -- base/applications/network/net/lang/ro-RO.rc | 30 -- base/applications/network/net/lang/ru-RU.rc | 30 -- base/applications/network/net/lang/tr-TR.rc | 30 -- base/applications/network/net/lang/zh-CN.rc | 30 -- base/applications/network/net/lang/zh-TW.rc | 30 -- base/applications/network/net/resource.h | 13 - sdk/include/reactos/mc/net_msg.mc | 422 ++++++++++++++++++++++++++++ 12 files changed, 431 insertions(+), 276 deletions(-) diff --git a/base/applications/network/net/cmdGroup.c b/base/applications/network/net/cmdGroup.c index 4fc1e7e08d..f825ed0408 100644 --- a/base/applications/network/net/cmdGroup.c +++ b/base/applications/network/net/cmdGroup.c @@ -223,14 +223,8 @@ cmdGroup( if (_wcsicmp(argv[i], L"/help") == 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_GROUP_SYNTAX); - ConResPuts(StdOut, IDS_GROUP_HELP_1); - ConResPuts(StdOut, IDS_GROUP_HELP_2); - ConResPuts(StdOut, IDS_GROUP_HELP_3); - ConResPuts(StdOut, IDS_GROUP_HELP_4); - ConResPuts(StdOut, IDS_GROUP_HELP_5); - ConResPuts(StdOut, IDS_GROUP_HELP_6); - ConResPuts(StdOut, IDS_GROUP_HELP_7); + PrintNetMessage(MSG_GROUP_SYNTAX); + PrintNetMessage(MSG_GROUP_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -358,7 +352,7 @@ done: if (result != 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_GROUP_SYNTAX); + PrintNetMessage(MSG_GROUP_SYNTAX); } return result; diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index df968b5e33..6b5903d735 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -62,21 +62,15 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"FILE") == 0) { - ConResPuts(StdOut, IDS_FILE_SYNTAX); - ConResPuts(StdOut, IDS_FILE_HELP); + PrintNetMessage(MSG_FILE_SYNTAX); + PrintNetMessage(MSG_FILE_HELP); return 0; } if (_wcsicmp(argv[2], L"GROUP") == 0) { - ConResPuts(StdOut, IDS_GROUP_SYNTAX); - ConResPuts(StdOut, IDS_GROUP_HELP_1); - ConResPuts(StdOut, IDS_GROUP_HELP_2); - ConResPuts(StdOut, IDS_GROUP_HELP_3); - ConResPuts(StdOut, IDS_GROUP_HELP_4); - ConResPuts(StdOut, IDS_GROUP_HELP_5); - ConResPuts(StdOut, IDS_GROUP_HELP_6); - ConResPuts(StdOut, IDS_GROUP_HELP_7); + PrintNetMessage(MSG_GROUP_SYNTAX); + PrintNetMessage(MSG_GROUP_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -212,9 +206,8 @@ INT cmdHelp(INT argc, WCHAR **argv) } #endif - ConResPuts(StdOut, IDS_HELP_SYNTAX); - ConResPuts(StdOut, IDS_HELP_HELP_1); - ConResPuts(StdOut, IDS_HELP_HELP_2); + PrintNetMessage(MSG_HELP_SYNTAX); + PrintNetMessage(MSG_HELP_HELP); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 108cc51a4f..89db1ce57d 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,36 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" - IDS_FILE_HELP "FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ -used without parameters, it displays the groupnames on the server.\n\n" - IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ - Supply only a groupname to view a list of users\n\ - in a group.\n" - IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ - a group. Separate multiple username entries with a space.\n" - IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" - IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" - IDS_HELP_SYNTAX "NET HELP command\n - or -\nNET command /HELP\n\n" - IDS_HELP_HELP_1 " The following commands are available:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG message#\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 09b6793e41..151249b825 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,36 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" - IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ -used without parameters, it displays the groupnames on the server.\n\n" - IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ - Supply only a groupname to view a list of users\n\ - in a group.\n" - IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ - a group. Separate multiple username entries with a space.\n" - IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" - IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" - IDS_HELP_SYNTAX "NET HELP <comando>\n - o -\nNET <comando> /HELP\n\n" - IDS_HELP_HELP_1 " Éstos son los argumentos de línea de comandos disponibles:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG <código de error>\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 111f82007d..e0e38d717d 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,37 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [identyfikator [/CLOSE]]\n\n" - IDS_FILE_HELP "FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [nazwa_grupy [/COMMENT:""tekst""]] [/DOMAIN]\n\ - nazwa_grupy {/ADD [/COMMENT:""tekst""] | /DELETE} [/DOMAIN]\n\ - nazwa_grupy nazwa_użytkownika [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP dodaje, wyświetla lub modyfikuje grupy globalne na serwerach.\n\ -Użyte bez parametrów wyświetla nazwy grup na serwerze.\n\n" - IDS_GROUP_HELP_2 "nazwa_grupy Nazwa grupy dodawanej, rozszerzanej lub usuwanej.\n\ - Aby zobaczyć listę użytkowników w grupie, podaj tylko\n\ - nazwę grupy.\n" - IDS_GROUP_HELP_3 "/COMMENT:""tekst"" Dodaje komentarz dla nowej lub istniejącej grupy.\n\ - Tekst musi być ujęty w cudzysłów.\n" - IDS_GROUP_HELP_4 "/DOMAIN Wykonuje operację na kontrolerze domeny.\n\ - Bez tego przełącznika operacje są wykonywane na\n\ - komputerze lokalnym.\n" - IDS_GROUP_HELP_5 "nazwa_użytkownika[ ...] Lista zawierająca nazwy jednego lub kilku\n\ - użytkowników dodawanych lub usuwanych z grupy.\n\ - Rozdziel kolejne nazwy znakiem spacji.\n" - IDS_GROUP_HELP_6 "/ADD Dodaje grupę lub dodaje nazwę użytkownika do grupy.\n" - IDS_GROUP_HELP_7 "/DELETE Usuwa grupę lub usuwa nazwę użytkownika z grupy.\n\n" - IDS_HELP_SYNTAX "NET HELP polecenie\n - lub -\nNET polecenie /HELP\n\n" - IDS_HELP_HELP_1 " Dostępne polecenia to:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG komunikat#\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG wyświetla informacje o komunikatach sieci (takich\n\ jak błąd, ostrzeżenie lub alarm). Gdy wpiszesz NET HELPMSG i błąd numeryczny\n\ diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index e7608f2415..103400fbc0 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,36 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" - IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ -used without parameters, it displays the groupnames on the server.\n\n" - IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ - Supply only a groupname to view a list of users\n\ - in a group.\n" - IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ - a group. Separate multiple username entries with a space.\n" - IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" - IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" - IDS_HELP_SYNTAX "NET HELP <comandă>\n - sau -\nNET <comandă> /HELP\n\n" - IDS_HELP_HELP_1 " Sunt disponibile următoarele comenzi:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG <Error Code>\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 73139b3e19..49f4fb34a5 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,36 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" - IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ -used without parameters, it displays the groupnames on the server.\n\n" - IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ - Supply only a groupname to view a list of users\n\ - in a group.\n" - IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ - a group. Separate multiple username entries with a space.\n" - IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" - IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" - IDS_HELP_SYNTAX "NET HELP <Команда>\n - или -\nNET <Команда> /HELP\n\n" - IDS_HELP_HELP_1 " Доступны следующие команды:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG <Код ошибки>\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index eb6857cadc..6647f4fd3c 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,36 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" - IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ -used without parameters, it displays the groupnames on the server.\n\n" - IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ - Supply only a groupname to view a list of users\n\ - in a group.\n" - IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ - a group. Separate multiple username entries with a space.\n" - IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" - IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" - IDS_HELP_SYNTAX "NET HELP <Komut>\n - ya da -\nNET <Komut> /HELP\n\n" - IDS_HELP_HELP_1 " Aşağıdaki komutlar kullanılabilir:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG <Yanlışlık Kodu>\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 72a4210ce3..08181b3e45 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,36 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" - IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ -used without parameters, it displays the groupnames on the server.\n\n" - IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ - Supply only a groupname to view a list of users\n\ - in a group.\n" - IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ - a group. Separate multiple username entries with a space.\n" - IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" - IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" - IDS_HELP_SYNTAX "NET HELP <Command>\n - or -\nNET <Command> /HELP\n\n" - IDS_HELP_HELP_1 " 以下命令可用:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG message#\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 8c63ff3154..ecb1a0e7b1 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,36 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" - IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ -used without parameters, it displays the groupnames on the server.\n\n" - IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ - Supply only a groupname to view a list of users\n\ - in a group.\n" - IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ - Enclose the text inquotation marks.\n" - IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ - of the current domain. Otherwise, the operation is \n\ - performed on the local computer.\n" - IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ - a group. Separate multiple username entries with a space.\n" - IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" - IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" - IDS_HELP_SYNTAX "NET HELP <命令>\n - 或 -\nNET <命令> /HELP\n\n" - IDS_HELP_HELP_1 " 以下命令是可用的:\n\n\ - NET ACCOUNTS NET HELP NET SHARE\n\ - NET COMPUTER NET HELPMSG NET START\n\ - NET CONFIG NET LOCALGROUP NET STATISTICS\n\ - NET CONFIG SERVER NET NAME NET STOP\n\ - NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ - NET CONTINUE NET PRINT NET USE\n\ - NET FILE NET SEND NET USER\n\ - NET GROUP NET SESSION NET VIEW\n\n" - IDS_HELP_HELP_2 " ...\n\n" IDS_HELPMSG_SYNTAX "NET HELPMSG <錯誤程式碼>\n\n" IDS_HELPMSG_HELP_1 "NET HELPMSG displays information about network messages (such as\n\ error, warning and alert messages). When you type NET HELPMSG and the numeric\n\ diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index b448713391..0b304a56fd 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,18 +1,5 @@ #pragma once -#define IDS_FILE_SYNTAX 126 -#define IDS_FILE_HELP 127 -#define IDS_GROUP_SYNTAX 128 -#define IDS_GROUP_HELP_1 129 -#define IDS_GROUP_HELP_2 130 -#define IDS_GROUP_HELP_3 131 -#define IDS_GROUP_HELP_4 132 -#define IDS_GROUP_HELP_5 133 -#define IDS_GROUP_HELP_6 134 -#define IDS_GROUP_HELP_7 135 -#define IDS_HELP_SYNTAX 136 -#define IDS_HELP_HELP_1 137 -#define IDS_HELP_HELP_2 138 #define IDS_HELPMSG_SYNTAX 139 #define IDS_HELPMSG_HELP_1 140 #define IDS_HELPMSG_HELP_2 141 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index e84c3ea5c8..d9ea9de23a 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -945,3 +945,425 @@ service Is the paused service SERVER WORKSTATION . + + +MessageId=10010 +SymbolicName=MSG_FILE_SYNTAX +Severity=Success +Facility=System +Language=English +NET FILE [id [/CLOSE]] +. +Language=Polish +NET FILE [identyfikator [/CLOSE]] +. +Language=Romanian +NET FILE [id [/CLOSE]] +. +Language=Russian +NET FILE [id [/CLOSE]] +. +Language=Spanish +NET FILE [id [/CLOSE]] +. +Language=Turkish +NET FILE [id [/CLOSE]] +. +Language=Chinese +NET FILE [id [/CLOSE]] +. +Language=Taiwanese +NET FILE [id [/CLOSE]] +. + + +MessageId=10011 +SymbolicName=MSG_FILE_HELP +Severity=Success +Facility=System +Language=English +NET FILE +... +. +Language=Polish +NET FILE +... +. +Language=Romanian +NET FILE +... +. +Language=Russian +NET FILE +... +. +Language=Spanish +NET FILE +... +. +Language=Turkish +NET FILE +... +. +Language=Chinese +NET FILE +... +. +Language=Taiwanese +NET FILE +... +. + + +MessageId=10012 +SymbolicName=MSG_GROUP_SYNTAX +Severity=Success +Facility=System +Language=English +NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname username [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Polish +NET GROUP [nazwa_grupy [/COMMENT:"tekst"]] [/DOMAIN] + nazwa_grupy {/ADD [/COMMENT:"tekst"] | /DELETE} [/DOMAIN] + nazwa_grupy nazwa_użytkownika [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Romanian +NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname username [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Russian +NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname username [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Spanish +NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname username [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Turkish +NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname username [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Chinese +NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname username [...] {/ADD | /DELETE} [/DOMAIN] +. +Language=Taiwanese +NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] + groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + groupname username [...] {/ADD | /DELETE} [/DOMAIN] +. + + +MessageId=10013 +SymbolicName=MSG_GROUP_HELP +Severity=Success +Facility=System +Language=English +NET GROUP adds, displays or modifies global groups on servers. When +used without parameters, it displays the groupnames on the server. + +groupname Is the name of the group to add, expand, or delete. + Supply only a groupname to view a list of users + in a group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +username[ ...] List one or more usernames to add to or remove from + a group. Separate multiple username entries with a space. +/ADD Adds a group, or adds a username to a group. +/DELETE Removes a group, or removes a username from a group. +. +Language=Polish +NET GROUP dodaje, wyświetla lub modyfikuje grupy globalne na serwerach. +Użyte bez parametrów wyświetla nazwy grup na serwerze. + +nazwa_grupy Nazwa grupy dodawanej, rozszerzanej lub usuwanej. + Aby zobaczyć listę użytkowników w grupie, podaj + tylko nazwę grupy. +/COMMENT:"tekst" Dodaje komentarz dla nowej lub istniejącej grupy. + Tekst musi być ujęty w cudzysłów. +/DOMAIN Wykonuje operację na kontrolerze domeny. + Bez tego przełącznika operacje są wykonywane na + komputerze lokalnym. +nazwa_użytkownika[ ...] Lista zawierająca nazwy jednego lub kilku + użytkowników dodawanych lub usuwanych z grupy. + Rozdziel kolejne nazwy znakiem spacji. +/ADD Dodaje grupę lub dodaje nazwę użytkownika do grupy. +/DELETE Usuwa grupę lub usuwa nazwę użytkownika z grupy. +. +Language=Romanian +NET GROUP adds, displays or modifies global groups on servers. When +used without parameters, it displays the groupnames on the server. + +groupname Is the name of the group to add, expand, or delete. + Supply only a groupname to view a list of users + in a group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +username[ ...] List one or more usernames to add to or remove from + a group. Separate multiple username entries with a space. +/ADD Adds a group, or adds a username to a group. +/DELETE Removes a group, or removes a username from a group. +. +Language=Russian +NET GROUP adds, displays or modifies global groups on servers. When +used without parameters, it displays the groupnames on the server. + +groupname Is the name of the group to add, expand, or delete. + Supply only a groupname to view a list of users + in a group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +username[ ...] List one or more usernames to add to or remove from + a group. Separate multiple username entries with a space. +/ADD Adds a group, or adds a username to a group. +/DELETE Removes a group, or removes a username from a group. +. +Language=Spanish +NET GROUP adds, displays or modifies global groups on servers. When +used without parameters, it displays the groupnames on the server. + +groupname Is the name of the group to add, expand, or delete. + Supply only a groupname to view a list of users + in a group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +username[ ...] List one or more usernames to add to or remove from + a group. Separate multiple username entries with a space. +/ADD Adds a group, or adds a username to a group. +/DELETE Removes a group, or removes a username from a group. +. +Language=Turkish +NET GROUP adds, displays or modifies global groups on servers. When +used without parameters, it displays the groupnames on the server. + +groupname Is the name of the group to add, expand, or delete. + Supply only a groupname to view a list of users + in a group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +username[ ...] List one or more usernames to add to or remove from + a group. Separate multiple username entries with a space. +/ADD Adds a group, or adds a username to a group. +/DELETE Removes a group, or removes a username from a group. +. +Language=Chinese +NET GROUP adds, displays or modifies global groups on servers. When +used without parameters, it displays the groupnames on the server. + +groupname Is the name of the group to add, expand, or delete. + Supply only a groupname to view a list of users + in a group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +username[ ...] List one or more usernames to add to or remove from + a group. Separate multiple username entries with a space. +/ADD Adds a group, or adds a username to a group. +/DELETE Removes a group, or removes a username from a group. +. +Language=Taiwanese +NET GROUP adds, displays or modifies global groups on servers. When +used without parameters, it displays the groupnames on the server. + +groupname Is the name of the group to add, expand, or delete. + Supply only a groupname to view a list of users + in a group. +/COMMENT:"text" Adds a comment for a new or existing group. + Enclose the text in quotation marks. +/DOMAIN Performs the operation on a domain controller + of the current domain. Otherwise, the operation is + performed on the local computer. +username[ ...] List one or more usernames to add to or remove from + a group. Separate multiple username entries with a space. +/ADD Adds a group, or adds a username to a group. +/DELETE Removes a group, or removes a username from a group. +. + + +MessageId=10014 +SymbolicName=MSG_HELP_SYNTAX +Severity=Success +Facility=System +Language=English +NET HELP command + - or - +NET command /HELP +. +Language=Polish +NET HELP polecenie + - lub - +NET polecenie /HELP +. +Language=Romanian +NET HELP <comandă> + - sau - +NET <comandă> /HELP +. +Language=Russian +NET HELP <Команда> + - или - +NET <Команда> /HELP +. +Language=Spanish +NET HELP <comando> + - o - +NET <comando> /HELP +. +Language=Turkish +NET HELP <Komut> + - ya da - +NET <Komut> /HELP +. +Language=Chinese +NET HELP <Command> + - or - +NET <Command> /HELP +. +Language=Taiwanese +NET HELP <命令> + - 或 - +NET <命令> /HELP +. + + +MessageId=10015 +SymbolicName=MSG_HELP_HELP +Severity=Success +Facility=System +Language=English + The following commands are available: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +Language=Polish + Dostępne polecenia to: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +Language=Romanian + Sunt disponibile următoarele comenzi: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +Language=Russian + Доступны следующие команды: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +Language=Spanish + Éstos son los argumentos de línea de comandos disponibles: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +Language=Turkish + Aşağıdaki komutlar kullanılabilir: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +Language=Chinese + 以下命令可用: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +Language=Taiwanese + 以下命令是可用的: + + NET ACCOUNTS NET HELP NET SHARE + NET COMPUTER NET HELPMSG NET START + NET CONFIG NET LOCALGROUP NET STATISTICS + NET CONFIG SERVER NET NAME NET STOP + NET CONFIG WORKSTATION NET PAUSE NET TIME + NET CONTINUE NET PRINT NET USE + NET FILE NET SEND NET USER + NET GROUP NET SESSION NET VIEW + + ... +. +

1 0

[reactos] 01/01: [USETUP] Add SETUP_INIT_PAGE in the list of virtual pages.
by Hermès Bélusca-Maïto 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02e4ff8eb369fbc1a9e01… commit 02e4ff8eb369fbc1a9e013186ab4cfaa0d1317e3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 23 21:00:56 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 23 21:02:08 2018 +0100 [USETUP] Add SETUP_INIT_PAGE in the list of virtual pages. --- base/setup/usetup/usetup.c | 4 +++- base/setup/usetup/usetup.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 7be0ff9dd9..deb918efb6 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4690,8 +4690,10 @@ RunUSetup(VOID) Page = QuitPage(&Ir); break; - case RECOVERY_PAGE: + /* Virtual pages */ + case SETUP_INIT_PAGE: case REBOOT_PAGE: + case RECOVERY_PAGE: break; } } diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index e65bc33a7f..3e4d7d50c3 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -75,7 +75,7 @@ extern PCWSTR SelectedLanguageId; typedef enum _PAGE_NUMBER { - SETUP_INIT_PAGE, + SETUP_INIT_PAGE, /* Virtual page */ LANGUAGE_PAGE, WELCOME_PAGE, LICENSE_PAGE,

1 0

[reactos] 01/01: [OSK] Add missing welcome box resource for Estonian (#1181)
by Bișoc George 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6141954f20dee7d8360b… commit d6141954f20dee7d8360b1ee328a06ed229cd5e2 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Dec 23 20:46:36 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 23 20:46:36 2018 +0100 [OSK] Add missing welcome box resource for Estonian (#1181) --- base/applications/osk/lang/et-EE.rc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index d1f770b90b..4284c6b603 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -126,4 +126,16 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "On-Screen Keyboard" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 + ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 + LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 +END + /* EOF */

1 0

[reactos] 02/02: [USETUP] Modify the integrated user-mode PnP manager along the lines of UMPNPMGR, so that we can wait until all the queued device installations finish before continuing the installation further.
by Hermès Bélusca-Maïto 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d23fa54488d5ec8b214c4… commit d23fa54488d5ec8b214c4c7611b97d8ef570bae8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 23 20:28:19 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 23 20:37:14 2018 +0100 [USETUP] Modify the integrated user-mode PnP manager along the lines of UMPNPMGR, so that we can wait until all the queued device installations finish before continuing the installation further. Add a corresponding please-wait page and update the translations. --- base/setup/usetup/devinst.c | 345 +++++++++++++++++++++++++++++++++++------ base/setup/usetup/devinst.h | 24 +++ base/setup/usetup/lang/bg-BG.h | 92 +++++++---- base/setup/usetup/lang/bn-BD.h | 52 ++++++- base/setup/usetup/lang/cs-CZ.h | 44 +++++- base/setup/usetup/lang/da-DK.h | 52 ++++++- base/setup/usetup/lang/de-DE.h | 46 +++++- base/setup/usetup/lang/el-GR.h | 50 +++++- base/setup/usetup/lang/en-US.h | 52 ++++++- base/setup/usetup/lang/es-ES.h | 56 +++++-- base/setup/usetup/lang/et-EE.h | 48 +++++- base/setup/usetup/lang/fr-FR.h | 56 +++++-- base/setup/usetup/lang/he-IL.h | 44 +++++- base/setup/usetup/lang/it-IT.h | 52 ++++++- base/setup/usetup/lang/ja-JP.h | 44 +++++- base/setup/usetup/lang/lt-LT.h | 54 ++++++- base/setup/usetup/lang/ms-MY.h | 54 ++++++- base/setup/usetup/lang/nl-NL.h | 40 ++++- base/setup/usetup/lang/pl-PL.h | 46 +++++- base/setup/usetup/lang/pt-BR.h | 42 ++++- base/setup/usetup/lang/ro-RO.h | 40 ++++- base/setup/usetup/lang/ru-RU.h | 42 ++++- base/setup/usetup/lang/sk-SK.h | 60 +++++-- base/setup/usetup/lang/sq-AL.h | 56 +++++-- base/setup/usetup/lang/sv-SE.h | 44 +++++- base/setup/usetup/lang/tr-TR.h | 38 +++++ base/setup/usetup/lang/uk-UA.h | 44 +++++- base/setup/usetup/usetup.c | 49 +++--- base/setup/usetup/usetup.h | 1 + 29 files changed, 1446 insertions(+), 221 deletions(-) diff --git a/base/setup/usetup/devinst.c b/base/setup/usetup/devinst.c index 2c067d72a0..ea4333c5a9 100644 --- a/base/setup/usetup/devinst.c +++ b/base/setup/usetup/devinst.c @@ -1,9 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/devinst.c * PURPOSE: Device installation * PROGRAMMER: Herv� Poussineau (hpoussin(a)reactos.org) + * Hermes Belusca-Maito */ #include <usetup.h> @@ -15,7 +15,28 @@ #include <guiddef.h> #include <libs/umpnpmgr/sysguid.h> -BOOLEAN +/* LOCALS *******************************************************************/ + +static HANDLE hEnumKey = NULL; +static HANDLE hServicesKey = NULL; + +static HANDLE hNoPendingInstalls = NULL; + +static HANDLE hPnpThread = NULL; +static HANDLE hDeviceInstallThread = NULL; + +static SLIST_HEADER DeviceInstallListHead; +static HANDLE hDeviceInstallListNotEmpty = NULL; + +typedef struct +{ + SLIST_ENTRY ListEntry; + WCHAR DeviceIds[ANYSIZE_ARRAY]; +} DeviceInstallParams; + +/* FUNCTIONS ****************************************************************/ + +static BOOLEAN ResetDevice( IN LPCWSTR DeviceId) { @@ -32,7 +53,7 @@ ResetDevice( return TRUE; } -BOOLEAN +static BOOLEAN InstallDriver( IN HINF hInf, IN HANDLE hServices, @@ -199,7 +220,7 @@ InstallDriver( return deviceInstalled; } -VOID +static VOID InstallDevice( IN HINF hInf, IN HANDLE hEnum, @@ -337,38 +358,58 @@ InstallDevice( NtClose(hDeviceKey); } -NTSTATUS -EventThread(IN LPVOID lpParameter) +/* Loop to install all queued devices installations */ +static ULONG NTAPI +DeviceInstallThread(IN PVOID Parameter) { - UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); - UNICODE_STRING ServicesU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); + HINF hSetupInf = *(HINF*)Parameter; + PSLIST_ENTRY ListEntry; + DeviceInstallParams* Params; + LARGE_INTEGER Timeout; - PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG PnpEventSize; - HINF hInf; - HANDLE hEnum, hServices; - NTSTATUS Status; - - hInf = *(HINF*)lpParameter; - - InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&hEnum, KEY_QUERY_VALUE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) + for (;;) { - DPRINT1("NtOpenKey('%wZ') failed with status 0x%08lx\n", &EnumU, Status); - return Status; - } + ListEntry = RtlInterlockedPopEntrySList(&DeviceInstallListHead); - InitializeObjectAttributes(&ObjectAttributes, &ServicesU, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&hServices, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey('%wZ') failed with status 0x%08lx\n", &ServicesU, Status); - NtClose(hEnum); - return Status; + if (ListEntry == NULL) + { + /* + * The list is now empty, but there may be a new enumerated device + * that is going to be added to the list soon. In order to avoid + * setting the hNoPendingInstalls event to release it soon after, + * we wait for maximum 1 second for no PnP enumeration event being + * received before declaring that no pending installations are + * taking place and setting the corresponding event. + */ + Timeout.QuadPart = -10000000LL; /* Wait for 1 second */ + if (NtWaitForSingleObject(hDeviceInstallListNotEmpty, FALSE, &Timeout) == STATUS_TIMEOUT) + { + /* We timed out: set the event and do the actual wait */ + NtSetEvent(hNoPendingInstalls, NULL); + NtWaitForSingleObject(hDeviceInstallListNotEmpty, FALSE, NULL); + } + } + else + { + NtResetEvent(hNoPendingInstalls, NULL); + Params = CONTAINING_RECORD(ListEntry, DeviceInstallParams, ListEntry); + InstallDevice(hSetupInf, hEnumKey, hServicesKey, Params->DeviceIds); + RtlFreeHeap(ProcessHeap, 0, Params); + } } + return 0; +} + +static ULONG NTAPI +PnpEventThread(IN PVOID Parameter) +{ + NTSTATUS Status; + PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; + ULONG PnpEventSize; + + UNREFERENCED_PARAMETER(Parameter); + PnpEventSize = 0x1000; PnpEvent = RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); if (PnpEvent == NULL) @@ -400,20 +441,45 @@ EventThread(IN LPVOID lpParameter) if (!NT_SUCCESS(Status)) { - DPRINT("NtPlugPlayEvent() failed (Status %lx)\n", Status); - break; + DPRINT1("NtGetPlugPlayEvent() failed (Status 0x%08lx)\n", Status); + goto Quit; } /* Process the PnP event */ DPRINT("Received PnP Event\n"); - if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ENUMERATED)) + if (IsEqualGUID(&PnpEvent->EventGuid, &GUID_DEVICE_ENUMERATED)) { - DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); - InstallDevice(hInf, hEnum, hServices, PnpEvent->TargetDevice.DeviceIds); + DeviceInstallParams* Params; + ULONG len; + ULONG DeviceIdLength; + + DPRINT("Device enumerated event: %S\n", PnpEvent->TargetDevice.DeviceIds); + + DeviceIdLength = wcslen(PnpEvent->TargetDevice.DeviceIds); + if (DeviceIdLength) + { + /* Queue device install (will be dequeued by DeviceInstallThread) */ + len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); + Params = RtlAllocateHeap(ProcessHeap, 0, len); + if (Params) + { + wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); + RtlInterlockedPushEntrySList(&DeviceInstallListHead, &Params->ListEntry); + NtSetEvent(hDeviceInstallListNotEmpty, NULL); + } + else + { + DPRINT1("Not enough memory (size %lu)\n", len); + } + } } else { - DPRINT("Unknown event\n"); + DPRINT("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", + PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2, PnpEvent->EventGuid.Data3, + PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1], PnpEvent->EventGuid.Data4[2], + PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4], PnpEvent->EventGuid.Data4[5], + PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]); } /* Dequeue the current PnP event and signal the next one */ @@ -426,17 +492,208 @@ Quit: if (PnpEvent) RtlFreeHeap(ProcessHeap, 0, PnpEvent); - NtClose(hServices); - NtClose(hEnum); - + NtTerminateThread(NtCurrentThread(), Status); return Status; } -DWORD WINAPI -PnpEventThread(IN LPVOID lpParameter) +NTSTATUS +WaitNoPendingInstallEvents( + IN PLARGE_INTEGER Timeout OPTIONAL) +{ + return NtWaitForSingleObject(hNoPendingInstalls, FALSE, Timeout); +} + +BOOLEAN +EnableUserModePnpManager(VOID) +{ + LARGE_INTEGER Timeout; + + /* Start the PnP thread */ + if (hPnpThread != NULL) + NtResumeThread(hPnpThread, NULL); + + /* + * Wait a little bit so that we get a chance to have some events being + * queued by the time the device-installation thread becomes resumed. + */ + Timeout.QuadPart = -10000000LL; /* Wait for 1 second */ + NtWaitForSingleObject(hDeviceInstallListNotEmpty, FALSE, &Timeout); + + /* Start the device installation thread */ + if (hDeviceInstallThread != NULL) + NtResumeThread(hDeviceInstallThread, NULL); + + return TRUE; +} + +BOOLEAN +DisableUserModePnpManager(VOID) +{ + /* Wait until all pending installations are done, then freeze the threads */ + if (WaitNoPendingInstallEvents(NULL) != STATUS_WAIT_0) + DPRINT1("WaitNoPendingInstallEvents() failed to wait!\n"); + + // TODO: use signalling events + + NtSuspendThread(hPnpThread, NULL); + NtSuspendThread(hDeviceInstallThread, NULL); + + return TRUE; +} + +NTSTATUS +InitializeUserModePnpManager( + IN HINF* phSetupInf) { NTSTATUS Status; - Status = EventThread(lpParameter); - NtTerminateThread(NtCurrentThread(), Status); - return 0; + OBJECT_ATTRIBUTES ObjectAttributes; + + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); + UNICODE_STRING ServicesU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); + + Status = NtCreateEvent(&hDeviceInstallListNotEmpty, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not create the event! (Status 0x%08lx)\n", Status); + goto Failure; + } + + Status = NtCreateEvent(&hNoPendingInstalls, + EVENT_ALL_ACCESS, + NULL, + NotificationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not create the event! (Status 0x%08lx)\n", Status); + goto Failure; + } + + RtlInitializeSListHead(&DeviceInstallListHead); + + InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenKey(&hEnumKey, KEY_QUERY_VALUE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey('%wZ') failed (Status 0x%08lx)\n", &EnumU, Status); + goto Failure; + } + + InitializeObjectAttributes(&ObjectAttributes, &ServicesU, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateKey(&hServicesKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateKey('%wZ') failed (Status 0x%08lx)\n", &ServicesU, Status); + goto Failure; + } + + /* Create the PnP event thread in suspended state */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + PnpEventThread, + NULL, + &hPnpThread, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create the PnP event thread (Status 0x%08lx)\n", Status); + hPnpThread = NULL; + goto Failure; + } + + /* Create the device installation thread in suspended state */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + DeviceInstallThread, + phSetupInf, + &hDeviceInstallThread, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create the device installation thread (Status 0x%08lx)\n", Status); + hDeviceInstallThread = NULL; + goto Failure; + } + + return STATUS_SUCCESS; + +Failure: + if (hPnpThread) + { + NtTerminateThread(hPnpThread, STATUS_SUCCESS); + NtClose(hPnpThread); + } + hPnpThread = NULL; + + if (hServicesKey) + NtClose(hServicesKey); + hServicesKey = NULL; + + if (hEnumKey) + NtClose(hEnumKey); + hEnumKey = NULL; + + if (hNoPendingInstalls) + NtClose(hNoPendingInstalls); + hNoPendingInstalls = NULL; + + if (hDeviceInstallListNotEmpty) + NtClose(hDeviceInstallListNotEmpty); + hDeviceInstallListNotEmpty = NULL; + + return Status; +} + +VOID +TerminateUserModePnpManager(VOID) +{ + DisableUserModePnpManager(); + + // TODO: use signalling events + + /* Kill the PnP thread as it blocks inside the NtGetPlugPlayEvent() call */ + if (hPnpThread) + { + NtTerminateThread(hPnpThread, STATUS_SUCCESS); + NtClose(hPnpThread); + } + hPnpThread = NULL; + + /* Kill the device installation thread */ + if (hDeviceInstallThread) + { + NtTerminateThread(hDeviceInstallThread, STATUS_SUCCESS); + NtClose(hDeviceInstallThread); + } + hDeviceInstallThread = NULL; + + /* Close the opened handles */ + + if (hServicesKey) + NtClose(hServicesKey); + hServicesKey = NULL; + + if (hEnumKey) + NtClose(hEnumKey); + hEnumKey = NULL; + + if (hNoPendingInstalls) + NtClose(hNoPendingInstalls); + hNoPendingInstalls = NULL; + + if (hDeviceInstallListNotEmpty) + NtClose(hDeviceInstallListNotEmpty); + hDeviceInstallListNotEmpty = NULL; } diff --git a/base/setup/usetup/devinst.h b/base/setup/usetup/devinst.h new file mode 100644 index 0000000000..5a1edc6e0b --- /dev/null +++ b/base/setup/usetup/devinst.h @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * PURPOSE: Device installation + * PROGRAMMER: Hervé Poussineau (hpoussin(a)reactos.org) + * Hermes Belusca-Maito + */ + +NTSTATUS +WaitNoPendingInstallEvents( + IN PLARGE_INTEGER Timeout OPTIONAL); + +BOOLEAN +EnableUserModePnpManager(VOID); + +BOOLEAN +DisableUserModePnpManager(VOID); + +NTSTATUS +InitializeUserModePnpManager( + IN HINF* phSetupInf); + +VOID +TerminateUserModePnpManager(VOID); diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 781fcdf863..390b2b2e32 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -3,12 +3,46 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY bgBGSetupInitPageEntries[] = +{ + { + 4, + 3, + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bgBGLanguagePageEntries[] = { { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -54,7 +88,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -136,7 +170,7 @@ static MUI_ENTRY bgBGIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -206,7 +240,7 @@ static MUI_ENTRY bgBGLicensePageEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -330,7 +364,7 @@ static MUI_ENTRY bgBGDevicePageEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -423,7 +457,7 @@ static MUI_ENTRY bgBGRepairPageEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -487,7 +521,7 @@ static MUI_ENTRY bgBGUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -557,7 +591,7 @@ static MUI_ENTRY bgBGComputerPageEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -609,7 +643,7 @@ static MUI_ENTRY bgBGFlushPageEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -649,7 +683,7 @@ static MUI_ENTRY bgBGQuitPageEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -695,7 +729,7 @@ static MUI_ENTRY bgBGDisplayPageEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -746,7 +780,7 @@ static MUI_ENTRY bgBGSuccessPageEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -792,7 +826,7 @@ static MUI_ENTRY bgBGBootPageEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -839,7 +873,7 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -910,7 +944,7 @@ static MUI_ENTRY bgBGConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1004,7 +1038,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = { 4, 3, - " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1038,7 +1072,7 @@ static MUI_ENTRY bgBGInstallDirectoryEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1090,7 +1124,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1131,7 +1165,7 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1183,7 +1217,7 @@ static MUI_ENTRY bgBGKeyboardSettingsEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1235,7 +1269,7 @@ static MUI_ENTRY bgBGLayoutSettingsEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1288,13 +1322,13 @@ static MUI_ENTRY bgBGPrepareCopyEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { 6, 8, - "\212\256\254\257\356\342\352\340\352\342 \341\245 \257\256\244\243\256\342\242\357 \247\240 \247\240\257\250\341 \255\240 \344\240\251\253\256\242\245\342\245 \255\240 \220\245\240\252\342\216\221. ", + "\212\256\254\257\356\342\352\340\352\342 \341\245 \257\256\244\243\256\342\242\357 \247\240 \247\240\257\250\341 \255\240 \344\240\251\253\256\242\245\342\245 \255\240 \220\245\240\252\342\216\221.", TEXT_STYLE_NORMAL }, { @@ -1317,7 +1351,7 @@ static MUI_ENTRY bgBGSelectFSEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1364,7 +1398,7 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { @@ -1410,13 +1444,13 @@ static MUI_ENTRY bgBGRegistryEntries[] = { 4, 3, - " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " . ", + " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", TEXT_STYLE_UNDERLINE }, { 6, 8, - "\217\340\256\342\250\347\240 \256\241\255\256\242\357\242\240\255\245 \255\240 \341\250\341\342\245\254\255\250\342\245 \255\240\341\342\340\256\251\252\250. ", + "\217\340\256\342\250\347\240 \256\241\255\256\242\357\242\240\255\245 \255\240 \341\250\341\342\245\254\255\250\342\245 \255\240\341\342\340\256\251\252\250.", TEXT_STYLE_NORMAL }, { @@ -1682,6 +1716,10 @@ MUI_ERROR bgBGErrorEntries[] = MUI_PAGE bgBGPages[] = { + { + SETUP_INIT_PAGE, + bgBGSetupInitPageEntries + }, { LANGUAGE_PAGE, bgBGLanguagePageEntries diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 352aeb1453..1cde9329cb 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1,5 +1,39 @@ #pragma once +static MUI_ENTRY bnBDSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bnBDLanguagePageEntries[] = { { @@ -606,19 +640,19 @@ static MUI_ENTRY bnBDFlushPageEntries[] = { 10, 6, - "The system is now making sure all data is stored on your disk", + "The system is now making sure all data is stored on your disk.", TEXT_STYLE_NORMAL }, { 10, 8, - "This may take a minute", + "This may take a minute.", TEXT_STYLE_NORMAL }, { 10, 9, - "When finished, your computer will reboot automatically", + "When finished, your computer will reboot automatically.", TEXT_STYLE_NORMAL }, { @@ -646,7 +680,7 @@ static MUI_ENTRY bnBDQuitPageEntries[] = { 10, 6, - "ReactOS is not completely installed", + "ReactOS is not completely installed.", TEXT_STYLE_NORMAL }, { @@ -670,7 +704,7 @@ static MUI_ENTRY bnBDQuitPageEntries[] = { 0, 0, - "Please wait ...", + "Please wait...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -1283,7 +1317,7 @@ static MUI_ENTRY bnBDPrepareCopyEntries[] = { 6, 8, - "Setup prepares your computer for copying the ReactOS files. ", + "Setup prepares your computer for copying the ReactOS files.", TEXT_STYLE_NORMAL }, { @@ -1405,7 +1439,7 @@ static MUI_ENTRY bnBDRegistryEntries[] = { 6, 8, - "Setup is updating the system configuration. ", + "Setup is updating the system configuration.", TEXT_STYLE_NORMAL }, { @@ -1669,6 +1703,10 @@ MUI_ERROR bnBDErrorEntries[] = MUI_PAGE bnBDPages[] = { + { + SETUP_INIT_PAGE, + bnBDSetupInitPageEntries + }, { LANGUAGE_PAGE, bnBDLanguagePageEntries diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 588f6cc171..361d7529d9 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -9,6 +9,40 @@ #pragma once +static MUI_ENTRY csCZSetupInitPageEntries[] = +{ + { + 4, + 3, + " Instalace ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY csCZLanguagePageEntries[] = { { @@ -136,7 +170,7 @@ static MUI_ENTRY csCZIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalace ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -487,7 +521,7 @@ static MUI_ENTRY csCZUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalace ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -655,7 +689,7 @@ static MUI_ENTRY csCZQuitPageEntries[] = { 10, 6, - "ReactOS nen\241 kompletn\330 nainstalov\240n", + "ReactOS nen\241 kompletn\330 nainstalov\240n.", TEXT_STYLE_NORMAL }, { @@ -1678,6 +1712,10 @@ MUI_ERROR csCZErrorEntries[] = MUI_PAGE csCZPages[] = { + { + SETUP_INIT_PAGE, + csCZSetupInitPageEntries + }, { LANGUAGE_PAGE, csCZLanguagePageEntries diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index c8f7a8db9e..c203f21e04 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY daDKSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " installationen ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY daDKLanguagePageEntries[] = { { @@ -130,7 +164,7 @@ static MUI_ENTRY daDKIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " installationen ", TEXT_STYLE_UNDERLINE }, { @@ -487,7 +521,7 @@ static MUI_ENTRY daDKUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " installationen ", TEXT_STYLE_UNDERLINE }, { @@ -615,13 +649,13 @@ static MUI_ENTRY daDKFlushPageEntries[] = { 10, 6, - "Systemet tjekker i \233jeblikket om alt er blevet kopieret til din disk", + "Systemet tjekker i \233jeblikket om alt er blevet kopieret til din disk.", TEXT_STYLE_NORMAL }, { 10, 8, - "Dette tager et \233jeblik", + "Dette tager et \233jeblik.", TEXT_STYLE_NORMAL }, { @@ -655,7 +689,7 @@ static MUI_ENTRY daDKQuitPageEntries[] = { 10, 6, - "ReactOS er ikke blevet helt installeret", + "ReactOS er ikke blevet helt installeret.", TEXT_STYLE_NORMAL }, { @@ -1299,7 +1333,7 @@ static MUI_ENTRY daDKPrepareCopyEntries[] = { 6, 8, - "Installationen g\233r din computer klar til at kopiere ReactOS filerne. ", + "Installationen g\233r din computer klar til at kopiere ReactOS filerne.", TEXT_STYLE_NORMAL }, { @@ -1421,7 +1455,7 @@ static MUI_ENTRY daDKRegistryEntries[] = { 6, 8, - "Installationen opdatere systemkonfigurationen. ", + "Installationen opdatere systemkonfigurationen.", TEXT_STYLE_NORMAL }, { @@ -1686,6 +1720,10 @@ MUI_ERROR daDKErrorEntries[] = MUI_PAGE daDKPages[] = { + { + SETUP_INIT_PAGE, + daDKSetupInitPageEntries + }, { LANGUAGE_PAGE, daDKLanguagePageEntries diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 5063475eeb..a01c38b1a1 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY deDESetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY deDELanguagePageEntries[] = { { @@ -615,7 +649,7 @@ static MUI_ENTRY deDEFlushPageEntries[] = { 10, 6, - "Die geschrieben Daten werden \201berpr\201ft", + "Die geschrieben Daten werden \201berpr\201ft.", TEXT_STYLE_NORMAL }, { @@ -655,7 +689,7 @@ static MUI_ENTRY deDEQuitPageEntries[] = { 10, 6, - "ReactOS wurde nicht vollst\204ndig installiert", + "ReactOS wurde nicht vollst\204ndig installiert.", TEXT_STYLE_NORMAL }, { @@ -673,7 +707,7 @@ static MUI_ENTRY deDEQuitPageEntries[] = { 0, 0, - "Bitte warten ...", + "Bitte warten...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1408,7 +1442,7 @@ static MUI_ENTRY deDERegistryEntries[] = { 6, 8, - "Systemkonfiguration wird aktualisiert. ", + "Systemkonfiguration wird aktualisiert.", TEXT_STYLE_HIGHLIGHT }, { @@ -1675,6 +1709,10 @@ MUI_ERROR deDEErrorEntries[] = MUI_PAGE deDEPages[] = { + { + SETUP_INIT_PAGE, + deDESetupInitPageEntries + }, { LANGUAGE_PAGE, deDELanguagePageEntries diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index d926085d0a..c839e82b27 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY elGRSetupInitPageEntries[] = +{ + { + 4, + 3, + " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY elGRLanguagePageEntries[] = { { @@ -130,7 +164,7 @@ static MUI_ENTRY elGRIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -481,7 +515,7 @@ static MUI_ENTRY elGRUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " \204\232\241\230\253\341\251\253\230\251\236 \253\246\254 ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -655,7 +689,7 @@ static MUI_ENTRY elGRQuitPageEntries[] = { 10, 6, - "\222\246 ReactOS \233\234\244 \234\232\241\230\253\230\251\253\341\237\236\241\234 \247\242\343\250\340\252", + "\222\246 ReactOS \233\234\244 \234\232\241\230\253\230\251\253\341\237\236\241\234 \247\242\343\250\340\252.", TEXT_STYLE_NORMAL }, { @@ -679,7 +713,7 @@ static MUI_ENTRY elGRQuitPageEntries[] = { 0, 0, - " \217\230\250\230\241\230\242\351 \247\234\250\240\243\342\244\234\253\234 ...", + " \217\230\250\230\241\230\242\351 \247\234\250\240\243\342\244\234\253\234...", TEXT_TYPE_STATUS, }, { @@ -1310,7 +1344,7 @@ static MUI_ENTRY elGRPrepareCopyEntries[] = { 6, 8, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \247\250\246\234\253\246\240\243\341\235\234\240 \253\246\244 \254\247\246\242\246\232\240\251\253\343 \251\230\252 \232\240\230 \253\236\244 \230\244\253\240\232\250\230\255\343 \253\340\244 \230\250\256\234\345\340\244 \253\246\254 ReactOS. ", + "\206 \234\232\241\230\253\341\251\253\230\251\236 \247\250\246\234\253\246\240\243\341\235\234\240 \253\246\244 \254\247\246\242\246\232\240\251\253\343 \251\230\252 \232\240\230 \253\236\244 \230\244\253\240\232\250\230\255\343 \253\340\244 \230\250\256\234\345\340\244 \253\246\254 ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1432,7 +1466,7 @@ static MUI_ENTRY elGRRegistryEntries[] = { 6, 8, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \230\244\230\244\234\351\244\234\240 \253\236 \233\246\243\343 \253\246\254 \251\254\251\253\343\243\230\253\246\252. ", + "\206 \234\232\241\230\253\341\251\253\230\251\236 \230\244\230\244\234\351\244\234\240 \253\236 \233\246\243\343 \253\246\254 \251\254\251\253\343\243\230\253\246\252.", TEXT_STYLE_NORMAL }, { @@ -1688,6 +1722,10 @@ MUI_ERROR elGRErrorEntries[] = MUI_PAGE elGRPages[] = { + { + SETUP_INIT_PAGE, + elGRSetupInitPageEntries + }, { LANGUAGE_PAGE, elGRLanguagePageEntries diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 1f90eb26da..8ba4fabbff 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1,5 +1,39 @@ #pragma once +static MUI_ENTRY enUSSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSLanguagePageEntries[] = { { @@ -607,19 +641,19 @@ static MUI_ENTRY enUSFlushPageEntries[] = { 10, 6, - "The system is now making sure all data is stored on your disk", + "The system is now making sure all data is stored on your disk.", TEXT_STYLE_NORMAL }, { 10, 8, - "This may take a minute", + "This may take a minute.", TEXT_STYLE_NORMAL }, { 10, 9, - "When finished, your computer will reboot automatically", + "When finished, your computer will reboot automatically.", TEXT_STYLE_NORMAL }, { @@ -647,7 +681,7 @@ static MUI_ENTRY enUSQuitPageEntries[] = { 10, 6, - "ReactOS is not completely installed", + "ReactOS is not completely installed.", TEXT_STYLE_NORMAL }, { @@ -671,7 +705,7 @@ static MUI_ENTRY enUSQuitPageEntries[] = { 0, 0, - "Please wait ...", + "Please wait...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -1284,7 +1318,7 @@ static MUI_ENTRY enUSPrepareCopyEntries[] = { 6, 8, - "Setup prepares your computer for copying the ReactOS files. ", + "Setup prepares your computer for copying the ReactOS files.", TEXT_STYLE_NORMAL }, { @@ -1406,7 +1440,7 @@ static MUI_ENTRY enUSRegistryEntries[] = { 6, 8, - "Setup is updating the system configuration. ", + "Setup is updating the system configuration.", TEXT_STYLE_NORMAL }, { @@ -1670,6 +1704,10 @@ MUI_ERROR enUSErrorEntries[] = MUI_PAGE enUSPages[] = { + { + SETUP_INIT_PAGE, + enUSSetupInitPageEntries + }, { LANGUAGE_PAGE, enUSLanguagePageEntries diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 9df1907c12..dd55090886 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -5,6 +5,40 @@ #pragma once +static MUI_ENTRY esESSetupInitPageEntries[] = +{ + { + 4, + 3, + " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY esESLanguagePageEntries[] = { { @@ -132,7 +166,7 @@ static MUI_ENTRY esESIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -483,7 +517,7 @@ static MUI_ENTRY esESUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalaci\242n de ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -611,19 +645,19 @@ static MUI_ENTRY esESFlushPageEntries[] = { 10, 6, - "El sistema se est\240 asegurando que todos los datos sean salvados", + "El sistema se est\240 asegurando que todos los datos sean salvados.", TEXT_STYLE_NORMAL }, { 10, 8, - "Esta operaci\242n puede durar varios minutos", + "Esta operaci\242n puede durar varios minutos.", TEXT_STYLE_NORMAL }, { 10, 9, - "Cuando haya terminado, su equipo se reiniciar\240 autom\240ticamente", + "Cuando haya terminado, su equipo se reiniciar\240 autom\240ticamente.", TEXT_STYLE_NORMAL }, { @@ -651,7 +685,7 @@ static MUI_ENTRY esESQuitPageEntries[] = { 10, 6, - "ReactOS no ha sido instalado completamente", + "ReactOS no ha sido instalado completamente.", TEXT_STYLE_NORMAL }, { @@ -1040,7 +1074,7 @@ static MUI_ENTRY esESInstallDirectoryEntries[] = { 6, 8, - "El programa instalar\240 los archivos en la partici\242n seleccionada. ", + "El programa instalar\240 los archivos en la partici\242n seleccionada.", TEXT_STYLE_NORMAL }, { @@ -1289,7 +1323,7 @@ static MUI_ENTRY esESPrepareCopyEntries[] = { 6, 8, - "El programa prepara su equipo para copiar los archivos de ReactOS. ", + "El programa prepara su equipo para copiar los archivos de ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1411,7 +1445,7 @@ static MUI_ENTRY esESRegistryEntries[] = { 6, 8, - "El instalador est\240 actualizando la configuraci\242n del sistema. ", + "El instalador est\240 actualizando la configuraci\242n del sistema.", TEXT_STYLE_NORMAL }, { @@ -1675,6 +1709,10 @@ MUI_ERROR esESErrorEntries[] = MUI_PAGE esESPages[] = { + { + SETUP_INIT_PAGE, + esESSetupInitPageEntries + }, { LANGUAGE_PAGE, esESLanguagePageEntries diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 0dbb8d9620..cb18cab606 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY etEESetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldus ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY etEELanguagePageEntries[] = { { @@ -481,7 +515,7 @@ static MUI_ENTRY etEEUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " paigaldus ", TEXT_STYLE_UNDERLINE }, { @@ -609,19 +643,19 @@ static MUI_ENTRY etEEFlushPageEntries[] = { 10, 6, - "S\201steem kirjutab n\201\201d andmed kettale", + "S\201steem kirjutab n\201\201d andmed kettale.", TEXT_STYLE_NORMAL }, { 10, 8, - "V\344ib kuluda veidi aega", + "V\344ib kuluda veidi aega.", TEXT_STYLE_NORMAL }, { 10, 9, - "L\344petamisel taask\204ivitub arvuti automaatselt", + "L\344petamisel taask\204ivitub arvuti automaatselt.", TEXT_STYLE_NORMAL }, { @@ -649,7 +683,7 @@ static MUI_ENTRY etEEQuitPageEntries[] = { 10, 6, - "ReactOS ei ole t\204ielikult paigaldatud", + "ReactOS ei ole t\204ielikult paigaldatud.", TEXT_STYLE_NORMAL }, { @@ -1671,6 +1705,10 @@ MUI_ERROR etEEErrorEntries[] = MUI_PAGE etEEPages[] = { + { + SETUP_INIT_PAGE, + etEESetupInitPageEntries + }, { LANGUAGE_PAGE, etEELanguagePageEntries diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index c92e15fa02..d50f7fb5df 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY frFRSetupInitPageEntries[] = +{ + { + 4, + 3, + " Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Veuillez patienter pendant que le programme d'installation de ReactOS", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "s'initialise et d\202couvre vos p\202riph\202riques...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Veuillez patienter...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY frFRLanguagePageEntries[] = { { @@ -72,7 +106,7 @@ static MUI_ENTRY frFRWelcomePageEntries[] = { 6, 12, - "sur votre ordinateur et le pr\202pare \205 la 2e partie de l'installation.", + "sur votre ordinateur et le pr\202pare \205 la 2\212me partie de l'installation.", TEXT_STYLE_NORMAL }, { @@ -130,7 +164,7 @@ static MUI_ENTRY frFRIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -615,19 +649,19 @@ static MUI_ENTRY frFRFlushPageEntries[] = { 10, 6, - "Le syst\212me s'assure que toutes les donn\202es sont \202crites sur le disque", + "Le syst\212me s'assure que toutes les donn\202es sont \202crites sur le disque.", TEXT_STYLE_NORMAL }, { 10, 8, - "Cela peut prendre une minute", + "Cela peut prendre une minute.", TEXT_STYLE_NORMAL }, { 10, 9, - "Quand cela sera fini, votre ordinateur red\202marrera automatiquement", + "Quand cela sera fini, votre ordinateur red\202marrera automatiquement.", TEXT_STYLE_NORMAL }, { @@ -655,7 +689,7 @@ static MUI_ENTRY frFRQuitPageEntries[] = { 10, 6, - "ReactOS n'est pas compl\212tement install\202", + "ReactOS n'est pas compl\212tement install\202.", TEXT_STYLE_NORMAL }, { @@ -679,7 +713,7 @@ static MUI_ENTRY frFRQuitPageEntries[] = { 0, 0, - "Veuillez attendre ...", + "Veuillez patienter...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1304,7 +1338,7 @@ static MUI_ENTRY frFRPrepareCopyEntries[] = { 6, 8, - "Setup pr\202pare votre ordinateur pour copier les fichiers de ReactOS. ", + "Setup pr\202pare votre ordinateur pour copier les fichiers de ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1426,7 +1460,7 @@ static MUI_ENTRY frFRRegistryEntries[] = { 6, 8, - "Setup met \205 jour la configuration du syst\212me. ", + "Setup met \205 jour la configuration du syst\212me.", TEXT_STYLE_NORMAL }, { @@ -1690,6 +1724,10 @@ MUI_ERROR frFRErrorEntries[] = MUI_PAGE frFRPages[] = { + { + SETUP_INIT_PAGE, + frFRSetupInitPageEntries + }, { LANGUAGE_PAGE, frFRLanguagePageEntries diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index f7701b623d..4f252a9291 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -4,6 +4,40 @@ #pragma once /* Hebrew text is in visual order */ +static MUI_ENTRY heILSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " \232\220\227\232\204 ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY heILLanguagePageEntries[] = { { @@ -611,19 +645,19 @@ static MUI_ENTRY heILFlushPageEntries[] = { 10, 6, - "\212\214\231 \217\220\205\213\204 \214\222 \230\205\216\231 \222\203\211\216\204 \214\213\231 \200\203\205\205\232 \205\211\231\213\222 \232\213\230\222\216\204", + "\212\214\231 \217\220\205\213\204 \214\222 \230\205\216\231 \222\203\211\216\204 \214\213\231 \200\203\205\205\232 \205\211\231\213\222 \232\213\230\222\216\204.", TEXT_STYLE_NORMAL }, { 10, 8, - "\232\205\227\203 \204\216\213 \232\207\227\214 \214\205\213\211 \204\206", + "\232\205\227\203 \204\216\213 \232\207\227\214 \214\205\213\211 \204\206.", TEXT_STYLE_NORMAL }, { 10, 9, - "\211\210\216\205\210\205\200 \217\224\205\200\201 \231\203\207\216 \214\222\224\205\211 \201\231\207\216\204 ,\215\205\211\221\201", + "\211\210\216\205\210\205\200 \217\224\205\200\201 \231\203\207\216 \214\222\224\205\211 \201\231\207\216\204 ,\215\205\211\221\201.", TEXT_STYLE_NORMAL }, { @@ -1672,6 +1706,10 @@ MUI_ERROR heILErrorEntries[] = MUI_PAGE heILPages[] = { + { + SETUP_INIT_PAGE, + heILSetupInitPageEntries + }, { LANGUAGE_PAGE, heILLanguagePageEntries diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index c5784b9cbc..736b71418c 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1,5 +1,39 @@ #pragma once +static MUI_ENTRY itITSetupInitPageEntries[] = +{ + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY itITLanguagePageEntries[] = { { @@ -478,7 +512,7 @@ static MUI_ENTRY itITUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -606,19 +640,19 @@ static MUI_ENTRY itITFlushPageEntries[] = { 10, 6, - "Il sistema si sta accertando che tutti i dati vengano salvati", + "Il sistema si sta accertando che tutti i dati vengano salvati.", TEXT_STYLE_NORMAL }, { 10, 8, - "Questo potrebbe impiegare qualche minuto", + "Questo potrebbe impiegare qualche minuto.", TEXT_STYLE_NORMAL }, { 10, 9, - "Al termine, il computer verr\x85 riavviato automaticamente", + "Al termine, il computer verr\x85 riavviato automaticamente.", TEXT_STYLE_NORMAL }, { @@ -646,7 +680,7 @@ static MUI_ENTRY itITQuitPageEntries[] = { 10, 6, - "ReactOS non \x8A stato installato completamente", + "ReactOS non \x8A stato installato completamente.", TEXT_STYLE_NORMAL }, { @@ -1289,7 +1323,7 @@ static MUI_ENTRY itITPrepareCopyEntries[] = { 6, 8, - "Setup sta preparando il computer per la copia dei file di ReactOS. ", + "Setup sta preparando il computer per la copia dei file di ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1411,7 +1445,7 @@ static MUI_ENTRY itITRegistryEntries[] = { 6, 8, - "Setup sta aggiornando la configurazione del sistema. ", + "Setup sta aggiornando la configurazione del sistema.", TEXT_STYLE_NORMAL }, { @@ -1675,6 +1709,10 @@ MUI_ERROR itITErrorEntries[] = MUI_PAGE itITPages[] = { + { + SETUP_INIT_PAGE, + itITSetupInitPageEntries + }, { LANGUAGE_PAGE, itITLanguagePageEntries diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index de7412a31f..b8a7a49a05 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY jaJPSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY jaJPLanguagePageEntries[] = { { @@ -130,7 +164,7 @@ static MUI_ENTRY jaJPIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE }, { @@ -481,7 +515,7 @@ static MUI_ENTRY jaJPUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE }, { @@ -673,7 +707,7 @@ static MUI_ENTRY jaJPQuitPageEntries[] = { 0, 0, - "\265\317\301 \270\300\336\273\262 ...", + "\265\317\301 \270\300\336\273\262...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -1673,6 +1707,10 @@ MUI_ERROR jaJPErrorEntries[] = MUI_PAGE jaJPPages[] = { + { + SETUP_INIT_PAGE, + jaJPSetupInitPageEntries + }, { LANGUAGE_PAGE, jaJPLanguagePageEntries diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 0a2f87de84..5fe9791674 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -12,6 +12,40 @@ #pragma once +static MUI_ENTRY ltLTSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ltLTLanguagePageEntries[] = { { @@ -139,7 +173,7 @@ static MUI_ENTRY ltLTIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", TEXT_STYLE_UNDERLINE }, { @@ -490,7 +524,7 @@ static MUI_ENTRY ltLTUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", TEXT_STYLE_UNDERLINE }, { @@ -618,19 +652,19 @@ static MUI_ENTRY ltLTFlushPageEntries[] = { 10, 6, - "The system is now making sure all data is stored on your disk", + "The system is now making sure all data is stored on your disk.", TEXT_STYLE_NORMAL }, { 10, 8, - "This may take a minute", + "This may take a minute.", TEXT_STYLE_NORMAL }, { 10, 9, - "When finished, your computer will reboot automatically", + "When finished, your computer will reboot automatically.", TEXT_STYLE_NORMAL }, { @@ -658,7 +692,7 @@ static MUI_ENTRY ltLTQuitPageEntries[] = { 10, 6, - "ReactOS is not completely installed", + "ReactOS is not completely installed.", TEXT_STYLE_NORMAL }, { @@ -1295,7 +1329,7 @@ static MUI_ENTRY ltLTPrepareCopyEntries[] = { 6, 8, - "Setup prepares your computer for copying the ReactOS files. ", + "Setup prepares your computer for copying the ReactOS files.", TEXT_STYLE_NORMAL }, { @@ -1417,7 +1451,7 @@ static MUI_ENTRY ltLTRegistryEntries[] = { 6, 8, - "Setup is updating the system configuration. ", + "Setup is updating the system configuration.", TEXT_STYLE_NORMAL }, { @@ -1681,6 +1715,10 @@ MUI_ERROR ltLTErrorEntries[] = MUI_PAGE ltLTPages[] = { + { + SETUP_INIT_PAGE, + ltLTSetupInitPageEntries + }, { LANGUAGE_PAGE, ltLTLanguagePageEntries diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 426769f0f7..be06b02dd1 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1,5 +1,39 @@ #pragma once +static MUI_ENTRY msMYSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Persediaan ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY msMYLanguagePageEntries[] = { { @@ -127,7 +161,7 @@ static MUI_ENTRY msMYIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " Persediaan ", TEXT_STYLE_UNDERLINE }, { @@ -478,7 +512,7 @@ static MUI_ENTRY msMYUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " Persediaan ", TEXT_STYLE_UNDERLINE }, { @@ -606,19 +640,19 @@ static MUI_ENTRY msMYFlushPageEntries[] = { 10, 6, - "Sistem sekarang memastikan semua data yang disimpan pada cakera anda", + "Sistem sekarang memastikan semua data yang disimpan pada cakera anda.", TEXT_STYLE_NORMAL }, { 10, 8, - "Ini mungkin mengambil beberapa minit", + "Ini mungkin mengambil beberapa minit.", TEXT_STYLE_NORMAL }, { 10, 9, - "Apabila selesai, komputer akan but semula secara automatik", + "Apabila selesai, komputer akan but semula secara automatik.", TEXT_STYLE_NORMAL }, { @@ -646,7 +680,7 @@ static MUI_ENTRY msMYQuitPageEntries[] = { 10, 6, - "ReactOS tidak dipasang sepenuhnya", + "ReactOS tidak dipasang sepenuhnya.", TEXT_STYLE_NORMAL }, { @@ -1183,7 +1217,7 @@ static MUI_ENTRY msMYPrepareCopyEntries[] = { 6, 8, - "Persediaan menyediakan komputer awda untuk menyalin fail-fail ReactOS. ", + "Persediaan menyediakan komputer awda untuk menyalin fail-fail ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1305,7 +1339,7 @@ static MUI_ENTRY msMYRegistryEntries[] = { 6, 8, - "Persediaan sedang mengemaskini konfigurasi sistem. ", + "Persediaan sedang mengemaskini konfigurasi sistem.", TEXT_STYLE_NORMAL }, { @@ -1562,6 +1596,10 @@ MUI_ERROR msMYErrorEntries[] = MUI_PAGE msMYPages[] = { + { + SETUP_INIT_PAGE, + msMYSetupInitPageEntries + }, { LANGUAGE_PAGE, msMYLanguagePageEntries diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 7cee9425bd..e2beb8c3e6 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -8,6 +8,40 @@ #pragma once +static MUI_ENTRY nlNLSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY nlNLLanguagePageEntries[] = { { @@ -1120,7 +1154,7 @@ static MUI_ENTRY nlNLFileCopyEntries[] = { 50, 0, - "\xB3 Een ogenblik geduld ...", + "\xB3 Een ogenblik geduld...", TEXT_TYPE_STATUS }, { @@ -1695,6 +1729,10 @@ MUI_ERROR nlNLErrorEntries[] = MUI_PAGE nlNLPages[] = { + { + SETUP_INIT_PAGE, + nlNLSetupInitPageEntries + }, { LANGUAGE_PAGE, nlNLLanguagePageEntries diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index d661297b4d..305f7bf473 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -12,6 +12,40 @@ #pragma once +static MUI_ENTRY plPLSetupInitPageEntries[] = +{ + { + 4, + 3, + " Instalator ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY plPLLanguagePageEntries[] = { { @@ -618,7 +652,7 @@ static MUI_ENTRY plPLFlushPageEntries[] = { 10, 6, - "System ReactOS sprawdza, czy dane s\245 poprawnie zapisane na dysku", + "System ReactOS sprawdza, czy dane s\245 poprawnie zapisane na dysku.", TEXT_STYLE_NORMAL }, { @@ -682,7 +716,7 @@ static MUI_ENTRY plPLQuitPageEntries[] = { 0, 0, - "Prosz\251 czeka\206 ...", + "Prosz\251 czeka\206...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -1295,7 +1329,7 @@ static MUI_ENTRY plPLPrepareCopyEntries[] = { 6, 8, - "Instalator przygotuje tw\242j komputer do skopiowania plik\242w systemu. ", + "Instalator przygotuje tw\242j komputer do skopiowania plik\242w systemu.", TEXT_STYLE_NORMAL }, { @@ -1417,7 +1451,7 @@ static MUI_ENTRY plPLRegistryEntries[] = { 6, 8, - "Instalator uaktualnia w\210a\230nie konfiguracj\251 systemu. ", + "Instalator uaktualnia w\210a\230nie konfiguracj\251 systemu.", TEXT_STYLE_NORMAL }, { @@ -1681,6 +1715,10 @@ MUI_ERROR plPLErrorEntries[] = MUI_PAGE plPLPages[] = { + { + SETUP_INIT_PAGE, + plPLSetupInitPageEntries + }, { LANGUAGE_PAGE, plPLLanguagePageEntries diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index b038432fb7..32987a7c10 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY ptBRSetupInitPageEntries[] = +{ + { + 4, + 3, + " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptBRLanguagePageEntries[] = { { @@ -130,7 +164,7 @@ static MUI_ENTRY ptBRIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -475,7 +509,7 @@ static MUI_ENTRY ptBRUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1703,6 +1737,10 @@ MUI_ERROR ptBRErrorEntries[] = MUI_PAGE ptBRPages[] = { + { + SETUP_INIT_PAGE, + ptBRSetupInitPageEntries + }, { LANGUAGE_PAGE, ptBRLanguagePageEntries diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index def1a04e25..eb301442cd 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -4,6 +4,40 @@ /* �tefan Fulea (stefan dot fulea at mail dot com) */ #pragma once +static MUI_ENTRY roROSetupInitPageEntries[] = +{ + { + 4, + 3, + " Instalare ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY roROLanguagePageEntries[] = { { @@ -513,7 +547,7 @@ static MUI_ENTRY roROUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalare ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1719,6 +1753,10 @@ MUI_ERROR roROErrorEntries[] = MUI_PAGE roROPages[] = { + { + SETUP_INIT_PAGE, + roROSetupInitPageEntries + }, { LANGUAGE_PAGE, roROLanguagePageEntries diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index ac59201d8e..3f281b32a3 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -3,6 +3,40 @@ // To revert conversion, please execute "code7bit -r <file>". #pragma once +static MUI_ENTRY ruRUSetupInitPageEntries[] = +{ + { + 4, + 3, + " \223\341\342\240\255\256\242\252\240 ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ruRULanguagePageEntries[] = { { @@ -1304,7 +1338,7 @@ static MUI_ENTRY ruRUPrepareCopyEntries[] = { 6, 8, - "\217\256\244\243\256\342\256\242\252\240 \242\240\350\245\243\256 \252\256\254\257\354\356\342\245\340\240 \252 \252\256\257\250\340\256\242\240\255\250\356 \344\240\251\253\256\242 ReactOS. ", + "\217\256\244\243\256\342\256\242\252\240 \242\240\350\245\243\256 \252\256\254\257\354\356\342\245\340\240 \252 \252\256\257\250\340\256\242\240\255\250\356 \344\240\251\253\256\242 ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1426,7 +1460,7 @@ static MUI_ENTRY ruRURegistryEntries[] = { 6, 8, - "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \256\241\255\256\242\253\357\245\342 \252\256\255\344\250\243\343\340\240\346\250\356 \341\250\341\342\245\254\353. ", + "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \256\241\255\256\242\253\357\245\342 \252\256\255\344\250\243\343\340\240\346\250\356 \341\250\341\342\245\254\353.", TEXT_STYLE_NORMAL }, { @@ -1690,6 +1724,10 @@ MUI_ERROR ruRUErrorEntries[] = MUI_PAGE ruRUPages[] = { + { + SETUP_INIT_PAGE, + ruRUSetupInitPageEntries + }, { LANGUAGE_PAGE, ruRULanguagePageEntries diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 945fcbe401..ccca6f385d 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -9,12 +9,46 @@ #pragma once +static MUI_ENTRY skSKSetupInitPageEntries[] = +{ + { + 4, + 3, + " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY skSKLanguagePageEntries[] = { { 4, 3, - " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", + " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -60,7 +94,7 @@ static MUI_ENTRY skSKWelcomePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", + " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -136,7 +170,7 @@ static MUI_ENTRY skSKIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -487,7 +521,7 @@ static MUI_ENTRY skSKUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " In\347tal\240tor syst\202mu ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -615,19 +649,19 @@ static MUI_ENTRY skSKFlushPageEntries[] = { 10, 6, - "Syst\202m pr\240ve overuje v\347etky ulo\247en\202 \243daje na Va\347om disku", + "Syst\202m pr\240ve overuje v\347etky ulo\247en\202 \243daje na Va\347om disku.", TEXT_STYLE_NORMAL }, { 10, 8, - "To m\223\247e trva\234 nieko\226ko min\243t", + "To m\223\247e trva\234 nieko\226ko min\243t.", TEXT_STYLE_NORMAL }, { 10, 9, - "Ke\324 skon\237\241, po\237\241ta\237 sa automaticky re\347tartuje", + "Ke\324 skon\237\241, po\237\241ta\237 sa automaticky re\347tartuje.", TEXT_STYLE_NORMAL }, { @@ -655,7 +689,7 @@ static MUI_ENTRY skSKQuitPageEntries[] = { 10, 6, - "Syst\202m ReactOS nie je nain\347talovan\354 kompletne", + "Syst\202m ReactOS nie je nain\347talovan\354 kompletne.", TEXT_STYLE_NORMAL }, { @@ -679,7 +713,7 @@ static MUI_ENTRY skSKQuitPageEntries[] = { 0, 0, - "Po\237kajte, pros\241m ...", + "Po\237kajte, pros\241m...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -894,7 +928,7 @@ static MUI_ENTRY skSKSelectPartitionEntries[] = { 0, 0, - "Po\237kajte, pros\241m ...", + "Po\237kajte, pros\241m...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1293,7 +1327,7 @@ static MUI_ENTRY skSKPrepareCopyEntries[] = { 6, 8, - "Pripravuje sa kop\241rovanie s\243borov syst\202mu ReactOS. ", + "Pripravuje sa kop\241rovanie s\243borov syst\202mu ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1682,6 +1716,10 @@ MUI_ERROR skSKErrorEntries[] = MUI_PAGE skSKPages[] = { + { + SETUP_INIT_PAGE, + skSKSetupInitPageEntries + }, { LANGUAGE_PAGE, skSKLanguagePageEntries diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 20a60dee29..6c46b3d65e 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -7,6 +7,40 @@ #pragma once +static MUI_ENTRY sqALSetupInitPageEntries[] = +{ + { + 4, + 3, + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY sqALLanguagePageEntries[] = { { @@ -134,7 +168,7 @@ static MUI_ENTRY sqALIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -485,7 +519,7 @@ static MUI_ENTRY sqALUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -613,19 +647,19 @@ static MUI_ENTRY sqALFlushPageEntries[] = { 10, 6, - "Sistemi \211sht\211 tani duke u siguruar t\211 gjitha te dh\211nat jan\211 ruajtur n\211 diskun tuaj", + "Sistemi \211sht\211 tani duke u siguruar t\211 gjitha te dh\211nat jan\211 ruajtur n\211 diskun tuaj.", TEXT_STYLE_NORMAL }, { 10, 8, - "Kjo mund te marr\211 nje minut\211", + "Kjo mund te marr\211 nje minut\211.", TEXT_STYLE_NORMAL }, { 10, 9, - "Kur te p\211rfundoi, kompjuteri juaj do t\211 riniset automatikisht", + "Kur te p\211rfundoi, kompjuteri juaj do t\211 riniset automatikisht.", TEXT_STYLE_NORMAL }, { @@ -653,7 +687,7 @@ static MUI_ENTRY sqALQuitPageEntries[] = { 10, 6, - "ReactOS nuk \211sht\211 instaluar plot\211sisht", + "ReactOS nuk \211sht\211 instaluar plot\211sisht.", TEXT_STYLE_NORMAL }, { @@ -677,7 +711,7 @@ static MUI_ENTRY sqALQuitPageEntries[] = { 0, 0, - "Ju lutem prisni ...", + "Ju lutem prisni...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -1291,7 +1325,7 @@ static MUI_ENTRY sqALPrepareCopyEntries[] = { 6, 8, - "Instalimi pergatit kompjuterin tuaj p\211r kopjimin e dokumentave t\211 ReactOS. ", + "Instalimi pergatit kompjuterin tuaj p\211r kopjimin e dokumentave t\211 ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1413,7 +1447,7 @@ static MUI_ENTRY sqALRegistryEntries[] = { 6, 8, - "Instalimi po apdejton sistemin e konfigurimit. ", + "Instalimi po apdejton sistemin e konfigurimit.", TEXT_STYLE_NORMAL }, { @@ -1683,6 +1717,10 @@ MUI_ERROR sqALErrorEntries[] = MUI_PAGE sqALPages[] = { + { + SETUP_INIT_PAGE, + sqALSetupInitPageEntries + }, { LANGUAGE_PAGE, sqALLanguagePageEntries diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 81faf0147a..571c8d8361 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -9,6 +9,40 @@ */ #pragma once +static MUI_ENTRY svSESetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY svSELanguagePageEntries[] = { { @@ -679,7 +713,7 @@ static MUI_ENTRY svSEQuitPageEntries[] = { 0, 0, - " Var god v\204nta ...", + " Var god v\204nta...", TEXT_TYPE_STATUS, }, { @@ -1293,7 +1327,7 @@ static MUI_ENTRY svSEPrepareCopyEntries[] = { 6, 8, - "Setup f\224rbereder din dator f\224r kopiering av ReactOS filer. ", + "Setup f\224rbereder din dator f\224r kopiering av ReactOS filer.", TEXT_STYLE_NORMAL }, { @@ -1415,7 +1449,7 @@ static MUI_ENTRY svSERegistryEntries[] = { 6, 8, - "Setup uppdaterar systemkonfigurationen. ", + "Setup uppdaterar systemkonfigurationen.", TEXT_STYLE_NORMAL }, { @@ -1679,6 +1713,10 @@ MUI_ERROR svSEErrorEntries[] = MUI_PAGE svSEPages[] = { + { + SETUP_INIT_PAGE, + svSESetupInitPageEntries + }, { LANGUAGE_PAGE, svSELanguagePageEntries diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 65bbac350c..87608cee5b 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -5,6 +5,40 @@ #pragma once +static MUI_ENTRY trTRSetupInitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY trTRLanguagePageEntries[] = { { @@ -1651,6 +1685,10 @@ MUI_ERROR trTRErrorEntries[] = MUI_PAGE trTRPages[] = { + { + SETUP_INIT_PAGE, + trTRSetupInitPageEntries + }, { LANGUAGE_PAGE, trTRLanguagePageEntries diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index e2c059d216..e24f201152 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -8,6 +8,40 @@ #pragma once +static MUI_ENTRY ukUASetupInitPageEntries[] = +{ + { + 4, + 3, + " \202\341\342\240\255\256\242\253\245\255\255\357 ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 20, + "Please wait while the ReactOS Setup initializes itself", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 21, + "and discovers your devices...", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ukUALanguagePageEntries[] = { { @@ -963,7 +997,7 @@ static MUI_ENTRY ukUAConfirmDeleteSystemPartitionEntries[] = { 8, 20, - "\x07 \215\240\342\250\341\255i\342\354 ENTER \351\256\241 \242\250\244\240\253\250\342\250 \341\250\341\342\245\254\255\250\251 \340\256\247\244i\253. ", + "\x07 \215\240\342\250\341\255i\342\354 ENTER \351\256\241 \242\250\244\240\253\250\342\250 \341\250\341\342\245\254\255\250\251 \340\256\247\244i\253.", TEXT_STYLE_NORMAL }, { @@ -1292,7 +1326,7 @@ static MUI_ENTRY ukUAPrepareCopyEntries[] = { 6, 8, - "\202\341\342\240\255\256\242\253\356\242\240\347 \243\256\342\343\363 \202\240\350 \252\256\254\257'\356\342\245\340 \244\253\357 \252\256\257i\356\242\240\255\255\357 \344\240\251\253i\242 ReactOS. ", + "\202\341\342\240\255\256\242\253\356\242\240\347 \243\256\342\343\363 \202\240\350 \252\256\254\257'\356\342\245\340 \244\253\357 \252\256\257i\356\242\240\255\255\357 \344\240\251\253i\242 ReactOS.", TEXT_STYLE_NORMAL }, { @@ -1414,7 +1448,7 @@ static MUI_ENTRY ukUARegistryEntries[] = { 6, 8, - "\202\341\342\240\255\256\242\253\356\242\240\347 \256\255\256\242\253\356\363 \252\256\255\344i\243\343\340\240\346i\356 \341\250\341\342\245\254\250. ", + "\202\341\342\240\255\256\242\253\356\242\240\347 \256\255\256\242\253\356\363 \252\256\255\344i\243\343\340\240\346i\356 \341\250\341\342\245\254\250.", TEXT_STYLE_NORMAL }, { @@ -1679,6 +1713,10 @@ MUI_ERROR ukUAErrorEntries[] = MUI_PAGE ukUAPages[] = { + { + SETUP_INIT_PAGE, + ukUASetupInitPageEntries + }, { LANGUAGE_PAGE, ukUALanguagePageEntries diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index eaf6d9a618..7be0ff9dd9 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -31,6 +31,7 @@ #include "bootsup.h" #include "chkdsk.h" #include "cmdcons.h" +#include "devinst.h" #include "format.h" #define NDEBUG @@ -56,8 +57,6 @@ static WCHAR DefaultKBLayout[20]; // Copy of string inside KeyboardList static BOOLEAN RepairUpdateFlag = FALSE; -static HANDLE hPnpThread = NULL; - static PPARTLIST PartitionList = NULL; static PPARTENTRY TempPartition = NULL; static PFILE_SYSTEM_LIST FileSystemList = NULL; @@ -633,7 +632,7 @@ SetupStartPage(PINPUT_RECORD Ir) PGENERIC_LIST_ENTRY ListEntry; PCWSTR LocaleId; - CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + MUIDisplayPage(SETUP_INIT_PAGE); /* Initialize Setup, phase 1 */ Error = InitializeSetup(&USetupData, 1); @@ -643,12 +642,13 @@ SetupStartPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - /* Start the PnP thread */ - if (hPnpThread != NULL) - { - NtResumeThread(hPnpThread, NULL); - hPnpThread = NULL; - } + /* Initialize the user-mode PnP manager */ + if (!EnableUserModePnpManager()) + DPRINT1("The user-mode PnP manager could not initialize, expect unavailable devices!\n"); + + /* Wait for any immediate pending installations to finish */ + if (WaitNoPendingInstallEvents(NULL) != STATUS_WAIT_0) + DPRINT1("WaitNoPendingInstallEvents() failed to wait!\n"); CheckUnattendedSetup(&USetupData); @@ -4493,10 +4493,6 @@ FlushPage(PINPUT_RECORD Ir) } -DWORD WINAPI -PnpEventThread(IN LPVOID lpParameter); - - /* * The start routine and page management */ @@ -4515,19 +4511,13 @@ RunUSetup(VOID) if (!NT_SUCCESS(Status)) DPRINT1("NtInitializeRegistry() failed (Status 0x%08lx)\n", Status); - /* Create the PnP thread in suspended state */ - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - TRUE, - 0, - 0, - 0, - PnpEventThread, - &USetupData.SetupInf, - &hPnpThread, - NULL); + /* Initialize the user-mode PnP manager */ + Status = InitializeUserModePnpManager(&USetupData.SetupInf); if (!NT_SUCCESS(Status)) - hPnpThread = NULL; + { + // PrintString(??); + DPRINT1("The user-mode PnP manager could not initialize (Status 0x%08lx), expect unavailable devices!\n", Status); + } if (!CONSOLE_Init()) { @@ -4543,12 +4533,12 @@ RunUSetup(VOID) InitializeSetup(&USetupData, 0); USetupData.ErrorRoutine = USetupErrorRoutine; - /* Hide the cursor */ + /* Hide the cursor and clear the screen and keyboard buffer */ CONSOLE_SetCursorType(TRUE, FALSE); - - /* Global Initialization page */ CONSOLE_ClearScreen(); CONSOLE_Flush(); + + /* Global Initialization page */ Page = SetupStartPage(&Ir); while (Page != REBOOT_PAGE && Page != RECOVERY_PAGE) @@ -4706,6 +4696,9 @@ RunUSetup(VOID) } } + /* Terminate the user-mode PnP manager */ + TerminateUserModePnpManager(); + /* Setup has finished */ FinishSetup(&USetupData); diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index ef2fc1e553..e65bc33a7f 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -75,6 +75,7 @@ extern PCWSTR SelectedLanguageId; typedef enum _PAGE_NUMBER { + SETUP_INIT_PAGE, LANGUAGE_PAGE, WELCOME_PAGE, LICENSE_PAGE,

1 0

[reactos] 01/02: [USETUP] Check for invalid INF handles before doing operations.
by Hermès Bélusca-Maïto 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f1c8ac02013b07428665… commit 9f1c8ac02013b0742866531cf7383c168b69857c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 23 16:53:39 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 23 20:37:13 2018 +0100 [USETUP] Check for invalid INF handles before doing operations. --- base/setup/usetup/spapisup/infsupp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/setup/usetup/spapisup/infsupp.c b/base/setup/usetup/spapisup/infsupp.c index af18c491c1..98212975cb 100644 --- a/base/setup/usetup/spapisup/infsupp.c +++ b/base/setup/usetup/spapisup/infsupp.c @@ -43,6 +43,8 @@ WINAPI SetupCloseInfFile( IN HINF InfHandle) { + if (InfHandle == INVALID_HANDLE_VALUE) + return; InfCloseFile(InfHandle); } @@ -58,6 +60,9 @@ SetupFindFirstLineW( PINFCONTEXT pContext; BOOL ret; + if (InfHandle == INVALID_HANDLE_VALUE) + return FALSE; + ret = InfFindFirstLine(InfHandle, Section, Key, &pContext); if (!ret) return FALSE;

1 0

[reactos] 01/01: [NET] Move COMPUTER, CONFIG and CONTINUE command syntax and help texts into a message table.
by Eric Kohl 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34e92908217e68c57c36b… commit 34e92908217e68c57c36befdfedd059db93f917e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 23 20:22:48 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 23 20:22:48 2018 +0100 [NET] Move COMPUTER, CONFIG and CONTINUE command syntax and help texts into a message table. --- base/applications/network/net/cmdConfig.c | 19 +- base/applications/network/net/cmdContinue.c | 7 +- base/applications/network/net/help.c | 23 +- base/applications/network/net/lang/en-US.rc | 41 --- base/applications/network/net/lang/es-ES.rc | 41 --- base/applications/network/net/lang/pl-PL.rc | 41 --- base/applications/network/net/lang/ro-RO.rc | 41 --- base/applications/network/net/lang/ru-RU.rc | 41 --- base/applications/network/net/lang/tr-TR.rc | 41 --- base/applications/network/net/lang/zh-CN.rc | 41 --- base/applications/network/net/lang/zh-TW.rc | 41 --- base/applications/network/net/resource.h | 15 - sdk/include/reactos/mc/net_msg.mc | 550 +++++++++++++++++++++++++++- 13 files changed, 565 insertions(+), 377 deletions(-) diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index df7fce2c96..ecc434ad5c 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -183,12 +183,12 @@ cmdConfig( if (bServer == TRUE) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_SERVER_SYNTAX); + PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); } else { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_SYNTAX); + PrintNetMessage(MSG_CONFIG_SYNTAX); } return 0; } @@ -199,20 +199,15 @@ cmdConfig( if (bServer == TRUE) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_SERVER_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_1); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_2); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_3); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_4); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_5); + PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); + PrintNetMessage(MSG_CONFIG_SERVER_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); } else { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_HELP_1); - ConResPuts(StdOut, IDS_CONFIG_HELP_2); + PrintNetMessage(MSG_CONFIG_SYNTAX); + PrintNetMessage(MSG_CONFIG_HELP); } return 0; } @@ -271,7 +266,7 @@ cmdConfig( else { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_SERVER_SYNTAX); + PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); result = 1; goto done; } diff --git a/base/applications/network/net/cmdContinue.c b/base/applications/network/net/cmdContinue.c index 7fa3a934dd..7d656ca1e5 100644 --- a/base/applications/network/net/cmdContinue.c +++ b/base/applications/network/net/cmdContinue.c @@ -20,7 +20,7 @@ INT cmdContinue(INT argc, WCHAR **argv) if (argc != 3) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_CONTINUE_SYNTAX); + PrintNetMessage(MSG_CONTINUE_SYNTAX); return 1; } @@ -29,9 +29,8 @@ INT cmdContinue(INT argc, WCHAR **argv) if (_wcsicmp(argv[i], L"/help") == 0) { ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_CONTINUE_SYNTAX); - ConResPuts(StdOut, IDS_CONTINUE_HELP_1); - ConResPuts(StdOut, IDS_CONTINUE_HELP_2); + PrintNetMessage(MSG_CONTINUE_SYNTAX); + PrintNetMessage(MSG_CONTINUE_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 1; } diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index 9dcbe34028..df968b5e33 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -30,9 +30,8 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"COMPUTER") == 0) { - ConResPuts(StdOut, IDS_COMPUTER_SYNTAX); - ConResPuts(StdOut, IDS_COMPUTER_HELP_1); - ConResPuts(StdOut, IDS_COMPUTER_HELP_2); + PrintNetMessage(MSG_COMPUTER_SYNTAX); + PrintNetMessage(MSG_COMPUTER_HELP); return 0; } @@ -40,20 +39,15 @@ INT cmdHelp(INT argc, WCHAR **argv) { if ((argc > 3) && (_wcsicmp(argv[3], L"SERVER") == 0)) { - ConResPuts(StdOut, IDS_CONFIG_SERVER_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_1); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_2); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_3); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_4); - ConResPuts(StdOut, IDS_CONFIG_SERVER_HELP_5); + PrintNetMessage(MSG_CONFIG_SERVER_SYNTAX); + PrintNetMessage(MSG_CONFIG_SERVER_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else { - ConResPuts(StdOut, IDS_CONFIG_SYNTAX); - ConResPuts(StdOut, IDS_CONFIG_HELP_1); - ConResPuts(StdOut, IDS_CONFIG_HELP_2); + PrintNetMessage(MSG_CONFIG_SYNTAX); + PrintNetMessage(MSG_CONFIG_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } @@ -61,9 +55,8 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"CONTINUE") == 0) { - ConResPuts(StdOut, IDS_CONTINUE_SYNTAX); - ConResPuts(StdOut, IDS_CONTINUE_HELP_1); - ConResPuts(StdOut, IDS_CONTINUE_HELP_2); + PrintNetMessage(MSG_CONTINUE_SYNTAX); + PrintNetMessage(MSG_CONTINUE_HELP); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 5d03128159..108cc51a4f 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,47 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ -command is available only on server operating systems.\n\n" - IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ - the domain.\n\ -/ADD Adds the specified computer to the domain.\n\ -/DEL Removes the specified computer from the domain.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ -Server service. When used without the WORKSTATION or SERVER switch,\n\ -it displays a list of configurable services. To get help with\n\ -configuring a service, type NET HELP CONFIG service.\n\n" - IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ - Server service.\n\ -WORKSTATION Displays information about the configuration of the\n\ - Workstation service.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ - session can be inactive before it is disconected.\n\ - You can specify -1 to never disconnect. The range\n\ - is -1-65535 minutes; the default is 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ - screen and with the NET VIEW command.\n\ - Enclose the text in quotation marks.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ - appears on displays listings of servers. Note that\n\ - hiding a serverdoes not alter the permissions\n\ - on that server. The default is NO.\n\n" - IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Server service,\n\ -type NET CONFIG SERVER without parameters.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE service\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" - IDS_CONTINUE_HELP_2 "service Is the paused service\n\ - For example, one of the following:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 603513b9d9..09b6793e41 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,47 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ -command is available only on server operating systems.\n\n" - IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ - the domain.\n\ -/ADD Adds the specified computer to the domain.\n\ -/DEL Removes the specified computer from the domain.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ -Server service. When used without the WORKSTATION or SERVER switch,\n\ -it displays a list of configurable services. To get help with\n\ -configuring a service, type NET HELP CONFIG service.\n\n" - IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ - Server service.\n\ -WORKSTATION Displays information about the configuration of the\n\ - Workstation service.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ - session can be inactive before it is disconected.\n\ - You can specify -1 to never disconnect. The range\n\ - is -1-65535 minutes; the default is 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ - screen and with the NET VIEW command.\n\ - Enclose the text in quotation marks.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ - appears on displays listings of servers. Note that\n\ - hiding a serverdoes not alter the permissions\n\ - on that server. The default is NO.\n\n" - IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ -type NET CONFIG SERVER without parameters.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE <nombre del servicio>\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" - IDS_CONTINUE_HELP_2 "service Is the paused service\n\ - For example, one of the following:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index a718d45363..111f82007d 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,47 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\nazwa_komputera {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER dodaje lub usuwa komputer z bazy danych domeny.\n\ -To polecenie jest dostępne tylko na serwerowych systemach opoeracyjnych.\n\n" - IDS_COMPUTER_HELP_2 "\\nazwa_komputera Określa komputer dodawany lub usuwany\n\ - z domeny.\n\ -/ADD Dodaje określony komputer do domeny.\n\ -/DEL Usuwa określony komputer z domeny.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG wyświetla informacje o konfiguracji usług Stacja robocza lub\n\ -Serwer. Polecenie użyte bez przełącznika SERVER lub WORKSTATION wyświetla,\n\ -listę usług dostępnych do konfiguracji. Aby uzyskać pomoc na temat\n\ -konfigurowania usługi, wpisz polecenie NET HELP CONFIG usługa.\n\n" - IDS_CONFIG_HELP_2 "SERVER Wyświetla informacje o konfiguracji usługi Serwer\n\ -WORKSTATION Wyświetla informacje o konfiguracji usługi Stacja robocza.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:czas] [/SRVCOMMENT:""tekst""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER wyświetla lub zmienia ustawienia usługi Serwer.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:czas Ustawia maksymalną liczbę minut, przez\n\ - które sesja użytkownika może być nieaktywna, zanim\n\ - nastąpi jej rozłączenie. Użyj wartości -1, aby\n\ - zapobiec rozłączaniu. Zakres wynosi od -1 do 65535\n\ - minut, domyślnie 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""tekst"" Dodaje komentarz dla serwera wyświetlany na\n\ - ekranie komputera i przez polecenie NET VIEW.\n\ - Tekst musi być ujęty w cudzysłów.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Określa, czy nazwa serwera pojawia się\n\ - podczas wyświetlania listy serwerów. Należy pamiętać,\n\ - że ukrycie serwera nie zmienia uprawnień na tym\n\ - serwerze. Wartość domyślna: NO (nie ukrywaj).\n\n" - IDS_CONFIG_SERVER_HELP_5 "Aby wyświetlić bieżącą konfigurację usługi Serwer,\n\ -wpisz NET CONFIG SERVER bez parametrów.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE usługa\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE wznawia działanie usługi, która została.\n\ -wstrzymana poleceniem NET PAUSE.\n" - IDS_CONTINUE_HELP_2 "usługa Wstrzymana usługa\n\ - Może to być jedna z następujących usług:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [identyfikator [/CLOSE]]\n\n" IDS_FILE_HELP "FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [nazwa_grupy [/COMMENT:""tekst""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index b5e4f0e38a..e7608f2415 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,47 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ -command is available only on server operating systems.\n\n" - IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ - the domain.\n\ -/ADD Adds the specified computer to the domain.\n\ -/DEL Removes the specified computer from the domain.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ -Server service. When used without the WORKSTATION or SERVER switch,\n\ -it displays a list of configurable services. To get help with\n\ -configuring a service, type NET HELP CONFIG service.\n\n" - IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ - Server service.\n\ -WORKSTATION Displays information about the configuration of the\n\ - Workstation service.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ - session can be inactive before it is disconected.\n\ - You can specify -1 to never disconnect. The range\n\ - is -1-65535 minutes; the default is 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ - screen and with the NET VIEW command.\n\ - Enclose the text in quotation marks.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ - appears on displays listings of servers. Note that\n\ - hiding a serverdoes not alter the permissions\n\ - on that server. The default is NO.\n\n" - IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ -type NET CONFIG SERVER without parameters.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE <nume serviciu>\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" - IDS_CONTINUE_HELP_2 "service Is the paused service\n\ - For example, one of the following:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 8c918e1533..73139b3e19 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,47 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ -command is available only on server operating systems.\n\n" - IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ - the domain.\n\ -/ADD Adds the specified computer to the domain.\n\ -/DEL Removes the specified computer from the domain.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ -Server service. When used without the WORKSTATION or SERVER switch,\n\ -it displays a list of configurable services. To get help with\n\ -configuring a service, type NET HELP CONFIG service.\n\n" - IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ - Server service.\n\ -WORKSTATION Displays information about the configuration of the\n\ - Workstation service.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ - session can be inactive before it is disconected.\n\ - You can specify -1 to never disconnect. The range\n\ - is -1-65535 minutes; the default is 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ - screen and with the NET VIEW command.\n\ - Enclose the text in quotation marks.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ - appears on displays listings of servers. Note that\n\ - hiding a serverdoes not alter the permissions\n\ - on that server. The default is NO.\n\n" - IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ -type NET CONFIG SERVER without parameters.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE <имя_службы>\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" - IDS_CONTINUE_HELP_2 "service Is the paused service\n\ - For example, one of the following:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 33af6ce5d8..eb6857cadc 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,47 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ -command is available only on server operating systems.\n\n" - IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ - the domain.\n\ -/ADD Adds the specified computer to the domain.\n\ -/DEL Removes the specified computer from the domain.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ -Server service. When used without the WORKSTATION or SERVER switch,\n\ -it displays a list of configurable services. To get help with\n\ -configuring a service, type NET HELP CONFIG service.\n\n" - IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ - Server service.\n\ -WORKSTATION Displays information about the configuration of the\n\ - Workstation service.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ - session can be inactive before it is disconected.\n\ - You can specify -1 to never disconnect. The range\n\ - is -1-65535 minutes; the default is 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ - screen and with the NET VIEW command.\n\ - Enclose the text in quotation marks.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ - appears on displays listings of servers. Note that\n\ - hiding a serverdoes not alter the permissions\n\ - on that server. The default is NO.\n\n" - IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ -type NET CONFIG SERVER without parameters.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE <Hizmet Adı>\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" - IDS_CONTINUE_HELP_2 "service Is the paused service\n\ - For example, one of the following:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 91c346030e..72a4210ce3 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,47 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ -command is available only on server operating systems.\n\n" - IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ - the domain.\n\ -/ADD Adds the specified computer to the domain.\n\ -/DEL Removes the specified computer from the domain.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ -Server service. When used without the WORKSTATION or SERVER switch,\n\ -it displays a list of configurable services. To get help with\n\ -configuring a service, type NET HELP CONFIG service.\n\n" - IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ - Server service.\n\ -WORKSTATION Displays information about the configuration of the\n\ - Workstation service.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ - session can be inactive before it is disconected.\n\ - You can specify -1 to never disconnect. The range\n\ - is -1-65535 minutes; the default is 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ - screen and with the NET VIEW command.\n\ - Enclose the text in quotation marks.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ - appears on displays listings of servers. Note that\n\ - hiding a serverdoes not alter the permissions\n\ - on that server. The default is NO.\n\n" - IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ -type NET CONFIG SERVER without parameters.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE <Service Name>\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" - IDS_CONTINUE_HELP_2 "service Is the paused service\n\ - For example, one of the following:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 45d5fe804d..8c63ff3154 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,47 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" - IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ -command is available only on server operating systems.\n\n" - IDS_COMPUTER_HELP_2 "\\computername Specifies the computer to add or delete from\n\ - the domain.\n\ -/ADD Adds the specified computer to the domain.\n\ -/DEL Removes the specified computer from the domain.\n\n" - IDS_CONFIG_SYNTAX "NET CONFIG [SERVER | WORKSTATION]\n\n" - IDS_CONFIG_HELP_1 "NET CONFIG displays coniguration information of the Workstation or\n\ -Server service. When used without the WORKSTATION or SERVER switch,\n\ -it displays a list of configurable services. To get help with\n\ -configuring a service, type NET HELP CONFIG service.\n\n" - IDS_CONFIG_HELP_2 "SERVER Displays information about the configuration of the\n\ - Server service.\n\ -WORKSTATION Displays information about the configuration of the\n\ - Workstation service.\n\n" - IDS_CONFIG_SERVER_SYNTAX "NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:""text""]\n\ - [/HIDDEN:{YES | NO}]\n\n" - IDS_CONFIG_SERVER_HELP_1 "NET CONFIG SERVER displays or changes settings for the Server service.\n\n" - IDS_CONFIG_SERVER_HELP_2 "/AUTODISCONNECT:time Sets the maximum number of minutes a user's\n\ - session can be inactive before it is disconected.\n\ - You can specify -1 to never disconnect. The range\n\ - is -1-65535 minutes; the default is 15.\n" - IDS_CONFIG_SERVER_HELP_3 "/SRVCOMMENT:""text"" Adds a comment for the server that is displayed on\n\ - screen and with the NET VIEW command.\n\ - Enclose the text in quotation marks.\n" - IDS_CONFIG_SERVER_HELP_4 "/HIDDEN:{YES | NO} Specifies whether the server's computer name\n\ - appears on displays listings of servers. Note that\n\ - hiding a serverdoes not alter the permissions\n\ - on that server. The default is NO.\n\n" - IDS_CONFIG_SERVER_HELP_5 "To display the current configuration for the Servr service,\n\ -type NET CONFIG SERVER without parameters.\n\n" - IDS_CONTINUE_SYNTAX "NET CONTINUE <服務名稱>\n\n" - IDS_CONTINUE_HELP_1 "NET CONTINUE reactivates a service that has been suspended by NET PAUSE.\n\n" - IDS_CONTINUE_HELP_2 "service Is the paused service\n\ - For example, one of the following:\n\ - NET LOGON\n\ - NT LM SECURITY SUPPORT PROVIDER\n\ - SCHEDULE\n\ - SERVER\n\ - WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 71bbd8e2db..b448713391 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,20 +1,5 @@ #pragma once -#define IDS_COMPUTER_SYNTAX 111 -#define IDS_COMPUTER_HELP_1 112 -#define IDS_COMPUTER_HELP_2 113 -#define IDS_CONFIG_SYNTAX 114 -#define IDS_CONFIG_HELP_1 115 -#define IDS_CONFIG_HELP_2 116 -#define IDS_CONFIG_SERVER_SYNTAX 117 -#define IDS_CONFIG_SERVER_HELP_1 118 -#define IDS_CONFIG_SERVER_HELP_2 119 -#define IDS_CONFIG_SERVER_HELP_3 120 -#define IDS_CONFIG_SERVER_HELP_4 121 -#define IDS_CONFIG_SERVER_HELP_5 122 -#define IDS_CONTINUE_SYNTAX 123 -#define IDS_CONTINUE_HELP_1 124 -#define IDS_CONTINUE_HELP_2 125 #define IDS_FILE_SYNTAX 126 #define IDS_FILE_HELP 127 #define IDS_GROUP_SYNTAX 128 diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index b44a928dc1..e84c3ea5c8 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -209,7 +209,7 @@ NET ACCOUNTS to take effect. accounts havebeen set up (user User Manager or the NET USER command). - The Net Logon service must be running on all servers in the domain - that verify logon. Net Logon is started autmatically when the + that verify logon. Net Logon is started automatically when the operating system starts. /FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before @@ -332,7 +332,7 @@ NET ACCOUNTS to take effect. accounts havebeen set up (user User Manager or the NET USER command). - The Net Logon service must be running on all servers in the domain - that verify logon. Net Logon is started autmatically when the + that verify logon. Net Logon is started automatically when the operating system starts. /FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before @@ -373,7 +373,7 @@ NET ACCOUNTS to take effect. accounts havebeen set up (user User Manager or the NET USER command). - The Net Logon service must be running on all servers in the domain - that verify logon. Net Logon is started autmatically when the + that verify logon. Net Logon is started automatically when the operating system starts. /FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before @@ -401,3 +401,547 @@ NET ACCOUNTS to take effect. the operation is performed on the local computer. . + + +MessageId=10002 +SymbolicName=MSG_COMPUTER_SYNTAX +Severity=Success +Facility=System +Language=English +NET COMPUTER \\computername {/ADD | /DEL} +. +Language=Polish +NET COMPUTER \\nazwa_komputera {/ADD | /DEL} +. +Language=Romanian +NET COMPUTER \\computername {/ADD | /DEL} +. +Language=Russian +NET COMPUTER \\computername {/ADD | /DEL} +. +Language=Spanish +NET COMPUTER \\computername {/ADD | /DEL} +. +Language=Turkish +NET COMPUTER \\computername {/ADD | /DEL} +. +Language=Chinese +NET COMPUTER \\computername {/ADD | /DEL} +. +Language=Taiwanese +NET COMPUTER \\computername {/ADD | /DEL} +. + + +MessageId=10003 +SymbolicName=MSG_COMPUTER_HELP +Severity=Success +Facility=System +Language=English +NET COMPUTER adds or deletes computers from a domain database. This +command is available only on server operating systems. + +\\computername Specifies the computer to add or delete from + the domain. +/ADD Adds the specified computer to the domain. +/DEL Removes the specified computer from the domain. +. +Language=Polish +NET COMPUTER dodaje lub usuwa komputer z bazy danych domeny. +To polecenie jest dostępne tylko na serwerowych systemach opoeracyjnych. + +\\nazwa_komputera Określa komputer dodawany lub usuwany + z domeny. +/ADD Dodaje określony komputer do domeny. +/DEL Usuwa określony komputer z domeny. +. +Language=Romanian +NET COMPUTER adds or deletes computers from a domain database. This +command is available only on server operating systems. + +\\computername Specifies the computer to add or delete from + the domain. +/ADD Adds the specified computer to the domain. +/DEL Removes the specified computer from the domain. +. +Language=Russian +NET COMPUTER adds or deletes computers from a domain database. This +command is available only on server operating systems. + +\\computername Specifies the computer to add or delete from + the domain. +/ADD Adds the specified computer to the domain. +/DEL Removes the specified computer from the domain. +. +Language=Spanish +NET COMPUTER adds or deletes computers from a domain database. This +command is available only on server operating systems. + +\\computername Specifies the computer to add or delete from + the domain. +/ADD Adds the specified computer to the domain. +/DEL Removes the specified computer from the domain. +. +Language=Turkish +NET COMPUTER adds or deletes computers from a domain database. This +command is available only on server operating systems. + +\\computername Specifies the computer to add or delete from + the domain. +/ADD Adds the specified computer to the domain. +/DEL Removes the specified computer from the domain. +. +Language=Chinese +NET COMPUTER adds or deletes computers from a domain database. This +command is available only on server operating systems. + +\\computername Specifies the computer to add or delete from + the domain. +/ADD Adds the specified computer to the domain. +/DEL Removes the specified computer from the domain. +. +Language=Taiwanese +NET COMPUTER adds or deletes computers from a domain database. This +command is available only on server operating systems. + +\\computername Specifies the computer to add or delete from + the domain. +/ADD Adds the specified computer to the domain. +/DEL Removes the specified computer from the domain. +. + + +MessageId=10004 +SymbolicName=MSG_CONFIG_SYNTAX +Severity=Success +Facility=System +Language=English +NET CONFIG [SERVER | WORKSTATION] +. +Language=Polish +NET CONFIG [SERVER | WORKSTATION] +. +Language=Romanian +NET CONFIG [SERVER | WORKSTATION] +. +Language=Russian +NET CONFIG [SERVER | WORKSTATION] +. +Language=Spanish +NET CONFIG [SERVER | WORKSTATION] +. +Language=Turkish +NET CONFIG [SERVER | WORKSTATION] +. +Language=Chinese +NET CONFIG [SERVER | WORKSTATION] +. +Language=Taiwanese +NET CONFIG [SERVER | WORKSTATION] +. + + +MessageId=10005 +SymbolicName=MSG_CONFIG_HELP +Severity=Success +Facility=System +Language=English +NET CONFIG displays coniguration information of the Workstation or +Server service. When used without the WORKSTATION or SERVER switch, +it displays a list of configurable services. To get help with +configuring a service, type NET HELP CONFIG service. + +SERVER Displays information about the configuration of the + Server service. +WORKSTATION Displays information about the configuration of the + Workstation service. +. +Language=Polish +NET CONFIG wyświetla informacje o konfiguracji usług Stacja robocza lub +Serwer. Polecenie użyte bez przełącznika SERVER lub WORKSTATION wyświetla, +listę usług dostępnych do konfiguracji. Aby uzyskać pomoc na temat +konfigurowania usługi, wpisz polecenie NET HELP CONFIG usługa. + +SERVER Wyświetla informacje o konfiguracji usługi Serwer +WORKSTATION Wyświetla informacje o konfiguracji usługi Stacja robocza. +. +Language=Romanian +NET CONFIG displays coniguration information of the Workstation or +Server service. When used without the WORKSTATION or SERVER switch, +it displays a list of configurable services. To get help with +configuring a service, type NET HELP CONFIG service. + +SERVER Displays information about the configuration of the + Server service. +WORKSTATION Displays information about the configuration of the + Workstation service. +. +Language=Russian +NET CONFIG displays coniguration information of the Workstation or +Server service. When used without the WORKSTATION or SERVER switch, +it displays a list of configurable services. To get help with +configuring a service, type NET HELP CONFIG service. + +SERVER Displays information about the configuration of the + Server service. +WORKSTATION Displays information about the configuration of the + Workstation service. +. +Language=Spanish +NET CONFIG displays coniguration information of the Workstation or +Server service. When used without the WORKSTATION or SERVER switch, +it displays a list of configurable services. To get help with +configuring a service, type NET HELP CONFIG service. + +SERVER Displays information about the configuration of the + Server service. +WORKSTATION Displays information about the configuration of the + Workstation service. +. +Language=Turkish +NET CONFIG displays coniguration information of the Workstation or +Server service. When used without the WORKSTATION or SERVER switch, +it displays a list of configurable services. To get help with +configuring a service, type NET HELP CONFIG service. + +SERVER Displays information about the configuration of the + Server service. +WORKSTATION Displays information about the configuration of the + Workstation service. +. +Language=Chinese +NET CONFIG displays coniguration information of the Workstation or +Server service. When used without the WORKSTATION or SERVER switch, +it displays a list of configurable services. To get help with +configuring a service, type NET HELP CONFIG service. + +SERVER Displays information about the configuration of the + Server service. +WORKSTATION Displays information about the configuration of the + Workstation service. +. +Language=Taiwanese +NET CONFIG displays coniguration information of the Workstation or +Server service. When used without the WORKSTATION or SERVER switch, +it displays a list of configurable services. To get help with +configuring a service, type NET HELP CONFIG service. + +SERVER Displays information about the configuration of the + Server service. +WORKSTATION Displays information about the configuration of the + Workstation service. +. + + +MessageId=10006 +SymbolicName=MSG_CONFIG_SERVER_SYNTAX +Severity=Success +Facility=System +Language=English +NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] + [/HIDDEN:{YES | NO}] +. +Language=Polish +NET CONFIG SERVER [/AUTODISCONNECT:czas] [/SRVCOMMENT:"tekst"] + [/HIDDEN:{YES | NO}] +. +Language=Romanian +NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] + [/HIDDEN:{YES | NO}] +. +Language=Russian +NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] + [/HIDDEN:{YES | NO}] +. +Language=Spanish +NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] + [/HIDDEN:{YES | NO}] +. +Language=Turkish +NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] + [/HIDDEN:{YES | NO}] +. +Language=Chinese +NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] + [/HIDDEN:{YES | NO}] +. +Language=Taiwanese +NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] + [/HIDDEN:{YES | NO}] +. + + +MessageId=10007 +SymbolicName=MSG_CONFIG_SERVER_HELP +Severity=Success +Facility=System +Language=English +NET CONFIG SERVER displays or changes settings for the Server service. + +/AUTODISCONNECT:time Sets the maximum number of minutes a user's + session can be inactive before it is disconected. + You can specify -1 to never disconnect. The range + is -1-65535 minutes; the default is 15. +/SRVCOMMENT:"text" Adds a comment for the server that is displayed on + screen and with the NET VIEW command. + Enclose the text in quotation marks. +/HIDDEN:{YES | NO} Specifies whether the server's computer name + appears on displays listings of servers. Note that + hiding a serverdoes not alter the permissions + on that server. The default is NO. + +To display the current configuration for the Server service, +type NET CONFIG SERVER without parameters. +. +Language=Polish +NET CONFIG SERVER wyświetla lub zmienia ustawienia usługi Serwer. + +/AUTODISCONNECT:czas Ustawia maksymalną liczbę minut, przez + które sesja użytkownika może być nieaktywna, zanim + nastąpi jej rozłączenie. Użyj wartości -1, aby + zapobiec rozłączaniu. Zakres wynosi od -1 do 65535 + minut, domyślnie 15. +/SRVCOMMENT:"tekst" Dodaje komentarz dla serwera wyświetlany na + ekranie komputera i przez polecenie NET VIEW. + Tekst musi być ujęty w cudzysłów. +/HIDDEN:{YES | NO} Określa, czy nazwa serwera pojawia się + podczas wyświetlania listy serwerów. Należy pamiętać, + że ukrycie serwera nie zmienia uprawnień na tym + serwerze. Wartość domyślna: NO (nie ukrywaj). + +Aby wyświetlić bieżącą konfigurację usługi Serwer, +wpisz NET CONFIG SERVER bez parametrów. +. +Language=Romanian +NET CONFIG SERVER displays or changes settings for the Server service. + +/AUTODISCONNECT:time Sets the maximum number of minutes a user's + session can be inactive before it is disconected. + You can specify -1 to never disconnect. The range + is -1-65535 minutes; the default is 15. +/SRVCOMMENT:"text" Adds a comment for the server that is displayed on + screen and with the NET VIEW command. + Enclose the text in quotation marks. +/HIDDEN:{YES | NO} Specifies whether the server's computer name + appears on displays listings of servers. Note that + hiding a serverdoes not alter the permissions + on that server. The default is NO. + +To display the current configuration for the Server service, +type NET CONFIG SERVER without parameters. +. +Language=Russian +NET CONFIG SERVER displays or changes settings for the Server service. + +/AUTODISCONNECT:time Sets the maximum number of minutes a user's + session can be inactive before it is disconected. + You can specify -1 to never disconnect. The range + is -1-65535 minutes; the default is 15. +/SRVCOMMENT:"text" Adds a comment for the server that is displayed on + screen and with the NET VIEW command. + Enclose the text in quotation marks. +/HIDDEN:{YES | NO} Specifies whether the server's computer name + appears on displays listings of servers. Note that + hiding a serverdoes not alter the permissions + on that server. The default is NO. + +To display the current configuration for the Server service, +type NET CONFIG SERVER without parameters. +. +Language=Spanish +NET CONFIG SERVER displays or changes settings for the Server service. + +/AUTODISCONNECT:time Sets the maximum number of minutes a user's + session can be inactive before it is disconected. + You can specify -1 to never disconnect. The range + is -1-65535 minutes; the default is 15. +/SRVCOMMENT:"text" Adds a comment for the server that is displayed on + screen and with the NET VIEW command. + Enclose the text in quotation marks. +/HIDDEN:{YES | NO} Specifies whether the server's computer name + appears on displays listings of servers. Note that + hiding a serverdoes not alter the permissions + on that server. The default is NO. + +To display the current configuration for the Server service, +type NET CONFIG SERVER without parameters. +. +Language=Turkish +NET CONFIG SERVER displays or changes settings for the Server service. + +/AUTODISCONNECT:time Sets the maximum number of minutes a user's + session can be inactive before it is disconected. + You can specify -1 to never disconnect. The range + is -1-65535 minutes; the default is 15. +/SRVCOMMENT:"text" Adds a comment for the server that is displayed on + screen and with the NET VIEW command. + Enclose the text in quotation marks. +/HIDDEN:{YES | NO} Specifies whether the server's computer name + appears on displays listings of servers. Note that + hiding a serverdoes not alter the permissions + on that server. The default is NO. + +To display the current configuration for the Server service, +type NET CONFIG SERVER without parameters. +. +Language=Chinese +NET CONFIG SERVER displays or changes settings for the Server service. + +/AUTODISCONNECT:time Sets the maximum number of minutes a user's + session can be inactive before it is disconected. + You can specify -1 to never disconnect. The range + is -1-65535 minutes; the default is 15. +/SRVCOMMENT:"text" Adds a comment for the server that is displayed on + screen and with the NET VIEW command. + Enclose the text in quotation marks. +/HIDDEN:{YES | NO} Specifies whether the server's computer name + appears on displays listings of servers. Note that + hiding a serverdoes not alter the permissions + on that server. The default is NO. + +To display the current configuration for the Server service, +type NET CONFIG SERVER without parameters. +. +Language=Taiwanese +NET CONFIG SERVER displays or changes settings for the Server service. + +/AUTODISCONNECT:time Sets the maximum number of minutes a user's + session can be inactive before it is disconected. + You can specify -1 to never disconnect. The range + is -1-65535 minutes; the default is 15. +/SRVCOMMENT:"text" Adds a comment for the server that is displayed on + screen and with the NET VIEW command. + Enclose the text in quotation marks. +/HIDDEN:{YES | NO} Specifies whether the server's computer name + appears on displays listings of servers. Note that + hiding a serverdoes not alter the permissions + on that server. The default is NO. + +To display the current configuration for the Server service, +type NET CONFIG SERVER without parameters. +. + + +MessageId=10008 +SymbolicName=MSG_CONTINUE_SYNTAX +Severity=Success +Facility=System +Language=English +NET CONTINUE service +. +Language=Polish +NET CONTINUE usługa +. +Language=Romanian +NET CONTINUE <nume serviciu> +. +Language=Russian +NET CONTINUE <имя_службы> +. +Language=Spanish +NET CONTINUE <nombre del servicio> +. +Language=Turkish +NET CONTINUE <Hizmet Adı> +. +Language=Chinese +NET CONTINUE <Service Name> +. +Language=Taiwanese +NET CONTINUE <服務名稱> +. + + +MessageId=10009 +SymbolicName=MSG_CONTINUE_HELP +Severity=Success +Facility=System +Language=English +NET CONTINUE reactivates a service that has been suspended by NET PAUSE. + +service Is the paused service + For example, one of the following: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +. +Language=Polish +NET CONTINUE wznawia działanie usługi, która została. +wstrzymana poleceniem NET PAUSE. + +usługa Wstrzymana usługa + Może to być jedna z następujących usług: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +. +Language=Romanian +NET CONTINUE reactivates a service that has been suspended by NET PAUSE. + +service Is the paused service + For example, one of the following: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +. +Language=Russian +NET CONTINUE reactivates a service that has been suspended by NET PAUSE. + +service Is the paused service + For example, one of the following: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +. +Language=Spanish +NET CONTINUE reactivates a service that has been suspended by NET PAUSE. + +service Is the paused service + For example, one of the following: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +. +Language=Turkish +NET CONTINUE reactivates a service that has been suspended by NET PAUSE. + +service Is the paused service + For example, one of the following: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +. +Language=Chinese +NET CONTINUE reactivates a service that has been suspended by NET PAUSE. + +service Is the paused service + For example, one of the following: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +. +Language=Taiwanese +NET CONTINUE reactivates a service that has been suspended by NET PAUSE. + +service Is the paused service + For example, one of the following: + NET LOGON + NT LM SECURITY SUPPORT PROVIDER + SCHEDULE + SERVER + WORKSTATION +.

1 0

[reactos] 01/01: [SDK] Set proper lang IDs, aka fix build
by Pierre Schweitzer 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0b263f26f6928b26bd26… commit d0b263f26f6928b26bd267f680865eeaae895968 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 23 18:22:57 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 23 18:22:57 2018 +0100 [SDK] Set proper lang IDs, aka fix build --- sdk/include/reactos/mc/net_msg.mc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index a65776ce6a..b44a928dc1 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -11,9 +11,9 @@ FacilityNames=(System=0x0:FACILITY_SYSTEM LanguageNames=(English=0x409:MSG00409 Polish=0x415:MSG00415 - Romanian=0x018:MSG00018 + Romanian=0x418:MSG00418 Russian=0x419:MSG00419 - Spanish=0x00A:MSG0000A + Spanish=0x40A:MSG0040A Turkish=0x41F:MSG0041F Chinese=0x804:MSG00804 Taiwanese=0x404:MSG00404

1 0

[reactos] 01/01: [FONTVIEW] Update Traditional Chinese translation. (#1180)
by Luo Yufan 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35aa56a8ac910569c84dd… commit 35aa56a8ac910569c84dde34ef99bda8d957d8d9 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Mon Dec 24 00:00:09 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 23 17:00:09 2018 +0100 [FONTVIEW] Update Traditional Chinese translation. (#1180) --- base/applications/fontview/lang/zh-TW.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/base/applications/fontview/lang/zh-TW.rc b/base/applications/fontview/lang/zh-TW.rc index a346eb7985..28ce104ca1 100644 --- a/base/applications/fontview/lang/zh-TW.rc +++ b/base/applications/fontview/lang/zh-TW.rc @@ -12,19 +12,19 @@ STRINGTABLE BEGIN IDS_INSTALL "安裝" IDS_PRINT "列印" - IDS_STRING "ReactOS 給所有人一個自由的操作系統！ 1234567890" - IDS_OPEN "打開字體..." + IDS_STRING "路曼曼其脩遠兮，吾將上下而求索。1234567890" + IDS_OPEN "開啟字型..." IDS_ERROR "錯誤" IDS_ERROR_NOMEM "沒有足夠的記憶體來完成操作。" IDS_ERROR_NOFONT "%1 不是一個有效的字體檔案。" - IDS_ERROR_NOCLASS "窗口無法初始化。" - IDS_FILTER_LIST "所有支援的字體 (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ -字體檔 (*.fon;*.fnt)\0*.fon;*.fnt\0\ -TrueType 字體 (*.ttf)\0*.ttf\0\ -TrueType Font Collection (*.ttc)\0*.ttc\0\ -OpenType 字體 (*.otf)\0*.otf\0\ -OpenType Font Collection (*.otc)\0*.otc\0\ + IDS_ERROR_NOCLASS "視窗無法初始化。" + IDS_FILTER_LIST "所有支援的字型 (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ +字型檔案 (*.fon;*.fnt)\0*.fon;*.fnt\0\ +TrueType 字型 (*.ttf)\0*.ttf\0\ +TrueType 字型集合 (*.ttc)\0*.ttc\0\ +OpenType 字型 (*.otf)\0*.otf\0\ +OpenType 字型集合 (*.otc)\0*.otc\0\ 所有檔 (*.*)\0*.*\0" - IDS_PREVIOUS "< P&revious" - IDS_NEXT "&Next >" + IDS_PREVIOUS "< 上一步(&R)" + IDS_NEXT "下一步(&N) >" END

1 0

[reactos] 01/01: [NET] Move ACCOUNTS command syntax and help text into a message table.
by Eric Kohl 23 Dec '18

23 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7292af515dc13b5703154… commit 7292af515dc13b5703154c1f4e12e7fd4b7aca47 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 23 16:47:16 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 23 16:50:25 2018 +0100 [NET] Move ACCOUNTS command syntax and help text into a message table. --- base/applications/network/net/CMakeLists.txt | 1 + base/applications/network/net/cmdAccounts.c | 15 +- base/applications/network/net/help.c | 13 +- base/applications/network/net/lang/en-US.rc | 38 --- base/applications/network/net/lang/es-ES.rc | 38 --- base/applications/network/net/lang/pl-PL.rc | 41 --- base/applications/network/net/lang/ro-RO.rc | 38 --- base/applications/network/net/lang/ru-RU.rc | 38 --- base/applications/network/net/lang/tr-TR.rc | 38 --- base/applications/network/net/lang/zh-CN.rc | 38 --- base/applications/network/net/lang/zh-TW.rc | 38 --- base/applications/network/net/main.c | 24 ++ base/applications/network/net/net.h | 5 + base/applications/network/net/net.rc | 2 + base/applications/network/net/resource.h | 11 - sdk/include/reactos/mc/CMakeLists.txt | 1 + sdk/include/reactos/mc/net_msg.mc | 403 +++++++++++++++++++++++++++ 17 files changed, 441 insertions(+), 341 deletions(-) diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index 03f772bc09..cee4e856d3 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND SOURCE add_executable(net ${SOURCE} net.rc) set_module_type(net win32cui UNICODE) target_link_libraries(net conutils ${PSEH_LIB}) +add_dependencies(net net_msg) add_importlibs(net advapi32 netapi32 mpr msvcrt kernel32 ntdll) add_pch(net net.h SOURCE) add_cd_file(TARGET net DESTINATION reactos/system32 FOR all) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index 454aeeb892..2ffc6eb2c5 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -37,7 +37,7 @@ cmdAccounts( { /* Print short syntax help */ ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX); + PrintNetMessage(MSG_ACCOUNTS_SYNTAX); return 0; } @@ -45,17 +45,8 @@ cmdAccounts( { /* Print full help text*/ ConResPuts(StdOut, IDS_GENERIC_SYNTAX); - ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_1); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_2); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_3); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_4); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_5); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_6); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_7); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_8); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_9); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_10); + PrintNetMessage(MSG_ACCOUNTS_SYNTAX); + PrintNetMessage(MSG_ACCOUNTS_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index 8d70860ad9..9dcbe34028 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -22,17 +22,8 @@ INT cmdHelp(INT argc, WCHAR **argv) */ if (_wcsicmp(argv[2], L"ACCOUNTS") == 0) { - ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_1); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_2); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_3); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_4); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_5); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_6); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_7); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_8); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_9); - ConResPuts(StdOut, IDS_ACCOUNTS_HELP_10); + PrintNetMessage(MSG_ACCOUNTS_SYNTAX); + PrintNetMessage(MSG_ACCOUNTS_HELP); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index ebbe8d039a..5d03128159 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,44 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ - [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]\n\ - [/UNIQUEPW:Count] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ -and logon requirements for all accounts.\n\ -When used without parameters, NET ACCOUNTS displays the current settings for\n\ -passwords, logon limitations, and domain information.\n\n" - IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ -NET ACCOUNTS to take effect.\n\n" - IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ - accounts havebeen set up (user User Manager or the NET USER command).\n\n" - IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ - that verify logon. Net Logon is started autmatically when the\n\ - operating system starts.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ - being forced to log off when the\n\ - account expires or valid logon hours expire.\n\ - NO, the default, prevents forced logoff.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ - a password. The range is 0-14 characters;\n\ - the default is 6 characters.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ - password is valid. No limit is specified\n\ - by using UNLIMITED. /MAXPWAGE cannot be less\n\ - than /MINPWAGE. The range is 1-999; the\n\ - default is to leave the value unchanged.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ - pass before a user can change a password.\n\ - A value of 0 sets no minimum time. The range\n\ - is 0-999; the default is 0 days. /MINPWAGE\n\ - cannot be more than /MAXPWAGE.\n" - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ - through the specified number of password\n\ - changes. The maximum value is 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ - controller of the current domain. Otherwise,\n\ - the operation is performed on the local\n\ - computer.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ command is available only on server operating systems.\n\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 45619ea332..603513b9d9 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,44 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{minutos | NO}] [/MINPWLEN:longitud]\n\ - [/MAXPWAGE:{días | UNLIMITED}] [/MINPWAGE:días]\n\ - [/UNIQUEPW:número] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ -and logon requirements for all accounts.\n\ -When used without parameters, NET ACCOUNTS displays the current settings for\n\ -passwords, logon limitations, and domain information.\n\n" - IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ -NET ACCOUNTS to take effect.\n\n" - IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ - accounts havebeen set up (user User Manager or the NET USER command).\n\n" - IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ - that verify logon. Net Logon is started autmatically when the\n\ - operating system starts.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ - being forced to log off when the\n\ - account expires or valid logon hours expire.\n\ - NO, the default, prevents forced logoff.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ - a password. The range is 0-14 characters;\n\ - the default is 6 characters.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ - password is valid. No limit is specified\n\ - by using UNLIMITED. /MAXPWAGE cannot be less\n\ - than /MINPWAGE. The range is 1-999; the\n\ - default is to leave the value unchanged.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ - pass before a user can change a password.\n\ - A value of 0 sets no minimum time. The range\n\ - is 0-999; the default is 0 days. /MINPWAGE\n\ - cannot be more than /MAXPWAGE.\n" - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ - through the specified number of password\n\ - changes. The maximum value is 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ - controller of the current domain. Otherwise,\n\ - the operation is performed on the local\n\ - computer.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ command is available only on server operating systems.\n\n" diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 08191b44a2..a718d45363 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,47 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{minuty|NO}] [/MINPWLEN:długość]\n\ - [/MAXPWAGE:{dni|UNLIMITED}] [/MINPWAGE:dni]\n\ - [/UNIQUEPW:liczba] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS uaktualnia bazę kont użytkowników i zmienia hasło oraz wymagania\n\ -logowania dla wszystkich kont.\n\ -Użyte bez opcji, NET ACCOUNTS wyświetla bieżące ustawienia\n\ -hasła i ograniczeń logowania oraz informacje o domenie.\n\n" - IDS_ACCOUNTS_HELP_2 "Aby opcje użyte z NET ACCOUNTS odniosły skutek, muszą być\n\ -spełnione dwa warunki.\n\n" - IDS_ACCOUNTS_HELP_3 "- Wymagania hasła i logowania odnoszą skutek tylko wtedy, gdy\n\ - zostało utworzone konto użytkownika (w tym celu użyj\n\ - Menedżera użytkowników lub polecenia NET USER).\n\n" - IDS_ACCOUNTS_HELP_4 "- Usługa logowania (Net Logon) musi być uruchomiona na wszystkich\n\ - serwerach w domenie, które weryfikują logowanie. Usługa logowania\n\ - jest uruchamiana automatycznie podczas uruchamiania systemu.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minuty | NO} Ustawia liczbę minut, przez które użytkownik\n\ - może być zalogowany przed wymuszeniem wylogowania\n\ - wskutek wygaśnięcia lub ważności godzin logowania.\n\ - NO, wartość domyślna, zapobiega wymuszaniu\n\ - wylogowania.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:długość Ustawia minimalną liczbę znaków w haśle.\n\ - Zakres długości hasła wynosi od 0 do 14 znaków;\n\ - wartość domyślna to 6 znaków.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{dni | UNLIMITED} Ustawia maksymalną liczbę dni ważności\n\ - hasła. UNLIMITED ustala nieograniczony\n\ - czas ważności hasła. Wartość /MAXPWAGE nie\n\ - może być mniejsza od /MINPWAGE. Zakres wynosi\n\ - od 1 do 999; domyślnie wartość się nie zmienia.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:dni Ustawia minimalną liczbę dni, które muszą\n\ - minąć, zanim użytkownik może zmienić hasło.\n\ - Wartość 0 ustawia brak tego ograniczenia.\n\ - Zakres wynosi od 0 do 999; wartość domyślna\n\ - to 0 dni. Wartość /MINPWAGE nie może być \n\ - większa od wartości /MAXPWAGE." - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:liczba Wymaga, aby hasło użytkownika było unikatowe,\n\ - poprzez określoną liczbę zmian hasła.\n\ - Największa wartość to 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Wykonuje operacje na kontrolerze domeny\n\ - w bieżącej domenie. W innym wypadku,\n\ - operacje te są dokonywane na komputerze\n\ - lokalnym.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\nazwa_komputera {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER dodaje lub usuwa komputer z bazy danych domeny.\n\ To polecenie jest dostępne tylko na serwerowych systemach opoeracyjnych.\n\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 834eccba53..b5e4f0e38a 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,44 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Minute|NO}] [/MINPWLEN:Lungime]\n\ - [/MAXPWAGE:{Zile|UNLIMITED}] [/MINPWAGE:Zile]\n\ - [/UNIQUEPW:Număr] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS actualizează baza de utilizatori și modifică parola și\n\ -cerințele de autentificare pentru toate conturile.\n\ -Utilizat fără parametri, NET ACCOUNTS afișează configurația curentă pentru\n\ -parole, limitări de autentificare, și informații de domeniu.\n\n" - IDS_ACCOUNTS_HELP_2 "Sunt necesare două condiții pentru ca opțiunile utilizate cu\n\ -NET ACCOUNTS să aibă efect.\n\n" - IDS_ACCOUNTS_HELP_3 "- Cerințele de autentificare și parolele au sens doar când conturile\n\ - sunt instituite (cu Gestionarul de Utilizatori sau comanda NET USER).\n\n" - IDS_ACCOUNTS_HELP_4 "- Este necesar ca serviciul Net Logon să fie activ în toate servele din\n\ - domeniul de autentificare. Serviciul Net Logon este lansat automat la\n\ - pornirea sistemului de operare.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minute | NO} Definește numărul minutelor precursoare unei\n\ - deautentificări forțate la expirarea contului\n\ - sau a numărului valid de ore de autentificare.\n\ - NO (implicit) previne deautentificarea forțată.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ - a password. The range is 0-14 characters;\n\ - the default is 6 characters.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ - password is valid. No limit is specified\n\ - by using UNLIMITED. /MAXPWAGE cannot be less\n\ - than /MINPWAGE. The range is 1-999; the\n\ - default is to leave the value unchanged.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ - pass before a user can change a password.\n\ - A value of 0 sets no minimum time. The range\n\ - is 0-999; the default is 0 days. /MINPWAGE\n\ - cannot be more than /MAXPWAGE.\n" - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ - through the specified number of password\n\ - changes. The maximum value is 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ - controller of the current domain. Otherwise,\n\ - the operation is performed on the local\n\ - computer.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ command is available only on server operating systems.\n\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index b9a14f7ed4..8c918e1533 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,44 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{минуты | NO}] [/MINPWLEN:длина]\n\ - [/MAXPWAGE:{дни | UNLIMITED}] [/MINPWAGE:дни]\n\ - [/UNIQUEPW:число] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ -and logon requirements for all accounts.\n\ -When used without parameters, NET ACCOUNTS displays the current settings for\n\ -passwords, logon limitations, and domain information.\n\n" - IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ -NET ACCOUNTS to take effect.\n\n" - IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ - accounts havebeen set up (user User Manager or the NET USER command).\n\n" - IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ - that verify logon. Net Logon is started autmatically when the\n\ - operating system starts.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ - being forced to log off when the\n\ - account expires or valid logon hours expire.\n\ - NO, the default, prevents forced logoff.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ - a password. The range is 0-14 characters;\n\ - the default is 6 characters.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ - password is valid. No limit is specified\n\ - by using UNLIMITED. /MAXPWAGE cannot be less\n\ - than /MINPWAGE. The range is 1-999; the\n\ - default is to leave the value unchanged.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ - pass before a user can change a password.\n\ - A value of 0 sets no minimum time. The range\n\ - is 0-999; the default is 0 days. /MINPWAGE\n\ - cannot be more than /MAXPWAGE.\n" - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ - through the specified number of password\n\ - changes. The maximum value is 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ - controller of the current domain. Otherwise,\n\ - the operation is performed on the local\n\ - computer.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ command is available only on server operating systems.\n\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 3fb24e39c2..33af6ce5d8 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,44 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Dakîka|NO}] [/MINPWLEN:Uzunluk]\n\ - [/MAXPWAGE:{Gün|UNLIMITED}] [/MINPWAGE:Gün]\n\ - [/UNIQUEPW:Sayı] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ -and logon requirements for all accounts.\n\ -When used without parameters, NET ACCOUNTS displays the current settings for\n\ -passwords, logon limitations, and domain information.\n\n" - IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ -NET ACCOUNTS to take effect.\n\n" - IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ - accounts havebeen set up (user User Manager or the NET USER command).\n\n" - IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ - that verify logon. Net Logon is started autmatically when the\n\ - operating system starts.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ - being forced to log off when the\n\ - account expires or valid logon hours expire.\n\ - NO, the default, prevents forced logoff.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ - a password. The range is 0-14 characters;\n\ - the default is 6 characters.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ - password is valid. No limit is specified\n\ - by using UNLIMITED. /MAXPWAGE cannot be less\n\ - than /MINPWAGE. The range is 1-999; the\n\ - default is to leave the value unchanged.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ - pass before a user can change a password.\n\ - A value of 0 sets no minimum time. The range\n\ - is 0-999; the default is 0 days. /MINPWAGE\n\ - cannot be more than /MAXPWAGE.\n" - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ - through the specified number of password\n\ - changes. The maximum value is 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ - controller of the current domain. Otherwise,\n\ - the operation is performed on the local\n\ - computer.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ command is available only on server operating systems.\n\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index b643c14d1a..91c346030e 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,44 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ - [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]\n\ - [/UNIQUEPW:Count] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ -and logon requirements for all accounts.\n\ -When used without parameters, NET ACCOUNTS displays the current settings for\n\ -passwords, logon limitations, and domain information.\n\n" - IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ -NET ACCOUNTS to take effect.\n\n" - IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ - accounts havebeen set up (user User Manager or the NET USER command).\n\n" - IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ - that verify logon. Net Logon is started autmatically when the\n\ - operating system starts.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ - being forced to log off when the\n\ - account expires or valid logon hours expire.\n\ - NO, the default, prevents forced logoff.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ - a password. The range is 0-14 characters;\n\ - the default is 6 characters.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ - password is valid. No limit is specified\n\ - by using UNLIMITED. /MAXPWAGE cannot be less\n\ - than /MINPWAGE. The range is 1-999; the\n\ - default is to leave the value unchanged.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ - pass before a user can change a password.\n\ - A value of 0 sets no minimum time. The range\n\ - is 0-999; the default is 0 days. /MINPWAGE\n\ - cannot be more than /MAXPWAGE.\n" - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ - through the specified number of password\n\ - changes. The maximum value is 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ - controller of the current domain. Otherwise,\n\ - the operation is performed on the local\n\ - computer.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ command is available only on server operating systems.\n\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 1673f953ae..45d5fe804d 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,44 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_ACCOUNTS_SYNTAX "NET ACCOUNTS [/FORCELOGOFF:{分鐘|NO}] [/MINPWLEN:長度]\n\ - [/MAXPWAGE:{天|UNLIMITED}] [/MINPWAGE:天]\n\ - [/UNIQUEPW:計數] [/DOMAIN]\n\n" - IDS_ACCOUNTS_HELP_1 "NET ACCOUNTS updates the user accounts database and modifies password\n\ -and logon requirements for all accounts.\n\ -When used without parameters, NET ACCOUNTS displays the current settings for\n\ -passwords, logon limitations, and domain information.\n\n" - IDS_ACCOUNTS_HELP_2 "Two conditions are required in order for options used with\n\ -NET ACCOUNTS to take effect.\n\n" - IDS_ACCOUNTS_HELP_3 "- The password and logon requirements are only effective if user\n\ - accounts havebeen set up (user User Manager or the NET USER command).\n\n" - IDS_ACCOUNTS_HELP_4 "- The Net Logon service must be running on all servers in the domain\n\ - that verify logon. Net Logon is started autmatically when the\n\ - operating system starts.\n\n" - IDS_ACCOUNTS_HELP_5 "/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before\n\ - being forced to log off when the\n\ - account expires or valid logon hours expire.\n\ - NO, the default, prevents forced logoff.\n" - IDS_ACCOUNTS_HELP_6 "/MINPWLEN:length Sets the minimum number of characters for\n\ - a password. The range is 0-14 characters;\n\ - the default is 6 characters.\n" - IDS_ACCOUNTS_HELP_7 "/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a\n\ - password is valid. No limit is specified\n\ - by using UNLIMITED. /MAXPWAGE cannot be less\n\ - than /MINPWAGE. The range is 1-999; the\n\ - default is to leave the value unchanged.\n" - IDS_ACCOUNTS_HELP_8 "/MINPWAGE:days Sets the minimum number of days that must\n\ - pass before a user can change a password.\n\ - A value of 0 sets no minimum time. The range\n\ - is 0-999; the default is 0 days. /MINPWAGE\n\ - cannot be more than /MAXPWAGE.\n" - IDS_ACCOUNTS_HELP_9 "/UNIQUEPW:number Requires that a users passwords be unique\n\ - through the specified number of password\n\ - changes. The maximum value is 24.\n" - IDS_ACCOUNTS_HELP_10 "/DOMAIN Performs the operation on a domain\n\ - controller of the current domain. Otherwise,\n\ - the operation is performed on the local\n\ - computer.\n\n" IDS_COMPUTER_SYNTAX "NET COMPUTER \\computername {/ADD | /DEL}\n\n" IDS_COMPUTER_HELP_1 "NET COMPUTER adds or deletes computers from a domain database. This\n\ command is available only on server operating systems.\n\n" diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 34637202c7..883ee2ef2b 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -145,6 +145,30 @@ PrintErrorMessage( } +VOID +PrintNetMessage( + DWORD dwMessage) +{ + PWSTR pBuffer; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_IGNORE_INSERTS, + GetModuleHandleW(NULL), + dwMessage, + LANG_USER_DEFAULT, + (LPWSTR)&pBuffer, + 0, + NULL); + if (pBuffer) + { + ConPrintf(StdOut, L"%s\n", pBuffer); + LocalFree(pBuffer); + pBuffer = NULL; + } +} + + VOID ReadFromConsole( LPWSTR lpInput, diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index 4e2f4a1518..de61f92f39 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -24,6 +24,7 @@ #include <conutils.h> +#include <net_msg.h> #include "resource.h" extern HMODULE hModuleNetMsg; @@ -42,6 +43,10 @@ VOID PrintErrorMessage( DWORD dwError); +VOID +PrintNetMessage( + DWORD dwMessage); + VOID ReadFromConsole( LPWSTR lpInput, diff --git a/base/applications/network/net/net.rc b/base/applications/network/net/net.rc index 78bed3dc1c..7fda9f27ee 100644 --- a/base/applications/network/net/net.rc +++ b/base/applications/network/net/net.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_ORIGINAL_FILENAME "net.exe" #include <reactos/version.rc> +#include <net_msg.rc> + /* UTF-8 */ #pragma code_page(65001) diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 84d5f878a7..71bbd8e2db 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,16 +1,5 @@ #pragma once -#define IDS_ACCOUNTS_SYNTAX 100 -#define IDS_ACCOUNTS_HELP_1 101 -#define IDS_ACCOUNTS_HELP_2 102 -#define IDS_ACCOUNTS_HELP_3 103 -#define IDS_ACCOUNTS_HELP_4 104 -#define IDS_ACCOUNTS_HELP_5 105 -#define IDS_ACCOUNTS_HELP_6 106 -#define IDS_ACCOUNTS_HELP_7 107 -#define IDS_ACCOUNTS_HELP_8 108 -#define IDS_ACCOUNTS_HELP_9 109 -#define IDS_ACCOUNTS_HELP_10 110 #define IDS_COMPUTER_SYNTAX 111 #define IDS_COMPUTER_HELP_1 112 #define IDS_COMPUTER_HELP_2 113 diff --git a/sdk/include/reactos/mc/CMakeLists.txt b/sdk/include/reactos/mc/CMakeLists.txt index 56e501f41a..46753f3bc1 100644 --- a/sdk/include/reactos/mc/CMakeLists.txt +++ b/sdk/include/reactos/mc/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND ANSI_SOURCE list(APPEND UNICODE_SOURCE errcodes.mc + net_msg.mc neteventmsg.mc netmsgmsg.mc ntiologc.mc diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc new file mode 100644 index 0000000000..a65776ce6a --- /dev/null +++ b/sdk/include/reactos/mc/net_msg.mc @@ -0,0 +1,403 @@ +MessageIdTypedef=DWORD + +SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS + Informational=0x1:STATUS_SEVERITY_INFORMATIONAL + Warning=0x2:STATUS_SEVERITY_WARNING + Error=0x3:STATUS_SEVERITY_ERROR + ) + +FacilityNames=(System=0x0:FACILITY_SYSTEM + ) + +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415 + Romanian=0x018:MSG00018 + Russian=0x419:MSG00419 + Spanish=0x00A:MSG0000A + Turkish=0x41F:MSG0041F + Chinese=0x804:MSG00804 + Taiwanese=0x404:MSG00404 + ) + + +MessageId=10000 +SymbolicName=MSG_ACCOUNTS_SYNTAX +Severity=Success +Facility=System +Language=English +NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length] + [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days] + [/UNIQUEPW:Count] [/DOMAIN] +. +Language=Polish +NET ACCOUNTS [/FORCELOGOFF:{minuty|NO}] [/MINPWLEN:długość] + [/MAXPWAGE:{dni|UNLIMITED}] [/MINPWAGE:dni] + [/UNIQUEPW:liczba] [/DOMAIN] +. +Language=Romanian +NET ACCOUNTS [/FORCELOGOFF:{Minute|NO}] [/MINPWLEN:Lungime] + [/MAXPWAGE:{Zile|UNLIMITED}] [/MINPWAGE:Zile] + [/UNIQUEPW:Număr] [/DOMAIN] +. +Language=Russian +NET ACCOUNTS [/FORCELOGOFF:{минуты | NO}] [/MINPWLEN:длина] + [/MAXPWAGE:{дни | UNLIMITED}] [/MINPWAGE:дни] + [/UNIQUEPW:число] [/DOMAIN] +. +Language=Spanish +NET ACCOUNTS [/FORCELOGOFF:{minutos | NO}] [/MINPWLEN:longitud] + [/MAXPWAGE:{días | UNLIMITED}] [/MINPWAGE:días] + [/UNIQUEPW:número] [/DOMAIN] +. +Language=Turkish +NET ACCOUNTS [/FORCELOGOFF:{Dakîka|NO}] [/MINPWLEN:Uzunluk] + [/MAXPWAGE:{Gün|UNLIMITED}] [/MINPWAGE:Gün] + [/UNIQUEPW:Sayı] [/DOMAIN] +. +Language=Chinese +NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length] + [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days] + [/UNIQUEPW:Count] [/DOMAIN] +. +Language=Taiwanese +NET ACCOUNTS [/FORCELOGOFF:{分鐘|NO}] [/MINPWLEN:長度] + [/MAXPWAGE:{天|UNLIMITED}] [/MINPWAGE:天] + [/UNIQUEPW:計數] [/DOMAIN] +. + + +MessageId=10001 +SymbolicName=MSG_ACCOUNTS_HELP +Severity=Success +Facility=System +Language=English +NET ACCOUNTS updates the user accounts database and modifies password +and logon requirements for all accounts. +When used without parameters, NET ACCOUNTS displays the current settings for +passwords, logon limitations, and domain information. + +Two conditions are required in order for options used with +NET ACCOUNTS to take effect. + +- The password and logon requirements are only effective if user + accounts have been set up (user User Manager or the NET USER command). + +- The Net Logon service must be running on all servers in the domain + that verify logon. Net Logon is started automatically when the + operating system starts. + +/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before + being forced to log off when the + account expires or valid logon hours expire. + NO, the default, prevents forced logoff. +/MINPWLEN:length Sets the minimum number of characters for + a password. The range is 0-14 characters; + the default is 6 characters. +/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a + password is valid. No limit is specified + by using UNLIMITED. /MAXPWAGE cannot be less + than /MINPWAGE. The range is 1-999; the + default is to leave the value unchanged. +/MINPWAGE:days Sets the minimum number of days that must + pass before a user can change a password. + A value of 0 sets no minimum time. The range + is 0-999; the default is 0 days. /MINPWAGE + cannot be more than /MAXPWAGE. +/UNIQUEPW:number Requires that a users passwords be unique + through the specified number of password + changes. The maximum value is 24. +/DOMAIN Performs the operation on a domain + controller of the current domain. Otherwise, + the operation is performed on the local + computer. +. +Language=Polish +NET ACCOUNTS uaktualnia bazę kont użytkowników i zmienia hasło oraz wymagania +logowania dla wszystkich kont. +Użyte bez opcji, NET ACCOUNTS wyświetla bieżące ustawienia +hasła i ograniczeń logowania oraz informacje o domenie. + +Aby opcje użyte z NET ACCOUNTS odniosły skutek, muszą być +spełnione dwa warunki. + +- Wymagania hasła i logowania odnoszą skutek tylko wtedy, gdy + zostało utworzone konto użytkownika (w tym celu użyj + Menedżera użytkowników lub polecenia NET USER). + +- Usługa logowania (Net Logon) musi być uruchomiona na wszystkich + serwerach w domenie, które weryfikują logowanie. Usługa logowania + jest uruchamiana automatycznie podczas uruchamiania systemu. + +/FORECELOGOFF:{minuty | NO} Ustawia liczbę minut, przez które użytkownik + może być zalogowany przed wymuszeniem wylogowania + wskutek wygaśnięcia lub ważności godzin logowania. + NO, wartość domyślna, zapobiega wymuszaniu + wylogowania. +/MINPWLEN:długość Ustawia minimalną liczbę znaków w haśle. + Zakres długości hasła wynosi od 0 do 14 znaków; + wartość domyślna to 6 znaków. +/MAXPWAGE:{dni | UNLIMITED} Ustawia maksymalną liczbę dni ważności + hasła. UNLIMITED ustala nieograniczony + czas ważności hasła. Wartość /MAXPWAGE nie + może być mniejsza od /MINPWAGE. Zakres wynosi + od 1 do 999; domyślnie wartość się nie zmienia. +/MINPWAGE:dni Ustawia minimalną liczbę dni, które muszą + minąć, zanim użytkownik może zmienić hasło. + Wartość 0 ustawia brak tego ograniczenia. + Zakres wynosi od 0 do 999; wartość domyślna + to 0 dni. Wartość /MINPWAGE nie może być + większa od wartości /MAXPWAGE. +/UNIQUEPW:liczba Wymaga, aby hasło użytkownika było unikatowe, + poprzez określoną liczbę zmian hasła. + Największa wartość to 24. +/DOMAIN Wykonuje operacje na kontrolerze domeny + w bieżącej domenie. W innym wypadku, + operacje te są dokonywane na komputerze + lokalnym. +. +Language=Romanian +NET ACCOUNTS actualizează baza de utilizatori și modifică parola și +cerințele de autentificare pentru toate conturile. +Utilizat fără parametri, NET ACCOUNTS afișează configurația curentă pentru +parole, limitări de autentificare, și informații de domeniu. + +Sunt necesare două condiții pentru ca opțiunile utilizate cu +NET ACCOUNTS să aibă efect. + +- Cerințele de autentificare și parolele au sens doar când conturile + sunt instituite (cu Gestionarul de Utilizatori sau comanda NET USER). + +- Este necesar ca serviciul Net Logon să fie activ în toate servele din + domeniul de autentificare. Serviciul Net Logon este lansat automat la + pornirea sistemului de operare. + +/FORECELOGOFF:{minute | NO} Definește numărul minutelor precursoare unei + deautentificări forțate la expirarea contului + sau a numărului valid de ore de autentificare. + NO (implicit) previne deautentificarea forțată. +/MINPWLEN:length Sets the minimum number of characters for + a password. The range is 0-14 characters; + the default is 6 characters. +/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a + password is valid. No limit is specified + by using UNLIMITED. /MAXPWAGE cannot be less + than /MINPWAGE. The range is 1-999; the + default is to leave the value unchanged. +/MINPWAGE:days Sets the minimum number of days that must + pass before a user can change a password. + A value of 0 sets no minimum time. The range + is 0-999; the default is 0 days. /MINPWAGE + cannot be more than /MAXPWAGE. +/UNIQUEPW:number Requires that a users passwords be unique + through the specified number of password + changes. The maximum value is 24. +/DOMAIN Performs the operation on a domain + controller of the current domain. Otherwise, + the operation is performed on the local + computer. +. +Language=Russian +NET ACCOUNTS updates the user accounts database and modifies password +and logon requirements for all accounts. +When used without parameters, NET ACCOUNTS displays the current settings for +passwords, logon limitations, and domain information. + +Two conditions are required in order for options used with +NET ACCOUNTS to take effect. + +- The password and logon requirements are only effective if user + accounts havebeen set up (user User Manager or the NET USER command). + +- The Net Logon service must be running on all servers in the domain + that verify logon. Net Logon is started autmatically when the + operating system starts. + +/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before + being forced to log off when the + account expires or valid logon hours expire. + NO, the default, prevents forced logoff. +/MINPWLEN:length Sets the minimum number of characters for + a password. The range is 0-14 characters; + the default is 6 characters. +/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a + password is valid. No limit is specified + by using UNLIMITED. /MAXPWAGE cannot be less + than /MINPWAGE. The range is 1-999; the + default is to leave the value unchanged. +/MINPWAGE:days Sets the minimum number of days that must + pass before a user can change a password. + A value of 0 sets no minimum time. The range + is 0-999; the default is 0 days. /MINPWAGE + cannot be more than /MAXPWAGE. +/UNIQUEPW:number Requires that a users passwords be unique + through the specified number of password + changes. The maximum value is 24. +/DOMAIN Performs the operation on a domain + controller of the current domain. Otherwise, + the operation is performed on the local + computer. +. +Language=Spanish +NET ACCOUNTS updates the user accounts database and modifies password +and logon requirements for all accounts. +When used without parameters, NET ACCOUNTS displays the current settings for +passwords, logon limitations, and domain information. + +Two conditions are required in order for options used with +NET ACCOUNTS to take effect. + +- The password and logon requirements are only effective if user + accounts have been set up (user User Manager or the NET USER command). + +- The Net Logon service must be running on all servers in the domain + that verify logon. Net Logon is started automatically when the + operating system starts. + +/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before + being forced to log off when the + account expires or valid logon hours expire. + NO, the default, prevents forced logoff. +/MINPWLEN:length Sets the minimum number of characters for + a password. The range is 0-14 characters; + the default is 6 characters. +/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a + password is valid. No limit is specified + by using UNLIMITED. /MAXPWAGE cannot be less + than /MINPWAGE. The range is 1-999; the + default is to leave the value unchanged. +/MINPWAGE:days Sets the minimum number of days that must + pass before a user can change a password. + A value of 0 sets no minimum time. The range + is 0-999; the default is 0 days. /MINPWAGE + cannot be more than /MAXPWAGE. +/UNIQUEPW:number Requires that a users passwords be unique + through the specified number of password + changes. The maximum value is 24. +/DOMAIN Performs the operation on a domain + controller of the current domain. Otherwise, + the operation is performed on the local + computer. +. +Language=Turkish +NET ACCOUNTS updates the user accounts database and modifies password +and logon requirements for all accounts. +When used without parameters, NET ACCOUNTS displays the current settings for +passwords, logon limitations, and domain information. + +Two conditions are required in order for options used with +NET ACCOUNTS to take effect. + +- The password and logon requirements are only effective if user + accounts havebeen set up (user User Manager or the NET USER command). + +- The Net Logon service must be running on all servers in the domain + that verify logon. Net Logon is started autmatically when the + operating system starts. + +/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before + being forced to log off when the + account expires or valid logon hours expire. + NO, the default, prevents forced logoff. +/MINPWLEN:length Sets the minimum number of characters for + a password. The range is 0-14 characters; + the default is 6 characters. +/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a + password is valid. No limit is specified + by using UNLIMITED. /MAXPWAGE cannot be less + than /MINPWAGE. The range is 1-999; the + default is to leave the value unchanged. +/MINPWAGE:days Sets the minimum number of days that must + pass before a user can change a password. + A value of 0 sets no minimum time. The range + is 0-999; the default is 0 days. /MINPWAGE + cannot be more than /MAXPWAGE. +/UNIQUEPW:number Requires that a users passwords be unique + through the specified number of password + changes. The maximum value is 24. +/DOMAIN Performs the operation on a domain + controller of the current domain. Otherwise, + the operation is performed on the local + computer. +. +Language=Chinese +NET ACCOUNTS updates the user accounts database and modifies password +and logon requirements for all accounts. +When used without parameters, NET ACCOUNTS displays the current settings for +passwords, logon limitations, and domain information. + +Two conditions are required in order for options used with +NET ACCOUNTS to take effect. + +- The password and logon requirements are only effective if user + accounts havebeen set up (user User Manager or the NET USER command). + +- The Net Logon service must be running on all servers in the domain + that verify logon. Net Logon is started autmatically when the + operating system starts. + +/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before + being forced to log off when the + account expires or valid logon hours expire. + NO, the default, prevents forced logoff. +/MINPWLEN:length Sets the minimum number of characters for + a password. The range is 0-14 characters; + the default is 6 characters. +/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a + password is valid. No limit is specified + by using UNLIMITED. /MAXPWAGE cannot be less + than /MINPWAGE. The range is 1-999; the + default is to leave the value unchanged. +/MINPWAGE:days Sets the minimum number of days that must + pass before a user can change a password. + A value of 0 sets no minimum time. The range + is 0-999; the default is 0 days. /MINPWAGE + cannot be more than /MAXPWAGE. +/UNIQUEPW:number Requires that a users passwords be unique + through the specified number of password + changes. The maximum value is 24. +/DOMAIN Performs the operation on a domain + controller of the current domain. Otherwise, + the operation is performed on the local + computer. +. +Language=Taiwanese +NET ACCOUNTS updates the user accounts database and modifies password +and logon requirements for all accounts. +When used without parameters, NET ACCOUNTS displays the current settings for +passwords, logon limitations, and domain information. + +Two conditions are required in order for options used with +NET ACCOUNTS to take effect. + +- The password and logon requirements are only effective if user + accounts havebeen set up (user User Manager or the NET USER command). + +- The Net Logon service must be running on all servers in the domain + that verify logon. Net Logon is started autmatically when the + operating system starts. + +/FORECELOGOFF:{minutes | NO} Sets the number of minutes a user has before + being forced to log off when the + account expires or valid logon hours expire. + NO, the default, prevents forced logoff. +/MINPWLEN:length Sets the minimum number of characters for + a password. The range is 0-14 characters; + the default is 6 characters. +/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a + password is valid. No limit is specified + by using UNLIMITED. /MAXPWAGE cannot be less + than /MINPWAGE. The range is 1-999; the + default is to leave the value unchanged. +/MINPWAGE:days Sets the minimum number of days that must + pass before a user can change a password. + A value of 0 sets no minimum time. The range + is 0-999; the default is 0 days. /MINPWAGE + cannot be more than /MAXPWAGE. +/UNIQUEPW:number Requires that a users passwords be unique + through the specified number of password + changes. The maximum value is 24. +/DOMAIN Performs the operation on a domain + controller of the current domain. Otherwise, + the operation is performed on the local + computer. +.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs