[ros-diffs] [gadamopoulos] 53224: [uxtheme] - Unfortunately ExtCreateRegion does not seem to work, so for the time being use a simpler (and slower) implementation of UXTHEME_RegionFromDibBits that uses multipl...

[gadamopoulos at svn.reactos.org]

Author: gadamopoulos
Date: Sun Aug 14 10:52:13 2011
New Revision: 53224

URL: http://svn.reactos.org/svn/reactos?rev=53224&view=rev
Log:
[uxtheme]
- Unfortunately ExtCreateRegion does not seem to work, so for the time being use a simpler (and slower) implementation of UXTHEME_RegionFromDibBits that uses multiple calls to CombineRgn

Modified:
    branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c

Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c?rev=53224&r1=53223&r2=53224&view=diff
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c [iso-8859-1] Sun Aug 14 10:52:13 2011
@@ -1771,8 +1771,12 @@
 {
     int x, y, xstart;
     int cMaxRgnRects, cRgnDataSize, cRgnRects;
+#ifdef EXTCREATEREGION_WORKS
     RECT* prcCurrent;
     PRGNDATA prgnData;
+#else
+    HRGN hrgnTemp;
+#endif
     ULONG clrTransparent, *pclrCurrent;
     HRGN hrgnRet;
 
@@ -1784,10 +1788,14 @@
     cMaxRgnRects = 4* (pRect->bottom-pRect->top);
     cRgnDataSize = sizeof(RGNDATA) + cMaxRgnRects * sizeof(RECT);
 
+#ifdef EXTCREATEREGION_WORKS
     /* Allocate the region data */
     prgnData = (PRGNDATA)HeapAlloc(GetProcessHeap(), 0, cRgnDataSize);
 
     prcCurrent = (PRECT)prgnData->Buffer;
+#else
+    hrgnRet = CreateRectRgn(0,0,0,0);
+#endif
     
     /* Calculate the region rects */
     y=0;
@@ -1811,6 +1819,7 @@
                     pclrCurrent++;
                 }
 
+#ifdef EXTCREATEREGION_WORKS
                 /* Add the scaned line to the region */
                 SetRect(prcCurrent, xstart, y,x,y+1);
                 prcCurrent++;
@@ -1827,6 +1836,11 @@
                                                      cRgnDataSize);
                     prcCurrent = (RECT*)prgnData->Buffer + cRgnRects;
                 }
+#else
+                hrgnTemp = CreateRectRgn(xstart, y,x,y+1);
+                CombineRgn(hrgnRet, hrgnRet, hrgnTemp, RGN_OR );
+                DeleteObject(hrgnTemp);
+#endif
             }
             else
             {
@@ -1837,6 +1851,7 @@
         y++;
     }
 
+#ifdef EXTCREATEREGION_WORKS
     /* Fill the region data header */
     prgnData->rdh.dwSize = sizeof(prgnData->rdh);
     prgnData->rdh.iType = RDH_RECTANGLES;
@@ -1849,6 +1864,7 @@
 
     /* Free the region data*/
     HeapFree(GetProcessHeap(),0,prgnData);
+#endif
 
     /* return the region*/
     return hrgnRet;