From 888262ede77dea2bd97cdd38a5c056a3a2760a51 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 9 May 2008 16:40:21 +0400 Subject: [PATCH] gdiplus: Added GdipLoadImageFromFileICM (no icm yet). --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 6 ++++++ dlls/gdiplus/tests/image.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 905cff58a1b..e9de1cda3df 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -436,7 +436,7 @@ @ stub GdipIsVisibleRegionRect @ stub GdipIsVisibleRegionRectI @ stdcall GdipLoadImageFromFile(wstr ptr) -@ stub GdipLoadImageFromFileICM +@ stdcall GdipLoadImageFromFileICM(wstr ptr) @ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stub GdipMeasureCharacterRanges diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index fc4146f23cd..72bf7f509bf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -727,6 +727,12 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, 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) { IPicture *pic; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 26aede02e3d..5142f7c6895 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -121,6 +121,12 @@ static void test_LoadingImages(void) stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); expect(InvalidParameter, stat); + + stat = GdipLoadImageFromFileICM(0, 0); + expect(InvalidParameter, stat); + + stat = GdipLoadImageFromFileICM(0, (GpImage**)0xdeadbeef); + expect(InvalidParameter, stat); } static void test_SavingImages(void)