From 88aa13419ccfea44c3c1d0a51eec042eaa61e3bf Mon Sep 17 00:00:00 2001 From: James Tabor Date: Wed, 23 May 2012 23:04:23 +0000 Subject: [PATCH] [UXTHEME] - Sync port up to Wine 1.5.4 and head. svn path=/trunk/; revision=56654 --- reactos/dll/win32/uxtheme/draw.c | 4 ++-- reactos/dll/win32/uxtheme/metric.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/uxtheme/draw.c b/reactos/dll/win32/uxtheme/draw.c index 7268d77c723..cfb9d3a4a47 100644 --- a/reactos/dll/win32/uxtheme/draw.c +++ b/reactos/dll/win32/uxtheme/draw.c @@ -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; diff --git a/reactos/dll/win32/uxtheme/metric.c b/reactos/dll/win32/uxtheme/metric.c index 7252d1eae40..3127ef4362d 100644 --- a/reactos/dll/win32/uxtheme/metric.c +++ b/reactos/dll/win32/uxtheme/metric.c @@ -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 {