Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

At last, enable screensaver

Browse source 
svn path=/trunk/; revision=24013
This commit is contained in:
Hervé Poussineau 2006-09-10 02:22:12 +00:00
parent 96bb2d5365
commit 0fbf1539ac
3 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/system/winlogon/sas.c
View file

@ -545,7 +545,7 @@ DispatchSAS(
if (!Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure))
{
/* Skip start of screen saver */
SetEvent(Session->hUserActivity);
SetEvent(Session->hEndOfScreenSaver);
}
else
{

36
reactos/base/system/winlogon/screensaver.c
View file

@ -89,9 +89,16 @@ ScreenSaverThreadMain(
goto cleanup;
}
Session->hEndOfScreenSaver = CreateEventW(NULL, FALSE, FALSE, NULL);
if (!Session->hEndOfScreenSaver)
{
ERR("WL: Unable to create event (error %lu)\n", GetLastError());
goto cleanup;
}
HandleArray[0] = Session->hEndOfScreenSaverThread;
HandleArray[1] = Session->hScreenSaverParametersChanged;
HandleArray[2] = Session->hUserActivity;
HandleArray[2] = Session->hEndOfScreenSaver;
LoadScreenSaverParameters(&Timeout);
@ -160,6 +167,8 @@ cleanup:
RevertToSelf();
if (Session->hUserActivity)
CloseHandle(Session->hUserActivity);
if (Session->hEndOfScreenSaver)
CloseHandle(Session->hEndOfScreenSaver);
#ifndef USE_GETLASTINPUTINFO
if (Session->KeyboardHook)
UnhookWindowsHookEx(Session->KeyboardHook);
@ -177,9 +186,6 @@ InitializeScreenSaver(
{
HANDLE ScreenSaverThread;
FIXME("Disabling screen saver due to numerous bugs in ReactOS (see r23540)!\n");
return TRUE;
#ifndef USE_GETLASTINPUTINFO
/* Register hooks to detect keyboard and mouse activity */
Session->KeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardActivityProc, hAppInstance, 0);
@ -234,7 +240,9 @@ StartScreenSaver(
DWORD dwType;
STARTUPINFOW StartupInfo;
PROCESS_INFORMATION ProcessInformation;
HANDLE HandleArray[2];
LONG rc;
NTSTATUS Status;
BOOL ret = FALSE;
if (!ImpersonateLoggedOnUser(Session->UserToken))
@ -286,17 +294,29 @@ StartScreenSaver(
WARN("WL: Unable to start %S, error %lu\n", szApplicationName, GetLastError());
goto cleanup;
}
CloseHandle(ProcessInformation.hThread);
SystemParametersInfoW(SPI_SETSCREENSAVERRUNNING, TRUE, NULL, 0);
/* Wait the end of the process or some other activity */
ResetEvent(Session->hUserActivity);
HandleArray[0] = ProcessInformation.hProcess;
HandleArray[1] = Session->hUserActivity;
Status = WaitForMultipleObjects(2, HandleArray, FALSE, INFINITE);
if (Status == WAIT_OBJECT_0 + 1)
{
/* Kill the screen saver */
TerminateProcess(ProcessInformation.hProcess, 0);
}
SetEvent(Session->hEndOfScreenSaver);
CloseHandle(ProcessInformation.hProcess);
CloseHandle(ProcessInformation.hThread);
cleanup:
RevertToSelf();
if (hKey)
RegCloseKey(hKey);
if (ret)
SystemParametersInfoW(SPI_SETSCREENSAVERRUNNING, TRUE, NULL, 0);
else
if (!ret)
{
PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_ACTIVITY, 0);
#ifndef USE_GETLASTINPUTINFO

3
reactos/base/system/winlogon/winlogon.h
View file

@ -27,7 +27,7 @@
#ifndef __WINLOGON_MAIN_H__
#define __WINLOGON_MAIN_H__
//#define USE_GETLASTINPUTINFO
#define USE_GETLASTINPUTINFO
#define WIN32_NO_STATUS
#include <windows.h>
@ -146,6 +146,7 @@ typedef struct _WLSESSION
HANDLE hEndOfScreenSaverThread;
HANDLE hScreenSaverParametersChanged;
HANDLE hUserActivity;
HANDLE hEndOfScreenSaver;
#ifndef USE_GETLASTINPUTINFO
DWORD LastActivity;
#endif