reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdiplus: Fix memory leak in GdipCreateMetafileFromWMF.

Browse Source
This commit is contained in:
Evan Stade 2007-07-31 19:15:12 -07:00 committed by Alexandre Julliard
parent 9da6cc907e
commit cfef981a9a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/gdiplus/graphics.c
View File

@ -846,11 +846,12 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete,
GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile)
{
static int calls;
IStream *stream;
IStream *stream = NULL;
UINT read;
BYTE* copy;
METAFILEPICT mfp;
HENHMETAFILE hemf;
GpStatus retval = GenericError;
if(!hwmf || !metafile || !placeable)
return InvalidParameter;
@ -882,16 +883,19 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete,
if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){
ERR("could not make stream\n");
return GenericError;
goto end;
}
*metafile = GdipAlloc(sizeof(GpMetafile));
if(!*metafile) return OutOfMemory;
if(!*metafile){
retval = OutOfMemory;
goto end;
}
if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture,
(LPVOID*) &((*metafile)->image.picture)) != S_OK){
GdipFree(*metafile);
return GenericError;
goto end;
}
(*metafile)->image.type = ImageTypeMetafile;
@ -903,11 +907,15 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete,
- placeable->BoundingBox.Top)) / ((REAL) placeable->Inch);
(*metafile)->unit = UnitInch;
if(delete)
DeleteMetaFile(hwmf);
return Ok;
retval = Ok;
end:
IStream_Release(stream);
GdipFree(copy);
return retval;
}
GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics)