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

gdi32: Fall back to StretchBlt if the driver doesn't export PatBlt or BitBlt.

This commit is contained in:
Alexandre Julliard 2009-09-30 20:55:26 +02:00
parent 3fe20bdc7e
commit ab15d13290
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/gdi32/bitblt.c
View File

@ -47,12 +47,18 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top,
if (!dc) return FALSE; if (!dc) return FALSE;
TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop );
if (dc->funcs->pPatBlt) if (dc->funcs->pPatBlt)
{ {
TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop );
update_dc( dc ); update_dc( dc );
bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop ); bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop );
} }
else if (dc->funcs->pStretchBlt)
{
update_dc( dc );
bRet = dc->funcs->pStretchBlt( dc->physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop );
}
release_dc_ptr( dc ); release_dc_ptr( dc );
return bRet; return bRet;
} }
@ -72,14 +78,19 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE;
if (dcDst->funcs->pBitBlt) if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt)
{ {
update_dc( dcDst ); update_dc( dcDst );
dcSrc = get_dc_ptr( hdcSrc ); dcSrc = get_dc_ptr( hdcSrc );
if (dcSrc) update_dc( dcSrc ); if (dcSrc) update_dc( dcSrc );
ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, if (dcDst->funcs->pBitBlt)
dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height,
dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop );
else
ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, width, height,
dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc,
width, height, rop );
release_dc_ptr( dcDst ); release_dc_ptr( dcDst );
if (dcSrc) release_dc_ptr( dcSrc ); if (dcSrc) release_dc_ptr( dcSrc );

12
dlls/gdi32/mfdrv/bitblt.c
View File

@ -35,18 +35,6 @@ BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height,
} }
/***********************************************************************
* MFDRV_BitBlt
*/
BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height,
PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop )
{
return MFDRV_StretchBlt(devDst, xDst, yDst, width, height, devSrc,
xSrc, ySrc, width, height, rop);
}
/*********************************************************************** /***********************************************************************
* MFDRV_StretchBlt * MFDRV_StretchBlt
* this function contains TWO ways for processing StretchBlt in metafiles, * this function contains TWO ways for processing StretchBlt in metafiles,

2
dlls/gdi32/mfdrv/init.c
View File

@ -38,7 +38,7 @@ static const DC_FUNCTIONS MFDRV_Funcs =
MFDRV_Arc, /* pArc */ MFDRV_Arc, /* pArc */
NULL, /* pArcTo */ NULL, /* pArcTo */
MFDRV_BeginPath, /* pBeginPath */ MFDRV_BeginPath, /* pBeginPath */
MFDRV_BitBlt, /* pBitBlt */ NULL, /* pBitBlt */
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
MFDRV_Chord, /* pChord */ MFDRV_Chord, /* pChord */
MFDRV_CloseFigure, /* pCloseFigure */ MFDRV_CloseFigure, /* pCloseFigure */

3
dlls/gdi32/mfdrv/metafiledrv.h
View File

@ -64,9 +64,6 @@ extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;
extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width,
INT height, PHYSDEV devSrc, INT xSrc, INT ySrc,
DWORD rop ) DECLSPEC_HIDDEN;
extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right,
INT bottom, INT xstart, INT ystart, INT xend, INT bottom, INT xstart, INT ystart, INT xend,
INT yend ) DECLSPEC_HIDDEN; INT yend ) DECLSPEC_HIDDEN;