Index: dll/win32/msgina/gui.c =================================================================== --- dll/win32/msgina/gui.c (revision 61047) +++ dll/win32/msgina/gui.c (working copy) @@ -174,11 +174,34 @@ 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; } Index: dll/win32/msgina/lang/bg-BG.rc =================================================================== --- dll/win32/msgina/lang/bg-BG.rc (revision 61047) +++ dll/win32/msgina/lang/bg-BG.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ -28,9 +29,11 @@ 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 "Log on to:",IDC_STATIC,6,96,42,8 + COMBOBOX IDC_LOGON_TO,54,95,159,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 Index: dll/win32/msgina/lang/cs-CZ.rc =================================================================== --- dll/win32/msgina/lang/cs-CZ.rc (revision 61047) +++ dll/win32/msgina/lang/cs-CZ.rc (working copy) @@ -14,13 +14,14 @@ 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,10 +30,12 @@ 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 + LTEXT "Jméno:",IDC_STATIC,36,75,45,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 + 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,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Storno",IDCANCEL,115,122,50,14 PUSHBUTTON "Vypnout",IDC_SHUTDOWN,179,122,50,14 Index: dll/win32/msgina/lang/de-DE.rc =================================================================== --- dll/win32/msgina/lang/de-DE.rc (revision 61047) +++ dll/win32/msgina/lang/de-DE.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ 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,36,75,45,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Passwort:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,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 "Abbrechen",IDCANCEL,160,122,50,14 + PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,214,122,50,14 END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 Index: dll/win32/msgina/lang/en-US.rc =================================================================== --- dll/win32/msgina/lang/en-US.rc (revision 61047) +++ dll/win32/msgina/lang/en-US.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ 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,40,8 + EDITTEXT IDC_USERNAME,54,57,159,14,ES_AUTOHSCROLL + LTEXT "Password:",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 "Cancel",IDCANCEL,160,122,50,14 + PUSHBUTTON "Shutdown",IDC_SHUTDOWN,214,122,50,14 END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 Index: dll/win32/msgina/lang/es-ES.rc =================================================================== --- dll/win32/msgina/lang/es-ES.rc (revision 61047) +++ dll/win32/msgina/lang/es-ES.rc (working copy) @@ -14,13 +14,14 @@ 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 @@ -29,13 +30,15 @@ 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 + LTEXT "Usuario:",IDC_STATIC,36,75,45,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 "Log on to:",IDC_STATIC,6,96,42,8 + COMBOBOX IDC_LOGON_TO,54,95,159,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 Index: dll/win32/msgina/lang/fr-FR.rc =================================================================== --- dll/win32/msgina/lang/fr-FR.rc (revision 61047) +++ dll/win32/msgina/lang/fr-FR.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ 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 + LTEXT "Utilisateur :",IDC_STATIC,36,75,45,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 "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 "Annuler",IDCANCEL,160,122,50,14 + PUSHBUTTON "Éteindre",IDC_SHUTDOWN,214,122,50,14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Index: dll/win32/msgina/lang/he-IL.rc =================================================================== --- dll/win32/msgina/lang/he-IL.rc (revision 61047) +++ dll/win32/msgina/lang/he-IL.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ -28,6 +29,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 + LTEXT "Log on to:",IDC_STATIC,6,96,42,8 + COMBOBOX IDC_LOGON_TO,54,95,159,14,CBS_DROPDOWNLIST | WS_VSCROLL PUSHBUTTON "אישור",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "ביטול",IDCANCEL,115,122,50,14 PUSHBUTTON "כיבוי",IDC_SHUTDOWN,179,122,50,14 Index: dll/win32/msgina/lang/id-ID.rc =================================================================== --- dll/win32/msgina/lang/id-ID.rc (revision 61047) +++ dll/win32/msgina/lang/id-ID.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ 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 + LTEXT "Nama pengguna:",IDC_STATIC,36, 75, 61, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - LTEXT "Kata sandi:",IDC_STATIC, 40, 93, 42, 8 + LTEXT "Kata sandi:",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 "Batal",IDCANCEL,115,122,50,14 - PUSHBUTTON "Matikan",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 "Batal",IDCANCEL,160,122,50,14 + PUSHBUTTON "Matikan",IDC_SHUTDOWN,214,122,50,14 END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 Index: dll/win32/msgina/lang/it-IT.rc =================================================================== --- dll/win32/msgina/lang/it-IT.rc (revision 61047) +++ dll/win32/msgina/lang/it-IT.rc (working copy) @@ -17,13 +17,14 @@ 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 @@ -36,9 +37,11 @@ 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 "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 "Annulla",IDCANCEL,160,122,50,14 + PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,214,122,50,14 END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 Index: dll/win32/msgina/lang/ja-JP.rc =================================================================== --- dll/win32/msgina/lang/ja-JP.rc (revision 61047) +++ dll/win32/msgina/lang/ja-JP.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ -28,9 +29,11 @@ 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 "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 Index: dll/win32/msgina/lang/no-NO.rc =================================================================== --- dll/win32/msgina/lang/no-NO.rc (revision 61047) +++ dll/win32/msgina/lang/no-NO.rc (working copy) @@ -9,13 +9,14 @@ 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 @@ 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 Index: dll/win32/msgina/lang/pl-PL.rc =================================================================== --- dll/win32/msgina/lang/pl-PL.rc (revision 61047) +++ dll/win32/msgina/lang/pl-PL.rc (working copy) @@ -17,13 +17,14 @@ 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 @@ -36,9 +37,11 @@ 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 "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 "Anuluj",IDCANCEL,160,122,50,14 + PUSHBUTTON "Wyłącz",IDC_SHUTDOWN,214,122,50,14 END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 Index: dll/win32/msgina/lang/ro-RO.rc =================================================================== --- dll/win32/msgina/lang/ro-RO.rc (revision 61047) +++ dll/win32/msgina/lang/ro-RO.rc (working copy) @@ -10,13 +10,14 @@ 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 combinația de taste «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 combinația de taste «Ctrl»+«Alt»+«Del»",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 @@ -29,9 +30,11 @@ EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Parolă:", 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 "Log on to:", IDC_STATIC,6,96,42,8 + COMBOBOX IDC_LOGON_TO,54,95,159,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 Index: dll/win32/msgina/lang/ru-RU.rc =================================================================== --- dll/win32/msgina/lang/ru-RU.rc (revision 61047) +++ dll/win32/msgina/lang/ru-RU.rc (working copy) @@ -11,13 +11,14 @@ 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 @@ -30,9 +31,11 @@ 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 "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 Index: dll/win32/msgina/lang/sk-SK.rc =================================================================== --- dll/win32/msgina/lang/sk-SK.rc (revision 61047) +++ dll/win32/msgina/lang/sk-SK.rc (working copy) @@ -14,13 +14,14 @@ 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 @@ -33,9 +34,11 @@ 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 "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 "Zrušiť",IDCANCEL,160,122,50,14 + PUSHBUTTON "Vypnúť",IDC_SHUTDOWN,214,122,50,14 END IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 Index: dll/win32/msgina/lang/uk-UA.rc =================================================================== --- dll/win32/msgina/lang/uk-UA.rc (revision 61047) +++ dll/win32/msgina/lang/uk-UA.rc (working copy) @@ -17,13 +17,14 @@ 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 @@ 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 Index: dll/win32/msgina/msgina.spec =================================================================== --- dll/win32/msgina/msgina.spec (revision 61047) +++ dll/win32/msgina/msgina.spec (working copy) @@ -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) Index: dll/win32/msgina/resource.h =================================================================== --- dll/win32/msgina/resource.h (revision 61047) +++ dll/win32/msgina/resource.h (working copy) @@ -19,6 +19,7 @@ #define IDC_LOCKMSG 1009 #define IDC_LOGONMSG 1010 #define IDC_LOGONDATE 1011 +#define IDC_LOGON_TO 1012 #define IDI_ROSLOGO 20000 Index: dll/win32/msgina/stubs.c =================================================================== --- dll/win32/msgina/stubs.c (revision 61047) +++ dll/win32/msgina/stubs.c (working copy) @@ -19,11 +19,11 @@ DWORD WINAPI ShellShutdownDialog( HWND hParent, - DWORD Unknown, + LPWSTR lpUsername, BOOL bHideLogoff) { UNREFERENCED_PARAMETER(hParent); - UNREFERENCED_PARAMETER(Unknown); + UNREFERENCED_PARAMETER(lpUsername); UNREFERENCED_PARAMETER(bHideLogoff); /* Return values: