Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed locking in NtGdiGetCharWidth32. This caused problems with AbiWord reported by Jason Filby.

Browse source 
svn path=/trunk/; revision=10076
This commit is contained in:
Filip Navara 2004-07-11 02:10:48 +00:00
parent ce4aa8ef2e
commit 85cec6dde5
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/subsys/win32k/objects/text.c
View file

@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: text.c,v 1.103 2004/07/09 20:28:20 navaraf Exp $ */
/* $Id: text.c,v 1.104 2004/07/11 02:10:48 navaraf Exp $ */
#include <w32k.h>
#include <ft2build.h>
@ -2016,10 +2016,17 @@ NtGdiGetCharWidth32(HDC hDC,
SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE;
}
TextObj = TEXTOBJ_LockText(hFont);
hFont = dc->w.hFont;
TextObj = TEXTOBJ_LockText(hFont);
DC_UnlockDc(hDC);
if (TextObj == NULL)
{
ExFreePool(SafeBuffer);
SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE;
}
if (!NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI)))
{
ExFreePool(SafeBuffer);