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

gdi32: Implement DeleteDC in the path driver. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-06-21 14:46:04 +09:00
parent 86d14ad17e
commit 234daa7522
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/gdi32/path.c
View File

@ -99,7 +99,7 @@ struct path_physdev
static inline struct path_physdev *get_path_physdev( PHYSDEV dev ) static inline struct path_physdev *get_path_physdev( PHYSDEV dev )
{ {
return (struct path_physdev *)dev; return CONTAINING_RECORD( dev, struct path_physdev, dev );
} }
void free_gdi_path( struct gdi_path *path ) void free_gdi_path( struct gdi_path *path )
@ -750,13 +750,9 @@ static BOOL pathdrv_BeginPath( PHYSDEV dev )
*/ */
static BOOL pathdrv_AbortPath( PHYSDEV dev ) static BOOL pathdrv_AbortPath( PHYSDEV dev )
{ {
struct path_physdev *physdev = get_path_physdev( dev );
DC *dc = get_dc_ptr( dev->hdc ); DC *dc = get_dc_ptr( dev->hdc );
if (!dc) return FALSE; path_driver.pDeleteDC( pop_dc_driver( dc, &path_driver ));
free_gdi_path( physdev->path );
pop_dc_driver( dc, &path_driver );
HeapFree( GetProcessHeap(), 0, physdev );
release_dc_ptr( dc ); release_dc_ptr( dc );
return TRUE; return TRUE;
} }
@ -770,7 +766,6 @@ static BOOL pathdrv_EndPath( PHYSDEV dev )
struct path_physdev *physdev = get_path_physdev( dev ); struct path_physdev *physdev = get_path_physdev( dev );
DC *dc = get_dc_ptr( dev->hdc ); DC *dc = get_dc_ptr( dev->hdc );
if (!dc) return FALSE;
dc->path = physdev->path; dc->path = physdev->path;
pop_dc_driver( dc, &path_driver ); pop_dc_driver( dc, &path_driver );
HeapFree( GetProcessHeap(), 0, physdev ); HeapFree( GetProcessHeap(), 0, physdev );
@ -801,7 +796,10 @@ static BOOL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
*/ */
static BOOL pathdrv_DeleteDC( PHYSDEV dev ) static BOOL pathdrv_DeleteDC( PHYSDEV dev )
{ {
assert( 0 ); /* should never be called */ struct path_physdev *physdev = get_path_physdev( dev );
free_gdi_path( physdev->path );
HeapFree( GetProcessHeap(), 0, physdev );
return TRUE; return TRUE;
} }