Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Win32k/Gdi32

Browse source 
- Remove NtGdiCreateFont/Indirect, and NtGdiGetOutlineTextMetrics.

svn path=/trunk/; revision=26593
This commit is contained in:
James Tabor 2007-04-30 15:33:35 +00:00
parent 6e7167b022
commit 4bb33d9f46
2 changed files with 0 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/include/reactos/win32k/ntgdibad.h
View file

@ -49,31 +49,6 @@ typedef struct tagFONTFAMILYINFO
DWORD FontType;
} FONTFAMILYINFO, *PFONTFAMILYINFO;
/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */
HFONT
NTAPI
NtGdiCreateFontIndirect(CONST LPLOGFONTW lf);
/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */
HFONT
NTAPI
NtGdiCreateFont(
int Height,
int Width,
int Escapement,
int Orientation,
int Weight,
DWORD Italic,
DWORD Underline,
DWORD StrikeOut,
DWORD CharSet,
DWORD OutputPrecision,
DWORD ClipPrecision,
DWORD Quality,
DWORD PitchAndFamily,
LPCWSTR Face
);
/* Should be using NtGdiEnumFontChunk */
INT
NTAPI
@ -621,13 +596,6 @@ NtGdiGetMetaRgn (
HRGN hrgn
);
/* Use NtGdiGetOutlineTextMetricsInternalW. */
UINT
STDCALL
NtGdiGetOutlineTextMetrics(HDC hDC,
UINT Data,
LPOUTLINETEXTMETRICW otm);
/* Use NtGdiDoPalette with GdiPalGetEntries. */
UINT
STDCALL

80
reactos/subsystems/win32/win32k/objects/text.c
View file

@ -523,86 +523,6 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont)
return Status;
}
HFONT
STDCALL
NtGdiCreateFont(int Height,
int Width,
int Escapement,
int Orientation,
int Weight,
DWORD Italic,
DWORD Underline,
DWORD StrikeOut,
DWORD CharSet,
DWORD OutputPrecision,
DWORD ClipPrecision,
DWORD Quality,
DWORD PitchAndFamily,
LPCWSTR Face)
{
LOGFONTW logfont;
HFONT NewFont;
NTSTATUS Status = STATUS_SUCCESS;
logfont.lfHeight = Height;
logfont.lfWidth = Width;
logfont.lfEscapement = Escapement;
logfont.lfOrientation = Orientation;
logfont.lfWeight = Weight;
logfont.lfItalic = Italic;
logfont.lfUnderline = Underline;
logfont.lfStrikeOut = StrikeOut;
logfont.lfCharSet = CharSet;
logfont.lfOutPrecision = OutputPrecision;
logfont.lfClipPrecision = ClipPrecision;
logfont.lfQuality = Quality;
logfont.lfPitchAndFamily = PitchAndFamily;
if (NULL != Face)
{
int Size = sizeof(logfont.lfFaceName) / sizeof(WCHAR);
wcsncpy((wchar_t *)logfont.lfFaceName, Face, Size - 1);
/* Be 101% sure to have '\0' at end of string */
logfont.lfFaceName[Size - 1] = '\0';
}
else
{
logfont.lfFaceName[0] = L'\0';
}
if (NT_SUCCESS(Status))
{
Status = TextIntCreateFontIndirect(&logfont, &NewFont);
}
return NT_SUCCESS(Status) ? NewFont : NULL;
}
HFONT
STDCALL
NtGdiCreateFontIndirect(CONST LPLOGFONTW lf)
{
LOGFONTW SafeLogfont;
HFONT NewFont;
NTSTATUS Status = STATUS_SUCCESS;
if (NULL != lf)
{
Status = MmCopyFromCaller(&SafeLogfont, lf, sizeof(LOGFONTW));
if (NT_SUCCESS(Status))
{
Status = TextIntCreateFontIndirect(&SafeLogfont, &NewFont);
}
}
else
{
Status = STATUS_INVALID_PARAMETER;
}
return NT_SUCCESS(Status) ? NewFont : NULL;
}
HFONT
STDCALL
NtGdiHfontCreate(