Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-02 22:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DESK.CPL]

Browse source 
Modify font enumeration code to deal with failure to read the registry key. Also change the registry key being queried to match the one used on Windows. Patch by Ricardo Hanke.
CORE-8203

svn path=/trunk/; revision=65621
This commit is contained in:
Ziliang Guo 2014-12-12 22:07:29 +00:00
parent 34dee12ec2
commit aa7bd0b1b7
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
reactos/dll/cpl/desk/general.c
View file

@ -26,8 +26,21 @@ InitFontSizeList(HWND hWnd)
{
if (SetupFindFirstLine(hInf, _T("Font Sizes"), NULL, &Context))
{
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontDPI"),
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\Software\\Fonts"),
0, KEY_READ, &hKey) == ERROR_SUCCESS)
{
dwSize = MAX_PATH;
dwType = REG_DWORD;
if (!RegQueryValueEx(hKey, _T("LogPixels"), NULL,
&dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS)
{
dwValue = 0;
}
RegCloseKey(hKey);
}
for (;;)
{
TCHAR Buffer[LINE_LEN];
@ -41,23 +54,17 @@ InitFontSizeList(HWND hWnd)
if (i != CB_ERR)
SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci);
dwSize = MAX_PATH;
dwType = REG_DWORD;
if (RegQueryValueEx(hKey, _T("LogPixels"), NULL,
&dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS)
if ((int)dwValue == ci)
{
if ((int)dwValue == ci)
{
SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0);
SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc);
}
SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0);
SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc);
}
else
SendMessage(hFontSize, CB_SETCURSEL, 0, 0);
}
if (!SetupFindNextLine(&Context, &Context))
{
RegCloseKey(hKey);
break;
}
}