[ekohl] 58359: [WINLOGON] - Call DispatchSAS when the screen saver is started by a WM_LOGONNOTIFY message. - Lock the workstation after the screen saver was terminated.

Author: ekohl
Date: Sat Feb 23 19:48:22 2013
New Revision: 58359

URL: http://svn.reactos.org/svn/reactos?rev=58359&view=rev
Log:
[WINLOGON]
- Call DispatchSAS when the screen saver is started by a WM_LOGONNOTIFY message.
- Lock the workstation after the screen saver was terminated.

Modified:
    trunk/reactos/base/system/winlogon/sas.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] Sat Feb 23 19:48:22 2013
@@ -22,8 +22,6 @@
 
 #define HK_CTRL_ALT_DEL   0
 #define HK_CTRL_SHIFT_ESC 1
-
-static BOOL inScrn = FALSE;
 
 /* FUNCTIONS ****************************************************************/
 
@@ -940,9 +938,9 @@
 		}
 		else
 		{
+			StartScreenSaver(Session);
 			if (bSecure)
 				DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA);
-			StartScreenSaver(Session);
 		}
 	}
 	else if (dwSasType == WLX_SAS_TYPE_SCRNSVR_ACTIVITY)
@@ -1154,24 +1152,7 @@
                 }
                 case LN_START_SCREENSAVE:
                 {
-                    BOOL bSecure = FALSE;
-
-                    if (inScrn)
-                       break;
-
-                    inScrn = TRUE;
-
-                    // lParam 1 == Secure
-                    if (lParam)
-                    {
-                       if
(Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure))
-                       {
-                          if (bSecure) DoGenericAction(Session,
WLX_SAS_ACTION_LOCK_WKSTA);
-		       }
-                    }
-
-                    StartScreenSaver(Session);
-                    inScrn = FALSE;
+                    DispatchSAS(Session, WLX_SAS_TYPE_SCRNSVR_TIMEOUT);
                     break;
                 }
                 case LN_LOCK_WORKSTATION: