Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDIPLUS] GdipCreateBitmapFromStream should accept metafiles (#4181)

Browse source 
- Add hbitmap_from_emf helper function.
- GdipCreateBitmapFromStream accepts the metafiles.
CORE-17814
This commit is contained in:
Katayama Hirofumi MZ 2021-12-25 21:40:08 +09:00 committed by GitHub
parent 99a6d03786
commit 5c8ae0d766
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
dll/win32/gdiplus/image.c
View file

@ -1897,6 +1897,41 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride,
return Ok;
}
#ifdef __REACTOS__
static HBITMAP hbitmap_from_emf(HENHMETAFILE hemf)
{
BITMAPINFO bmi;
HBITMAP hbm;
SIZE size;
ENHMETAHEADER header;
HGDIOBJ hbmOld;
RECT rc;
HDC hdc;
GetEnhMetaFileHeader(hemf, sizeof(header), &header);
size.cx = header.rclBounds.right - header.rclBounds.left + 1;
size.cy = header.rclBounds.bottom - header.rclBounds.top + 1;
ZeroMemory(&bmi, sizeof(bmi));
bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader);
bmi.bmiHeader.biWidth = size.cx;
bmi.bmiHeader.biHeight = size.cy;
bmi.bmiHeader.biPlanes = 1;
bmi.bmiHeader.biBitCount = 24;
hdc = CreateCompatibleDC(NULL);
hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0);
hbmOld = SelectObject(hdc, hbm);
SetRect(&rc, 0, 0, size.cx, size.cy);
PlayEnhMetaFile(hdc, hemf, &rc);
SelectObject(hdc, hbmOld);
DeleteDC(hdc);
return hbm;
}
#endif
GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream,
GpBitmap **bitmap)
{
@ -1909,6 +1944,19 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream,
if(stat != Ok)
return stat;
#ifdef __REACTOS__
if ((*bitmap)->image.type == ImageTypeMetafile)
{
HBITMAP hbm = hbitmap_from_emf(((GpMetafile*)*bitmap)->hemf);
GdipDisposeImage(&(*bitmap)->image);
if (!hbm)
return GenericError; /* FIXME: what error to return? */
GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap);
DeleteObject(hbm);
}
else
#endif
if((*bitmap)->image.type != ImageTypeBitmap){
GdipDisposeImage(&(*bitmap)->image);
*bitmap = NULL;