ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Fix for GpRegion clone helper.

This commit is contained in:
Nikolay Sivov 2008-08-27 02:03:23 +04:00 committed by Alexandre Julliard
parent 0940154bd0
commit 740bc043cb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/gdiplus/region.c
View File

@ -167,9 +167,12 @@ static inline GpStatus clone_element(const region_element* element,
{
GpStatus stat;
*element2 = GdipAlloc(sizeof(region_element));
if (!*element2)
return OutOfMemory;
/* root node is allocated with GpRegion */
if(!*element2){
*element2 = GdipAlloc(sizeof(region_element));
if (!*element2)
return OutOfMemory;
}
(*element2)->type = element->type;
@ -188,6 +191,9 @@ static inline GpStatus clone_element(const region_element* element,
if (stat != Ok) goto clone_out;
break;
default:
(*element2)->elementdata.combine.left = NULL;
(*element2)->elementdata.combine.right = NULL;
stat = clone_element(element->elementdata.combine.left,
&(*element2)->elementdata.combine.left);
if (stat != Ok) goto clone_out;
@ -344,7 +350,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region,
GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1,
GpRegion *region2, CombineMode mode)
{
region_element *left, *right;
region_element *left, *right = NULL;
GpStatus stat;
TRACE("%p %p %d\n", region1, region2, mode);