[MSGINA]

- Update IDD_NOTICE_DLG and IDD_LOGGEDOUT_DLG to better match XP/2003. Patch by Lee Schroeder. Thanks a lot!
- Fix dialogs that were not updated by Lee's patch.

CORE-7604 #resolve

svn path=/trunk/; revision=62043

diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index c6c4524..71290b6 100644 (file)
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -175,11 +175,34 @@ EmptyWindowProc(
     IN WPARAM wParam,
     IN LPARAM lParam)
 {
-    UNREFERENCED_PARAMETER(hwndDlg);
-    UNREFERENCED_PARAMETER(uMsg);
-    UNREFERENCED_PARAMETER(wParam);
-    UNREFERENCED_PARAMETER(lParam);
+    PGINA_CONTEXT pgContext;
+    
+    pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
 
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+        }
+        case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+            HDC hdc;
+            if (pgContext->hBitmap)
+            {
+                hdc = BeginPaint(hwndDlg, &ps);
+                DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
+                EndPaint(hwndDlg, &ps);
+            }
+            return TRUE;
+        }
+        case WM_DESTROY:
+        {
+            DeleteObject(pgContext->hBitmap);
+            return TRUE;
+        }
+    }
     return FALSE;
 }
 

diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc
index c0b011f..81db99d 100644 (file)
--- a/reactos/dll/win32/msgina/lang/bg-BG.rc
+++ b/reactos/dll/win32/msgina/lang/bg-BG.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 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
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Натиснете едновременно Ctrl-Alt-Del", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Натиснете едновременно Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@ CAPTION "Вход"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Потребител:", IDC_STATIC, 36, 75, 45, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Парола:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Добре", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Отказ", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Изключване", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Потребител:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Парола:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Добре", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Отказ", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Изключване", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc
index 64b43df..e204537 100644 (file)
--- a/reactos/dll/win32/msgina/lang/cs-CZ.rc
+++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc
@@ -14,13 +14,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Vítejte v systému ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Stiskněte klávesy Ctrl-Alt-Delete", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Stiskněte klávesy Ctrl-Alt-Delete", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -29,13 +30,15 @@ CAPTION "Přihlášení"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Jméno:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Heslo:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Storno", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Jméno:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Heslo:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Storno", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc
index c8d9ec9..475bdf5 100644 (file)
--- a/reactos/dll/win32/msgina/lang/de-DE.rc
+++ b/reactos/dll/win32/msgina/lang/de-DE.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Willkommen bei ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Drücken Sie Strg+Alt+Entf", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Drücken Sie Strg+Alt+Entf",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@ CAPTION "Anmeldung"
 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, 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
+    LTEXT "Benutzername:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Passwort:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Anmelden an:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Abbrechen", IDCANCEL, 145, 122, 50, 14
+    PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 199, 122, 65, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/en-US.rc b/reactos/dll/win32/msgina/lang/en-US.rc
index ae6e781..2e82fbb 100644 (file)
--- a/reactos/dll/win32/msgina/lang/en-US.rc
+++ b/reactos/dll/win32/msgina/lang/en-US.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Welcome to ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Press Ctrl-Alt-Del key combination", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Press Ctrl-Alt-Delete to begin.",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@ CAPTION "Logon"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Username:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Password:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Cancel", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Username:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc
index 6af8138..aa9ae87 100644 (file)
--- a/reactos/dll/win32/msgina/lang/es-ES.rc
+++ b/reactos/dll/win32/msgina/lang/es-ES.rc
@@ -11,13 +11,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bienvenido a ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Presione la combinación Ctrl-Alt-Supr", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Presione la combinación Ctrl-Alt-Supr",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@ CAPTION "Acceder"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Usuario:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Contraseña:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Aceptar", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Cancelar", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Usuario:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Contraseña:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Aceptar", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Cancelar", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc
index 754756d..316d61c 100644 (file)
--- a/reactos/dll/win32/msgina/lang/fr-FR.rc
+++ b/reactos/dll/win32/msgina/lang/fr-FR.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bienvenue à ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@ CAPTION "Connexion"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Utilisateur :", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Mot de passe :", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Annuler", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Éteindre", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Utilisateur :", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Mot de passe :", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Annuler", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Éteindre", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc
index 470426d..a4df749 100644 (file)
--- a/reactos/dll/win32/msgina/lang/he-IL.rc
+++ b/reactos/dll/win32/msgina/lang/he-IL.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "ברוכים הבאים לReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "לחץ על Ctrl-Alt-Del בו זמנית", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "לחץ על Ctrl-Alt-Del בו זמנית", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@ CAPTION "כניסה"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "שם משתמש:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "סיסמה:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "אישור", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "ביטול", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "כיבוי", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "שם משתמש:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "סיסמה:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "אישור", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "ביטול", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "כיבוי", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc
index 1d14982..7a8fa4f 100644 (file)
--- a/reactos/dll/win32/msgina/lang/id-ID.rc
+++ b/reactos/dll/win32/msgina/lang/id-ID.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Selamat datang di ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@ CAPTION "Masuk"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Nama pengguna:", IDC_STATIC, 22, 75, 61, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Kata sandi:", IDC_STATIC, 40, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Batal", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Matikan", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Nama pengguna:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Kata sandi:", IDC_STATIC, 6, 78, 42, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Batal", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Matikan", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc
index a9df14e..0b374ee 100644 (file)
--- a/reactos/dll/win32/msgina/lang/it-IT.rc
+++ b/reactos/dll/win32/msgina/lang/it-IT.rc
@@ -17,13 +17,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Benvenuti in ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Premere i tasti Ctrl-Alt-Canc ", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Premere i tasti Ctrl-Alt-Canc ",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -32,13 +33,15 @@ CAPTION "Logon"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Utente:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Password:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Annulla", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Utente:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Annulla", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc
index de1857d..e0635e1 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ja-JP.rc
+++ b/reactos/dll/win32/msgina/lang/ja-JP.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "ReactOS へようこそ"
 FONT 9, "MS UI Gothic", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Ctrl-Alt-Del キーの組み合わせを押してください", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Ctrl-Alt-Del キーの組み合わせを押してください", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -24,13 +25,15 @@ CAPTION "ログオン"
 FONT 9, "MS UI Gothic", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "ユーザー名:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "パスワード:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "キャンセル", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "シャットダウン", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "ユーザー名:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "パスワード:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "キャンセル", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "シャットダウン", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc
index 681a2c2..be368ff 100644 (file)
--- a/reactos/dll/win32/msgina/lang/no-NO.rc
+++ b/reactos/dll/win32/msgina/lang/no-NO.rc
@@ -9,13 +9,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Velkommen til ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -28,9 +29,11 @@ BEGIN
     EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
     LTEXT "Passord:", IDC_STATIC, 36, 93, 42, 8
     EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Avbryt", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Avslutt", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8
+    COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Avbryt", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Avslutt", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc
index 8afcdcb..06de9b0 100644 (file)
--- a/reactos/dll/win32/msgina/lang/pl-PL.rc
+++ b/reactos/dll/win32/msgina/lang/pl-PL.rc
@@ -18,13 +18,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Witamy w ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Proszę wcisnąć kombinację klawiszy Ctrl-Alt-Del", IDC_STATIC, 37, 6, 144, 18
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Proszę wcisnąć kombinację klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -33,13 +34,15 @@ CAPTION "Logowanie"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Nazwa użytkownika:", IDC_STATIC, 11, 75, 70, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Hasło:", IDC_STATIC, 56, 93, 27, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Anuluj", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Wyłącz", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Nazwa użytkownika:", IDC_STATIC, 6, 60, 70, 8
+    EDITTEXT IDC_USERNAME, 73, 57, 142, 14, ES_AUTOHSCROLL
+    LTEXT "Hasło:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 73, 76, 142, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 73, 95, 142, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Anuluj", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Wyłącz", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc
index 455ac91..8730d96 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ro-RO.rc
+++ b/reactos/dll/win32/msgina/lang/ro-RO.rc
@@ -11,13 +11,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bun venit în ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Apasați simultan «Ctrl»+«Alt»+«Del»", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO,IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Apasați simultan «Ctrl»+«Alt»+«Del»", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@ CAPTION "Autentificare"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Nume utilizator:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Parola:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Con&firmă", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "A&nulează", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "&Oprește", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Nume utilizator:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Parola:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Con&firmă", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "A&nulează", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "&Oprește", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -42,8 +45,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
     GROUPBOX "Informații de autentificare", IDC_STATIC, 7, 61, 261, 52
-    LTEXT "<Mesaj>", IDC_LOGONMSG, 15, 73, 245, 18
-    LTEXT "<Dată de autentificare>", IDC_LOGONDATE, 15, 94, 245, 8
+    LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18
+    LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8
     CTEXT "Ce acțiune preferați?", IDC_STATIC, 10, 119, 255, 8
     PUSHBUTTON "&Blochează calculatorul", IDC_LOCK, 10, 135, 70, 14
     PUSHBUTTON "&Deautentifică-mă", IDC_LOGOFF, 90, 135, 70, 14

diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc
index 8306584..0312d94 100644 (file)
--- a/reactos/dll/win32/msgina/lang/ru-RU.rc
+++ b/reactos/dll/win32/msgina/lang/ru-RU.rc
@@ -11,13 +11,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Добро пожаловать в ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Нажмите клавиши Ctrl-Alt-Del.", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Нажмите клавиши Ctrl-Alt-Del.", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@ CAPTION "Вход"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    RTEXT "Имя пользователя:", IDC_STATIC, 6, 75, 70, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    RTEXT "Пароль:", IDC_STATIC, 6, 93, 70, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 47, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Отмена", IDCANCEL, 109, 122, 50, 14
-    PUSHBUTTON "Выключение", IDC_SHUTDOWN, 171, 122, 58, 14
+    LTEXT "Имя пользователя:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Пароль:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Отмена", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Выключение", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc
index 8b1bf56..c4eace8 100644 (file)
--- a/reactos/dll/win32/msgina/lang/sk-SK.rc
+++ b/reactos/dll/win32/msgina/lang/sk-SK.rc
@@ -14,13 +14,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Vitajte v systéme ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Stlačte kombináciu kláves Ctrl-Alt-Del", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Stlačte kombináciu kláves Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -29,13 +30,15 @@ CAPTION "Prihlásenie"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Meno používateľa:", IDC_STATIC, 18, 75, 64, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Heslo:", IDC_STATIC, 56, 93, 24, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Zrušiť", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Vypnúť", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Meno používateľa:", IDC_STATIC, 6, 60, 59, 8
+    EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL
+    LTEXT "Heslo:", IDC_STATIC, 6, 78, 59, 8
+    EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 59, 8
+    COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Zrušiť", IDCANCEL,160, 122, 50, 14
+    PUSHBUTTON "Vypnúť", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/lang/sq-AL.rc b/reactos/dll/win32/msgina/lang/sq-AL.rc
index 3dac6c4..cfa8851 100644 (file)
--- a/reactos/dll/win32/msgina/lang/sq-AL.rc
+++ b/reactos/dll/win32/msgina/lang/sq-AL.rc
@@ -28,13 +28,15 @@ CAPTION "Hzr"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Përdoruesi:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Fjalëkalimi:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Anulo", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Fikje", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Përdoruesi:", IDC_STATIC, 6, 60, 52, 8
+    EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL
+    LTEXT "Fjalëkalimi:", IDC_STATIC, 6, 78, 52, 8
+    EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8
+    COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Anulo", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Fikje", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -44,8 +46,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
     GROUPBOX "Informacionet Hzrese", IDC_STATIC, 7, 61, 261, 52
-    LTEXT "<Mesazhi>", IDC_LOGONMSG, 15, 73, 245, 18
-    LTEXT "<Data Hzrese>", IDC_LOGONDATE, 15, 94, 245, 8
+    LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18
+    LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8
     CTEXT "Çfarë doni të bëni?", IDC_STATIC, 10, 119, 255, 8
     PUSHBUTTON "Kyç kompjuterin", IDC_LOCK, 10, 135, 76, 14
     PUSHBUTTON "Dilni...", IDC_LOGOFF, 100, 135, 75, 14

diff --git a/reactos/dll/win32/msgina/lang/tr-TR.rc b/reactos/dll/win32/msgina/lang/tr-TR.rc
index c980aa9..6896cc7 100644 (file)
--- a/reactos/dll/win32/msgina/lang/tr-TR.rc
+++ b/reactos/dll/win32/msgina/lang/tr-TR.rc
@@ -11,13 +11,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "ReactOS'a Hoşgeldiniz"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Denetim, Seçenek ve Silme düğmelerine birlikte basınız.", IDC_STATIC, 38, 10, 144, 14
+    CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT "Denetim, Seçenek ve Silme düğmelerine birlikte basınız.",IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -26,13 +27,15 @@ CAPTION "Oturum Açma"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Kullanıcı Adı:", IDC_STATIC, 36, 75, 40, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Şifre:", IDC_STATIC, 36, 93, 42, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "Tamam", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "İptal", IDCANCEL, 115, 122, 50, 14
-    PUSHBUTTON "Bilgisayarı Kapat", IDC_SHUTDOWN, 179, 122, 50, 14
+    LTEXT "Kullanıcı Adı:", IDC_STATIC, 6, 60, 59, 8
+    EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL
+    LTEXT "Şifre:", IDC_STATIC, 6, 78, 59, 8
+    EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Olarak Oturum Aç:", IDC_STATIC, 6, 96, 59, 8
+    COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "Tamam", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "İptal", IDCANCEL, 145, 122, 50, 14
+    PUSHBUTTON "Bilgisayarı Kapat", IDC_SHUTDOWN, 199, 122, 65, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
@@ -42,8 +45,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
     GROUPBOX "Oturum Açma Bilgisi", IDC_STATIC, 7, 61, 261, 52
-    LTEXT "<İleti>", IDC_LOGONMSG, 15, 73, 245, 18
-    LTEXT "<Oturum Açma Zamânı>", IDC_LOGONDATE, 15, 94, 245, 8
+    LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18
+    LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8
     CTEXT "Ne yapmak istersiniz?", IDC_STATIC, 10, 119, 255, 8
     PUSHBUTTON "Bilgisayarı Kilitle", IDC_LOCK, 10, 135, 76, 14
     PUSHBUTTON "Oturumu Kapat", IDC_LOGOFF, 100, 135, 75, 14

diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc
index 75baefa..958388d 100644 (file)
--- a/reactos/dll/win32/msgina/lang/uk-UA.rc
+++ b/reactos/dll/win32/msgina/lang/uk-UA.rc
@@ -17,13 +17,14 @@ BEGIN
     LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS
 END
 
-IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32
+IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Ласкаво просимо до ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    ICON IDI_LOCKICON, -1, 7, 5, 32, 32
-    LTEXT "Натисніть клавіші Ctrl+Alt+Del", IDC_STATIC, 38, 10, 144, 14
+    CONTROL         IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
+    ICON            IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32
+    LTEXT           "Натисніть клавіші Ctrl+Alt+Del", IDC_STATIC, 38, 60, 144, 14
 END
 
 IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147
@@ -32,13 +33,15 @@ CAPTION "Вхід"
 FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
     CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54
-    LTEXT "Користувач:", IDC_STATIC, 33, 75, 48, 8
-    EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL
-    LTEXT "Пароль:", IDC_STATIC, 48, 93, 34, 8
-    EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD
-    PUSHBUTTON "OK", IDOK, 37, 122, 50, 14, BS_DEFPUSHBUTTON
-    PUSHBUTTON "Скасувати", IDCANCEL, 93, 122, 50, 14
-    PUSHBUTTON "Завершення роботи...", IDC_SHUTDOWN, 148, 122, 86, 14
+    LTEXT "Користувач:", IDC_STATIC, 6, 60, 40, 8
+    EDITTEXT IDC_USERNAME, 54, 57, 159, 14, ES_AUTOHSCROLL
+    LTEXT "Пароль:",IDC_STATIC, 6, 78, 42, 8
+    EDITTEXT IDC_PASSWORD, 54, 76, 159, 14, ES_AUTOHSCROLL | ES_PASSWORD
+    LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8
+    COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL
+    PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON "Скасувати", IDCANCEL, 160, 122, 50, 14
+    PUSHBUTTON "Завершення роботи...", IDC_SHUTDOWN, 214, 122, 50, 14
 END
 
 IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175

diff --git a/reactos/dll/win32/msgina/msgina.spec b/reactos/dll/win32/msgina/msgina.spec
index 0dfd167..12fd84a 100644 (file)
--- a/reactos/dll/win32/msgina/msgina.spec
+++ b/reactos/dll/win32/msgina/msgina.spec
@@ -26,7 +26,7 @@
 26 stub -noname stub26
 27 stub -noname stub27
 28 stub -noname stub28
-@ stdcall ShellShutdownDialog(ptr long long)
+@ stdcall ShellShutdownDialog(ptr wstr long)
 @ stdcall WlxActivateUserShell(ptr wstr wstr ptr)
 @ stdcall WlxDisconnectNotify(ptr)
 @ stdcall WlxDisplayLockedNotice(ptr)

diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h
index b430a7d..1b81c76 100644 (file)
--- a/reactos/dll/win32/msgina/resource.h
+++ b/reactos/dll/win32/msgina/resource.h
@@ -20,6 +20,7 @@
 #define IDC_LOGONMSG    1010
 #define IDC_LOGONDATE   1011
 #define IDC_CHANGEPWD   1012
+#define IDC_LOGON_TO    1013
 
 #define IDD_CHANGE_PASSWORD    106
 #define IDC_CHANGEPWD_USERNAME 1013

diff --git a/reactos/dll/win32/msgina/stubs.c b/reactos/dll/win32/msgina/stubs.c
index a862bcb..a167be0 100644 (file)
--- a/reactos/dll/win32/msgina/stubs.c
+++ b/reactos/dll/win32/msgina/stubs.c
@@ -16,12 +16,12 @@
  */
 DWORD WINAPI
 ShellShutdownDialog(
-    HWND  hParent,
-    DWORD Unknown,
-    BOOL  bHideLogoff)
+    HWND   hParent,
+    LPWSTR lpUsername,
+    BOOL   bHideLogoff)
 {
     UNREFERENCED_PARAMETER(hParent);
-    UNREFERENCED_PARAMETER(Unknown);
+    UNREFERENCED_PARAMETER(lpUsername);
     UNREFERENCED_PARAMETER(bHideLogoff);
 
     /* Return values: