gdiplus: Added GdipLoadImageFromFileICM (no icm yet).

This commit is contained in:
Nikolay Sivov 2008-05-09 16:40:21 +04:00 committed by Alexandre Julliard
parent 03b6c5e85f
commit 888262ede7
3 changed files with 13 additions and 1 deletions

View File

@ -436,7 +436,7 @@
@ stub GdipIsVisibleRegionRect @ stub GdipIsVisibleRegionRect
@ stub GdipIsVisibleRegionRectI @ stub GdipIsVisibleRegionRectI
@ stdcall GdipLoadImageFromFile(wstr ptr) @ stdcall GdipLoadImageFromFile(wstr ptr)
@ stub GdipLoadImageFromFileICM @ stdcall GdipLoadImageFromFileICM(wstr ptr)
@ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStream(ptr ptr)
@ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr)
@ stub GdipMeasureCharacterRanges @ stub GdipMeasureCharacterRanges

View File

@ -727,6 +727,12 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename,
return stat; return stat;
} }
/* FIXME: no icm handling */
GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage **image)
{
return GdipLoadImageFromFile(filename, image);
}
GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image)
{ {
IPicture *pic; IPicture *pic;

View File

@ -121,6 +121,12 @@ static void test_LoadingImages(void)
stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef);
expect(InvalidParameter, stat); expect(InvalidParameter, stat);
stat = GdipLoadImageFromFileICM(0, 0);
expect(InvalidParameter, stat);
stat = GdipLoadImageFromFileICM(0, (GpImage**)0xdeadbeef);
expect(InvalidParameter, stat);
} }
static void test_SavingImages(void) static void test_SavingImages(void)