niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

gdi32: Improve EMF DC cleanup when CloseEnhMetafile is not called.

Browse source
This commit is contained in:
Piotr Caban 2023-04-26 19:17:15 +02:00 • committed by Alexandre Julliard
parent d317db91f2
commit acbccf177e
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/gdi32/emfdc.c
View file

@ -2384,6 +2384,9 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr )
struct emf *emf = get_dc_emf( dc_attr ); struct emf *emf = get_dc_emf( dc_attr );
UINT index; UINT index;
if (emf->dc_brush) DeleteObject( emf->dc_brush );
if (emf->dc_pen) DeleteObject( emf->dc_pen );
CloseHandle( emf->file );
HeapFree( GetProcessHeap(), 0, emf->palette ); HeapFree( GetProcessHeap(), 0, emf->palette );
HeapFree( GetProcessHeap(), 0, emf->emh ); HeapFree( GetProcessHeap(), 0, emf->emh );
for (index = 0; index < emf->handles_size; index++) for (index = 0; index < emf->handles_size; index++)
@ -2597,7 +2600,9 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc )
RestoreDC( hdc, 1 ); RestoreDC( hdc, 1 );
if (emf->dc_brush) DeleteObject( emf->dc_brush ); if (emf->dc_brush) DeleteObject( emf->dc_brush );
emf->dc_brush = 0;
if (emf->dc_pen) DeleteObject( emf->dc_pen ); if (emf->dc_pen) DeleteObject( emf->dc_pen );
emf->dc_pen = 0;
emr->emr.iType = EMR_EOF; emr->emr.iType = EMR_EOF;
@ -2630,6 +2635,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc )
if (!WriteFile( emf->file, emf->emh, emf->emh->nBytes, NULL, NULL )) if (!WriteFile( emf->file, emf->emh, emf->emh->nBytes, NULL, NULL ))
{ {
CloseHandle( emf->file ); CloseHandle( emf->file );
emf->file = 0;
return 0; return 0;
} }
HeapFree( GetProcessHeap(), 0, emf->emh ); HeapFree( GetProcessHeap(), 0, emf->emh );
@ -2642,6 +2648,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc )
} }
hmf = EMF_Create_HENHMETAFILE( emf->emh, emf->emh->nBytes, emf->file != 0 ); hmf = EMF_Create_HENHMETAFILE( emf->emh, emf->emh->nBytes, emf->file != 0 );
emf->file = 0;
emf->emh = NULL; /* So it won't be deleted */ emf->emh = NULL; /* So it won't be deleted */
DeleteDC( hdc ); DeleteDC( hdc );
return hmf; return hmf;