Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/01: [NET] Move ACCOUNTS command syntax and help text into a message table.

by Eric Kohl

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. +.

5 years, 10 months

[reactos] 01/01: [NTOSKRNL] Set the MemoryMaker flag when executing write behind

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e16241255d518e318aafa… commit e16241255d518e318aafa7d02b8e2eb6049c60b9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 23 14:59:42 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 23 14:59:42 2018 +0100 [NTOSKRNL] Set the MemoryMaker flag when executing write behind --- ntoskrnl/cc/lazywrite.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/cc/lazywrite.c b/ntoskrnl/cc/lazywrite.c index 275507e904..56f8d922df 100644 --- a/ntoskrnl/cc/lazywrite.c +++ b/ntoskrnl/cc/lazywrite.c @@ -307,7 +307,9 @@ CcWorkerThread( break; case WriteBehind: + PsGetCurrentThread()->MemoryMaker = 1; CcWriteBehind(); + PsGetCurrentThread()->MemoryMaker = 0; WritePerformed = TRUE; break;

5 years, 10 months

[reactos] 01/01: [NTOSKRNL] Implement write behind in Cc

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e97071c8b715b16303ac… commit 7e97071c8b715b16303ac7fa00be652b17f552ec Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 23 14:43:17 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 23 14:45:38 2018 +0100 [NTOSKRNL] Implement write behind in Cc For now, this is just a split between scan and flush that were both done during lazy scan previously. Lazy scan shouldn't perform any write operation, but only queue a write behind operation. Our implementation is far from the original, as it seems our lazy scan should queue a write behind operation per shared cache map. Right now, we only perform global operation. --- ntoskrnl/cc/lazywrite.c | 61 ++++++++++++++++++++++++++++++++++-------- ntoskrnl/include/internal/cc.h | 2 +- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/cc/lazywrite.c b/ntoskrnl/cc/lazywrite.c index 8cb5adb2e7..275507e904 100644 --- a/ntoskrnl/cc/lazywrite.c +++ b/ntoskrnl/cc/lazywrite.c @@ -109,15 +109,33 @@ CcScanDpc( } /* And post it, it will be for lazy write */ - WorkItem->Function = LazyWrite; + WorkItem->Function = LazyScan; CcPostWorkQueue(WorkItem, &CcRegularWorkQueue); } +VOID +CcWriteBehind(VOID) +{ + ULONG Target, Count; + + Target = CcTotalDirtyPages / 8; + if (Target != 0) + { + /* Flush! */ + DPRINT("Lazy writer starting (%d)\n", Target); + CcRosFlushDirtyPages(Target, &Count, FALSE, TRUE); + + /* And update stats */ + CcLazyWritePages += Count; + ++CcLazyWriteIos; + DPRINT("Lazy writer done (%d)\n", Count); + } +} + VOID CcLazyWriteScan(VOID) { ULONG Target; - ULONG Count; KIRQL OldIrql; PLIST_ENTRY ListEntry; LIST_ENTRY ToPost; @@ -142,14 +160,15 @@ CcLazyWriteScan(VOID) Target = CcTotalDirtyPages / 8; if (Target != 0) { - /* Flush! */ - DPRINT("Lazy writer starting (%d)\n", Target); - CcRosFlushDirtyPages(Target, &Count, FALSE, TRUE); + /* There is stuff to flush, schedule a write-behind operation */ - /* And update stats */ - CcLazyWritePages += Count; - ++CcLazyWriteIos; - DPRINT("Lazy writer done (%d)\n", Count); + /* Allocate a work item */ + WorkItem = ExAllocateFromNPagedLookasideList(&CcTwilightLookasideList); + if (WorkItem != NULL) + { + WorkItem->Function = WriteBehind; + CcPostWorkQueue(WorkItem, &CcRegularWorkQueue); + } } /* Post items that were due for end of run */ @@ -208,7 +227,7 @@ CcWorkerThread( IN PVOID Parameter) { KIRQL OldIrql; - BOOLEAN DropThrottle; + BOOLEAN DropThrottle, WritePerformed; PWORK_QUEUE_ITEM Item; #if DBG PIRP TopLevel; @@ -218,6 +237,8 @@ CcWorkerThread( Item = Parameter; /* And by default, don't touch throttle */ DropThrottle = FALSE; + /* No write performed */ + WritePerformed = FALSE; #if DBG /* Top level IRP should be clean when started @@ -285,7 +306,12 @@ CcWorkerThread( CcPerformReadAhead(WorkItem->Parameters.Read.FileObject); break; - case LazyWrite: + case WriteBehind: + CcWriteBehind(); + WritePerformed = TRUE; + break; + + case LazyScan: CcLazyWriteScan(); break; @@ -309,6 +335,19 @@ CcWorkerThread( --CcNumberActiveWorkerThreads; KeReleaseQueuedSpinLock(LockQueueWorkQueueLock, OldIrql); + /* If there are pending write openations and we have at least 20 dirty pages */ + if (!IsListEmpty(&CcDeferredWrites) && CcTotalDirtyPages >= 20) + { + /* And if we performed a write operation previously, then + * stress the system a bit and reschedule a scan to find + * stuff to write + */ + if (WritePerformed) + { + CcLazyWriteScan(); + } + } + #if DBG /* Top level shouldn't have changed */ if (TopLevel != IoGetTopLevelIrp()) diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 8a5fb73838..10bdb43a86 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -278,7 +278,7 @@ typedef enum _WORK_QUEUE_FUNCTIONS { ReadAhead = 1, WriteBehind = 2, - LazyWrite = 3, + LazyScan = 3, SetDone = 4, } WORK_QUEUE_FUNCTIONS, *PWORK_QUEUE_FUNCTIONS;

5 years, 10 months

[reactos] 01/01: [NET] Load netmsg.dll right from the start and print some messages using netmsg.dll rather than local strings.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5c74ae6fe841863b6272… commit d5c74ae6fe841863b62722ff5424a1b023761e40 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 23 14:16:53 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 23 14:18:51 2018 +0100 [NET] Load netmsg.dll right from the start and print some messages using netmsg.dll rather than local strings. @Translators: Please start translating messages from netmsgmsg.mc and errorcodes.mc (located in sdk\include\reactos\mc). They will be used instead of local strings. --- base/applications/network/net/cmdConfig.c | 2 +- base/applications/network/net/cmdGroup.c | 1 + base/applications/network/net/cmdHelpMsg.c | 17 +-------- base/applications/network/net/cmdLocalGroup.c | 1 + base/applications/network/net/cmdStatistics.c | 2 +- base/applications/network/net/cmdUse.c | 4 +-- base/applications/network/net/main.c | 51 +++++++++++++++------------ base/applications/network/net/net.h | 2 ++ 8 files changed, 38 insertions(+), 42 deletions(-) diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index 0211b9bfec..df7fce2c96 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -302,7 +302,7 @@ done: NetApiBufferFree(ServerInfo); if (result == 0) - ConResPuts(StdOut, IDS_ERROR_NO_ERROR); + PrintErrorMessage(ERROR_SUCCESS); return result; } \ No newline at end of file diff --git a/base/applications/network/net/cmdGroup.c b/base/applications/network/net/cmdGroup.c index ccb5c6cb04..4fc1e7e08d 100644 --- a/base/applications/network/net/cmdGroup.c +++ b/base/applications/network/net/cmdGroup.c @@ -255,6 +255,7 @@ cmdGroup( } else { + PrintErrorMessage(3506/*, argv[i]*/); result = 1; goto done; } diff --git a/base/applications/network/net/cmdHelpMsg.c b/base/applications/network/net/cmdHelpMsg.c index 801def5cce..faa54d2b6e 100644 --- a/base/applications/network/net/cmdHelpMsg.c +++ b/base/applications/network/net/cmdHelpMsg.c @@ -13,8 +13,6 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) { - WCHAR szBuffer[MAX_PATH]; - HMODULE hMsgDll = NULL; INT i; LONG errNum; PWSTR endptr; @@ -52,20 +50,9 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) if (errNum >= MIN_LANMAN_MESSAGE_ID && errNum <= MAX_LANMAN_MESSAGE_ID) { - /* Load netmsg.dll */ - GetSystemDirectoryW(szBuffer, ARRAYSIZE(szBuffer)); - wcscat(szBuffer, L"\\netmsg.dll"); - - hMsgDll = LoadLibrary(szBuffer); - if (hMsgDll == NULL) - { - ConPrintf(StdOut, L"Failed to load netmsg.dll\n"); - return 0; - } - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, - hMsgDll, + hModuleNetMsg, errNum, LANG_USER_DEFAULT, (LPWSTR)&pBuffer, @@ -80,8 +67,6 @@ INT cmdHelpMsg(INT argc, WCHAR **argv) { PrintErrorMessage(3871); } - - FreeLibrary(hMsgDll); } else { diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index 44489b377f..e6970926ee 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -275,6 +275,7 @@ cmdLocalGroup( } else { + PrintErrorMessage(3506/*, argv[i]*/); result = 1; goto done; } diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c index 62bbca716c..652445ace4 100644 --- a/base/applications/network/net/cmdStatistics.c +++ b/base/applications/network/net/cmdStatistics.c @@ -294,7 +294,7 @@ cmdStatistics( } if (result == 0) - ConResPuts(StdOut, IDS_ERROR_NO_ERROR); + PrintErrorMessage(ERROR_SUCCESS); return result; } \ No newline at end of file diff --git a/base/applications/network/net/cmdUse.c b/base/applications/network/net/cmdUse.c index 59bc580a4d..1c1c479eff 100644 --- a/base/applications/network/net/cmdUse.c +++ b/base/applications/network/net/cmdUse.c @@ -109,7 +109,7 @@ cmdUse( { Status = EnumerateConnections(NULL); if (Status == NO_ERROR) - ConResPrintf(StdOut, IDS_ERROR_NO_ERROR); + PrintErrorMessage(ERROR_SUCCESS); else PrintError(Status); @@ -125,7 +125,7 @@ cmdUse( Status = EnumerateConnections(argv[2]); if (Status == NO_ERROR) - ConResPrintf(StdOut, IDS_ERROR_NO_ERROR); + PrintErrorMessage(ERROR_SUCCESS); else PrintError(Status); diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 0c932a23f3..34637202c7 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -45,6 +45,7 @@ COMMAND cmds[] = {NULL, NULL} }; +HMODULE hModuleNetMsg = NULL; VOID @@ -80,28 +81,15 @@ VOID PrintErrorMessage( DWORD dwError) { - WCHAR szDllBuffer[MAX_PATH]; WCHAR szErrorBuffer[16]; - HMODULE hMsgDll = NULL; PWSTR pBuffer; PWSTR pErrorInserts[2] = {NULL, NULL}; - /* Load netmsg.dll */ - GetSystemDirectoryW(szDllBuffer, ARRAYSIZE(szDllBuffer)); - wcscat(szDllBuffer, L"\\netmsg.dll"); - - hMsgDll = LoadLibrary(szDllBuffer); - if (hMsgDll == NULL) - { - ConPrintf(StdErr, L"Failed to load netmsg.dll\n"); - return; - } - if (dwError >= MIN_LANMAN_MESSAGE_ID && dwError <= MAX_LANMAN_MESSAGE_ID) { FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, - hMsgDll, + hModuleNetMsg, dwError, LANG_USER_DEFAULT, (LPWSTR)&pBuffer, @@ -141,7 +129,7 @@ PrintErrorMessage( /* Format and print the 3514 message */ FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, - hMsgDll, + hModuleNetMsg, 3514, LANG_USER_DEFAULT, (LPWSTR)&pBuffer, @@ -154,8 +142,6 @@ PrintErrorMessage( pBuffer = NULL; } } - - FreeLibrary(hMsgDll); } @@ -198,29 +184,50 @@ ReadFromConsole( int wmain(int argc, WCHAR **argv) { + WCHAR szDllBuffer[MAX_PATH]; PCOMMAND cmdptr; + int nResult = 0; + BOOL bRun = FALSE; /* Initialize the Console Standard Streams */ ConInitStdStreams(); - if (argc < 2) + /* Load netmsg.dll */ + GetSystemDirectoryW(szDllBuffer, ARRAYSIZE(szDllBuffer)); + wcscat(szDllBuffer, L"\\netmsg.dll"); + + hModuleNetMsg = LoadLibrary(szDllBuffer); + if (hModuleNetMsg == NULL) { - ConResPuts(StdOut, IDS_NET_SYNTAX); + ConPrintf(StdErr, L"Failed to load netmsg.dll\n"); return 1; } + if (argc < 2) + { + nResult = 1; + goto done; + } + /* Scan the command table */ for (cmdptr = cmds; cmdptr->name; cmdptr++) { if (_wcsicmp(argv[1], cmdptr->name) == 0) { - return cmdptr->func(argc, argv); + nResult = cmdptr->func(argc, argv); + bRun = TRUE; + break; } } - ConResPuts(StdOut, IDS_NET_SYNTAX); +done: + if (bRun == FALSE) + ConResPuts(StdOut, IDS_NET_SYNTAX); - return 1; + if (hModuleNetMsg != NULL) + FreeLibrary(hModuleNetMsg); + + return nResult; } INT unimplemented(INT argc, WCHAR **argv) diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index e075a55a6e..4e2f4a1518 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -26,6 +26,8 @@ #include "resource.h" +extern HMODULE hModuleNetMsg; + VOID PrintPaddedResourceString( UINT uID,

5 years, 10 months

[reactos] 02/02: [UMPNPMGR] Use HeapReAlloc() to reallocate the PnP events buffer. Fix a memory leak in DeviceInstallThread().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2955ed91ab11419e6d405… commit 2955ed91ab11419e6d4059e9d31dc8708eba46ba Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 23 14:06:03 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 23 14:09:17 2018 +0100 [UMPNPMGR] Use HeapReAlloc() to reallocate the PnP events buffer. Fix a memory leak in DeviceInstallThread(). --- base/services/umpnpmgr/umpnpmgr.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index e7e86e760a..94bc37e914 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -3476,6 +3476,7 @@ DeviceInstallThread(LPVOID lpParameter) ResetEvent(hNoPendingInstalls); Params = CONTAINING_RECORD(ListEntry, DeviceInstallParams, ListEntry); InstallDevice(Params->DeviceIds, showWizard); + HeapFree(GetProcessHeap(), 0, Params); } } @@ -3486,10 +3487,11 @@ DeviceInstallThread(LPVOID lpParameter) static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { - PPLUGPLAY_EVENT_BLOCK PnpEvent; - ULONG PnpEventSize; + DWORD dwRet = ERROR_SUCCESS; NTSTATUS Status; RPC_STATUS RpcStatus; + PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; + ULONG PnpEventSize; UNREFERENCED_PARAMETER(lpParameter); @@ -3509,10 +3511,13 @@ PnpEventThread(LPVOID lpParameter) if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; - HeapFree(GetProcessHeap(), 0, PnpEvent); - PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); - if (PnpEvent == NULL) - return ERROR_OUTOFMEMORY; + NewPnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); + if (NewPnpEvent == NULL) + { + dwRet = ERROR_OUTOFMEMORY; + break; + } + PnpEvent = NewPnpEvent; continue; } @@ -3619,7 +3624,7 @@ PnpEventThread(LPVOID lpParameter) HeapFree(GetProcessHeap(), 0, PnpEvent); - return ERROR_SUCCESS; + return dwRet; }

5 years, 10 months

[reactos] 01/02: [UMPNPMGR] Minor formatting, and enable a DPRINT1 in case NtGetPlugPlayEvent() fails and the PnpEventThread() thread unexpectedly terminates due to that.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e18da43fe4b170172fc0… commit 9e18da43fe4b170172fc08c89264cf69cf59cd30 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 23 14:02:16 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 23 14:09:16 2018 +0100 [UMPNPMGR] Minor formatting, and enable a DPRINT1 in case NtGetPlugPlayEvent() fails and the PnpEventThread() thread unexpectedly terminates due to that. --- base/services/umpnpmgr/umpnpmgr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index e1b0e1f276..e7e86e760a 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -3502,10 +3502,10 @@ PnpEventThread(LPVOID lpParameter) { DPRINT("Calling NtGetPlugPlayEvent()\n"); - /* Wait for the next pnp event */ + /* Wait for the next PnP event */ Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); - /* Resize the buffer for the PnP event if it's too small. */ + /* Resize the buffer for the PnP event if it's too small */ if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; @@ -3518,11 +3518,11 @@ PnpEventThread(LPVOID lpParameter) if (!NT_SUCCESS(Status)) { - DPRINT("NtGetPlugPlayEvent() failed (Status %lx)\n", Status); + DPRINT1("NtGetPlugPlayEvent() failed (Status 0x%08lx)\n", Status); break; } - /* Process the pnp event */ + /* Process the PnP event */ DPRINT("Received PnP Event\n"); if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED, &RpcStatus)) { @@ -3613,7 +3613,7 @@ PnpEventThread(LPVOID lpParameter) PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]); } - /* Dequeue the current pnp event and signal the next one */ + /* Dequeue the current PnP event and signal the next one */ NtPlugPlayControl(PlugPlayControlUserResponse, NULL, 0); }

5 years, 10 months

[reactos] 01/01: [KMTESTS:CC] Fix a typo, definitely showing this code path is not used during the test

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdc419eb1808659362ff7… commit cdc419eb1808659362ff71575e84541c6d460319 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 23 12:31:14 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 23 12:31:14 2018 +0100 [KMTESTS:CC] Fix a typo, definitely showing this code path is not used during the test --- modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c index af644a0a18..3d23ab54be 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c @@ -456,7 +456,7 @@ TestIrpHandler( RtlFillMemory(Buffer, Length, 0xBD); } - if (TestTestId == 4 && TestWritten && + if ((TestTestId == 4 || TestTestId == 5) && TestWritten && Offset.QuadPart <= VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG) && Offset.QuadPart + Length >= VACB_MAPPING_GRANULARITY - PAGE_SIZE) {

5 years, 10 months

[reactos] 02/02: [NTOSKRNL] Honor files that shouldn't be lazy written

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a267045f8cd36de9eb75… commit 1a267045f8cd36de9eb7542bef9a2fd7d34e0b09 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 23 12:10:58 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 23 12:10:58 2018 +0100 [NTOSKRNL] Honor files that shouldn't be lazy written --- ntoskrnl/cc/view.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index d64496595f..890c75e99c 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -222,6 +222,14 @@ CcRosFlushDirtyPages ( continue; } + /* Don't attempt to lazy write the files that asked not to */ + if (CalledFromLazy && + BooleanFlagOn(current->SharedCacheMap->Flags, WRITEBEHIND_DISABLED)) + { + CcRosVacbDecRefCount(current); + continue; + } + ASSERT(current->Dirty); KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql);

5 years, 10 months

[reactos] 01/02: [KMTESTS:CC] Add tests showing a dirty VACB isn't flushed on file growing

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34b6a287645ea80814ccd… commit 34b6a287645ea80814ccd2aee161cf59d7acc5a0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 23 12:04:39 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 23 12:04:39 2018 +0100 [KMTESTS:CC] Add tests showing a dirty VACB isn't flushed on file growing CORE-11819 --- .../rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c | 123 ++++++++++++++++++++- .../rostests/kmtests/ntos_cc/CcSetFileSizes_user.c | 4 +- 2 files changed, 122 insertions(+), 5 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c index 7895786dd5..af644a0a18 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_drv.c @@ -25,6 +25,11 @@ static PFILE_OBJECT TestFileObject; static PDEVICE_OBJECT TestDeviceObject; static KMT_IRP_HANDLER TestIrpHandler; static KMT_MESSAGE_HANDLER TestMessageHandler; +static BOOLEAN TestUnpin = FALSE; +static BOOLEAN TestSizing = FALSE; +static BOOLEAN TestDirtying = FALSE; +static BOOLEAN TestUncaching = FALSE; +static BOOLEAN TestWritten = FALSE; NTSTATUS TestEntry( @@ -45,6 +50,7 @@ TestEntry( TESTENTRY_NO_READONLY_DEVICE; KmtRegisterIrpHandler(IRP_MJ_READ, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_WRITE, NULL, TestIrpHandler); KmtRegisterMessageHandler(0, NULL, TestMessageHandler); return Status; @@ -153,6 +159,7 @@ PerformTest( ok_eq_pointer(TestDeviceObject, NULL); ok_eq_ulong(TestTestId, -1); + TestWritten = FALSE; TestDeviceObject = DeviceObject; TestTestId = TestId; TestFileObject = IoCreateStreamFileObject(NULL, DeviceObject); @@ -171,7 +178,7 @@ PerformTest( Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; Fcb->Header.ValidDataLength.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; - if (TestId > 1 && TestId < 4) + if ((TestId > 1 && TestId < 4) || TestId == 5) { Fcb->Header.AllocationSize.QuadPart = VACB_MAPPING_GRANULARITY - PAGE_SIZE; } @@ -249,6 +256,65 @@ PerformTest( ExFreePool(Buffer); } } + else if (TestId == 4 || TestId == 5) + { + /* Kill lazy writer */ + CcSetAdditionalCacheAttributes(TestFileObject, FALSE, TRUE); + + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, VACB_MAPPING_GRANULARITY - PAGE_SIZE, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + LARGE_INTEGER Flushed; + + ok_eq_ulong(Buffer[(VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG)) / sizeof(ULONG)], 0xBABABABA); + Buffer[(VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG)) / sizeof(ULONG)] = 0xDADADADA; + + TestDirtying = TRUE; + CcSetDirtyPinnedData(Bcb, NULL); + TestDirtying = FALSE; + + ok_bool_false(TestWritten, "Dirty VACB has been unexpectedly written!\n"); + + TestSizing = TRUE; + KmtStartSeh(); + CcSetFileSizes(TestFileObject, &NewFileSizes); + KmtEndSeh(STATUS_SUCCESS); + TestSizing = FALSE; + + ok_bool_false(TestWritten, "Dirty VACB has been unexpectedly written!\n"); + + Fcb->Header.AllocationSize.QuadPart = VACB_MAPPING_GRANULARITY; + Fcb->Header.FileSize.QuadPart = VACB_MAPPING_GRANULARITY; + + Flushed = CcGetFlushedValidData(TestFileObject->SectionObjectPointer, FALSE); + ok(Flushed.QuadPart == 0, "Flushed: %I64d\n", Flushed.QuadPart); + + TestUnpin = TRUE; + CcUnpinData(Bcb); + TestUnpin = FALSE; + + ok_bool_false(TestWritten, "Dirty VACB has been unexpectedly written!\n"); + + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, VACB_MAPPING_GRANULARITY, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_ulong(Buffer[(VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG)) / sizeof(ULONG)], 0xDADADADA); + ok_eq_ulong(Buffer[(VACB_MAPPING_GRANULARITY - sizeof(ULONG)) / sizeof(ULONG)], 0xBABABABA); + + CcUnpinData(Bcb); + + ok_bool_false(TestWritten, "Dirty VACB has been unexpectedly written!\n"); + } + } + } } } } @@ -271,9 +337,11 @@ CleanupTest( { if (CcIsFileCached(TestFileObject)) { + TestUncaching = TRUE; KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); CcUninitializeCacheMap(TestFileObject, &Zero, &CacheUninitEvent); KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); + TestUncaching = FALSE; } if (TestFileObject->FsContext != NULL) @@ -339,7 +407,8 @@ TestIrpHandler( PAGED_CODE(); DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); - ASSERT(IoStack->MajorFunction == IRP_MJ_READ); + ASSERT(IoStack->MajorFunction == IRP_MJ_READ || + IoStack->MajorFunction == IRP_MJ_WRITE); FsRtlEnterFileSystem(); @@ -350,9 +419,9 @@ TestIrpHandler( { PMDL Mdl; ULONG Length; - PVOID Buffer; PTEST_FCB Fcb; LARGE_INTEGER Offset; + PVOID Buffer, OrigBuffer; Offset = IoStack->Parameters.Read.ByteOffset; Length = IoStack->Parameters.Read.Length; @@ -369,7 +438,7 @@ TestIrpHandler( ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); - Buffer = MapAndLockUserBuffer(Irp, Length); + OrigBuffer = Buffer = MapAndLockUserBuffer(Irp, Length); ok(Buffer != NULL, "Null pointer!\n"); if (Offset.QuadPart < Fcb->Header.FileSize.QuadPart) @@ -387,6 +456,14 @@ TestIrpHandler( RtlFillMemory(Buffer, Length, 0xBD); } + if (TestTestId == 4 && TestWritten && + Offset.QuadPart <= VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG) && + Offset.QuadPart + Length >= VACB_MAPPING_GRANULARITY - PAGE_SIZE) + { + Buffer = (PVOID)((ULONG_PTR)OrigBuffer + (VACB_MAPPING_GRANULARITY - PAGE_SIZE - sizeof(ULONG))); + RtlFillMemory(Buffer, sizeof(ULONG), 0xDA); + } + Status = STATUS_SUCCESS; Mdl = Irp->MdlAddress; @@ -398,6 +475,44 @@ TestIrpHandler( Irp->IoStatus.Information = Length; } + else if (IoStack->MajorFunction == IRP_MJ_WRITE) + { + PMDL Mdl; + ULONG Length; + PVOID Buffer; + LARGE_INTEGER Offset; + + Offset = IoStack->Parameters.Write.ByteOffset; + Length = IoStack->Parameters.Write.Length; + + ok((TestTestId == 4 || TestTestId == 5), "Unexpected test id: %d\n", TestTestId); + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + + ok_bool_false(TestUnpin, "Write triggered while unpinning!\n"); + ok_bool_false(TestSizing, "Write triggered while sizing!\n"); + ok_bool_false(TestDirtying, "Write triggered while dirtying!\n"); + ok_bool_true(TestUncaching, "Write not triggered while uncaching!\n"); + + ok(FlagOn(Irp->Flags, IRP_NOCACHE), "Not coming from Cc\n"); + + ok_irql(PASSIVE_LEVEL); + ok((Offset.QuadPart % PAGE_SIZE == 0 || Offset.QuadPart == 0), "Offset is not aligned: %I64i\n", Offset.QuadPart); + ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); + + Buffer = MapAndLockUserBuffer(Irp, Length); + ok(Buffer != NULL, "Null pointer!\n"); + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); + + TestWritten = TRUE; + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Length; + } if (Status == STATUS_PENDING) { diff --git a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c index 121598444c..d472c5ecc9 100644 --- a/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcSetFileSizes_user.c @@ -22,8 +22,10 @@ START_TEST(CcSetFileSizes) * 1: copy read - only FS * 2: mapped data - FS & AS * 3: copy read - FS & AS + * 4: dirty VACB - only FS + * 5: dirty VACB - FS & AS */ - for (TestId = 0; TestId < 4; ++TestId) + for (TestId = 0; TestId < 6; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

5 years, 10 months

[reactos] 01/01: [NTOSKRNL] When growing a file, invalid the last VACB so that it can be refreshed

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0917c64812c6ed182c8f7… commit 0917c64812c6ed182c8f771309dfc628127eee2d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 23 11:08:01 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 23 11:19:14 2018 +0100 [NTOSKRNL] When growing a file, invalid the last VACB so that it can be refreshed This will avoid corruption when a file size is little grown and read afterwards. Up to now, FSD where reading 0es instead of expected data, causing corruption. This fixes MS FastFAT not being able to mount a FAT volume in ReactOS, corrupting the FAT. This also fixes the CcSetFileSizes kmtest tests. This is based on a patch by Thomas Faber. CORE-11819 --- ntoskrnl/cc/fs.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index e31a17b87b..5798f56a91 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -301,6 +301,43 @@ CcSetFileSizes ( 0, FALSE); } + else + { + PROS_VACB LastVacb; + + /* + * If file (allocation) size has increased, then we need to check whether + * it just grows in a single VACB (the last one). + * If so, we must mark the VACB as invalid to trigger a read to the + * FSD at the next VACB usage, and thus avoid returning garbage + */ + + /* Check for allocation size and the last VACB */ + if (SharedCacheMap->SectionSize.QuadPart < FileSizes->AllocationSize.QuadPart && + SharedCacheMap->SectionSize.QuadPart % VACB_MAPPING_GRANULARITY) + { + LastVacb = CcRosLookupVacb(SharedCacheMap, + SharedCacheMap->SectionSize.QuadPart); + if (LastVacb != NULL) + { + /* Mark it as invalid */ + CcRosReleaseVacb(SharedCacheMap, LastVacb, LastVacb->Dirty ? LastVacb->Valid : FALSE, FALSE, FALSE); + } + } + + /* Check for file size and the last VACB */ + if (SharedCacheMap->FileSize.QuadPart < FileSizes->FileSize.QuadPart && + SharedCacheMap->FileSize.QuadPart % VACB_MAPPING_GRANULARITY) + { + LastVacb = CcRosLookupVacb(SharedCacheMap, + SharedCacheMap->FileSize.QuadPart); + if (LastVacb != NULL) + { + /* Mark it as invalid */ + CcRosReleaseVacb(SharedCacheMap, LastVacb, LastVacb->Dirty ? LastVacb->Valid : FALSE, FALSE, FALSE); + } + } + } KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql); SharedCacheMap->SectionSize = FileSizes->AllocationSize;

5 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2018