From 14347c75ad50fead45b67b447b8bfadfe8d92f9e Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 22 Apr 2010 22:28:49 +0000 Subject: [PATCH] Disable gdi batch for SelectObject with fonts. Fixes font regression. svn path=/trunk/; revision=46998 --- reactos/dll/win32/gdi32/objects/dc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/gdi32/objects/dc.c b/reactos/dll/win32/gdi32/objects/dc.c index 34c31148bb3..2d90f60cdac 100644 --- a/reactos/dll/win32/gdi32/objects/dc.c +++ b/reactos/dll/win32/gdi32/objects/dc.c @@ -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);