From ebb0cc9c2bcb776ba468dec4f76cbeaead477e00 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Mon, 10 Jul 2006 15:02:43 +0000 Subject: [PATCH] Fixing a small bug, value where never devliver from SPI and that did make screensaver start direcky and start mulitetimes. svn path=/trunk/; revision=22998 --- .../subsystems/win32/win32k/ntuser/input.c | 5 +++-- reactos/subsystems/win32/win32k/ntuser/misc.c | 22 +++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c index 5a0e745b616..c0d76788a41 100644 --- a/reactos/subsystems/win32/win32k/ntuser/input.c +++ b/reactos/subsystems/win32/win32k/ntuser/input.c @@ -217,8 +217,9 @@ ScreenSaverThreadMain(PVOID StartContext) { BOOL nPreviousState = FALSE; DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); - DPRINT1("Keyboard Timeout counter was %I64d\n",DiffTimeKeyboard.QuadPart); - DPRINT1("Mouse Timeout counter was %I64d\n",DiffTimeMouse.QuadPart); + DPRINT1(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); + DPRINT1(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); + DPRINT1(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); CSR_API_MESSAGE Request; CsrInit(); diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c index 3c2ecf32f1b..dd4520371f6 100644 --- a/reactos/subsystems/win32/win32k/ntuser/misc.c +++ b/reactos/subsystems/win32/win32k/ntuser/misc.c @@ -1016,34 +1016,42 @@ IntSystemParametersInfo( switch(uiAction) { case SPI_GETFLATMENU: - if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; - return TRUE; + if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; + return TRUE; + break; case SPI_SETFLATMENU: WinStaObject->FlatMenu = uiParam; - break; + return TRUE; + break; case SPI_GETSCREENSAVETIMEOUT: if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; return TRUE; + break; case SPI_SETSCREENSAVETIMEOUT: - WinStaObject->ScreenSaverTimeOut = uiParam; - return TRUE; + WinStaObject->ScreenSaverTimeOut = uiParam; + return TRUE; + break; case SPI_GETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - return TRUE; + return TRUE; + break; case SPI_SETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; WinStaObject->ScreenSaverRunning = uiParam; - return TRUE; + return TRUE; + break; case SPI_GETWHEELSCROLLLINES: CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroLines; /* FIXME add this value to scroll list as scroll value ?? */ return TRUE; + break; case SPI_GETWHEELSCROLLCHARS: CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? return TRUE; + break; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME limit the maximum value? */