[ros-diffs] [jimtabor] 26593: Win32k/Gdi32 - Remove NtGdiCreateFont/Indirect, and NtGdiGetOutlineTextMetrics.

Author: jimtabor
Date: Mon Apr 30 19:33:35 2007
New Revision: 26593

URL: http://svn.reactos.org/svn/reactos?rev=26593&view=rev
Log:
Win32k/Gdi32
- Remove NtGdiCreateFont/Indirect, and NtGdiGetOutlineTextMetrics.

Modified:
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/subsystems/win32/win32k/objects/text.c

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgd...
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Apr 30 19:33:35 2007
@@ -49,31 +49,6 @@
   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
@@ -620,13 +595,6 @@
    HDC	hDC,
    HRGN	hrgn
    );
-
-/* Use NtGdiGetOutlineTextMetricsInternalW. */
-UINT
-STDCALL
-NtGdiGetOutlineTextMetrics(HDC  hDC,
-                                UINT  Data,
-                                LPOUTLINETEXTMETRICW otm);

/* Use NtGdiDoPalette with GdiPalGetEntries. */
 UINT

Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Apr 30 19:33:35 2007
@@ -522,86 +522,6 @@

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