Disable gdi batch for SelectObject with fonts. Fixes font regression.

svn path=/trunk/; revision=46998
This commit is contained in:
Timo Kreuzer 2010-04-22 22:28:49 +00:00
parent 1e1d4a34ac
commit 14347c75ad

View file

@ -1540,7 +1540,7 @@ SelectObject(HDC hDC,
PDC_ATTR pDc_Attr;
HGDIOBJ hOldObj = NULL;
UINT uType;
PTEB pTeb;
// PTEB pTeb;
if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
{
@ -1582,6 +1582,7 @@ SelectObject(HDC hDC,
case GDI_OBJECT_TYPE_FONT:
hOldObj = pDc_Attr->hlfntNew;
if (hOldObj == hGdiObj) return hOldObj;
#if 0
pDc_Attr->ulDirty_ &= ~SLOW_WIDTHS;
pDc_Attr->ulDirty_ |= DIRTY_CHARSET;
pDc_Attr->hlfntNew = hGdiObj;
@ -1603,6 +1604,7 @@ SelectObject(HDC hDC,
if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush();
return hOldObj;
}
#endif
// default for select object font
return NtGdiSelectFont(hDC, hGdiObj);