system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-19 12:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdiplus: Fix for GpRegion clone helper.

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