Commit 888262ed authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

gdiplus: Added GdipLoadImageFromFileICM (no icm yet).

parent 03b6c5e8
...@@ -436,7 +436,7 @@ ...@@ -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
......
...@@ -727,6 +727,12 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, ...@@ -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;
......
...@@ -121,6 +121,12 @@ static void test_LoadingImages(void) ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment