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

- Allocated a zero filled memory block for the font.

Browse source 
- Restored Ge's last changes.

svn path=/trunk/; revision=12176
This commit is contained in:
Hartmut Birr 2004-12-18 11:05:03 +00:00
parent 04cae08bbc
commit a653ae39ad
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
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.118 2004/12/18 09:39:14 gvg Exp $ */ /* $Id: text.c,v 1.119 2004/12/18 11:05:03 hbirr Exp $ */
#include <w32k.h> #include <w32k.h>
#include <ft2build.h> #include <ft2build.h>
@ -357,7 +357,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
return 0; return 0;
} }
FontGDI = EngAllocMem(0, sizeof(FONTGDI), TAG_FONTOBJ); FontGDI = EngAllocMem(FL_ZERO_MEMORY, sizeof(FONTGDI), TAG_FONTOBJ);
if(FontGDI == NULL) if(FontGDI == NULL)
{ {
FT_Done_Face(Face); FT_Done_Face(Face);
@ -1647,11 +1647,11 @@ NtGdiExtTextOut(
IntLockFreeType; IntLockFreeType;
error = FT_Set_Pixel_Sizes( error = FT_Set_Pixel_Sizes(
face, face,
TextObj->logfont.lfWidth,
/* FIXME should set character height if neg */ /* FIXME should set character height if neg */
(TextObj->logfont.lfHeight < 0 ? (TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight), TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
TextObj->logfont.lfWidth);
IntUnLockFreeType; IntUnLockFreeType;
if (error) if (error)
{ {
@ -2030,11 +2030,11 @@ NtGdiGetCharWidth32(HDC hDC,
IntLockFreeType; IntLockFreeType;
FT_Set_Pixel_Sizes(face, FT_Set_Pixel_Sizes(face,
TextObj->logfont.lfWidth,
/* FIXME should set character height if neg */ /* FIXME should set character height if neg */
(TextObj->logfont.lfHeight < 0 ? (TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight), TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
TextObj->logfont.lfWidth);
for (i = FirstChar; i <= LastChar; i++) for (i = FirstChar; i <= LastChar; i++)
{ {
@ -2188,11 +2188,11 @@ TextIntGetTextExtentPoint(PDC dc,
IntLockFreeType; IntLockFreeType;
error = FT_Set_Pixel_Sizes(face, error = FT_Set_Pixel_Sizes(face,
TextObj->logfont.lfWidth,
/* FIXME should set character height if neg */ /* FIXME should set character height if neg */
(TextObj->logfont.lfHeight < 0 ? (TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight), TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
TextObj->logfont.lfWidth);
IntUnLockFreeType; IntUnLockFreeType;
if (error) if (error)
{ {
@ -2543,11 +2543,11 @@ NtGdiGetTextMetrics(HDC hDC,
Face = FontGDI->face; Face = FontGDI->face;
IntLockFreeType; IntLockFreeType;
Error = FT_Set_Pixel_Sizes(Face, Error = FT_Set_Pixel_Sizes(Face,
TextObj->logfont.lfWidth,
/* FIXME should set character height if neg */ /* FIXME should set character height if neg */
(TextObj->logfont.lfHeight < 0 ? (TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight), TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
TextObj->logfont.lfWidth);
IntUnLockFreeType; IntUnLockFreeType;
if (0 != Error) if (0 != Error)
{ {