Ethan Chen : gdiplus: Implemented GdipCreateBitmapFromFileICM.
Alexandre Julliard
julliard at winehq.org
Thu Mar 6 11:08:36 CST 2008
Module: wine
Branch: master
Commit: e0552c1bc6a24a54310f8e58904c7a3d8792a26b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0552c1bc6a24a54310f8e58904c7a3d8792a26b
Author: Ethan Chen <echen at thunder-08-L>
Date: Tue Mar 4 19:22:01 2008 -0800
gdiplus: Implemented GdipCreateBitmapFromFileICM.
---
dlls/gdiplus/gdiplus.spec | 2 +-
dlls/gdiplus/image.c | 7 +++++++
include/gdiplusflat.h | 1 +
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index b4f314a..6e28a0e 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -72,7 +72,7 @@
@ stub GdipCreateAdjustableArrowCap
@ stub GdipCreateBitmapFromDirectDrawSurface
@ stdcall GdipCreateBitmapFromFile(wstr ptr)
-@ stub GdipCreateBitmapFromFileICM
+@ stdcall GdipCreateBitmapFromFileICM(wstr ptr)
@ stub GdipCreateBitmapFromGdiDib
@ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr)
@ stub GdipCreateBitmapFromHBITMAP
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 96db406..a5b6ef8 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -250,6 +250,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename,
return stat;
}
+/* FIXME: no icm */
+GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR* filename,
+ GpBitmap **bitmap)
+{
+ return GdipCreateBitmapFromFile(filename, bitmap);
+}
+
GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap,
HBITMAP* hbmReturn, ARGB background)
{
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index 1f635ba..b787ab3 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -249,6 +249,7 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*,
GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**);
GpStatus WINGDIPAPI GdipConvertToEmfPlusToStream(const GpGraphics*,GpMetafile*,INT*,IStream*,EmfType,const WCHAR*,GpMetafile**);
GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**);
+GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**);
GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**);
GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,
GpBitmap**);
More information about the wine-cvs
mailing list