[jimtabor] 56654: [UXTHEME] - Sync port up to Wine 1.5.4 and head.

Author: jimtabor
Date: Wed May 23 23:04:23 2012
New Revision: 56654

URL: http://svn.reactos.org/svn/reactos?rev=56654&view=rev
Log:
[UXTHEME]
- Sync port up to Wine 1.5.4 and head.

Modified:
    trunk/reactos/dll/win32/uxtheme/draw.c
    trunk/reactos/dll/win32/uxtheme/metric.c

Modified: trunk/reactos/dll/win32/uxtheme/draw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?re...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed May 23 23:04:23 2012
@@ -906,14 +906,14 @@
         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;

Modified: trunk/reactos/dll/win32/uxtheme/metric.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c?...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Wed May 23 23:04:23 2012
@@ -74,7 +74,7 @@
                 SetLastError(hr);
        }
     }
-    return GetSysColor(iColorID - TMT_FIRSTCOLOR);
+    return GetSysColor(iColorID);
 }

/***********************************************************************
@@ -105,7 +105,7 @@
        }
     }
     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 {