Author: greatlrd Date: Sat Jul 14 18:17:54 2007 New Revision: 27657
URL: http://svn.reactos.org/svn/reactos?rev=27657&view=rev Log: adding SPI_SETSCREENSAVEACTIVE now, it can be set to false or true false for no screen saver and true for screensaver.
Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c
Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Sat Jul 14 18:17:54 2007 @@ -34,10 +34,12 @@ HANDLE ShellWindow; HANDLE ShellListView;
- BOOL FlatMenu; - /* ScreenSaver */ - BOOL ScreenSaverRunning; - UINT ScreenSaverTimeOut; + BOOL FlatMenu; + /* ScreenSaver */ + BOOL ScreenSaverRunning; + UINT ScreenSaverTimeOut; + /* Should this be on each desktop ? */ + BOOL ScreenSaverActive;
/* Wallpaper */ HANDLE hbmWallpaper;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sat Jul 14 18:17:54 2007 @@ -958,6 +958,9 @@ /* FIXME: Implement this, don't just return constant */ *(PBOOL)pvParam = FALSE; break; + + + case SPI_GETKEYBOARDCUES: case SPI_SETDOUBLECLKWIDTH: case SPI_SETDOUBLECLKHEIGHT: @@ -1025,10 +1028,11 @@ if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; WinStaObject->ScreenSaverRunning = uiParam; break; + case SPI_SETSCREENSAVEACTIVE: + WinStaObject->ScreenSaverActive = uiParam; + break; case SPI_GETSCREENSAVEACTIVE: - /* FIXME: how to disable the screensaver? */ - ASSERT(pvParam); - *((BOOL*)pvParam) = TRUE; + if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverActive; break; case SPI_GETWHEELSCROLLLINES: ASSERT(pvParam);
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Sat Jul 14 18:17:54 2007 @@ -537,8 +537,9 @@ CurInfo->MouseHoverWidth = 4; CurInfo->MouseHoverHeight = 4;
- WindowStationObject->ScreenSaverTimeOut = 10 * 60; - WindowStationObject->SystemCursor = CurInfo; + WindowStationObject->ScreenSaverActive = FALSE; + WindowStationObject->ScreenSaverTimeOut = 10; + WindowStationObject->SystemCursor = CurInfo;
/* END FIXME loading from register */