Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:43:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DESK] Set the default value for the placement combobox and load the monitor bitmap before the registry is accessed. Lower the requested access rights for RegOpenKeyEx to HKEY_QUERY_VALUE. In case RegOpenKeyEx fails, simply return to the calling function. Remove result and varType variables. By Ricardo Hanke. CORE-9365

Browse source 
svn path=/trunk/; revision=66681
This commit is contained in:
Amine Khaldi 2015-03-14 10:28:22 +00:00
parent 4ec3e6e63e
commit 959962a683
1 changed files with 17 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

47
reactos/dll/cpl/desk/background.c
View file

@ -446,8 +446,6 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData)
HKEY regKey; HKEY regKey;
TCHAR szBuffer[2]; TCHAR szBuffer[2];
DWORD bufferSize = sizeof(szBuffer); DWORD bufferSize = sizeof(szBuffer);
DWORD varType = REG_SZ;
LONG result;
BITMAP bitmap; BITMAP bitmap;
AddListViewItems(hwndDlg, pData); AddListViewItems(hwndDlg, pData);
@ -461,21 +459,25 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData)
LoadString(hApplet, IDS_TILE, szString, sizeof(szString) / sizeof(TCHAR)); LoadString(hApplet, IDS_TILE, szString, sizeof(szString) / sizeof(TCHAR));
SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString); SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString);
/* Load the default settings from the registry */ SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0);
result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); pData->placementSelection = PLACEMENT_CENTER;
if (result != ERROR_SUCCESS)
pData->hBitmap = (HBITMAP) LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
if (pData->hBitmap != NULL)
{ {
/* reg key open failed; maybe it does not exist? create it! */ GetObject(pData->hBitmap, sizeof(BITMAP), &bitmap);
DWORD dwDisposition = 0;
result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, NULL, 0, KEY_ALL_ACCESS, NULL, pData->cxSource = bitmap.bmWidth;
&regKey, &dwDisposition ); pData->cySource = bitmap.bmHeight;
/* Now the key must be created & opened and regKey points to opened key */
/* On error result will not contain ERROR_SUCCESS. I don't know how to handle */
/* this case :( */
} }
result = RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); /* Load the default settings from the registry */
if (result == ERROR_SUCCESS) if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_QUERY_VALUE, &regKey) != ERROR_SUCCESS)
{
return;
}
if (RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, NULL, (LPBYTE)szBuffer, &bufferSize) == ERROR_SUCCESS)
{ {
if (_ttoi(szBuffer) == 0) if (_ttoi(szBuffer) == 0)
{ {
@ -489,14 +491,8 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData)
pData->placementSelection = PLACEMENT_STRETCH; pData->placementSelection = PLACEMENT_STRETCH;
} }
} }
else
{
SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0);
pData->placementSelection = PLACEMENT_CENTER;
}
result = RegQueryValueEx(regKey, TEXT("TileWallpaper"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); if (RegQueryValueEx(regKey, TEXT("TileWallpaper"), 0, NULL, (LPBYTE)szBuffer, &bufferSize) == ERROR_SUCCESS)
if (result == ERROR_SUCCESS)
{ {
if (_ttoi(szBuffer) == 1) if (_ttoi(szBuffer) == 1)
{ {
@ -506,15 +502,6 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData)
} }
RegCloseKey(regKey); RegCloseKey(regKey);
pData->hBitmap = (HBITMAP) LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
if (pData->hBitmap != NULL)
{
GetObject(pData->hBitmap, sizeof(BITMAP), &bitmap);
pData->cxSource = bitmap.bmWidth;
pData->cySource = bitmap.bmHeight;
}
} }