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

fixed some error cases

Browse source 
svn path=/trunk/; revision=9207
This commit is contained in:
Thomas Bluemel 2004-04-23 21:35:59 +00:00
parent e7d451e2fd
commit aeef6123b6
1 changed files with 74 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: text.c,v 1.89 2004/04/09 20:03:20 navaraf Exp $ */ /* $Id: text.c,v 1.90 2004/04/23 21:35:59 weiden Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
@ -1515,7 +1515,10 @@ NtGdiExtTextOut(
dc = DC_LockDc(hDC); dc = DC_LockDc(hDC);
if (!dc) if (!dc)
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE; return FALSE;
}
if (NULL != UnsafeDx) if (NULL != UnsafeDx)
{ {
@ -2467,66 +2470,76 @@ NtGdiGetTextMetrics(HDC hDC,
TT_OS2 *pOS2; TT_OS2 *pOS2;
ULONG Error; ULONG Error;
dc = DC_LockDc(hDC); if (NULL == tm)
if (NULL == dc || NULL == tm)
{ {
Status = STATUS_INVALID_PARAMETER; SetLastWin32Error(STATUS_INVALID_PARAMETER);
return FALSE;
}
if(!(dc = DC_LockDc(hDC)))
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE;
}
TextObj = TEXTOBJ_LockText(dc->w.hFont);
if (NULL != TextObj)
{
Status = GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI);
if (NT_SUCCESS(Status))
{
Face = FontGDI->face;
IntLockFreeType;
Error = FT_Set_Pixel_Sizes(Face,
/* FIXME should set character height if neg */
(TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight),
TextObj->logfont.lfWidth);
IntUnLockFreeType;
if (0 != Error)
{
DPRINT1("Error in setting pixel sizes: %u\n", Error);
Status = STATUS_UNSUCCESSFUL;
}
else
{
memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW));
IntLockFreeType;
pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
IntUnLockFreeType;
if (NULL == pOS2)
{
DPRINT1("Can't find OS/2 table - not TT font?\n");
Status = STATUS_UNSUCCESSFUL;
}
else
{
SafeTm.tmAveCharWidth = (pOS2->xAvgCharWidth + 32) >> 6;
}
SafeTm.tmAscent = (Face->size->metrics.ascender + 32) >> 6; // units above baseline
SafeTm.tmDescent = (32 - Face->size->metrics.descender) >> 6; // units below baseline
SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent;
SafeTm.tmMaxCharWidth = (Face->size->metrics.max_advance + 32) >> 6;
Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW));
}
}
TEXTOBJ_UnlockText(dc->w.hFont);
} }
else else
{ {
TextObj = TEXTOBJ_LockText(dc->w.hFont); ASSERT(FALSE);
if (NULL != TextObj) Status = STATUS_INVALID_HANDLE;
{ }
Status = GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI); DC_UnlockDc(hDC);
if (NT_SUCCESS(Status))
{ if(!NT_SUCCESS(Status))
Face = FontGDI->face; {
IntLockFreeType; SetLastNtError(Status);
Error = FT_Set_Pixel_Sizes(Face, return FALSE;
/* FIXME should set character height if neg */
(TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight),
TextObj->logfont.lfWidth);
IntUnLockFreeType;
if (0 != Error)
{
DPRINT1("Error in setting pixel sizes: %u\n", Error);
Status = STATUS_UNSUCCESSFUL;
}
else
{
memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW));
IntLockFreeType;
pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
IntUnLockFreeType;
if (NULL == pOS2)
{
DPRINT1("Can't find OS/2 table - not TT font?\n");
Status = STATUS_UNSUCCESSFUL;
}
else
{
SafeTm.tmAveCharWidth = (pOS2->xAvgCharWidth + 32) >> 6;
}
SafeTm.tmAscent = (Face->size->metrics.ascender + 32) >> 6; // units above baseline
SafeTm.tmDescent = (32 - Face->size->metrics.descender) >> 6; // units below baseline
SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent;
SafeTm.tmMaxCharWidth = (Face->size->metrics.max_advance + 32) >> 6;
Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW));
}
}
TEXTOBJ_UnlockText(dc->w.hFont);
}
else
{
ASSERT(FALSE);
Status = STATUS_INVALID_HANDLE;
}
DC_UnlockDc(hDC);
} }
return NT_SUCCESS(Status); return TRUE;
} }
BOOL BOOL
@ -2564,7 +2577,8 @@ NtGdiSetTextAlign(HDC hDC,
dc = DC_LockDc(hDC); dc = DC_LockDc(hDC);
if (!dc) if (!dc)
{ {
return 0; SetLastWin32Error(ERROR_INVALID_HANDLE);
return GDI_ERROR;
} }
prevAlign = dc->w.textAlign; prevAlign = dc->w.textAlign;
dc->w.textAlign = Mode; dc->w.textAlign = Mode;
@ -2583,7 +2597,8 @@ NtGdiSetTextColor(HDC hDC,
if (!dc) if (!dc)
{ {
return 0x80000000; SetLastWin32Error(ERROR_INVALID_HANDLE);
return CLR_INVALID;
} }
oldColor = dc->w.textColor; oldColor = dc->w.textColor;