Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-17 09:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DESK]

Browse source 
- Remove the SCRNSAVE.EXE value from the registry and set ScreenSaveActive to "0" as this is the setting for "None" screen saver.
- Change screen saver settings the way Windows XP does it.

svn path=/trunk/; revision=58360
This commit is contained in:
Eric Kohl 2013-02-24 08:58:05 +00:00
parent d09a5ff14a
commit d21e3a1d25
2 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/boot/bootdata/hivedef.inf
View file

@ -91,8 +91,7 @@ HKCU,"Control Panel\Desktop","DragHeight",0x00000000,"4"
HKCU,"Control Panel\Desktop","DragWidth",0x00000000,"4" HKCU,"Control Panel\Desktop","DragWidth",0x00000000,"4"
HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0"
HKCU,"Control Panel\Desktop","HungAppTimeout",2,"5000" HKCU,"Control Panel\Desktop","HungAppTimeout",2,"5000"
HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0,"" HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"0"
HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"1"
HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1"
HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600"
HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000"

41
reactos/dll/cpl/desk/screensaver.c
View file

@ -473,7 +473,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
{ {
INT Time; INT Time;
BOOL bRet; BOOL bRet;
TCHAR szTime[256], Sec; TCHAR Sec;
UINT Ret; UINT Ret;
/* Set the screensaver */ /* Set the screensaver */
@ -485,36 +485,18 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
REG_SZ, REG_SZ,
(PBYTE)pData->ScreenSaverItems[pData->Selection].szFilename, (PBYTE)pData->ScreenSaverItems[pData->Selection].szFilename,
_tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) * sizeof(TCHAR)); _tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) * sizeof(TCHAR));
SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_UPDATEINIFILE);
} }
else else
{ {
/* Windows deletes the value if no screensaver is set */ /* Windows deletes the value if no screensaver is set */
RegDeleteValue(regKey, _T("SCRNSAVE.EXE")); RegDeleteValue(regKey, _T("SCRNSAVE.EXE"));
DeleteMode = TRUE; DeleteMode = TRUE;
SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, 0, SPIF_UPDATEINIFILE);
} }
/* set the screensaver time delay */
Time = GetDlgItemInt(hwndDlg,
IDC_SCREENS_TIMEDELAY,
&bRet,
FALSE);
if (Time == 0)
Time = 60;
else
Time *= 60;
_itot(Time, szTime, 10);
RegSetValueEx(regKey,
_T("ScreenSaveTimeOut"),
0,
REG_SZ,
(PBYTE)szTime,
_tcslen(szTime) * sizeof(TCHAR));
if (DeleteMode) Time = 0;
SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE);
/* Set the secure value */ /* Set the secure value */
Ret = SendDlgItemMessage(hwndDlg, Ret = SendDlgItemMessage(hwndDlg,
IDC_SCREENS_USEPASSCHK, IDC_SCREENS_USEPASSCHK,
@ -529,6 +511,18 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
(PBYTE)&Sec, (PBYTE)&Sec,
sizeof(TCHAR)); sizeof(TCHAR));
/* Set the screensaver time delay */
Time = GetDlgItemInt(hwndDlg,
IDC_SCREENS_TIMEDELAY,
&bRet,
FALSE);
if (Time == 0)
Time = 60;
else
Time *= 60;
SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
RegCloseKey(regKey); RegCloseKey(regKey);
} }
} }
@ -735,7 +729,6 @@ ScreenSaverPageProc(HWND hwndDlg,
{ {
if (command == BN_CLICKED) if (command == BN_CLICKED)
{ {
MessageBox(NULL, TEXT("Feature not yet implemented"), TEXT("Sorry"), MB_OK);
PropSheet_Changed(GetParent(hwndDlg), hwndDlg); PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
} }
break; break;