[MSGINA]

- Remove the WM_SYSMENU style from the security dialog.
- Add the unlock dialog.
- Fix the layout of the german logon dialog. Password and user name are left-aligned again.

svn path=/trunk/; revision=58328

diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc
index 163947a..d47b91f 100644 (file)
--- a/reactos/dll/win32/msgina/lang/bg-BG.rc
+++ b/reactos/dll/win32/msgina/lang/bg-BG.rc
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Сигурност"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -59,6 +59,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Здравейте!"

diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc
index f90be9e..6362ead 100644 (file)
--- a/reactos/dll/win32/msgina/lang/cs-CZ.rc
+++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc
@@ -40,7 +40,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bezpečnost"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -65,6 +65,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Vítejte!"

diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc
index ed6d2ea..44181be 100644 (file)
--- a/reactos/dll/win32/msgina/lang/de-DE.rc
+++ b/reactos/dll/win32/msgina/lang/de-DE.rc
@@ -24,17 +24,17 @@ CAPTION "Logon"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Benutzername:",IDC_STATIC,26, 75, 54, 8
-    EDITTEXT        IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL
-    LTEXT           "Passwort:",IDC_STATIC,43, 93, 38, 8
-    EDITTEXT        IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT           "Benutzername:",IDC_STATIC,36, 75, 54, 8
+    EDITTEXT        IDC_USERNAME,92,72,119,14,ES_AUTOHSCROLL
+    LTEXT           "Passwort:",IDC_STATIC,36, 93, 42, 8
+    EDITTEXT        IDC_PASSWORD,92,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD
     PUSHBUTTON      "OK",IDOK,41, 122, 50, 14,BS_DEFPUSHBUTTON
     PUSHBUTTON      "Abbrechen",IDCANCEL,103, 122, 50, 14
     PUSHBUTTON      "Herunterfahren",IDC_SHUTDOWN,165, 122, 64, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Sicherheit"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -59,6 +59,23 @@ BEGIN
     LTEXT           "Drücken Sie Strg+Alt+Entf um den Computer zu entsperren.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "Dieser Computer wird verwendet und ist gesperrt.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Benutzername:",IDC_STATIC,36,107,54,8
+    EDITTEXT        IDC_USERNAME,92,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Passwort:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,92,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Abbrechen",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Willkommen!"

diff --git a/reactos/dll/win32/msgina/lang/en-US.rc b/reactos/dll/win32/msgina/lang/en-US.rc
index 2df5740..da4c1e4 100644 (file)
--- a/reactos/dll/win32/msgina/lang/en-US.rc
+++ b/reactos/dll/win32/msgina/lang/en-US.rc
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Security"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -54,9 +54,26 @@ FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
     ICON            IDI_LOCKICON,-1,7,59,20,20
-    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,37,61,231,8
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
     LTEXT           "Message",IDC_LOCKMSG,37,75,231,26
-    LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
+    LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,36,106,232,8
+END
+
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
 END
 
 STRINGTABLE

diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc
index 0ae5053..e16f4f9 100644 (file)
--- a/reactos/dll/win32/msgina/lang/es-ES.rc
+++ b/reactos/dll/win32/msgina/lang/es-ES.rc
@@ -39,7 +39,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Seguridad"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -64,6 +64,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "¡Bienvenido!"

diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc
index 8fc8fb2..68c9832 100644 (file)
--- a/reactos/dll/win32/msgina/lang/fr-FR.rc
+++ b/reactos/dll/win32/msgina/lang/fr-FR.rc
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Sécurité"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -59,6 +59,23 @@ BEGIN
     LTEXT           "Appuyez sur les touches Ctrl-Alt-Suppr pour déverrouiller l'ordinateur.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Bienvenue!"

diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc
index 69dbccb..54a8277 100644 (file)
--- a/reactos/dll/win32/msgina/lang/he-IL.rc
+++ b/reactos/dll/win32/msgina/lang/he-IL.rc
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "אבטחה"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -59,6 +59,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "ברוכים הבאים!"

diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc
index b4a2f9f..d4a222b 100644 (file)
--- a/reactos/dll/win32/msgina/lang/id-ID.rc
+++ b/reactos/dll/win32/msgina/lang/id-ID.rc
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Keamanan"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -59,6 +59,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Selamat datang!"

diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc
index 5301bbb..507a050 100644 (file)
--- a/reactos/dll/win32/msgina/lang/it-IT.rc
+++ b/reactos/dll/win32/msgina/lang/it-IT.rc
@@ -41,6 +41,20 @@ BEGIN
     PUSHBUTTON      "Spegnimento",IDC_SHUTDOWN,179,122,50,14
 END
 
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Sicurezza"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    LTEXT           "Cosa volete fare?",IDC_STATIC,86,60,87,8
+    PUSHBUTTON      "Bloccare il computer",IDC_LOCK,10,76,70,14
+    PUSHBUTTON      "Fine sessione",IDC_LOGOFF,90,76,70,14
+    PUSHBUTTON      "Spegnimento",IDC_SHUTDOWN,170,76,70,14
+    PUSHBUTTON      "Task manager",IDC_TASKMGR,90,95,70,14
+    PUSHBUTTON      "Annulla",IDCANCEL,170,95,70,14
+END
+
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Computer Locked"
@@ -53,18 +67,21 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
-CAPTION "Sicurezza"
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Cosa volete fare?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Bloccare il computer",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Fine sessione",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Spegnimento",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Task manager",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Annulla",IDCANCEL,170,95,70,14
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
 END
 
 STRINGTABLE

diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc
index b54c9aa..c62eea1 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ja-JP.rc
+++ b/reactos/dll/win32/msgina/lang/ja-JP.rc
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "セキュリティ"
 FONT 9, "MS UI Gothic",400,0,1
 BEGIN
@@ -59,6 +59,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS        "ようこそ!"

diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc
index 5c95a40..df40ef8 100644 (file)
--- a/reactos/dll/win32/msgina/lang/no-NO.rc
+++ b/reactos/dll/win32/msgina/lang/no-NO.rc
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "ReactOS-sikkerhet"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -59,6 +59,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Velkommen!"

diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc
index ca8ab64..7bff95b 100644 (file)
--- a/reactos/dll/win32/msgina/lang/pl-PL.rc
+++ b/reactos/dll/win32/msgina/lang/pl-PL.rc
@@ -42,7 +42,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bezpieczeństwo"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -67,6 +67,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Witaj!"

diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc
index e62c43c..195f7c6 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ro-RO.rc
+++ b/reactos/dll/win32/msgina/lang/ro-RO.rc
@@ -35,7 +35,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Securitate"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -60,6 +60,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS        "Bun venit!"

diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc
index 9915585..8ed4af2 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ru-RU.rc
+++ b/reactos/dll/win32/msgina/lang/ru-RU.rc
@@ -36,7 +36,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Безопасность"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -61,6 +61,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Добро пожаловать!"

diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc
index 68f4951..8a87de2 100644 (file)
--- a/reactos/dll/win32/msgina/lang/sk-SK.rc
+++ b/reactos/dll/win32/msgina/lang/sk-SK.rc
@@ -38,6 +38,20 @@ BEGIN
     PUSHBUTTON      "Vypnúť",IDC_SHUTDOWN,179,122,50,14
 END
 
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Bezpečnosť"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    LTEXT           "Čo chcete urobiť?",IDC_STATIC,86,60,87,8
+    PUSHBUTTON      "Uzamknúť počítač",IDC_LOCK,10,76,70,14
+    PUSHBUTTON      "Odhlásiť",IDC_LOGOFF,90,76,70,14
+    PUSHBUTTON      "Vypnúť",IDC_SHUTDOWN,170,76,70,14
+    PUSHBUTTON      "Správca úloh",IDC_TASKMGR,90,95,70,14
+    PUSHBUTTON      "Zrušiť",IDCANCEL,170,95,70,14
+END
+
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Computer Locked"
@@ -50,18 +64,21 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
-CAPTION "Bezpečnosť"
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Čo chcete urobiť?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Uzamknúť počítač",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Odhlásiť",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Vypnúť",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Správca úloh",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Zrušiť",IDCANCEL,170,95,70,14
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
 END
 
 STRINGTABLE

diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc
index b4d793a..27bd321 100644 (file)
--- a/reactos/dll/win32/msgina/lang/uk-UA.rc
+++ b/reactos/dll/win32/msgina/lang/uk-UA.rc
@@ -42,7 +42,7 @@ BEGIN
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
-STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Безпека"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
@@ -67,6 +67,23 @@ BEGIN
     LTEXT           "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8
 END
 
+IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
+STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
+CAPTION "Unlock Computer"
+FONT 8,"MS Shell Dlg",400,0,1
+BEGIN
+    CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
+    ICON            IDI_LOCKICON,-1,7,59,20,20
+    LTEXT           "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8
+    LTEXT           "Message",IDC_LOCKMSG,36,75,232,26
+    LTEXT           "Username:",IDC_STATIC,36,107,40,8
+    EDITTEXT        IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,36,125,42,8
+    EDITTEXT        IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD
+    PUSHBUTTON      "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,144,154,50,14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Ласкаво просимо!"

diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h
index db356d9..45c200c 100644 (file)
--- a/reactos/dll/win32/msgina/resource.h
+++ b/reactos/dll/win32/msgina/resource.h
@@ -6,6 +6,7 @@
 #define IDD_LOGGEDON_DLG                102
 #define IDD_LOGGEDOUT_DLG               103
 #define IDD_LOCKED_DLG                  104
+#define IDD_UNLOCK_DLG                  105
 
 #define IDC_LOGOFF                      1001
 #define IDC_USERNAME                    1002