[ekohl] 63745: [MSGINA] - Implement the legal notice dialog. - Rename ReadRegSzKey to ReadRegSzValue. - Rename ReadRegDwordKey to ReadRegDwordValue.
Author: ekohl Date: Sun Jul 27 21:05:42 2014 New Revision: 63745
URL: http://svn.reactos.org/svn/reactos?rev=63745&view=rev Log: [MSGINA] - Implement the legal notice dialog. - Rename ReadRegSzKey to ReadRegSzValue. - Rename ReadRegDwordKey to ReadRegDwordValue.
Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/sq-AL.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/resource.h
Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -9,6 +9,7 @@
#include <wingdi.h> #include <winnls.h> +#include <winreg.h>
typedef struct _DISPLAYSTATUSMSG { @@ -19,6 +20,13 @@ PWSTR pMessage; HANDLE StartupEvent; } DISPLAYSTATUSMSG, *PDISPLAYSTATUSMSG; + +typedef struct _LEGALNOTICEDATA +{ + LPWSTR pszCaption; + LPWSTR pszText; +} LEGALNOTICEDATA, *PLEGALNOTICEDATA; +
static BOOL GUIInitialize( @@ -1162,13 +1170,89 @@ return FALSE; }
+ +static +INT_PTR +CALLBACK +LegalNoticeDialogProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PLEGALNOTICEDATA pLegalNotice; + + switch (uMsg) + { + case WM_INITDIALOG: + pLegalNotice = (PLEGALNOTICEDATA)lParam; + SetWindowTextW(hwndDlg, pLegalNotice->pszCaption); + SetDlgItemTextW(hwndDlg, IDC_LEGALNOTICE_TEXT, pLegalNotice->pszText); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, 0); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + } + + return FALSE; +} + + static INT GUILoggedOutSAS( IN OUT PGINA_CONTEXT pgContext) { + LEGALNOTICEDATA LegalNotice = {NULL, NULL}; + HKEY hKey = NULL; + LONG rc; int result;
TRACE("GUILoggedOutSAS()\n"); + + rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon", + 0, + KEY_QUERY_VALUE, + &hKey); + if (rc == ERROR_SUCCESS) + { + ReadRegSzValue(hKey, + L"LegalNoticeCaption", + &LegalNotice.pszCaption); + + ReadRegSzValue(hKey, + L"LegalNoticeText", + &LegalNotice.pszText); + + RegCloseKey(hKey); + } + + if (LegalNotice.pszCaption != NULL && wcslen(LegalNotice.pszCaption) != 0 && + LegalNotice.pszText != NULL && wcslen(LegalNotice.pszText) != 0) + { + pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_LEGALNOTICE_DLG), + GetDesktopWindow(), + LegalNoticeDialogProc, + (LPARAM)&LegalNotice); + } + + if (LegalNotice.pszCaption != NULL) + HeapFree(GetProcessHeap(), 0, LegalNotice.pszCaption); + + if (LegalNotice.pszText != NULL) + HeapFree(GetProcessHeap(), 0, LegalNotice.pszText);
result = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx,
Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-BG... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "ÐÑказ", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐдÑавейÑе!"
Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-CZ... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -133,6 +133,15 @@ PUSHBUTTON "Storno", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "VÃtejte!"
Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-DE... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Willkommen!"
Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-US... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Welcome!"
Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-ES... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -130,6 +130,15 @@ PUSHBUTTON "Cancelar", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "¡Bienvenido!"
Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-FR... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "Annuler", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!"
Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-IL... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "×ר×××× ×××××!"
Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-ID... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Selamat datang!"
Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-IT... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -137,6 +137,15 @@ PUSHBUTTON "Annulla", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Benvenuti!"
Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-JP... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ãããã!"
Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-NO... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -128,6 +128,15 @@ PUSHBUTTON "Avbryt", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Velkommen!"
Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-PL... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -138,6 +138,15 @@ PUSHBUTTON "Anuluj", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Witaj!"
Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-RO... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -130,6 +130,15 @@ PUSHBUTTON "A&nuleazÄ", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bun venit!"
Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-RU... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -130,6 +130,15 @@ PUSHBUTTON "ÐÑмена", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐобÑо пожаловаÑÑ!"
Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-SK... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -133,6 +133,15 @@ PUSHBUTTON "Zrušiť", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Vitajte!"
Modified: trunk/reactos/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sq-AL... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -131,6 +131,15 @@ PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Mirëseerdhët!"
Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-TR... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -130,6 +130,15 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "HoÅgeldiniz!"
Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-UA... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -136,6 +136,15 @@ PUSHBUTTON "СкаÑÑваÑи", IDCANCEL, 204, 122, 55, 14 END
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐаÑкаво пÑоÑимо!"
Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?r... ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -57,10 +57,10 @@ return TRUE; }
-static LONG -ReadRegSzKey( +LONG +ReadRegSzValue( IN HKEY hKey, - IN LPCWSTR pszKey, + IN LPCWSTR pszValue, OUT LPWSTR* pValue) { LONG rc; @@ -72,7 +72,7 @@ return ERROR_INVALID_PARAMETER;
*pValue = NULL; - rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); + rc = RegQueryValueExW(hKey, pszValue, NULL, &dwType, NULL, &cbData); if (rc != ERROR_SUCCESS) return rc; if (dwType != REG_SZ) @@ -80,7 +80,7 @@ Value = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); if (!Value) return ERROR_NOT_ENOUGH_MEMORY; - rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); + rc = RegQueryValueExW(hKey, pszValue, NULL, NULL, (LPBYTE)Value, &cbData); if (rc != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, Value); @@ -94,9 +94,9 @@ }
static LONG -ReadRegDwordKey( +ReadRegDwordValue( IN HKEY hKey, - IN LPCWSTR pszKey, + IN LPCWSTR pszValue, OUT LPDWORD pValue) { LONG rc; @@ -108,7 +108,7 @@ return ERROR_INVALID_PARAMETER;
cbData = sizeof(DWORD); - rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, (LPBYTE)&dwValue, &cbData); + rc = RegQueryValueExW(hKey, pszValue, NULL, &dwType, (LPBYTE)&dwValue, &cbData); if (rc == ERROR_SUCCESS && dwType == REG_DWORD) *pValue = dwValue;
@@ -131,7 +131,7 @@ KEY_QUERY_VALUE, &ControlKey);
- rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); + rc = ReadRegSzValue(ControlKey, L"SystemStartOptions", &SystemStartOptions); if (rc != ERROR_SUCCESS) goto cleanup;
@@ -186,9 +186,9 @@ return FALSE; }
- rc = ReadRegSzKey(hKey, - L"AutoAdminLogon", - &lpAutoAdminLogon); + rc = ReadRegSzValue(hKey, + L"AutoAdminLogon", + &lpAutoAdminLogon); if (rc == ERROR_SUCCESS) { if (wcscmp(lpAutoAdminLogon, L"1") == 0) @@ -197,9 +197,9 @@
TRACE("bAutoAdminLogon: %s\n", pgContext->bAutoAdminLogon ? "TRUE" : "FALSE");
- rc = ReadRegDwordKey(hKey, - L"DisableCAD", - &dwDisableCAD); + rc = ReadRegDwordValue(hKey, + L"DisableCAD", + &dwDisableCAD); if (rc == ERROR_SUCCESS) { if (dwDisableCAD != 0) @@ -209,18 +209,18 @@ TRACE("bDisableCAD: %s\n", pgContext->bDisableCAD ? "TRUE" : "FALSE");
pgContext->bShutdownWithoutLogon = TRUE; - rc = ReadRegSzKey(hKey, - L"ShutdownWithoutLogon", - &lpShutdownWithoutLogon); + rc = ReadRegSzValue(hKey, + L"ShutdownWithoutLogon", + &lpShutdownWithoutLogon); if (rc == ERROR_SUCCESS) { if (wcscmp(lpShutdownWithoutLogon, L"0") == 0) pgContext->bShutdownWithoutLogon = FALSE; }
- rc = ReadRegSzKey(hKey, - L"DontDisplayLastUserName", - &lpDontDisplayLastUserName); + rc = ReadRegSzValue(hKey, + L"DontDisplayLastUserName", + &lpDontDisplayLastUserName); if (rc == ERROR_SUCCESS) { if (wcscmp(lpDontDisplayLastUserName, L"1") == 0) @@ -856,19 +856,19 @@ /* Set it by default to disabled, we might reenable it again later */ pgContext->AutoLogonState = AUTOLOGON_DISABLED;
- rc = ReadRegSzKey(WinLogonKey, L"AutoAdminLogon", &AutoLogon); + rc = ReadRegSzValue(WinLogonKey, L"AutoAdminLogon", &AutoLogon); if (rc != ERROR_SUCCESS) goto cleanup; if (wcscmp(AutoLogon, L"1") != 0) goto cleanup;
- rc = ReadRegSzKey(WinLogonKey, L"AutoLogonCount", &AutoCount); + rc = ReadRegSzValue(WinLogonKey, L"AutoLogonCount", &AutoCount); if (rc == ERROR_SUCCESS && wcscmp(AutoCount, L"0") == 0) goto cleanup; else if (rc != ERROR_FILE_NOT_FOUND) goto cleanup;
- rc = ReadRegSzKey(WinLogonKey, L"IgnoreShiftOverride", &UserName); + rc = ReadRegSzValue(WinLogonKey, L"IgnoreShiftOverride", &UserName); if (rc == ERROR_SUCCESS) { if (wcscmp(AutoLogon, L"1") != 0 && GetKeyState(VK_SHIFT) < 0) @@ -887,13 +887,13 @@ { pgContext->AutoLogonState = AUTOLOGON_DISABLED;
- rc = ReadRegSzKey(WinLogonKey, L"DefaultUserName", &UserName); + rc = ReadRegSzValue(WinLogonKey, L"DefaultUserName", &UserName); if (rc != ERROR_SUCCESS) goto cleanup; - rc = ReadRegSzKey(WinLogonKey, L"DefaultDomain", &Domain); + rc = ReadRegSzValue(WinLogonKey, L"DefaultDomain", &Domain); if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) goto cleanup; - rc = ReadRegSzKey(WinLogonKey, L"DefaultPassword", &Password); + rc = ReadRegSzValue(WinLogonKey, L"DefaultPassword", &Password); if (rc != ERROR_SUCCESS) goto cleanup;
Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?r... ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -97,6 +97,12 @@
/* msgina.c */
+LONG +ReadRegSzValue( + IN HKEY hKey, + IN LPCWSTR pszValue, + OUT LPWSTR *pValue); + BOOL DoAdminUnlock( IN PGINA_CONTEXT pgContext,
Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.h... ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Sun Jul 27 21:05:42 2014 @@ -33,6 +33,10 @@ #define IDC_CHANGEPWD_NEWPWD2 1017
#define IDD_LOGOFF_DLG 107 + +#define IDD_LEGALNOTICE_DLG 1018 +#define IDC_LEGALNOTICE_TEXT 1019 +
#define IDI_ROSLOGO 20000 #define IDI_SHELL_SHUTDOWN 20001
-
ekohl＠svn.reactos.org