From 7339d03e092c8a8985a88be5c8457ec575240e19 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Thu, 6 Jul 2006 01:55:53 +0000 Subject: [PATCH] Fixing one bug, do not list current screensaver twice. svn path=/trunk/; revision=22880 --- reactos/dll/cpl/desk/screensaver.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/reactos/dll/cpl/desk/screensaver.c b/reactos/dll/cpl/desk/screensaver.c index c9750b2ca2e..c2b5ed757ad 100644 --- a/reactos/dll/cpl/desk/screensaver.c +++ b/reactos/dll/cpl/desk/screensaver.c @@ -243,14 +243,14 @@ void AddListViewItems2() LV_ITEM listItem; LV_COLUMN dummy; RECT clientRect; - HKEY regKey; + //HKEY regKey; SHFILEINFO sfi; HIMAGELIST himl; HIMAGELIST g_hScreenShellImageList = NULL; - TCHAR wallpaperFilename[MAX_PATH]; - DWORD bufferSize = sizeof(wallpaperFilename); - DWORD varType = REG_SZ; - LONG result; + //TCHAR wallpaperFilename[MAX_PATH]; + //DWORD bufferSize = sizeof(wallpaperFilename); + //DWORD varType = REG_SZ; + //LONG result; UINT i = 0; int g_ScreenlistViewItemCount = 0; ScreenSaverItem *ScreenSaverItem = NULL; @@ -288,6 +288,7 @@ void AddListViewItems2() g_ScreenlistViewItemCount++; /* Add current screensaver if any */ + /* RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, ®Key); result = RegQueryValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); @@ -329,9 +330,12 @@ void AddListViewItems2() g_ScreenlistViewItemCount++; } - } + } + + RegCloseKey(regKey); + */ /* Add all the screensavers in the C:\ReactOS\System32 directory. */