[UXTHEME]

- Sync port up to Wine 1.5.4 and head.

svn path=/trunk/; revision=56654
This commit is contained in:
James Tabor 2012-05-23 23:04:23 +00:00
parent f770056aa3
commit 88aa13419c
2 changed files with 4 additions and 4 deletions

View file

@ -906,14 +906,14 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId,
vert[0].Red = GetRValue(gradient1) << 8;
vert[0].Green = GetGValue(gradient1) << 8;
vert[0].Blue = GetBValue(gradient1) << 8;
vert[0].Alpha = 0x0000;
vert[0].Alpha = 0xff00;
vert[1].x = pRect->right;
vert[1].y = pRect->bottom;
vert[1].Red = GetRValue(gradient2) << 8;
vert[1].Green = GetGValue(gradient2) << 8;
vert[1].Blue = GetBValue(gradient2) << 8;
vert[1].Alpha = 0x0000;
vert[1].Alpha = 0xff00;
gRect.UpperLeft = 0;
gRect.LowerRight = 1;

View file

@ -74,7 +74,7 @@ COLORREF WINAPI GetThemeSysColor(HTHEME hTheme, int iColorID)
SetLastError(hr);
}
}
return GetSysColor(iColorID - TMT_FIRSTCOLOR);
return GetSysColor(iColorID);
}
/***********************************************************************
@ -105,7 +105,7 @@ HRESULT WINAPI GetThemeSysFont(HTHEME hTheme, int iFontID, LOGFONTW *plf)
}
}
if(iFontID == TMT_ICONTITLEFONT) {
if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), &plf, 0))
if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), plf, 0))
return HRESULT_FROM_WIN32(GetLastError());
}
else {