ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: GdipLoadImageFromStream makes initializations.

Browse Source
This commit is contained in:
Evan Stade 2007-08-07 18:42:20 -07:00 committed by Alexandre Julliard
parent 7d03a41325
commit 985ea4afac
1 changed files with 58 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
dlls/gdiplus/image.c
View File

@ -318,10 +318,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride,
GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream,
GpBitmap **bitmap) GpBitmap **bitmap)
{ {
BITMAPINFO bmi;
BITMAPCOREHEADER* bmch;
OLE_HANDLE hbm;
HDC hdc;
GpStatus stat; GpStatus stat;
stat = GdipLoadImageFromStream(stream, (GpImage**) bitmap); stat = GdipLoadImageFromStream(stream, (GpImage**) bitmap);
@ -329,30 +325,11 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream,
if(stat != Ok) if(stat != Ok)
return stat; return stat;
/* FIXME: make sure it's actually a bitmap */ if((*bitmap)->image.type != ImageTypeBitmap){
(*bitmap)->image.type = ImageTypeBitmap; IPicture_Release((*bitmap)->image.picture);
(*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); GdipFree(bitmap);
(*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); return GenericError; /* FIXME: what error to return? */
/* get the pixel format */
IPicture_get_Handle((*bitmap)->image.picture, &hbm);
IPicture_get_CurDC((*bitmap)->image.picture, &hdc);
bmch = (BITMAPCOREHEADER*) (&bmi.bmiHeader);
bmch->bcSize = sizeof(BITMAPCOREHEADER);
if(!hdc){
HBITMAP old;
hdc = GetDC(0);
old = SelectObject(hdc, (HBITMAP)hbm);
GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS);
SelectObject(hdc, old);
ReleaseDC(0, hdc);
} }
else
GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS);
(*bitmap)->format = (bmch->bcBitCount << 8) | PixelFormatGDI;
return Ok; return Ok;
} }
@ -594,21 +571,68 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image,
GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image)
{ {
IPicture *pic;
short type;
if(!stream || !image) if(!stream || !image)
return InvalidParameter; return InvalidParameter;
*image = GdipAlloc(sizeof(GpImage));
if(!*image) return OutOfMemory;
if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture,
(LPVOID*) &((*image)->picture)) != S_OK){ (LPVOID*) &pic) != S_OK){
TRACE("Could not load picture\n"); TRACE("Could not load picture\n");
GdipFree(*image);
return GenericError; return GenericError;
} }
/* FIXME: use IPicture_get_Type to get image type? */ IStream_AddRef(stream);
IPicture_get_Type(pic, &type);
if(type == PICTYPE_BITMAP){
BITMAPINFO bmi;
BITMAPCOREHEADER* bmch;
OLE_HANDLE hbm;
HDC hdc;
*image = GdipAlloc(sizeof(GpBitmap));
if(!*image) return OutOfMemory;
(*image)->type = ImageTypeBitmap;
(*((GpBitmap**) image))->width = ipicture_pixel_width(pic);
(*((GpBitmap**) image))->height = ipicture_pixel_height(pic);
/* get the pixel format */
IPicture_get_Handle(pic, &hbm);
IPicture_get_CurDC(pic, &hdc);
bmch = (BITMAPCOREHEADER*) (&bmi.bmiHeader);
bmch->bcSize = sizeof(BITMAPCOREHEADER);
if(!hdc){
HBITMAP old;
hdc = GetDC(0);
old = SelectObject(hdc, (HBITMAP)hbm);
GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS);
SelectObject(hdc, old);
ReleaseDC(0, hdc);
}
else
GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS);
(*((GpBitmap**) image))->format = (bmch->bcBitCount << 8) | PixelFormatGDI;
}
else if(type == PICTYPE_METAFILE || type == PICTYPE_ENHMETAFILE){
/* FIXME: missing initialization code */
*image = GdipAlloc(sizeof(GpMetafile));
if(!*image) return OutOfMemory;
(*image)->type = ImageTypeMetafile;
}
else{
*image = GdipAlloc(sizeof(GpImage));
if(!*image) return OutOfMemory;
(*image)->type = ImageTypeUnknown; (*image)->type = ImageTypeUnknown;
}
(*image)->picture = pic;
return Ok; return Ok;
} }