Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 61631: [MSGINA] Implement the log-off dialog.
by ekohl＠svn.reactos.org 15 Jan '14

15 Jan '14

Author: ekohl Date: Wed Jan 15 20:34:21 2014 New Revision: 61631 URL: http://svn.reactos.org/svn/reactos?rev=61631&view=rev Log: [MSGINA] Implement the log-off dialog. 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/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc 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] Wed Jan 15 20:34:21 2014 @@ -312,6 +312,56 @@ static INT_PTR CALLBACK +LogOffDialogProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDYES: + EndDialog(hwndDlg, IDYES); + return TRUE; + + case IDNO: + EndDialog(hwndDlg, IDNO); + return TRUE; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, IDNO); + return TRUE; + } + + return FALSE; +} + + +static +INT +OnLogOff( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + return pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_LOGOFF_DLG), + hwndDlg, + LogOffDialogProc, + (LPARAM)pgContext); +} + + +static INT_PTR CALLBACK LoggedOnWindowProc( IN HWND hwndDlg, IN UINT uMsg, @@ -342,7 +392,8 @@ EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); return TRUE; case IDC_LOGOFF: - EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); + if (OnLogOff(hwndDlg, pgContext) == IDYES) + EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); return TRUE; case IDC_SHUTDOWN: EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-C… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -105,6 +105,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-D… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -44,7 +44,7 @@ LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "Was wollen Sie tun?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "Computer sperren", IDC_LOCK, 10, 135, 76, 14 - PUSHBUTTON "Abmelden", IDC_LOGOFF, 100, 135, 75, 14 + PUSHBUTTON "Abmelden...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 189, 135, 76, 14 PUSHBUTTON "Password Ã¤ndern", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED PUSHBUTTON "Task-Manager", IDC_TASKMGR, 100, 154, 75, 14 @@ -100,6 +100,17 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Von ReactOS abmelden" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Wollen Sie sich wirklich abmelden?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Ja", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Nein", IDNO, 95, 39, 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-U… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -44,7 +44,7 @@ LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "What do you want to do?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "Lock computer", IDC_LOCK, 10, 135, 76, 14 - PUSHBUTTON "Log off", IDC_LOGOFF, 100, 135, 75, 14 + PUSHBUTTON "Log off...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 189, 135, 76, 14 PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-E… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-F… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-I… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-I… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-I… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -108,6 +108,17 @@ PUSHBUTTON "Cancella", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-J… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-N… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-P… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -108,6 +108,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-R… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-R… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-S… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -105,6 +105,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Vitajte!" Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 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-U… ============================================================================== --- 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] Wed Jan 15 20:34:21 2014 @@ -108,6 +108,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾!" Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -28,6 +28,8 @@ #define IDC_CHANGEPWD_NEWPWD1 1016 #define IDC_CHANGEPWD_NEWPWD2 1017 +#define IDD_LOGOFF_DLG 107 + #define IDI_ROSLOGO 20000 #define IDI_LOCKICON 21

1 0

[ekohl] 61630: [WINLOGON] - Use the states STATE_INIT and SATE_LOGGED_OFF_SAS. - State machine clean-up.
by ekohl＠svn.reactos.org 14 Jan '14

14 Jan '14

Author: ekohl Date: Tue Jan 14 22:27:34 2014 New Revision: 61630 URL: http://svn.reactos.org/svn/reactos?rev=61630&view=rev Log: [WINLOGON] - Use the states STATE_INIT and SATE_LOGGED_OFF_SAS. - State machine clean-up. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -844,22 +844,28 @@ switch (wlxAction) { case WLX_SAS_ACTION_LOGON: /* 0x01 */ - if (HandleLogon(Session)) - { - SwitchDesktop(Session->ApplicationDesktop); - Session->LogonState = STATE_LOGGED_ON; - } - else - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + if (Session->LogonState == STATE_LOGGED_OFF_SAS) + { + if (HandleLogon(Session)) + { + SwitchDesktop(Session->ApplicationDesktop); + Session->LogonState = STATE_LOGGED_ON; + } + else + { + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + } + } break; case WLX_SAS_ACTION_NONE: /* 0x02 */ - if (Session->LogonState == STATE_LOGGED_ON_SAS) + if (Session->LogonState == STATE_LOGGED_OFF_SAS) + { + Session->LogonState = STATE_LOGGED_OFF; + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + } + else if (Session->LogonState == STATE_LOGGED_ON_SAS) { Session->LogonState = STATE_LOGGED_ON; - } - else if (Session->LogonState == STATE_LOGGED_OFF) - { - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } else if (Session->LogonState == STATE_LOCKED_SAS) { @@ -928,82 +934,95 @@ { DWORD wlxAction = WLX_SAS_ACTION_NONE; HWND hwnd; - - /* Ignore SAS if we are already in an SAS state */ - if (Session->LogonState == STATE_LOGGED_OFF_SAS || - Session->LogonState == STATE_LOGGED_ON_SAS || - Session->LogonState == STATE_LOCKED_SAS) - return; - - if (Session->LogonState == STATE_LOGGED_ON) - { - Session->LogonState = STATE_LOGGED_ON_SAS; - wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); - } - else if (Session->LogonState == STATE_LOCKED) - { - hwnd = GetTopDialogWindow(); - if (hwnd != NULL) - { - SendMessage(hwnd, WM_USER, 0, 0); - } - - Session->LogonState = STATE_LOCKED_SAS; - wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); - } - else - { - /* Display a new dialog (if necessary) */ - switch (dwSasType) - { - case WLX_SAS_TYPE_TIMEOUT: /* 0x00 */ - { - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); - return; - } - default: - { - PSID LogonSid = NULL; /* FIXME */ - - hwnd = GetTopDialogWindow(); - if (hwnd != NULL) + PSID LogonSid = NULL; /* FIXME */ + BOOL bSecure = TRUE; + + switch (dwSasType) + { + case WLX_SAS_TYPE_CTRL_ALT_DEL: + switch (Session->LogonState) + { + case STATE_INIT: + Session->LogonState = STATE_LOGGED_OFF; + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + return; + + case STATE_LOGGED_OFF: + Session->LogonState = STATE_LOGGED_OFF_SAS; + + hwnd = GetTopDialogWindow(); + if (hwnd != NULL) + SendMessage(hwnd, WLX_WM_SAS, 0, 0); + + Session->Options = 0; + + wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOutSAS( + Session->Gina.Context, + Session->SASAction, + &Session->LogonId, + LogonSid, + &Session->Options, + &Session->UserToken, + &Session->MprNotifyInfo, + (PVOID*)&Session->Profile); + break; + + case STATE_LOGGED_OFF_SAS: + /* Ignore SAS if we are already in an SAS state */ + return; + + case STATE_LOGGED_ON: + Session->LogonState = STATE_LOGGED_ON_SAS; + wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); + break; + + case STATE_LOGGED_ON_SAS: + /* Ignore SAS if we are already in an SAS state */ + return; + + case STATE_LOCKED: + Session->LogonState = STATE_LOCKED_SAS; + + hwnd = GetTopDialogWindow(); + if (hwnd != NULL) + SendMessage(hwnd, WLX_WM_SAS, 0, 0); + + wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); + break; + + case STATE_LOCKED_SAS: + /* Ignore SAS if we are already in an SAS state */ + return; + + default: + return; + } + break; + + case WLX_SAS_TYPE_TIMEOUT: + return; + + case WLX_SAS_TYPE_SCRNSVR_TIMEOUT: + if (!Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure)) + { + /* Skip start of screen saver */ + SetEvent(Session->hEndOfScreenSaver); + } + else + { + StartScreenSaver(Session); + if (bSecure) { - SendMessage(hwnd, WM_USER, 0, 0); + wlxAction = WLX_SAS_ACTION_LOCK_WKSTA; +// DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); } - - Session->Options = 0; - - wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOutSAS( - Session->Gina.Context, - Session->SASAction, - &Session->LogonId, - LogonSid, - &Session->Options, - &Session->UserToken, - &Session->MprNotifyInfo, - (PVOID*)&Session->Profile); - break; - } - } - } - - if (dwSasType == WLX_SAS_TYPE_SCRNSVR_TIMEOUT) - { - BOOL bSecure = TRUE; - if (!Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure)) - { - /* Skip start of screen saver */ - SetEvent(Session->hEndOfScreenSaver); - } - else - { - StartScreenSaver(Session); - if (bSecure) - DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); - } - } - else if (dwSasType == WLX_SAS_TYPE_SCRNSVR_ACTIVITY) - SetEvent(Session->hUserActivity); + } + break; + + case WLX_SAS_TYPE_SCRNSVR_ACTIVITY: + SetEvent(Session->hUserActivity); + break; + } DoGenericAction(Session, wlxAction); } Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -429,7 +429,7 @@ //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); /* Display logged out screen */ - WLSession->LogonState = STATE_LOGGED_OFF; + WLSession->LogonState = STATE_INIT; RemoveStatusMessage(WLSession); /* Check for pending setup */ @@ -442,7 +442,7 @@ RunSetup(); } else - PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); + PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_CTRL_ALT_DEL, 0); /* Tell kernel that CurrentControlSet is good (needed * to support Last good known configuration boot) */ Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -155,16 +155,6 @@ * STATE_LOCKED. Pressing "Shutdown" changes the state to * STATE_SHUTTING_DOWN. * - * STATE_SCREENSAVER - * Winlogon runs the screen saver. Upon user activity, the screensaver - * terminates and the state changes back to STATE_LOGGED_ON if the secure - * screen saver option is off. Otherwise, the state changes to STATE_LOCKED. - * - * STATE_LOGGING_OFF - * Winlogon shows the logoff dialog. Pressing "Cancel" or a timeout changes - * the state back to STATE_LOGGED_ON_SAS. Pressing "OK" logs off the user - * and changes the state to STATE_LOGGED_OFF. - * * STATE_LOCKED * Winlogon shows the locked message dialog. When the user presses "Ctrl- * Alt-Del" the state changes to STATE_LOCKED_SAS. If DisableCAD is true, @@ -177,6 +167,11 @@ * pressing "OK" unlocks the computer and changes the state to * STATE_LOGGED_ON. * + * STATE_LOGGING_OFF + * Winlogon shows the logoff dialog. Pressing "Cancel" or a timeout changes + * the state back to STATE_LOGGED_ON_SAS. Pressing "OK" logs off the user + * and changes the state to STATE_LOGGED_OFF. + * * STATE_SHUTTING_DOWN * Winlogon shows the shutdown dialog. Presing "Cancel" or a timeout will * change the state back to STATE_LOGGED_ON_SAS. Pressing "OK" will change @@ -184,20 +179,25 @@ * * STATE_SHUT_DOWN * Terminates Winlogon and initiates shut-down. + * + * STATE_SCREENSAVER + * Winlogon runs the screen saver. Upon user activity, the screensaver + * terminates and the state changes back to STATE_LOGGED_ON if the secure + * screen saver option is off. Otherwise, the state changes to STATE_LOCKED. */ typedef enum _LOGON_STATE { - STATE_INIT, // not used yet + STATE_INIT, STATE_LOGGED_OFF, - STATE_LOGGED_OFF_SAS, // not used yet + STATE_LOGGED_OFF_SAS, STATE_LOGGED_ON, STATE_LOGGED_ON_SAS, - STATE_SCREENSAVER, // not used yet STATE_LOCKED, STATE_LOCKED_SAS, STATE_LOGGING_OFF, // not used yet STATE_SHUTTING_DOWN, // not used yet - STATE_SHUT_DOWN // not used yet + STATE_SHUT_DOWN, // not used yet + STATE_SCREENSAVER // not used yet } LOGON_STATE, *PLOGON_STATE; #define LockWorkstation(Session) Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -155,9 +155,9 @@ return FALSE; } - if (uMsg == WM_USER) - { - EndDialog(hwndDlg, 0); + if (uMsg == WLX_WM_SAS) + { + EndDialog(hwndDlg, WLX_DLG_SAS); return 0; }

1 0

[tkreuzer] 61629: [PCIIDEX] Revert unwanted changes
by tkreuzer＠svn.reactos.org 14 Jan '14

14 Jan '14

Author: tkreuzer Date: Tue Jan 14 21:30:49 2014 New Revision: 61629 URL: http://svn.reactos.org/svn/reactos?rev=61629&view=rev Log: [PCIIDEX] Revert unwanted changes Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] Tue Jan 14 21:30:49 2014 @@ -351,63 +351,6 @@ *pDeviceRelations = DeviceRelations; return STATUS_SUCCESS; -} - -//GUID_PCIIDE_INTERRUPT_INTERFACE -//GUID_PCIIDE_REQUEST_PROPER_RESOURCES - -DEFINE_GUID(GUID_PCIIDE_SYNC_ACCESS_INTERFACE, 0x681190EB, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); -DEFINE_GUID(GUID_PCIIDE_XFER_MODE_INTERFACE, 0x681190EC, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); - - - -NTSTATUS -PciIdeXPdoPnpQueryInterface( - PIRP Irp) -{ -#if 0 - PIO_STACK_LOCATION IrpStack = IoGetCurrentIrpStackLocation(Irp); - PACPI_INTERFACE_STANDARD AcpiInterface; - - if (IrpStack->Parameters.QueryInterface.Version != 1) - { - DPRINT1("Invalid version number: %d\n", - IrpStack->Parameters.QueryInterface.Version); - return STATUS_INVALID_PARAMETER; - } - - if (IsEqualGUID(IrpStack->Parameters.QueryInterface.InterfaceType, - &GUID_PCIIDE_XFER_MODE_INTERFACE)) - { - DPRINT1("GUID_PCIIDE_XFER_MODE_INTERFACE\n"); - - if (IrpStack->Parameters.QueryInterface.Size < sizeof(ACPI_INTERFACE_STANDARD)) - { - DPRINT1("Buffer too small! (%d)\n", IrpStack->Parameters.QueryInterface.Size); - return STATUS_BUFFER_TOO_SMALL; - } - - AcpiInterface = (PACPI_INTERFACE_STANDARD)IrpStack->Parameters.QueryInterface.Interface; - - AcpiInterface->InterfaceReference = AcpiInterfaceReference; - AcpiInterface->InterfaceDereference = AcpiInterfaceDereference; - AcpiInterface->GpeConnectVector = AcpiInterfaceConnectVector; - AcpiInterface->GpeDisconnectVector = AcpiInterfaceDisconnectVector; - AcpiInterface->GpeEnableEvent = AcpiInterfaceEnableEvent; - AcpiInterface->GpeDisableEvent = AcpiInterfaceDisableEvent; - AcpiInterface->GpeClearStatus = AcpiInterfaceClearStatus; - AcpiInterface->RegisterForDeviceNotifications = AcpiInterfaceNotificationsRegister; - AcpiInterface->UnregisterForDeviceNotifications = AcpiInterfaceNotificationsUnregister; - - return STATUS_SUCCESS; - } - else - { - DPRINT1("Invalid GUID\n"); - return STATUS_NOT_SUPPORTED; - } -#endif - return STATUS_NOT_IMPLEMENTED; } NTSTATUS NTAPI @@ -576,11 +519,6 @@ } break; } - case IRP_MN_QUERY_INTERFACE: - { - Status = PciIdeXPdoPnpQueryInterface(Irp); - break; - } default: { /* We can't forward request to the lower driver, because

1 0

[tkreuzer] 61628: [BATTC] Check if MiniportInfo->Pdo is NULL before passing it to IoRegisterDeviceInterface [CMBATT] Fix broken CmBattGetAcpiInterfaces [COMPBATT] Fix "typo" in CompBattAddDevice th...
by tkreuzer＠svn.reactos.org 14 Jan '14

14 Jan '14

Author: tkreuzer Date: Tue Jan 14 21:21:29 2014 New Revision: 61628 URL: http://svn.reactos.org/svn/reactos?rev=61628&view=rev Log: [BATTC] Check if MiniportInfo->Pdo is NULL before passing it to IoRegisterDeviceInterface [CMBATT] Fix broken CmBattGetAcpiInterfaces [COMPBATT] Fix "typo" in CompBattAddDevice that caused memory corruption Modified: trunk/reactos/drivers/battery/battc/battc.c trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/battery/battc/battc.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -151,18 +151,26 @@ ExInitializeFastMutex(&BattClass->Mutex); - Status = IoRegisterDeviceInterface(MiniportInfo->Pdo, - &GUID_DEVICE_BATTERY, - NULL, - &BattClass->InterfaceName); - if (NT_SUCCESS(Status)) - { - DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName); - IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE); - } - else - { - DPRINT1("IoRegisterDeviceInterface failed (0x%x)\n", Status); + if (MiniportInfo->Pdo != NULL) + { + Status = IoRegisterDeviceInterface(MiniportInfo->Pdo, + &GUID_DEVICE_BATTERY, + NULL, + &BattClass->InterfaceName); + if (NT_SUCCESS(Status)) + { + DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName); + Status = IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE); + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + DPRINT1("Got STATUS_OBJECT_NAME_EXISTS for SetDeviceInterfaceState\n"); + Status = STATUS_SUCCESS; + } + } + else + { + DPRINT1("IoRegisterDeviceInterface failed (0x%x)\n", Status); + } } *ClassData = BattClass; Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -23,7 +23,7 @@ NTSTATUS Status; PCMBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; if (CmBattDebug & 0x20) DbgPrint("CmBattWaitWakeLoop: Entered.\n"); - + /* Check for success */ if ((NT_SUCCESS(IoStatusBlock->Status)) && (DeviceExtension->WaitWakeEnable)) { @@ -48,7 +48,7 @@ DeviceExtension->PowerIrp = NULL; } } - + NTSTATUS NTAPI CmBattIoCompletion(IN PDEVICE_OBJECT DeviceObject, @@ -87,6 +87,7 @@ /* Build the query */ IoStackLocation = IoGetNextIrpStackLocation(Irp); + IoStackLocation->MajorFunction = IRP_MJ_PNP; IoStackLocation->MinorFunction = IRP_MN_QUERY_INTERFACE; IoStackLocation->Parameters.QueryInterface.InterfaceType = &GUID_ACPI_INTERFACE_STANDARD; IoStackLocation->Parameters.QueryInterface.Size = sizeof(ACPI_INTERFACE_STANDARD); @@ -100,16 +101,15 @@ /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); - + /* Set the completion routine */ - IoCopyCurrentIrpStackLocationToNext(Irp); IoSetCompletionRoutine(Irp, (PVOID)CmBattIoCompletion, &Event, TRUE, TRUE, TRUE); - + /* Now call ACPI */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) @@ -122,10 +122,10 @@ NULL); Status = Irp->IoStatus.Status; } - + /* Free the IRP */ IoFreeIrp(Irp); - + /* Return status */ if (!(NT_SUCCESS(Status)) && (CmBattDebug & 0xC)) DbgPrint("CmBattGetAcpiInterfaces: Could not get ACPI driver interfaces, status = %x\n", Status); @@ -157,7 +157,7 @@ DeviceExtension, DeviceExtension->FdoType, DeviceExtension->DeviceId); - + /* Make sure it's safe to go ahead */ IoReleaseRemoveLockAndWait(&DeviceExtension->RemoveLock, 0); @@ -168,7 +168,7 @@ IoCancelIrp(DeviceExtension->PowerIrp); DeviceExtension->PowerIrp = NULL; } - + /* Check what type of FDO is being removed */ Context = DeviceExtension->AcpiInterface.Context; if (DeviceExtension->FdoType == CmBattBattery) @@ -187,7 +187,7 @@ CmBattWmiDeRegistration(DeviceExtension); AcAdapterPdo = NULL; } - + /* Detach and delete */ IoDetachDevice(DeviceExtension->AttachedDevice); IoDeleteDevice(DeviceExtension->DeviceObject); @@ -209,30 +209,30 @@ DeviceExtension = DeviceObject->DeviceExtension; switch (IoStackLocation->MinorFunction) { - case IRP_MN_WAIT_WAKE: + case IRP_MN_WAIT_WAKE: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_WAIT_WAKE\n"); break; - + case IRP_MN_POWER_SEQUENCE: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_POWER_SEQUENCE\n"); break; - + case IRP_MN_QUERY_POWER: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_WAIT_WAKE\n"); break; - + case IRP_MN_SET_POWER: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_SET_POWER type: %d, State: %d \n", IoStackLocation->Parameters.Power.Type, IoStackLocation->Parameters.Power.State); break; - + default: - + if (CmBattDebug & 1) DbgPrint("CmBattPowerDispatch: minor %d\n", IoStackLocation->MinorFunction); break; @@ -252,7 +252,7 @@ Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - + /* Return status */ return Status; } @@ -271,12 +271,12 @@ /* Get stack location and device extension */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = DeviceObject->DeviceExtension; - + /* Set default error */ Status = STATUS_NOT_SUPPORTED; /* Try to acquire the lock before doing anything */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, 0); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); if (!NT_SUCCESS(Status)) { /* Complete the request */ @@ -287,9 +287,9 @@ /* What's the operation? */ switch (IoStackLocation->MinorFunction) - { + { case IRP_MN_QUERY_PNP_DEVICE_STATE: - + /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); @@ -322,28 +322,28 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); return Status; - + case IRP_MN_SURPRISE_REMOVAL: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_SURPRISE_REMOVAL\n"); - + /* Lock the device extension and set the handle count to invalid */ ExAcquireFastMutex(&DeviceExtension->FastMutex); DeviceExtension->HandleCount = -1; ExReleaseFastMutex(&DeviceExtension->FastMutex); Status = STATUS_SUCCESS; break; - + case IRP_MN_START_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_START_DEVICE\n"); - + /* Mark the extension as started */ if (DeviceExtension->FdoType == CmBattBattery) DeviceExtension->Started = TRUE; Status = STATUS_SUCCESS; break; - - case IRP_MN_STOP_DEVICE: + + case IRP_MN_STOP_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_STOP_DEVICE\n"); @@ -351,7 +351,7 @@ if (DeviceExtension->FdoType == CmBattBattery) DeviceExtension->Started = FALSE; Status = STATUS_SUCCESS; break; - + case IRP_MN_QUERY_REMOVE_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_QUERY_REMOVE_DEVICE\n"); @@ -376,23 +376,23 @@ /* Fail because there's still open handles */ Status = STATUS_UNSUCCESSFUL; } - + /* Release the lock and return */ ExReleaseFastMutex(&DeviceExtension->FastMutex); break; - + case IRP_MN_REMOVE_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_REMOVE_DEVICE\n"); - + /* Call the remove code */ Status = CmBattRemoveDevice(DeviceObject, Irp); break; - + case IRP_MN_CANCEL_REMOVE_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_CANCEL_REMOVE_DEVICE\n"); - + /* Lock the extension and get the handle count */ ExAcquireFastMutex(&DeviceExtension->FastMutex); if (DeviceExtension->HandleCount == -1) @@ -403,33 +403,33 @@ else if (CmBattDebug & 2) { /* Nop, but warn about it */ - DbgPrint("CmBattPnpDispatch: Received CANCEL_REMOVE when OpenCount == %x\n", + DbgPrint("CmBattPnpDispatch: Received CANCEL_REMOVE when OpenCount == %x\n", DeviceExtension->HandleCount); } - + /* Return success in all cases, and release the lock */ Status = STATUS_SUCCESS; ExReleaseFastMutex(&DeviceExtension->FastMutex); break; - + case IRP_MN_QUERY_STOP_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_QUERY_STOP_DEVICE\n"); - - /* There's no real support for this */ + + /* There's no real support for this */ Status = STATUS_NOT_IMPLEMENTED; break; case IRP_MN_CANCEL_STOP_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_CANCEL_STOP_DEVICE\n"); - - /* There's no real support for this */ + + /* There's no real support for this */ Status = STATUS_NOT_IMPLEMENTED; break; - + case IRP_MN_QUERY_CAPABILITIES: - + /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); @@ -496,14 +496,14 @@ IoStackLocation->MinorFunction); break; } - - /* Release the remove lock */ + + /* Release the remove lock */ IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); /* Set IRP status if we have one */ if (Status != STATUS_NOT_SUPPORTED) Irp->IoStatus.Status = Status; - /* Did someone pick it up? */ + /* Did someone pick it up? */ if ((NT_SUCCESS(Status)) || (Status == STATUS_NOT_SUPPORTED)) { /* Still unsupported, try ACPI */ @@ -539,7 +539,7 @@ ULONG ResultLength; PAGED_CODE(); if (CmBattDebug & 0x220) DbgPrint("CmBattCreateFdo: Entered\n"); - + /* Get unique ID */ Status = CmBattGetUniqueId(DeviceObject, &UniqueId); if (!NT_SUCCESS(Status)) @@ -549,7 +549,7 @@ if (CmBattDebug & 2) DbgPrint("CmBattCreateFdo: Error %x from _UID, assuming unit #0\n", Status); } - + /* Create the FDO */ Status = IoCreateDevice(DriverObject, DeviceExtensionSize, @@ -565,7 +565,7 @@ DbgPrint("CmBattCreateFdo: error (0x%x) creating device object\n", Status); return Status; } - + /* Set FDO flags */ FdoDeviceObject->Flags |= (DO_POWER_PAGABLE | DO_BUFFERED_IO); FdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; @@ -576,7 +576,7 @@ FdoExtension->DeviceObject = FdoDeviceObject; FdoExtension->FdoDeviceObject = FdoDeviceObject; FdoExtension->PdoDeviceObject = DeviceObject; - + /* Attach to ACPI */ FdoExtension->AttachedDevice = IoAttachDeviceToDeviceStack(FdoDeviceObject, DeviceObject); @@ -588,7 +588,7 @@ DbgPrint("CmBattCreateFdo: IoAttachDeviceToDeviceStack failed.\n"); return STATUS_UNSUCCESSFUL; } - + /* Get ACPI interface for EVAL */ Status = CmBattGetAcpiInterfaces(FdoExtension->AttachedDevice, &FdoExtension->AcpiInterface); @@ -604,14 +604,14 @@ /* Setup the rest of the extension */ ExInitializeFastMutex(&FdoExtension->FastMutex); - IoInitializeRemoveLock(&FdoExtension->RemoveLock, 0, 0, 0); + IoInitializeRemoveLock(&FdoExtension->RemoveLock, 'RbmC', 0, 0); FdoExtension->HandleCount = 0; FdoExtension->WaitWakeEnable = FALSE; FdoExtension->DeviceId = UniqueId; FdoExtension->DeviceName = NULL; FdoExtension->DelayNotification = FALSE; FdoExtension->ArFlag = 0; - + /* Open the device key */ Status = IoOpenDeviceRegistryKey(DeviceObject, PLUGPLAY_REGKEY_DEVICE, @@ -630,9 +630,9 @@ if (NT_SUCCESS(Status)) { /* Set value */ - FdoExtension->WaitWakeEnable = *(PULONG)PartialInfo->Data; + FdoExtension->WaitWakeEnable = ((*(PULONG)PartialInfo->Data) != 0); } - + /* Close the handle */ ZwClose(KeyHandle); } @@ -652,7 +652,7 @@ BATTERY_MINIPORT_INFO MiniportInfo; NTSTATUS Status; PDEVICE_OBJECT FdoDeviceObject; - PCMBATT_DEVICE_EXTENSION FdoExtension; + PCMBATT_DEVICE_EXTENSION FdoExtension; PAGED_CODE(); if (CmBattDebug & 0x220) DbgPrint("CmBattAddBattery: pdo %x\n", DeviceObject); @@ -680,7 +680,7 @@ FdoExtension->InterruptTime = KeQueryInterruptTime(); FdoExtension->TripPointSet = CmBattSetTripPpoint(FdoExtension, 0) != STATUS_OBJECT_NAME_NOT_FOUND; - + /* Setup the battery miniport information structure */ RtlZeroMemory(&MiniportInfo, sizeof(MiniportInfo)); MiniportInfo.Pdo = DeviceObject; @@ -694,7 +694,7 @@ MiniportInfo.SetStatusNotify = (PVOID)CmBattSetStatusNotify; MiniportInfo.DisableStatusNotify = (PVOID)CmBattDisableStatusNotify; MiniportInfo.DeviceName = FdoExtension->DeviceName; - + /* Register with the class driver */ Status = BatteryClassInitializeDevice(&MiniportInfo, &FdoExtension->ClassData); if (!NT_SUCCESS(Status)) @@ -714,7 +714,7 @@ DbgPrint("CmBattAddBattery: Could not register as a WMI provider, status = %Lx\n", Status); return Status; } - + /* Register ACPI */ Status = FdoExtension->AcpiInterface.RegisterForDeviceNotifications(FdoExtension->AcpiInterface.Context, (PVOID)CmBattNotifyHandler, @@ -728,7 +728,7 @@ if (CmBattDebug & 0xC) DbgPrint("CmBattAddBattery: Could not register for battery notify, status = %Lx\n", Status); } - + /* Return status */ return Status; } @@ -757,7 +757,7 @@ /* Set this as the AC adapter's PDO */ AcAdapterPdo = PdoDeviceObject; } - + /* Create the FDO for the adapter */ Status = CmBattCreateFdo(DriverObject, PdoDeviceObject, @@ -770,7 +770,7 @@ DbgPrint("CmBattAddAcAdapter: error (0x%x) creating Fdo\n", Status); return Status; } - + /* Set the type and do WMI registration */ DeviceExtension = FdoDeviceObject->DeviceExtension; DeviceExtension->FdoType = CmBattAcAdapter; @@ -781,7 +781,7 @@ if (CmBattDebug & 0xC) DbgPrint("CmBattAddBattery: Could not register as a WMI provider, status = %Lx\n", Status); } - + /* Register with ACPI */ Status = DeviceExtension->AcpiInterface.RegisterForDeviceNotifications(DeviceExtension->AcpiInterface.Context, (PVOID)CmBattNotifyHandler, @@ -809,7 +809,7 @@ PAGED_CODE(); if (CmBattDebug & 0x220) DbgPrint("CmBattAddDevice: Entered with pdo %x\n", PdoDeviceObject); - + /* Make sure we have a PDO */ if (!PdoDeviceObject) { @@ -817,7 +817,7 @@ if (CmBattDebug & 0x24) DbgPrint("CmBattAddDevice: Asked to do detection\n"); return STATUS_NO_MORE_ENTRIES; } - + /* Open the driver key */ Status = IoOpenDeviceRegistryKey(PdoDeviceObject, PLUGPLAY_REGKEY_DRIVER, @@ -846,7 +846,7 @@ DbgPrint("CmBattAddDevice: Could not read the power type identifier: %x\n", Status); return Status; } - + /* Check what kind of power source this is */ PowerSourceType = *(PULONG)PartialInfo->Data; if (PowerSourceType == 1) @@ -866,7 +866,7 @@ DbgPrint("CmBattAddDevice: Invalid POWER_SOURCE_TYPE == %d \n", PowerSourceType); return STATUS_UNSUCCESSFUL; } - + /* Return whatever the FDO creation routine did */ return Status; } Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -11,7 +11,7 @@ #include "compbatt.h" /* FUNCTIONS ******************************************************************/ - + NTSTATUS NTAPI CompBattPowerDispatch(IN PDEVICE_OBJECT DeviceObject, @@ -19,10 +19,10 @@ { PCOMPBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; if (CompBattDebug & 1) DbgPrint("CompBatt: PowerDispatch received power IRP.\n"); - + /* Start the next IRP */ PoStartNextPowerIrp(Irp); - + /* Call the next driver in the stack */ IoSkipCurrentIrpStackLocation(Irp); return PoCallDriver(DeviceExtension->AttachedDevice, Irp); @@ -52,18 +52,18 @@ IoAcquireRemoveLock(&BatteryData->RemoveLock, 0); ExReleaseFastMutex(&DeviceExtension->Lock); IoReleaseRemoveLockAndWait(&BatteryData->RemoveLock, 0); - + /* Remove the entry from the list */ ExAcquireFastMutex(&DeviceExtension->Lock); RemoveEntryList(&BatteryData->BatteryLink); ExReleaseFastMutex(&DeviceExtension->Lock); return BatteryData; } - + /* Next */ NextEntry = NextEntry->Flink; } - + /* Done */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING RemoveBatteryFromList\n"); @@ -80,7 +80,7 @@ BOOLEAN Found = FALSE; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING IsBatteryAlreadyOnList\n"); - + /* Loop the battery list */ ExAcquireFastMutex(&DeviceExtension->Lock); ListHead = &DeviceExtension->BatteryList; @@ -99,7 +99,7 @@ /* Next */ NextEntry = NextEntry->Flink; } - + /* Release the lock and return search status */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING IsBatteryAlreadyOnList\n"); @@ -119,7 +119,7 @@ PAGED_CODE(); if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING AddNewBattery \"%w\" \n", BatteryName->Buffer); - + /* Is this a new battery? */ if (!IsBatteryAlreadyOnList(BatteryName, DeviceExtension)) { @@ -136,7 +136,7 @@ BatteryData->BatteryName.MaximumLength = BatteryName->Length; BatteryData->BatteryName.Buffer = (PWCHAR)(BatteryData + 1); RtlCopyUnicodeString(&BatteryData->BatteryName, BatteryName); - + /* Get the device object */ Status = CompBattGetDeviceObjectPointer(BatteryName, FILE_ALL_ACCESS, @@ -147,14 +147,14 @@ /* Reference the DO and drop the FO */ ObReferenceObject(BatteryData->DeviceObject); ObDereferenceObject(FileObject); - - /* Allocate the battery IRP */ + + /* Allocate the battery IRP */ Irp = IoAllocateIrp(BatteryData->DeviceObject->StackSize + 1, 0); if (Irp) { /* Save it */ BatteryData->Irp = Irp; - + /* Setup the stack location */ IoStackLocation = IoGetNextIrpStackLocation(Irp); IoStackLocation->Parameters.Others.Argument1 = DeviceExtension; @@ -176,7 +176,7 @@ ExInitializeWorkItem(&BatteryData->WorkItem, (PVOID)CompBattMonitorIrpCompleteWorker, BatteryData); - + /* Setup the IRP work entry */ CompBattMonitorIrpComplete(BatteryData->DeviceObject, Irp, 0); Status = STATUS_SUCCESS; @@ -193,10 +193,10 @@ else if (CompBattDebug & 8) { /* Fail */ - DbgPrint("CompBattAddNewBattery: Failed to get device Object. status = %lx\n", + DbgPrint("CompBattAddNewBattery: Failed to get device Object. status = %lx\n", Status); } - + /* Free the battery data */ ExFreePool(BatteryData); } @@ -229,7 +229,7 @@ /* Dereference and free it */ ObDereferenceObject(BatteryData->DeviceObject); ExFreePool(BatteryData); - + /* Notify class driver */ DeviceExtension->Flags = 0; BatteryClassStatusNotify(DeviceExtension->ClassData); @@ -248,7 +248,7 @@ PWCHAR LinkList; UNICODE_STRING LinkString; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteries\n"); - + /* Get all battery links */ Status = IoGetDeviceInterfaces(&GUID_DEVICE_BATTERY, NULL, 0, &LinkList); p = LinkList; @@ -260,12 +260,12 @@ /* Create the string */ RtlInitUnicodeString(&LinkString, p); if (!LinkString.Length) break; - + /* Add this battery and move on */ Status = CompBattAddNewBattery(&LinkString, DeviceExtension); p += (LinkString.Length / sizeof(WCHAR)) + sizeof(UNICODE_NULL); } - + /* Parsing complete, clean up buffer */ ExFreePool(LinkList); } @@ -274,7 +274,7 @@ /* Fail */ DbgPrint("CompBatt: Couldn't get list of batteries\n"); } - + /* Done */ if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteries\n"); return Status; @@ -325,12 +325,12 @@ UNICODE_STRING SymbolicLinkName; BATTERY_MINIPORT_INFO MiniportInfo; if (CompBattDebug & 2) DbgPrint("CompBatt: Got an AddDevice - %x\n", PdoDeviceObject); - + /* Create the device */ RtlInitUnicodeString(&DeviceName, L"\\Device\\CompositeBattery"); Status = IoCreateDevice(DriverObject, sizeof(COMPBATT_DEVICE_EXTENSION), - &DeviceName, + &DeviceName, FILE_DEVICE_BATTERY, FILE_DEVICE_SECURE_OPEN, FALSE, @@ -340,11 +340,11 @@ /* Setup symbolic link for Win32 access */ RtlInitUnicodeString(&SymbolicLinkName, L"\\DosDevices\\CompositeBattery"); IoCreateSymbolicLink(&SymbolicLinkName, &DeviceName); - + /* Initialize the device extension */ DeviceExtension = DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExtension, 0x1B0u); - + RtlZeroMemory(DeviceExtension, sizeof(COMPBATT_DEVICE_EXTENSION)); + /* Attach to device stack and set DO pointers */ DeviceExtension->AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, PdoDeviceObject); @@ -355,7 +355,7 @@ if (CompBattDebug & 8) DbgPrint("CompBattAddDevice: Could not attach to LowerDevice.\n"); IoDeleteDevice(DeviceObject); - return STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } /* Set device object flags */ @@ -367,7 +367,7 @@ InitializeListHead(&DeviceExtension->BatteryList); DeviceExtension->Flags = 0; DeviceExtension->NextTag = 1; - + /* Setup the miniport data */ RtlZeroMemory(&MiniportInfo, sizeof(MiniportInfo)); MiniportInfo.MajorVersion = BATTERY_CLASS_MAJOR_VERSION; @@ -381,7 +381,7 @@ MiniportInfo.SetStatusNotify = (BCLASS_SET_STATUS_NOTIFY)CompBattSetStatusNotify; MiniportInfo.DisableStatusNotify = (BCLASS_DISABLE_STATUS_NOTIFY)CompBattDisableStatusNotify; MiniportInfo.Pdo = NULL; - + /* Register with the class driver */ Status = BatteryClassInitializeDevice(&MiniportInfo, &DeviceExtension->ClassData); @@ -413,7 +413,7 @@ switch (IoStackLocation->MinorFunction) { case IRP_MN_START_DEVICE: - + /* Device is starting, register for new batteries and pick up current ones */ Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, 0, @@ -438,32 +438,32 @@ } break; case IRP_MN_CANCEL_STOP_DEVICE: - + /* Explicitly say ok */ Status = STATUS_SUCCESS; break; - + case IRP_MN_CANCEL_REMOVE_DEVICE: /* Explicitly say ok */ Status = STATUS_SUCCESS; break; - + case IRP_MN_SURPRISE_REMOVAL: - + /* Explicitly say ok */ Status = STATUS_SUCCESS; break; - + case IRP_MN_QUERY_PNP_DEVICE_STATE: - + /* Add this in */ Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; Status = STATUS_SUCCESS; break; - + default: - + /* Not supported */ Status = STATUS_INVALID_DEVICE_REQUEST; break; @@ -472,7 +472,7 @@ /* Set IRP status if we have one */ if (Status != STATUS_NOT_SUPPORTED) Irp->IoStatus.Status = Status; - /* Did someone pick it up? */ + /* Did someone pick it up? */ if ((NT_SUCCESS(Status)) || (Status == STATUS_NOT_SUPPORTED)) { /* Still unsupported, try ACPI */ Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -351,6 +351,63 @@ *pDeviceRelations = DeviceRelations; return STATUS_SUCCESS; +} + +//GUID_PCIIDE_INTERRUPT_INTERFACE +//GUID_PCIIDE_REQUEST_PROPER_RESOURCES + +DEFINE_GUID(GUID_PCIIDE_SYNC_ACCESS_INTERFACE, 0x681190EB, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); +DEFINE_GUID(GUID_PCIIDE_XFER_MODE_INTERFACE, 0x681190EC, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); + + + +NTSTATUS +PciIdeXPdoPnpQueryInterface( + PIRP Irp) +{ +#if 0 + PIO_STACK_LOCATION IrpStack = IoGetCurrentIrpStackLocation(Irp); + PACPI_INTERFACE_STANDARD AcpiInterface; + + if (IrpStack->Parameters.QueryInterface.Version != 1) + { + DPRINT1("Invalid version number: %d\n", + IrpStack->Parameters.QueryInterface.Version); + return STATUS_INVALID_PARAMETER; + } + + if (IsEqualGUID(IrpStack->Parameters.QueryInterface.InterfaceType, + &GUID_PCIIDE_XFER_MODE_INTERFACE)) + { + DPRINT1("GUID_PCIIDE_XFER_MODE_INTERFACE\n"); + + if (IrpStack->Parameters.QueryInterface.Size < sizeof(ACPI_INTERFACE_STANDARD)) + { + DPRINT1("Buffer too small! (%d)\n", IrpStack->Parameters.QueryInterface.Size); + return STATUS_BUFFER_TOO_SMALL; + } + + AcpiInterface = (PACPI_INTERFACE_STANDARD)IrpStack->Parameters.QueryInterface.Interface; + + AcpiInterface->InterfaceReference = AcpiInterfaceReference; + AcpiInterface->InterfaceDereference = AcpiInterfaceDereference; + AcpiInterface->GpeConnectVector = AcpiInterfaceConnectVector; + AcpiInterface->GpeDisconnectVector = AcpiInterfaceDisconnectVector; + AcpiInterface->GpeEnableEvent = AcpiInterfaceEnableEvent; + AcpiInterface->GpeDisableEvent = AcpiInterfaceDisableEvent; + AcpiInterface->GpeClearStatus = AcpiInterfaceClearStatus; + AcpiInterface->RegisterForDeviceNotifications = AcpiInterfaceNotificationsRegister; + AcpiInterface->UnregisterForDeviceNotifications = AcpiInterfaceNotificationsUnregister; + + return STATUS_SUCCESS; + } + else + { + DPRINT1("Invalid GUID\n"); + return STATUS_NOT_SUPPORTED; + } +#endif + return STATUS_NOT_IMPLEMENTED; } NTSTATUS NTAPI @@ -519,6 +576,11 @@ } break; } + case IRP_MN_QUERY_INTERFACE: + { + Status = PciIdeXPdoPnpQueryInterface(Irp); + break; + } default: { /* We can't forward request to the lower driver, because

1 0

[tfaber] 61627: [LWIP] - Fix warning. Already applied upstream. [CMAKE] - Make C4013 (implicit function declaration) an error CORE-7538
by tfaber＠svn.reactos.org 14 Jan '14

14 Jan '14

Author: tfaber Date: Tue Jan 14 21:04:39 2014 New Revision: 61627 URL: http://svn.reactos.org/svn/reactos?rev=61627&view=rev Log: [LWIP] - Fix warning. Already applied upstream. [CMAKE] - Make C4013 (implicit function declaration) an error CORE-7538 Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/lib/drivers/lwip/src/api/tcpip.c Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=61627… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Jan 14 21:04:39 2014 @@ -33,11 +33,16 @@ add_compile_flags("/FS") endif () -# C++ exception specification ignored... yeah we don't care +# Disable overly sensitive warnings as well as those that generally aren't +# useful to us. +# - TODO: C4018: signed/unsigned mismatch +# - TODO: C4244: integer truncation +# - C4290: C++ exception specification ignored +#add_compile_flags("/wd4018 /wd4244 /wd4290") add_compile_flags("/wd4290") # The following warnings are treated as errors: -# - TODO: C4013: implicit function declaration +# - C4013: implicit function declaration # - C4022: pointer type mismatch for parameter # - TODO: C4028: formal parameter different from declaration # - C4047: different level of indirection @@ -49,7 +54,7 @@ # - TODO: C4133: incompatible types # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage -add_compile_flags("/we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700") +add_compile_flags("/we4013 /we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700") # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses Modified: trunk/reactos/lib/drivers/lwip/src/api/tcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/api/t… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/api/tcpip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/api/tcpip.c [iso-8859-1] Tue Jan 14 21:04:39 2014 @@ -46,6 +46,7 @@ #include "lwip/pbuf.h" #include "lwip/tcpip.h" #include "lwip/init.h" +#include "lwip/ip.h" #include "netif/etharp.h" #include "netif/ppp_oe.h"

1 0

[tkreuzer] 61626: [LSASRV] Make the LSAP_POLICY_AUDIT_EVENTS_DATA structure compatible to the one used in Windows, so that the registry data is compatible between Windows and ReactOS lsasrv. Window...
by tkreuzer＠svn.reactos.org 14 Jan '14

14 Jan '14

Author: tkreuzer Date: Tue Jan 14 20:24:43 2014 New Revision: 61626 URL: http://svn.reactos.org/svn/reactos?rev=61626&view=rev Log: [LSASRV] Make the LSAP_POLICY_AUDIT_EVENTS_DATA structure compatible to the one used in Windows, so that the registry data is compatible between Windows and ReactOS lsasrv. Windows does not actually use dynamically sized structures, but always stores a full structure and the AuditEventsCount is AFTER the AuditEvents array, so that it is in fact pretty pointless. But that's how it works. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Tue Jan 14 20:24:43 2014 @@ -241,8 +241,6 @@ PSID AccountDomainSid = NULL; PSECURITY_DESCRIPTOR PolicySd = NULL; ULONG PolicySdSize = 0; - ULONG AuditEventsCount; - ULONG AuditEventsSize; ULONG i; NTSTATUS Status; @@ -263,17 +261,15 @@ AuditLogInfo.NextAuditRecordId = 0; // DWORD /* Initialize the Audit Events attribute */ - AuditEventsCount = AuditCategoryAccountLogon - AuditCategorySystem + 1; - AuditEventsSize = sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA) + AuditEventsCount * sizeof(DWORD); AuditEventsInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - AuditEventsSize); + sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA)); if (AuditEventsInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; AuditEventsInfo->AuditingMode = FALSE; - AuditEventsInfo->MaximumAuditEventCount = AuditEventsCount; - for (i = 0; i < AuditEventsCount; i++) + AuditEventsInfo->MaximumAuditEventCount = POLICY_AUDIT_EVENT_TYPE_COUNT; + for (i = 0; i < POLICY_AUDIT_EVENT_TYPE_COUNT; i++) AuditEventsInfo->AuditEvents[i] = 0; /* Initialize the DNS Domain GUID attribute */ @@ -351,7 +347,7 @@ LsapSetObjectAttribute(PolicyObject, L"PolAdtEv", AuditEventsInfo, - AuditEventsSize); + sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA)); /* Set the DNS Domain Name attribute */ LsapSetObjectAttribute(PolicyObject, @@ -984,7 +980,7 @@ NULL); if (!NT_SUCCESS(Status)) { - ERR("NtCreateKey failed for '%S' with status 0x%lx\n", + ERR("NtCreateKey failed for '%S' with status 0x%lx\n", AttributeName, Status); return Status; } @@ -998,7 +994,7 @@ if (!NT_SUCCESS(Status)) { - ERR("RtlpNtSetValueKey failed for '%S' with status 0x%lx\n", + ERR("RtlpNtSetValueKey failed for '%S' with status 0x%lx\n", AttributeName, Status); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Jan 14 20:24:43 2014 @@ -65,12 +65,12 @@ #define LSAP_DB_SIGNATURE 0x12345678 - +#define POLICY_AUDIT_EVENT_TYPE_COUNT (AuditCategoryAccountLogon - AuditCategorySystem + 1) typedef struct _LSAP_POLICY_AUDIT_EVENTS_DATA { BOOLEAN AuditingMode; + DWORD AuditEvents[POLICY_AUDIT_EVENT_TYPE_COUNT]; DWORD MaximumAuditEventCount; - DWORD AuditEvents[0]; } LSAP_POLICY_AUDIT_EVENTS_DATA, *PLSAP_POLICY_AUDIT_EVENTS_DATA; typedef struct _LSAP_LOGON_CONTEXT

1 0

[tkreuzer] 61625: [FREELDR] Modify UiMessageBox so that it allows to pass a format string and parameters. Make use of it in WinLdrLoadBootDrivers to show the file that couldn't be loaded.
by tkreuzer＠svn.reactos.org 14 Jan '14

14 Jan '14

Author: tkreuzer Date: Tue Jan 14 20:12:07 2014 New Revision: 61625 URL: http://svn.reactos.org/svn/reactos?rev=61625&view=rev Log: [FREELDR] Modify UiMessageBox so that it allows to pass a format string and parameters. Make use of it in WinLdrLoadBootDrivers to show the file that couldn't be loaded. Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -66,7 +66,7 @@ VOID UiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen VOID UiUpdateDateTime(VOID); // Updates the date and time VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen -VOID UiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button +VOID UiMessageBox(PCSTR Format, ...); // Displays a message box on the screen with an ok button VOID UiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -344,9 +344,15 @@ UiDrawCenteredText(Left, Top, Right, Bottom, MessageText, ATTR(UiTextColor, UiMenuBgColor)); } -VOID UiMessageBox(PCSTR MessageText) -{ - UiVtbl.MessageBox(MessageText); +VOID UiMessageBox(PCSTR Format, ...) +{ + CHAR Buffer[256]; + va_list ap; + + va_start(ap, Format); + vsnprintf(Buffer, sizeof(Buffer) - sizeof(CHAR), Format, ap); + UiVtbl.MessageBox(Buffer); + va_end(ap); } VOID UiMessageBoxCritical(PCSTR MessageText) Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -325,7 +325,8 @@ //FIXME: Maybe remove it from the list and try to continue? if (!Status) { - UiMessageBox("Can't load boot driver!"); + ERR("Can't load boot driver '%wZ'!", &BootDriver->FilePath); + UiMessageBox("Can't load boot driver '%wZ'!", &BootDriver->FilePath); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -538,9 +538,9 @@ /* Get the Driver's Name */ ValueSize = sizeof(ServiceName); rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize); - //TRACE_CH(REACTOS, "RegEnumKey(): rc %d\n", (int)rc); - - /* Makre sure it's valid, and check if we're done */ + TRACE("RegEnumKey(): rc %d\n", (int)rc); + + /* Make sure it's valid, and check if we're done */ if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) @@ -627,7 +627,7 @@ FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); return; } - //TRACE_CH(REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName); + TRACE("Service %d: '%S'\n", (int)Index, ServiceName); /* open driver Key */ rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey);

1 0

[tkreuzer] 61624: [RTL] Fix a nasty bug in RtlQueryRegistryValues, that caused memory corruption when the the key name or data had the "wrong" length.
by tkreuzer＠svn.reactos.org 14 Jan '14

14 Jan '14

Author: tkreuzer Date: Tue Jan 14 19:41:01 2014 New Revision: 61624 URL: http://svn.reactos.org/svn/reactos?rev=61624&view=rev Log: [RTL] Fix a nasty bug in RtlQueryRegistryValues, that caused memory corruption when the the key name or data had the "wrong" length. Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=616… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Tue Jan 14 19:41:01 2014 @@ -211,7 +211,7 @@ /* Check if we have space to copy the data */ RequiredLength = KeyValueInfo->NameLength + sizeof(UNICODE_NULL); - if (SpareLength < RequiredLength) + if ((SpareData > DataEnd) || (SpareLength < RequiredLength)) { /* Fail and return the missing length */ *InfoSize = (ULONG)(SpareData - (PCHAR)KeyValueInfo) + RequiredLength;

1 0

[tkreuzer] 61623: [NTOSKRNL] Forgot to commit this file.
by tkreuzer＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: tkreuzer Date: Mon Jan 13 22:35:01 2014 New Revision: 61623 URL: http://svn.reactos.org/svn/reactos?rev=61623&view=rev Log: [NTOSKRNL] Forgot to commit this file. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Jan 13 22:35:01 2014 @@ -649,7 +649,7 @@ LoaderExtension = LoaderBlock->Extension; if (LoaderExtension) { - ASSERTMSG("ReactOS doesn't support NTLDR Profiles yet!\n", FALSE); + DPRINT("ReactOS doesn't support NTLDR Profiles yet!\n"); } /* Create the current hardware profile key */ @@ -816,7 +816,6 @@ if (HiveBase) { /* Import it */ - ((PHBASE_BLOCK)HiveBase)->Length = LoaderBlock->RegistryLength; Status = CmpInitializeHive((PCMHIVE*)&SystemHive, HINIT_MEMORY, HIVE_NOLAZYFLUSH,

1 0

[ekohl] 61622: [WINLOGON] - Implement the STATE_LOCKED and STATE_LOCKED_SAS states and their transitions. [MSGINA] - Disable the logoff button of the security dialog if the AutoAdminLogon option is...
by ekohl＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: ekohl Date: Mon Jan 13 22:15:27 2014 New Revision: 61622 URL: http://svn.reactos.org/svn/reactos?rev=61622&view=rev Log: [WINLOGON] - Implement the STATE_LOCKED and STATE_LOCKED_SAS states and their transitions. [MSGINA] - Disable the logoff button of the security dialog if the AutoAdminLogon option is enabled. - Implement the unlock computer dialog. The user name and password check is not implemented yet. Just press OK to unlock the computer. - Simulate an SAS when the DisableCAD option is enabled and the computer is locked. The unlock dialog appears immediately. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Mon Jan 13 22:15:27 2014 @@ -861,6 +861,11 @@ { Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } + else if (Session->LogonState == STATE_LOCKED_SAS) + { + Session->LogonState = STATE_LOCKED; + Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); + } break; case WLX_SAS_ACTION_LOCK_WKSTA: /* 0x03 */ if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) @@ -922,10 +927,12 @@ IN DWORD dwSasType) { DWORD wlxAction = WLX_SAS_ACTION_NONE; + HWND hwnd; /* Ignore SAS if we are already in an SAS state */ if (Session->LogonState == STATE_LOGGED_OFF_SAS || - Session->LogonState == STATE_LOGGED_ON_SAS) + Session->LogonState == STATE_LOGGED_ON_SAS || + Session->LogonState == STATE_LOCKED_SAS) return; if (Session->LogonState == STATE_LOGGED_ON) @@ -934,7 +941,16 @@ wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); } else if (Session->LogonState == STATE_LOCKED) + { + hwnd = GetTopDialogWindow(); + if (hwnd != NULL) + { + SendMessage(hwnd, WM_USER, 0, 0); + } + + Session->LogonState = STATE_LOCKED_SAS; wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); + } else { /* Display a new dialog (if necessary) */ @@ -948,7 +964,6 @@ default: { PSID LogonSid = NULL; /* FIXME */ - HWND hwnd; hwnd = GetTopDialogWindow(); if (hwnd != NULL) Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Mon Jan 13 22:15:27 2014 @@ -194,7 +194,7 @@ STATE_LOGGED_ON_SAS, STATE_SCREENSAVER, // not used yet STATE_LOCKED, - STATE_LOCKED_SAS, // not used yet + STATE_LOCKED_SAS, STATE_LOGGING_OFF, // not used yet STATE_SHUTTING_DOWN, // not used yet STATE_SHUT_DOWN // not used yet 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] Mon Jan 13 22:15:27 2014 @@ -282,6 +282,9 @@ wsprintfW(Buffer4, Buffer1, Buffer2, Buffer3); SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4); + + if (pgContext->bAutoAdminLogon == TRUE) + EnableWindow(GetDlgItem(hwnd, IDC_LOGOFF), FALSE); } @@ -518,16 +521,109 @@ return WLX_SAS_ACTION_NONE; } + +static +INT_PTR +CALLBACK +UnlockWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + + if (pgContext->bDisableCAD == TRUE) + EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); + + SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + return TRUE; + + 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; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + { +#if 0 + LPWSTR UserName = NULL, Password = NULL; + INT result = WLX_SAS_ACTION_NONE; + + if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') + break; + if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password) && + DoLoginTasks(pgContext, UserName, NULL, Password)) + { + result = WLX_SAS_ACTION_LOGON; + } + HeapFree(GetProcessHeap(), 0, UserName); + HeapFree(GetProcessHeap(), 0, Password); + EndDialog(hwndDlg, result); +#endif + EndDialog(hwndDlg, WLX_SAS_ACTION_UNLOCK_WKSTA); + return TRUE; + } + + case IDCANCEL: + EndDialog(hwndDlg, WLX_SAS_ACTION_NONE); + return TRUE; + } + break; + } + + return FALSE; +} + + static INT GUILockedSAS( IN OUT PGINA_CONTEXT pgContext) { + int result; + TRACE("GUILockedSAS()\n"); - UNREFERENCED_PARAMETER(pgContext); - - UNIMPLEMENTED; - return WLX_SAS_ACTION_UNLOCK_WKSTA; + result = pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_UNLOCK_DLG), + GetDesktopWindow(), + UnlockWindowProc, + (LPARAM)pgContext); + if (result >= WLX_SAS_ACTION_LOGON && + result <= WLX_SAS_ACTION_SWITCH_CONSOLE) + { + WARN("GUILockedSAS() returns 0x%x\n", result); + return result; + } + + WARN("GUILockedSAS() failed (0x%x)\n", result); + return WLX_SAS_ACTION_NONE; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Mon Jan 13 22:15:27 2014 @@ -819,8 +819,6 @@ else pgContext->AutoLogonState = AUTOLOGON_DISABLED; -TRACE("pgContext->bDisableCAD: %lu\n", pgContext->bDisableCAD); - if (pgContext->bDisableCAD == TRUE) { pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); @@ -902,6 +900,12 @@ TRACE("WlxDisplayLockedNotice()\n"); + if (pgContext->bDisableCAD == TRUE) + { + pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); + return; + } + pGinaUI->DisplayLockedNotice(pgContext); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs