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

gdi32: Add a helper function to find a specific driver in the DC stack.

This commit is contained in:
Alexandre Julliard 2012-08-21 12:54:01 +02:00
parent 2cd062831d
commit 0f5cc668ba
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/gdi32/gdi_private.h
View File

@ -179,6 +179,14 @@ static inline PHYSDEV pop_dc_driver( DC *dc, PHYSDEV dev )
return dev; return dev;
} }
static inline PHYSDEV find_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs )
{
PHYSDEV dev;
for (dev = dc->physDev; dev; dev = dev->next) if (dev->funcs == funcs) return dev;
return NULL;
}
/* bitmap object */ /* bitmap object */
typedef struct tagBITMAPOBJ typedef struct tagBITMAPOBJ

9
dlls/gdi32/path.c
View File

@ -856,14 +856,15 @@ static BOOL pathdrv_DeleteDC( PHYSDEV dev )
BOOL PATH_SavePath( DC *dst, DC *src ) BOOL PATH_SavePath( DC *dst, DC *src )
{ {
struct path_physdev *physdev; PHYSDEV dev;
if (src->path) if (src->path)
{ {
if (!(dst->path = copy_gdi_path( src->path ))) return FALSE; if (!(dst->path = copy_gdi_path( src->path ))) return FALSE;
} }
else if ((physdev = find_path_physdev( src ))) else if ((dev = find_dc_driver( src, &path_driver )))
{ {
struct path_physdev *physdev = get_path_physdev( dev );
if (!(dst->path = copy_gdi_path( physdev->path ))) return FALSE; if (!(dst->path = copy_gdi_path( physdev->path ))) return FALSE;
dst->path_open = TRUE; dst->path_open = TRUE;
} }
@ -880,7 +881,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src )
if (!physdev) if (!physdev)
{ {
if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE;
physdev = get_path_physdev( dst->physDev ); physdev = get_path_physdev( find_dc_driver( dst, &path_driver ));
} }
else free_gdi_path( physdev->path ); else free_gdi_path( physdev->path );
@ -2101,7 +2102,7 @@ BOOL nulldrv_BeginPath( PHYSDEV dev )
free_gdi_path( path ); free_gdi_path( path );
return FALSE; return FALSE;
} }
physdev = get_path_physdev( dc->physDev ); physdev = get_path_physdev( find_dc_driver( dc, &path_driver ));
physdev->path = path; physdev->path = path;
if (dc->path) free_gdi_path( dc->path ); if (dc->path) free_gdi_path( dc->path );
dc->path = NULL; dc->path = NULL;