Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:15:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DESK] Refactor the work with registry parameters

Browse source 
Use SHGet/Set functions instead of talking directly to registry.
This makes the code a lot more simple and readable.

CORE-3567
This commit is contained in:
Stanislav Motylkov 2022-10-20 04:10:04 +03:00
parent 769fcd895b
commit 5f14928763
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 29 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

134
dll/cpl/desk/desktop.c
View file

@ -26,7 +26,7 @@
*/ */
#define IDS_PERSONAL 9227 #define IDS_PERSONAL 9227
static const TCHAR szHideDesktopIcons[] = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\HideDesktopIcons"); static const TCHAR szHideDesktopIcons[] = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\HideDesktopIcons\\");
static const TCHAR szClassicStartMenu[] = TEXT("ClassicStartMenu"); static const TCHAR szClassicStartMenu[] = TEXT("ClassicStartMenu");
static const TCHAR szNewStartPanel[] = TEXT("NewStartPanel"); static const TCHAR szNewStartPanel[] = TEXT("NewStartPanel");
@ -62,75 +62,38 @@ struct
VOID VOID
InitDesktopSettings(PDESKTOP_DATA pData) InitDesktopSettings(PDESKTOP_DATA pData)
{ {
HKEY regKey, iconKey1, iconKey2;
UINT i; UINT i;
DWORD dwType, cbData; TCHAR regPath[MAX_PATH];
/* Default values */
for (i = 0; i < _countof(pData->optIcons); i++)
{
// pData->optIcons[i].bHideClassic is FALSE by default
pData->optIcons[i].bHideNewStart = TRUE;
}
/* Load desktop icon settings from the registry */ /* Load desktop icon settings from the registry */
if (RegOpenKeyEx(HKEY_CURRENT_USER, szHideDesktopIcons, StringCchCopy(regPath, _countof(regPath), szHideDesktopIcons);
0, KEY_QUERY_VALUE, &regKey) != ERROR_SUCCESS) StringCchCat(regPath, _countof(regPath), szClassicStartMenu);
{
goto LoadIcons;
}
if (RegOpenKeyEx(regKey, szClassicStartMenu, 0, KEY_QUERY_VALUE, &iconKey1) != ERROR_SUCCESS)
iconKey1 = NULL;
if (RegOpenKeyEx(regKey, szNewStartPanel, 0, KEY_QUERY_VALUE, &iconKey2) != ERROR_SUCCESS)
iconKey2 = NULL;
for (i = 0; i < _countof(pData->optIcons); i++) for (i = 0; i < _countof(pData->optIcons); i++)
{ {
LSTATUS res; pData->optIcons[i].bHideClassic = SHRegGetBoolUSValue(regPath, DesktopIcons[i].CLSID, FALSE, FALSE);
DWORD dwData;
if (iconKey1)
{
cbData = sizeof(dwData);
res = RegQueryValueEx(iconKey1, DesktopIcons[i].CLSID, NULL, &dwType, (LPBYTE)&dwData, &cbData);
if (res == ERROR_SUCCESS && dwType == REG_DWORD && cbData == sizeof(dwData))
pData->optIcons[i].bHideClassic = !!dwData;
}
if (iconKey2)
{
cbData = sizeof(dwData);
res = RegQueryValueEx(iconKey2, DesktopIcons[i].CLSID, NULL, &dwType, (LPBYTE)&dwData, &cbData);
if (res == ERROR_SUCCESS && dwType == REG_DWORD && cbData == sizeof(dwData))
pData->optIcons[i].bHideNewStart = !!dwData;
}
} }
if (iconKey1) StringCchCopy(regPath, _countof(regPath), szHideDesktopIcons);
RegCloseKey(iconKey1); StringCchCat(regPath, _countof(regPath), szNewStartPanel);
if (iconKey2) for (i = 0; i < _countof(pData->optIcons); i++)
RegCloseKey(iconKey2); {
pData->optIcons[i].bHideNewStart = SHRegGetBoolUSValue(regPath, DesktopIcons[i].CLSID, FALSE, TRUE);
}
RegCloseKey(regKey);
LoadIcons:
for (i = 0; i < _countof(IconChange); i++) for (i = 0; i < _countof(IconChange); i++)
{ {
TCHAR iconPath[MAX_PATH]; DWORD cbData, dwType;
TCHAR szData[MAX_PATH]; TCHAR szData[MAX_PATH];
/* Current icons */ /* Current icons */
StringCchCopy(iconPath, _countof(iconPath), szUserClass); StringCchCopy(regPath, _countof(regPath), szUserClass);
StringCchCat(iconPath, _countof(iconPath), IconChange[i].CLSID); StringCchCat(regPath, _countof(regPath), IconChange[i].CLSID);
StringCchCat(iconPath, _countof(iconPath), szDefaultIcon); StringCchCat(regPath, _countof(regPath), szDefaultIcon);
cbData = sizeof(szData); cbData = sizeof(szData);
if (SHGetValue(HKEY_CURRENT_USER, iconPath, IconChange[i].IconName, &dwType, if (SHGetValue(HKEY_CURRENT_USER, regPath, IconChange[i].IconName, &dwType,
&szData, &cbData) == ERROR_SUCCESS && &szData, &cbData) == ERROR_SUCCESS &&
(dwType == REG_SZ || dwType == REG_EXPAND_SZ)) (dwType == REG_SZ || dwType == REG_EXPAND_SZ))
{ {
@ -139,12 +102,12 @@ LoadIcons:
/* Default icons */ /* Default icons */
/* FIXME: Get default icons from theme data, fallback to CLSID data on error. */ /* FIXME: Get default icons from theme data, fallback to CLSID data on error. */
StringCchCopy(iconPath, _countof(iconPath), szSysClass); StringCchCopy(regPath, _countof(regPath), szSysClass);
StringCchCat(iconPath, _countof(iconPath), IconChange[i].CLSID); StringCchCat(regPath, _countof(regPath), IconChange[i].CLSID);
StringCchCat(iconPath, _countof(iconPath), szDefaultIcon); StringCchCat(regPath, _countof(regPath), szDefaultIcon);
cbData = sizeof(szData); cbData = sizeof(szData);
if (SHGetValue(HKEY_CLASSES_ROOT, iconPath, IconChange[i].IconName, &dwType, if (SHGetValue(HKEY_CLASSES_ROOT, regPath, IconChange[i].IconName, &dwType,
&szData, &cbData) == ERROR_SUCCESS && &szData, &cbData) == ERROR_SUCCESS &&
(dwType == REG_SZ || dwType == REG_EXPAND_SZ)) (dwType == REG_SZ || dwType == REG_EXPAND_SZ))
{ {
@ -194,63 +157,24 @@ SaveDesktopSettings(PDESKTOP_DATA pData)
static BOOL static BOOL
GetCurrentValue(UINT i, BOOL bNewStart) GetCurrentValue(UINT i, BOOL bNewStart)
{ {
HKEY regKey, iconKey; TCHAR regPath[MAX_PATH];
LSTATUS res;
DWORD dwType, cbData;
BOOL bRet;
/* Set default value */ StringCchCopy(regPath, _countof(regPath), szHideDesktopIcons);
bRet = bNewStart; StringCchCat(regPath, _countof(regPath), bNewStart ? szNewStartPanel : szClassicStartMenu);
if (RegOpenKeyEx(HKEY_CURRENT_USER, szHideDesktopIcons, return SHRegGetBoolUSValue(regPath, DesktopIcons[i].CLSID, FALSE, bNewStart);
0, KEY_QUERY_VALUE, &regKey) != ERROR_SUCCESS)
{
return bRet;
}
if (RegOpenKeyEx(regKey, (bNewStart ? szNewStartPanel : szClassicStartMenu),
0, KEY_QUERY_VALUE, &iconKey) != ERROR_SUCCESS)
{
RegCloseKey(regKey);
return bRet;
}
cbData = sizeof(bRet);
res = RegQueryValueEx(iconKey, DesktopIcons[i].CLSID, NULL, &dwType, (LPBYTE)&bRet, &cbData);
if (res != ERROR_SUCCESS || dwType != REG_DWORD || cbData != sizeof(bRet))
bRet = bNewStart;
RegCloseKey(iconKey);
RegCloseKey(regKey);
return bRet;
} }
static VOID static VOID
SetCurrentValue(UINT i, BOOL bNewStart, BOOL bValue) SetCurrentValue(UINT i, BOOL bNewStart, BOOL bValue)
{ {
HKEY regKey, iconKey; TCHAR regPath[MAX_PATH];
if (RegCreateKeyEx(HKEY_CURRENT_USER, szHideDesktopIcons, StringCchCopy(regPath, _countof(regPath), szHideDesktopIcons);
0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, StringCchCat(regPath, _countof(regPath), bNewStart ? szNewStartPanel : szClassicStartMenu);
NULL, &regKey, NULL) != ERROR_SUCCESS)
{
return;
}
if (RegCreateKeyEx(regKey, (bNewStart ? szNewStartPanel : szClassicStartMenu), SHSetValue(HKEY_CURRENT_USER, regPath, DesktopIcons[i].CLSID, REG_DWORD,
0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, (LPBYTE)&bValue, sizeof(bValue));
NULL, &iconKey, NULL) != ERROR_SUCCESS)
{
RegCloseKey(regKey);
return;
}
RegSetValueEx(iconKey, DesktopIcons[i].CLSID, 0, REG_DWORD, (LPBYTE)&bValue, sizeof(bValue));
RegCloseKey(iconKey);
RegCloseKey(regKey);
} }
VOID VOID