Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DESK]

Browse source 
- Fix #6262: each new applied color scheme increase the window title height by one
- Don't read REG_QWORD directly to DWORD variable

svn path=/trunk/; revision=52892
This commit is contained in:
Rafal Harabien 2011-07-26 10:51:54 +00:00
parent de40c205e9
commit 9cb007b9f8
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/cpl/desk/theme.c
View file

@ -63,7 +63,7 @@ const int g_SizeMetric[NUM_SIZES] =
{ {
SM_CXBORDER, /* 00: SIZE_BORDER_X */ SM_CXBORDER, /* 00: SIZE_BORDER_X */
SM_CYBORDER, /* 01: SIZE_BORDER_Y */ SM_CYBORDER, /* 01: SIZE_BORDER_Y */
SM_CYCAPTION, /* 02: SIZE_CAPTION_Y */ SM_CYSIZE, /* 02: SIZE_CAPTION_Y */
SM_CXICON, /* 03: SIZE_ICON_X */ SM_CXICON, /* 03: SIZE_ICON_X */
SM_CYICON, /* 04: SIZE_ICON_Y */ SM_CYICON, /* 04: SIZE_ICON_Y */
SM_CXICONSPACING, /* 05: SIZE_ICON_SPC_X */ SM_CXICONSPACING, /* 05: SIZE_ICON_SPC_X */
@ -72,7 +72,7 @@ const int g_SizeMetric[NUM_SIZES] =
SM_CYMENU, /* 08: SIZE_MENU_Y */ SM_CYMENU, /* 08: SIZE_MENU_Y */
SM_CXVSCROLL, /* 09: SIZE_SCROLL_X */ SM_CXVSCROLL, /* 09: SIZE_SCROLL_X */
SM_CYHSCROLL, /* 10: SIZE_SCROLL_Y */ SM_CYHSCROLL, /* 10: SIZE_SCROLL_Y */
SM_CYSMCAPTION, /* 11: SIZE_SMCAPTION_Y */ SM_CYSMSIZE, /* 11: SIZE_SMCAPTION_Y */
SM_CXEDGE, /* 12: SIZE_EDGE_X */ SM_CXEDGE, /* 12: SIZE_EDGE_X */
SM_CYEDGE, /* 13: SIZE_EDGE_Y */ SM_CYEDGE, /* 13: SIZE_EDGE_Y */
SM_CYSIZEFRAME, /* 14: SIZE_FRAME_Y */ SM_CYSIZEFRAME, /* 14: SIZE_FRAME_Y */
@ -190,13 +190,16 @@ BOOL LoadThemeFromReg(THEME* theme, INT ThemeId)
for (i = 0; i < NUM_SIZES; i++) for (i = 0; i < NUM_SIZES; i++)
{ {
wsprintf(strValueName, TEXT("Size #%d"), i); wsprintf(strValueName, TEXT("Size #%d"), i);
UINT64 iSize;
dwLength = sizeof(UINT64); dwLength = sizeof(UINT64);
if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&theme->Size[i], &dwLength) != ERROR_SUCCESS || if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&iSize, &dwLength) != ERROR_SUCCESS ||
dwType != REG_QWORD || dwLength != sizeof(UINT64)) dwType != REG_QWORD || dwLength != sizeof(UINT64))
{ {
/* Failed to read registry value, initialize with current setting for now */ /* Failed to read registry value, initialize with current setting for now */
theme->Size[i] = GetSystemMetrics(g_SizeMetric[i]); theme->Size[i] = GetSystemMetrics(g_SizeMetric[i]); if(i == SIZE_CAPTION_Y) OutputDebugStringA("GetSystemMetrics!\n");
} }
else
theme->Size[i] = (INT)iSize;
} }
RegCloseKey(hkScheme); RegCloseKey(hkScheme);
} }