01/01: [MSGINA] Display the 'account expired' message when a user tries to log on using an expired account. - Ros-diffs

1 Sep 2018

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f4d70b405d3479e69ae04...
commit 6f4d70b405d3479e69ae0423fd1f306b43c13695
Author:     Eric Kohl eric.kohl@reactos.org
AuthorDate: Sat Sep 1 21:08:14 2018 +0200
Commit:     Eric Kohl eric.kohl@reactos.org
CommitDate: Sat Sep 1 21:10:42 2018 +0200
[MSGINA] Display the 'account expired' message when a user tries to log on using an expired account.
---
 dll/win32/msgina/gui.c         | 8 ++++++++
 dll/win32/msgina/lang/bg-BG.rc | 1 +
 dll/win32/msgina/lang/cs-CZ.rc | 1 +
 dll/win32/msgina/lang/de-DE.rc | 1 +
 dll/win32/msgina/lang/en-US.rc | 1 +
 dll/win32/msgina/lang/es-ES.rc | 1 +
 dll/win32/msgina/lang/fr-FR.rc | 1 +
 dll/win32/msgina/lang/he-IL.rc | 1 +
 dll/win32/msgina/lang/id-ID.rc | 1 +
 dll/win32/msgina/lang/it-IT.rc | 1 +
 dll/win32/msgina/lang/ja-JP.rc | 1 +
 dll/win32/msgina/lang/no-NO.rc | 1 +
 dll/win32/msgina/lang/pl-PL.rc | 1 +
 dll/win32/msgina/lang/ro-RO.rc | 1 +
 dll/win32/msgina/lang/ru-RU.rc | 1 +
 dll/win32/msgina/lang/sk-SK.rc | 1 +
 dll/win32/msgina/lang/sq-AL.rc | 1 +
 dll/win32/msgina/lang/tr-TR.rc | 1 +
 dll/win32/msgina/lang/uk-UA.rc | 1 +
 dll/win32/msgina/lang/zh-CN.rc | 1 +
 dll/win32/msgina/lang/zh-TW.rc | 1 +
 dll/win32/msgina/resource.h    | 1 +
 22 files changed, 29 insertions(+)

diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c
index a2466e8c47..cafced9aa2 100644
--- a/dll/win32/msgina/gui.c
+++ b/dll/win32/msgina/gui.c
@@ -932,6 +932,14 @@ DoLogon(
                 goto done;
             }
         }
+        else if (SubStatus == STATUS_ACCOUNT_EXPIRED)
+        {
+            ResourceMessageBox(pgContext,
+                               hwndDlg,
+                               MB_OK | MB_ICONEXCLAMATION,
+                               IDS_LOGONTITLE,
+                               IDS_ACCOUNTEXPIRED);
+        }
         else
         {
             TRACE("Other error!\n");
diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc
index 9c740958da..97da77a593 100644
--- a/dll/win32/msgina/lang/bg-BG.rc
+++ b/dll/win32/msgina/lang/bg-BG.rc
@@ -198,6 +198,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc
index ed7faa0087..e80492613b 100644
--- a/dll/win32/msgina/lang/cs-CZ.rc
+++ b/dll/win32/msgina/lang/cs-CZ.rc
@@ -203,6 +203,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Tento účet byl vypnut. Prosím kontaktujte administrátora tohoto systému."
     IDS_PASSWORDMUSTCHANGE "Při prvním přihlášení je nutné změnit heslo."
     IDS_PASSWORDEXPIRED "Heslu vypršela platnost a musí být změněno."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc
index c1308c1ccf..5308a8e468 100644
--- a/dll/win32/msgina/lang/de-DE.rc
+++ b/dll/win32/msgina/lang/de-DE.rc
@@ -198,6 +198,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Ihr Konto wurde deaktiviert. Wenden Sie sich an Ihren Systemadministrator."
     IDS_PASSWORDMUSTCHANGE "Sie müssen Ihr Passwort bei der ersten Anmeldung ändern."
     IDS_PASSWORDEXPIRED "Ihr Passwort ist abgelaufen und muss geändert werden."
+    IDS_ACCOUNTEXPIRED "Ihr Konto ist abgelaufen. Bitte wenden Sie sich an Ihren Systemadministrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc
index 8960dd6901..b7c5e92260 100644
--- a/dll/win32/msgina/lang/en-US.rc
+++ b/dll/win32/msgina/lang/en-US.rc
@@ -199,6 +199,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc
index 2539dbe40f..c9a5a6ffb5 100644
--- a/dll/win32/msgina/lang/es-ES.rc
+++ b/dll/win32/msgina/lang/es-ES.rc
@@ -199,6 +199,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "La cuenta ha sido desactivada. Contacte con su administrador del sistema."
     IDS_PASSWORDMUSTCHANGE "Es necesario cambiar la contraseña en el primer inicio de sesión."
     IDS_PASSWORDEXPIRED "La contraseña ha expirado y debe cambiarse."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc
index 03b6b88964..98c9916875 100644
--- a/dll/win32/msgina/lang/fr-FR.rc
+++ b/dll/win32/msgina/lang/fr-FR.rc
@@ -198,6 +198,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Votre compte est désactivé. Voyez votre administrateur système."
     IDS_PASSWORDMUSTCHANGE "Vous devez changer votre mot de passe à la première connexion."
     IDS_PASSWORDEXPIRED "Votre mot de passe a expiré et doit être changé."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc
index 708dc9274e..23c24f9985 100644
--- a/dll/win32/msgina/lang/he-IL.rc
+++ b/dll/win32/msgina/lang/he-IL.rc
@@ -198,6 +198,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc
index f705fda24b..02660b5dd2 100644
--- a/dll/win32/msgina/lang/id-ID.rc
+++ b/dll/win32/msgina/lang/id-ID.rc
@@ -198,6 +198,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc
index a21b8e7920..866f037547 100644
--- a/dll/win32/msgina/lang/it-IT.rc
+++ b/dll/win32/msgina/lang/it-IT.rc
@@ -207,6 +207,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Il tuo account è stato disattivato. Per favore contatti l'amministratore di sistema."
     IDS_PASSWORDMUSTCHANGE "Ti è chiesto di cambiare password al primo login."
     IDS_PASSWORDEXPIRED "La tua password è scaduta e devi cambiarla."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc
index c5a265d02e..38de8b4abb 100644
--- a/dll/win32/msgina/lang/ja-JP.rc
+++ b/dll/win32/msgina/lang/ja-JP.rc
@@ -198,6 +198,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc
index 2772b08b18..f3b6bf9670 100644
--- a/dll/win32/msgina/lang/no-NO.rc
+++ b/dll/win32/msgina/lang/no-NO.rc
@@ -198,6 +198,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc
index 75d8cbe3d6..e2d52236d6 100644
--- a/dll/win32/msgina/lang/pl-PL.rc
+++ b/dll/win32/msgina/lang/pl-PL.rc
@@ -208,6 +208,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Twoje konto zostało wyłączone. Skontaktuj się z administratorem systemu."
     IDS_PASSWORDMUSTCHANGE "Jesteś zobowiązany do zmiany hasła przy pierwszym logowaniu."
     IDS_PASSWORDEXPIRED "Twoje hasło wygasło i musi zostać zmienione."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc
index bdbfc8a024..5b111d527a 100644
--- a/dll/win32/msgina/lang/ro-RO.rc
+++ b/dll/win32/msgina/lang/ro-RO.rc
@@ -207,6 +207,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Contul dumneavoastră a fost dezactivat. Contactați administratorul de sistem."
     IDS_PASSWORDMUSTCHANGE "Este imperativ să vă schimbați parola la prima autentificare."
     IDS_PASSWORDEXPIRED "Parola v-a expirat și trebuie schimbată."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc
index 7672eb13d0..be7272f8a0 100644
--- a/dll/win32/msgina/lang/ru-RU.rc
+++ b/dll/win32/msgina/lang/ru-RU.rc
@@ -200,6 +200,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Ваш аккаунт отключен. Пожалуйста, обратитесь к системному администратору."
     IDS_PASSWORDMUSTCHANGE "Вы должны сменить пароль при следующем входе."
     IDS_PASSWORDEXPIRED "Срок действия вашего пароля истек, необходимо его изменить."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc
index 655251b568..789443de47 100644
--- a/dll/win32/msgina/lang/sk-SK.rc
+++ b/dll/win32/msgina/lang/sk-SK.rc
@@ -203,6 +203,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc
index cd3d7ee467..b4474db1b7 100644
--- a/dll/win32/msgina/lang/sq-AL.rc
+++ b/dll/win32/msgina/lang/sq-AL.rc
@@ -202,6 +202,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc
index b3e75f3607..de1b088d46 100644
--- a/dll/win32/msgina/lang/tr-TR.rc
+++ b/dll/win32/msgina/lang/tr-TR.rc
@@ -200,6 +200,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Hesâbınız edilginleştirildi. Lütfen dizge yöneticinizi görünüz."
     IDS_PASSWORDMUSTCHANGE "İlk oturum açmada şifrenizi değiştirmeniz gerekir."
     IDS_PASSWORDEXPIRED "Şifrenizin süresi doldu ve şifreniz değiştirilmelidir."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc
index 68956efb2a..96f093b43f 100644
--- a/dll/win32/msgina/lang/uk-UA.rc
+++ b/dll/win32/msgina/lang/uk-UA.rc
@@ -206,6 +206,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator."
     IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
     IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc
index 50446c4770..b9d11ffe00 100644
--- a/dll/win32/msgina/lang/zh-CN.rc
+++ b/dll/win32/msgina/lang/zh-CN.rc
@@ -201,6 +201,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "您的帐户已被禁用。请参阅您的系统管理员。"
     IDS_PASSWORDMUSTCHANGE "您需要更改您在首次登录的密码。"
     IDS_PASSWORDEXPIRED "您的密码已过期，必须更改。"
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc
index c6f6d5940c..c5b4e1e83d 100644
--- a/dll/win32/msgina/lang/zh-TW.rc
+++ b/dll/win32/msgina/lang/zh-TW.rc
@@ -200,6 +200,7 @@ BEGIN
     IDS_LOGONUSERDISABLED "您的帳戶已被禁用。請參閱您的系統管理員。"
     IDS_PASSWORDMUSTCHANGE "您需要更改您在首次登入的密碼。"
     IDS_PASSWORDEXPIRED "您的密碼已過期，必須更改。"
+    IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator."
 END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h
index 49ae3a8c44..cdba2c0b66 100644
--- a/dll/win32/msgina/resource.h
+++ b/dll/win32/msgina/resource.h
@@ -86,6 +86,7 @@
 #define IDS_LOGONUSERDISABLED    40017
 #define IDS_PASSWORDMUSTCHANGE   40018
 #define IDS_PASSWORDEXPIRED      40019
+#define IDS_ACCOUNTEXPIRED       40020
#define IDS_SHUTDOWN_SHUTDOWN         50000
 #define IDS_SHUTDOWN_LOGOFF           50001

    