Vincent Povirk : gdiplus: Add and use an HBITMAP field in GpBitmap objects.
Alexandre Julliard
julliard at winehq.org
Sat Aug 29 11:36:12 CDT 2009
Module: wine
Branch: master
Commit: e48524ceb6f4a584b8b1f37eeaf0fc73e563bfca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48524ceb6f4a584b8b1f37eeaf0fc73e563bfca
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Fri Aug 28 14:49:35 2009 -0500
gdiplus: Add and use an HBITMAP field in GpBitmap objects.
---
dlls/gdiplus/brush.c | 2 +-
dlls/gdiplus/gdiplus_private.h | 1 +
dlls/gdiplus/image.c | 13 ++++++++-----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index be4298e..f719ff8 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -670,7 +670,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image,
n_y + n_height > ((GpBitmap*)image)->height)
return InvalidParameter;
- IPicture_get_Handle(image->picture, (OLE_HANDLE*)&hbm);
+ hbm = ((GpBitmap*)image)->hbitmap;
if(!hbm) return GenericError;
IPicture_get_CurDC(image->picture, &hdc);
bm_is_selected = (hdc != 0);
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index e36f921..5765eac 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -222,6 +222,7 @@ struct GpBitmap{
ImageLockMode lockmode;
INT numlocks;
BYTE *bitmapbits; /* pointer to the buffer we passed in BitmapLockBits */
+ HBITMAP hbitmap;
};
struct GpCachedBitmap{
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 9c4f56c..e201973 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -167,7 +167,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect,
if(bitmap->lockmode)
return WrongState;
- IPicture_get_Handle(bitmap->image.picture, (OLE_HANDLE*)&hbm);
+ hbm = bitmap->hbitmap;
IPicture_get_CurDC(bitmap->image.picture, &hdc);
bm_is_selected = (hdc != 0);
@@ -263,7 +263,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap,
return Ok;
}
- IPicture_get_Handle(bitmap->image.picture, (OLE_HANDLE*)&hbm);
+ hbm = bitmap->hbitmap;
IPicture_get_CurDC(bitmap->image.picture, &hdc);
bm_is_selected = (hdc != 0);
@@ -587,6 +587,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap)
(*bitmap)->image.flags = ImageFlagsNone;
(*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture);
(*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture);
+ (*bitmap)->hbitmap = NULL;
DeleteObject(iinfo.hbmColor);
DeleteObject(iinfo.hbmMask);
@@ -687,6 +688,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride,
(*bitmap)->width = width;
(*bitmap)->height = height;
(*bitmap)->format = format;
+ IPicture_get_Handle((*bitmap)->image.picture, (OLE_HANDLE*)&(*bitmap)->hbitmap);
return Ok;
}
@@ -1261,6 +1263,8 @@ static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid,
IPicture_get_Handle(pic, (OLE_HANDLE*)&hbm);
IPicture_get_CurDC(pic, &hdc);
+ (*((GpBitmap**) image))->hbitmap = hbm;
+
bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader);
bmch->bcSize = sizeof(BITMAPCOREHEADER);
@@ -1576,9 +1580,8 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream,
if (encode_image == NULL)
return UnknownImageFormat;
- /* extract underlying hbitmap representation from the IPicture */
- hr = IPicture_get_Handle(image->picture, (OLE_HANDLE*)&hbmp);
- if (FAILED(hr) || !hbmp)
+ hbmp = ((GpBitmap*)image)->hbitmap;
+ if (!hbmp)
return GenericError;
hr = IPicture_get_CurDC(image->picture, &hdc);
if (FAILED(hr))
More information about the wine-cvs
mailing list