From 6f4d70b405d3479e69ae0423fd1f306b43c13695 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 1 Sep 2018 21:08:14 +0200 Subject: [PATCH] [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 a2466e8c47d..cafced9aa22 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 9c740958da8..97da77a5938 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 ed7faa00872..e80492613bb 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 c1308c1ccf8..5308a8e4689 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 8960dd6901b..b7c5e92260c 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 2539dbe40fd..c9a5a6ffb50 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 03b6b88964f..98c99168756 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 708dc9274ec..23c24f99857 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 f705fda24bc..02660b5dd2e 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 a21b8e7920b..866f037547f 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 c5a265d02ec..38de8b4abb4 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 2772b08b181..f3b6bf96707 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 75d8cbe3d68..e2d52236d63 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 bdbfc8a0244..5b111d527a8 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 7672eb13d0b..be7272f8a0b 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 655251b5683..789443de473 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 cd3d7ee467b..b4474db1b71 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 b3e75f36079..de1b088d46d 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 68956efb2a1..96f093b43f1 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 50446c4770c..b9d11ffe003 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 c6f6d5940cc..c5b4e1e83dc 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 49ae3a8c440..cdba2c0b662 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