Nikolay Sivov : gdiplus: Added GdipLoadImageFromFileICM (no icm yet).
Alexandre Julliard
julliard at winehq.org
Mon May 12 07:12:29 CDT 2008
Module: wine
Branch: master
Commit: 888262ede77dea2bd97cdd38a5c056a3a2760a51
URL: http://source.winehq.org/git/wine.git/?a=commit;h=888262ede77dea2bd97cdd38a5c056a3a2760a51
Author: Nikolay Sivov <bunglehead at gmail.com>
Date: Fri May 9 16:40:21 2008 +0400
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 deletions(-)
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 905cff5..e9de1cd 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 fc4146f..72bf7f5 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 26aede0..5142f7c 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)
More information about the wine-cvs
mailing list