Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 11:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDIPLUS]

Browse source 
sync gdiplus with wine 1.1.41

svn path=/trunk/; revision=46317
This commit is contained in:
Christoph von Wittich 2010-03-21 19:20:42 +00:00
parent 335d8b61b1
commit 518193eb0a
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/gdiplus/brush.c
View file

@ -865,7 +865,10 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image,
(*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb);
(*texture)->brush.bt = BrushTypeTextureFill; (*texture)->brush.bt = BrushTypeTextureFill;
(*texture)->wrap = imageattr->wrap; if (imageattr)
(*texture)->wrap = imageattr->wrap;
else
(*texture)->wrap = WrapModeTile;
(*texture)->image = new_image; (*texture)->image = new_image;
exit: exit:

11
reactos/dll/win32/gdiplus/image.c
View file

@ -2108,6 +2108,8 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile,
if(!(calls++)) if(!(calls++))
FIXME("not implemented\n"); FIXME("not implemented\n");
memset(header, 0, sizeof(MetafileHeader));
return Ok; return Ok;
} }
@ -2194,6 +2196,7 @@ struct image_format_dimension image_format_dimensions[] =
{NULL} {NULL}
}; };
/* FIXME: Need to handle multi-framed images */
GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image,
GDIPCONST GUID* dimensionID, UINT* count) GDIPCONST GUID* dimensionID, UINT* count)
{ {
@ -2201,13 +2204,15 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image,
TRACE("(%p,%s,%p)\n", image, debugstr_guid(dimensionID), count); TRACE("(%p,%s,%p)\n", image, debugstr_guid(dimensionID), count);
if(!image || !dimensionID || !count) if(!image || !count)
return InvalidParameter; return InvalidParameter;
if(!(calls++)) if(!(calls++))
FIXME("not implemented\n"); FIXME("returning frame count of 1\n");
return NotImplemented; *count = 1;
return Ok;
} }
GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image, GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image,