Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 03:07:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=46998
This commit is contained in:
Timo Kreuzer 2010-04-22 22:28:49 +00:00
parent 1e1d4a34ac
commit 14347c75ad
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/gdi32/objects/dc.c
View file

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