Fix a cut & paste error.
[reactos.git] / reactos / subsys / win32k / objects / text.c
index 5cca2cb..89589ea 100644 (file)
@@ -1,54 +1,43 @@
 /*
- *  ReactOS W32 Subsystem
- *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
+ * ReactOS W32 Subsystem
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * Parts based on Wine code
+ * Copyright 1993 Alexandre Julliard
+ *           1997 Alex Korobka
+ * Copyright 2002,2003 Shachar Shemesh
+ * Copyright 2001 Huw D M Davies for CodeWeavers.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.70 2004/01/29 22:17:54 rcampbell Exp $ */
-
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <napi/win32.h>
-#include <internal/safe.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/text.h>
-#include <win32k/kapi.h>
-#include <include/error.h>
-#include <include/desktop.h>
+/* $Id$ */
+
+#include <w32k.h>
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <freetype/tttables.h>
 
-#include "../eng/handle.h"
-
-#include <include/inteng.h>
-#include <include/text.h>
-#include <include/eng.h>
-#include <include/palette.h>
-
 #define NDEBUG
-#include <win32k/debug1.h>
+#include <debug.h>
 
 FT_Library  library;
 
 typedef struct _FONT_ENTRY {
   LIST_ENTRY ListEntry;
-  HFONT hFont;
+  FONTGDI *Font;
   UNICODE_STRING FaceName;
   BYTE NotEnum;
 } FONT_ENTRY, *PFONT_ENTRY;
@@ -59,314 +48,364 @@ static FAST_MUTEX FreeTypeLock;
 
 static LIST_ENTRY FontListHead;
 static FAST_MUTEX FontListLock;
-static INT FontsLoaded = 0; /* number of all fonts loaded (including private fonts */
 static BOOL RenderingEnabled = TRUE;
 
+static PWCHAR ElfScripts[32] = { /* these are in the order of the fsCsb[0] bits */
+  L"Western", /*00*/
+  L"Central_European",
+  L"Cyrillic",
+  L"Greek",
+  L"Turkish",
+  L"Hebrew",
+  L"Arabic",
+  L"Baltic",
+  L"Vietnamese", /*08*/
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, /*15*/
+  L"Thai",
+  L"Japanese",
+  L"CHINESE_GB2312",
+  L"Hangul",
+  L"CHINESE_BIG5",
+  L"Hangul(Johab)",
+  NULL, NULL, /*23*/
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+  L"Symbol" /*31*/
+};
+
+/*
+ *  For NtGdiTranslateCharsetInfo
+ */
+#define FS(x) {{0,0,0,0},{0x1<<(x),0}}
+#define MAXTCIINDEX 32
+static CHARSETINFO FontTci[MAXTCIINDEX] = {
+  /* ANSI */
+  { ANSI_CHARSET, 1252, FS(0)},
+  { EASTEUROPE_CHARSET, 1250, FS(1)},
+  { RUSSIAN_CHARSET, 1251, FS(2)},
+  { GREEK_CHARSET, 1253, FS(3)},
+  { TURKISH_CHARSET, 1254, FS(4)},
+  { HEBREW_CHARSET, 1255, FS(5)},
+  { ARABIC_CHARSET, 1256, FS(6)},
+  { BALTIC_CHARSET, 1257, FS(7)},
+  { VIETNAMESE_CHARSET, 1258, FS(8)},
+  /* reserved by ANSI */
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  /* ANSI and OEM */
+  { THAI_CHARSET,  874,  FS(16)},
+  { SHIFTJIS_CHARSET, 932, FS(17)},
+  { GB2312_CHARSET, 936, FS(18)},
+  { HANGEUL_CHARSET, 949, FS(19)},
+  { CHINESEBIG5_CHARSET, 950, FS(20)},
+  { JOHAB_CHARSET, 1361, FS(21)},
+  /* reserved for alternate ANSI and OEM */
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { DEFAULT_CHARSET, 0, FS(0)},
+  /* reserved for system */
+  { DEFAULT_CHARSET, 0, FS(0)},
+  { SYMBOL_CHARSET, 42 /* CP_SYMBOL */, FS(31)},
+};
+
+VOID FASTCALL
+IntLoadSystemFonts(VOID);
+
+INT FASTCALL
+IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics);
+
 BOOL FASTCALL
-IntIsFontRenderingEnabled(VOID)
+InitFontSupport(VOID)
 {
-  BOOL Ret;
-  HDC hDC;
-  PDC dc;
-  PSURFOBJ SurfObj;
-  Ret = RenderingEnabled;
-  hDC = IntGetScreenDC();
-  if(hDC)
-  {
-    dc = DC_LockDc(hDC);
-    SurfObj = (PSURFOBJ)AccessUserObject((ULONG) dc->Surface);
-    if(SurfObj)
-      Ret = (SurfObj->iBitmapFormat >= BMF_8BPP);
-    DC_UnlockDc(hDC);
-  }
-  return Ret;
+   ULONG ulError;
+
+   InitializeListHead(&FontListHead);
+   ExInitializeFastMutex(&FontListLock);
+   ExInitializeFastMutex(&FreeTypeLock);
+
+   ulError = FT_Init_FreeType(&library);
+   if (ulError) {
+      DPRINT1("FT_Init_FreeType failed with error code 0x%x\n", ulError);
+      return FALSE;
+   }
+
+   IntLoadSystemFonts();
+
+   return TRUE;
 }
 
+/*
+ * IntLoadSystemFonts
+ *
+ * Search the system font directory and adds each font found.
+ */
+
 VOID FASTCALL
-IntEnableFontRendering(BOOL Enable)
+IntLoadSystemFonts(VOID)
 {
-  RenderingEnabled = Enable;
-}
+   OBJECT_ATTRIBUTES ObjectAttributes;
+   UNICODE_STRING Directory, SearchPattern, FileName, TempString;
+   IO_STATUS_BLOCK Iosb;
+   HANDLE hDirectory;
+   BYTE *DirInfoBuffer;
+   PFILE_DIRECTORY_INFORMATION DirInfo;
+   BOOL bRestartScan = TRUE;
+   NTSTATUS Status;
+
+   RtlInitUnicodeString(&Directory, L"\\SystemRoot\\media\\fonts\\");
+   /* FIXME: Add support for other font types */
+   RtlInitUnicodeString(&SearchPattern, L"*.ttf");
+
+   InitializeObjectAttributes(
+      &ObjectAttributes,
+      &Directory,
+      OBJ_CASE_INSENSITIVE,
+      NULL,
+      NULL);
+
+   Status = ZwOpenFile(
+      &hDirectory,
+      SYNCHRONIZE | FILE_LIST_DIRECTORY,
+      &ObjectAttributes,
+      &Iosb,
+      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+      FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE);
+
+   if (NT_SUCCESS(Status))
+   {
+      DirInfoBuffer = ExAllocatePool(PagedPool, 0x4000);
+      if (DirInfoBuffer == NULL)
+      {
+         ZwClose(hDirectory);
+         return;
+      }
 
-FT_Render_Mode FASTCALL
-IntGetFontRenderMode(LOGFONTW *logfont)
-{  
-  switch(logfont->lfQuality)
-  {
-    //case ANTIALIASED_QUALITY:
-    case DEFAULT_QUALITY:
-      return FT_RENDER_MODE_NORMAL;
-    case DRAFT_QUALITY:
-      return FT_RENDER_MODE_LIGHT;
-    //case NONANTIALIASED_QUALITY:
-    case PROOF_QUALITY:
-      return FT_RENDER_MODE_MONO;
-    //case CLEARTYPE_QUALITY:
-    //  return FT_RENDER_MODE_LCD;
-  }
-  return FT_RENDER_MODE_MONO;
+      FileName.Buffer = ExAllocatePool(PagedPool, MAX_PATH * sizeof(WCHAR));
+      if (FileName.Buffer == NULL)
+      {
+         ExFreePool(DirInfoBuffer);
+         ZwClose(hDirectory);
+         return;
+      }
+      FileName.Length = 0;
+      FileName.MaximumLength = MAX_PATH * sizeof(WCHAR);
+
+      while (1)
+      {
+         Status = ZwQueryDirectoryFile(
+            hDirectory,
+            NULL,
+            NULL,
+            NULL,
+            &Iosb,
+            DirInfoBuffer,
+            0x4000,
+            FileDirectoryInformation,
+            FALSE,
+            &SearchPattern,
+            bRestartScan);
+
+         if (!NT_SUCCESS(Status) || Status == STATUS_NO_MORE_FILES)
+         {
+            break;
+         }
+
+         DirInfo = (PFILE_DIRECTORY_INFORMATION)DirInfoBuffer;
+         while (1)
+         {
+            TempString.Buffer = DirInfo->FileName;
+            TempString.Length =
+            TempString.MaximumLength = DirInfo->FileNameLength;
+            RtlCopyUnicodeString(&FileName, &Directory);
+            RtlAppendUnicodeStringToString(&FileName, &TempString);
+            IntGdiAddFontResource(&FileName, 0);
+            if (DirInfo->NextEntryOffset == 0)
+               break;
+            DirInfo = (PFILE_DIRECTORY_INFORMATION)((ULONG_PTR)DirInfo + DirInfo->NextEntryOffset);
+         }
+
+         bRestartScan = FALSE;
+      }
+
+      ExFreePool(FileName.Buffer);
+      ExFreePool(DirInfoBuffer);
+      ZwClose(hDirectory);
+   }
 }
 
-int FASTCALL
-IntGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl)
-{
-  HFONT NewFont;
-  PFONTOBJ FontObj;
-  PFONTGDI FontGDI;
-  NTSTATUS Status;
-  HANDLE FileHandle;
-  OBJECT_ATTRIBUTES ObjectAttributes;
-  FILE_STANDARD_INFORMATION FileStdInfo;
-  PVOID buffer;
-  ULONG size;
-  INT error;
-  FT_Face face;
-  ANSI_STRING StringA;
-  IO_STATUS_BLOCK Iosb;
-  PFONT_ENTRY entry;
+/*
+ * IntGdiAddFontResource
+ *
+ * Adds the font resource from the specified file to the system.
+ */
 
-  NewFont = (HFONT)CreateGDIHandle(sizeof( FONTGDI ), sizeof( FONTOBJ ));
-  FontObj = (PFONTOBJ) AccessUserObject( (ULONG) NewFont );
-  FontGDI = (PFONTGDI) AccessInternalObject( (ULONG) NewFont );
+INT FASTCALL
+IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
+{
+   FONTGDI *FontGDI;
+   NTSTATUS Status;
+   HANDLE FileHandle;
+   OBJECT_ATTRIBUTES ObjectAttributes;
+   PVOID Buffer = NULL;
+   IO_STATUS_BLOCK Iosb;
+   INT Error;
+   FT_Face Face;
+   ANSI_STRING AnsiFaceName;
+   PFONT_ENTRY Entry;
+   PSECTION_OBJECT SectionObject;
+   ULONG ViewSize = 0;
+
+   /* Open the font file */
+
+   InitializeObjectAttributes(&ObjectAttributes, FileName, 0, NULL, NULL);
+   Status = ZwOpenFile(
+      &FileHandle,
+      FILE_GENERIC_READ | SYNCHRONIZE,
+      &ObjectAttributes,
+      &Iosb,
+      FILE_SHARE_READ,
+      FILE_SYNCHRONOUS_IO_NONALERT);
+
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("Could not font file: %wZ\n", FileName);
+      return 0;
+   }
 
-  //  Open the Module
-  InitializeObjectAttributes(&ObjectAttributes, Filename, 0, NULL, NULL);
+   Status = MmCreateSection(&SectionObject, SECTION_ALL_ACCESS,
+                            NULL, NULL, PAGE_READONLY,
+                            0, FileHandle, NULL);
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("Could not map file: %wZ\n", FileName);
+      ZwClose(FileHandle);
+      return 0;
+   }
 
-  Status = ZwOpenFile(&FileHandle, 
-                      GENERIC_READ|SYNCHRONIZE, 
-                      &ObjectAttributes, 
-                      &Iosb, 
-                      0, //ShareAccess
-                      FILE_SYNCHRONOUS_IO_NONALERT);
+   ZwClose(FileHandle);
 
-  if (!NT_SUCCESS(Status))
-  {
-    DPRINT1("Could not open module file: %wZ\n", Filename);
-    return 0;
-  }
+   Status = MmMapViewInSystemSpace(SectionObject, &Buffer, &ViewSize);
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("Could not map file: %wZ\n", FileName);
+      return Status;
+   }
 
-  //  Get the size of the file
-  Status = NtQueryInformationFile(FileHandle, &Iosb, &FileStdInfo, sizeof(FileStdInfo), FileStandardInformation);
-  if (!NT_SUCCESS(Status))
-  {
-    DPRINT1("Could not get file size\n");
-    return 0;
-  }
+   IntLockFreeType;
+   Error = FT_New_Memory_Face(
+      library,
+      Buffer,
+      ViewSize,
+      0,
+      &Face);
+   IntUnLockFreeType;
 
-  //  Allocate nonpageable memory for driver
-  size = FileStdInfo.EndOfFile.u.LowPart;
-  buffer = ExAllocatePool(NonPagedPool, size);
+   if (Error)
+   {
+      if (Error == FT_Err_Unknown_File_Format)
+         DPRINT("Unknown font file format\n");
+      else
+         DPRINT("Error reading font file (error code: %u)\n", Error);
+      ObDereferenceObject(SectionObject);
+      return 0;
+   }
 
-  if (buffer == NULL)
-  {
-    DPRINT1("could not allocate memory for module");
-    return 0;
-  }
+   Entry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_ENTRY), TAG_FONT);
+   if (!Entry)
+   {
+      FT_Done_Face(Face);
+      ObDereferenceObject(SectionObject);
+      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+      return 0;
+   }
 
-  //  Load driver into memory chunk
-  Status = ZwReadFile(FileHandle, 
-                      NULL, 
-                      NULL, 
-                      NULL, 
-                      &Iosb, 
-                      buffer, 
-                      FileStdInfo.EndOfFile.u.LowPart, 
-                      NULL, 
-                      NULL);
-                      
-  if (!NT_SUCCESS(Status))
-  {
-    DPRINT1("could not read module file into memory");
-    ExFreePool(buffer);
-    return 0;
-  }
+   FontGDI = EngAllocMem(FL_ZERO_MEMORY, sizeof(FONTGDI), TAG_FONTOBJ);
+   if(FontGDI == NULL)
+   {
+      FT_Done_Face(Face);
+      ObDereferenceObject(SectionObject);
+      ExFreePool(Entry);
+      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+      return 0;
+   }
 
-  ZwClose(FileHandle);
+   /* FontGDI->Filename = FileName; perform strcpy */
+   FontGDI->face = Face;
 
-  ExAcquireFastMutex(&FreeTypeLock);
-  error = FT_New_Memory_Face(library, buffer, size, 0, &face);
-  ExReleaseFastMutex(&FreeTypeLock);
-  if (error == FT_Err_Unknown_File_Format)
-  {
-    DPRINT1("Unknown font file format\n");
-    return 0;
-  }
-  else if (error)
-  {
-    DPRINT1("Error reading font file (error code: %u)\n", error); // 48
-    return 0;
-  }
-  
-  entry = ExAllocatePool(NonPagedPool, sizeof(FONT_ENTRY));
-  if(!entry)
-  {
-    SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-    return 0;
-  }
+   /* FIXME: Complete text metrics */
+   FontGDI->TextMetric.tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* units above baseline */
+   FontGDI->TextMetric.tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */
+   FontGDI->TextMetric.tmHeight = (Face->size->metrics.ascender -
+                                   Face->size->metrics.descender) >> 6;
 
-  // FontGDI->Filename = Filename; perform strcpy
-  FontGDI->face = face;
+   DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name);
+   DPRINT("Num glyphs: %u\n", Face->num_glyphs);
 
-  // FIXME: Complete text metrics
-  FontGDI->TextMetric.tmAscent = (face->size->metrics.ascender + 32) / 64; // units above baseline
-  FontGDI->TextMetric.tmDescent = (- face->size->metrics.descender + 32) / 64; // units below baseline
-  FontGDI->TextMetric.tmHeight = FontGDI->TextMetric.tmAscent + FontGDI->TextMetric.tmDescent;
+   /* Add this font resource to the font table */
 
-  DPRINT("Font loaded: %s (%s)\n", face->family_name, face->style_name);
-  DPRINT("Num glyphs: %u\n", face->num_glyphs);
+   Entry->Font = FontGDI;
+   Entry->NotEnum = (Characteristics & FR_NOT_ENUM);
+   RtlInitAnsiString(&AnsiFaceName, (LPSTR)Face->family_name);
+   RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiFaceName, TRUE);
 
-  // Add this font resource to the font table
-  entry->hFont = NewFont;
-  entry->NotEnum = (fl & FR_NOT_ENUM);
-  RtlInitAnsiString(&StringA, (LPSTR)face->family_name);
-  RtlAnsiStringToUnicodeString(&entry->FaceName, &StringA, TRUE);
-  
-  if(fl & FR_PRIVATE)
-  {
-    PW32PROCESS Win32Process = PsGetWin32Process();
-    
-    ExAcquireFastMutex(&Win32Process->PrivateFontListLock);
-    InsertTailList(&Win32Process->PrivateFontListHead, &entry->ListEntry);
-    FontsLoaded++;
-    ExReleaseFastMutex(&Win32Process->PrivateFontListLock);
-  }
-  else
-  {
-    ExAcquireFastMutex(&FontListLock);
-    InsertTailList(&FontListHead, &entry->ListEntry);
-    FontsLoaded++;
-    ExReleaseFastMutex(&FontListLock);
-  }
+   if (Characteristics & FR_PRIVATE)
+   {
+      PW32PROCESS Win32Process = PsGetWin32Process();
+      IntLockProcessPrivateFonts(Win32Process);
+      InsertTailList(&Win32Process->PrivateFontListHead, &Entry->ListEntry);
+      IntUnLockProcessPrivateFonts(Win32Process);
+   }
+   else
+   {
+      IntLockGlobalFonts;
+      InsertTailList(&FontListHead, &Entry->ListEntry);
+      IntUnLockGlobalFonts;
+   }
 
-  return 1;
+   return 1;
 }
 
-BOOL FASTCALL InitFontSupport(VOID)
+BOOL FASTCALL
+IntIsFontRenderingEnabled(VOID)
 {
-       ULONG ulError;
-       UNICODE_STRING cchDir, cchFilename, cchSearchPattern ;
-       OBJECT_ATTRIBUTES obAttr;
-       IO_STATUS_BLOCK Iosb;
-       HANDLE hDirectory;
-       NTSTATUS Status;
-       PFILE_DIRECTORY_INFORMATION iFileData;
-       PVOID   pBuff;
-       BOOLEAN bRestartScan = TRUE;
-       
-       
-       
-       if(pBuff)
-       {
-           InitializeListHead(&FontListHead);
-        ExInitializeFastMutex(&FontListLock);
-        ExInitializeFastMutex(&FreeTypeLock);
-       
-        ulError = FT_Init_FreeType(&library);
-    
-        if(!ulError)
-        {
-           RtlInitUnicodeString(&cchDir, L"\\SystemRoot\\Media\\Fonts\\");
-
-                   //RtlInitUnicodeString(&cchFilename, (PWCHAR)ExAllocatePool(NonPagedPool,0x4000));
-                   RtlInitUnicodeString(&cchSearchPattern,L"*.ttf");
-    
-                   InitializeObjectAttributes( &obAttr,
-                                                                       &cchDir,
-                                                                       OBJ_CASE_INSENSITIVE, 
-                                                                       NULL,
-                                                                       NULL );
-                                                                       
-            Status = ZwOpenFile( &hDirectory,
-                                 SYNCHRONIZE | FILE_LIST_DIRECTORY,
-                                 &obAttr,
-                                 &Iosb,
-                                 FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                                 FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE );         
-            if( NT_SUCCESS(Status) )
-            {          
-                while(1)
-                {   
-                    iFileData = NULL;
-                    pBuff = ExAllocatePool(NonPagedPool,0x4000);
-                    RtlInitUnicodeString(&cchFilename,0);
-                    cchFilename.MaximumLength = 0x1000;
-                    cchFilename.Buffer = ExAllocatePool(PagedPool,cchFilename.MaximumLength);
-                    cchFilename.Length = 0;
-                                   
-                                   Status = NtQueryDirectoryFile( hDirectory,
-                                                                  NULL,
-                                                                  NULL,
-                                                                  NULL,
-                                                                  &Iosb,
-                                                                  pBuff,
-                                                                  0x4000,
-                                                                  FileDirectoryInformation,
-                                                                  TRUE,
-                                                                  &cchSearchPattern,
-                                                                  bRestartScan );
-                                  
-                    iFileData = (PFILE_DIRECTORY_INFORMATION)pBuff;
-                   
-                    RtlAppendUnicodeToString(&cchFilename, cchDir.Buffer);
-                    RtlAppendUnicodeToString(&cchFilename, iFileData->FileName);
-                                   RtlAppendUnicodeToString(&cchFilename, L"\0");
-                                   
-                                   if( !NT_SUCCESS(Status) || Status == STATUS_NO_MORE_FILES )
-                                       break;
-                                  
-                                   DbgPrint("Adding Font:  \"%S\"\n", cchFilename.Buffer);
-                                   //NtGdiAddFontResource(&cchFilename, 0);
-                                   IntGdiAddFontResource(&cchFilename, 0);
-                                   ExFreePool(pBuff);
-                                   ExFreePool(cchFilename.Buffer);
-                                   bRestartScan = FALSE;
-                               }
-                               ExFreePool(pBuff);
-                               return TRUE;
-            }
-        }
-       }
-       return FALSE;
+   BOOL Ret = RenderingEnabled;
+   HDC hDC;
+
+   hDC = IntGetScreenDC();
+   if (hDC)
+      Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && RenderingEnabled;
+
+   return Ret;
 }
 
-static NTSTATUS STDCALL
-GetFontObjectsFromTextObj(PTEXTOBJ TextObj, HFONT *FontHandle, PFONTOBJ *FontObj, PFONTGDI *FontGDI)
+VOID FASTCALL
+IntEnableFontRendering(BOOL Enable)
 {
-  NTSTATUS Status = STATUS_SUCCESS;
+  RenderingEnabled = Enable;
+}
 
-  ASSERT(NULL != TextObj && NULL != TextObj->GDIFontHandle);
-  if (NULL != TextObj && NULL != TextObj->GDIFontHandle)
-  {
-    if (NT_SUCCESS(Status) && NULL != FontHandle)
-    {
-      *FontHandle = TextObj->GDIFontHandle;
-    }
-    if (NT_SUCCESS(Status) && NULL != FontObj)
-    {
-      *FontObj = AccessUserObject((ULONG) TextObj->GDIFontHandle);
-      if (NULL == *FontObj)
-      {
-       ASSERT(FALSE);
-       Status = STATUS_INVALID_HANDLE;
-      }
-    }
-    if (NT_SUCCESS(Status) && NULL != FontGDI)
-    {
-      *FontGDI = AccessInternalObject((ULONG) TextObj->GDIFontHandle);
-      if (NULL == *FontGDI)
-      {
-       ASSERT(FALSE);
-       Status = STATUS_INVALID_HANDLE;
-      }
-    }
-  }
-  else
+FT_Render_Mode FASTCALL
+IntGetFontRenderMode(LOGFONTW *logfont)
+{
+  switch(logfont->lfQuality)
   {
-    Status = STATUS_INVALID_HANDLE;
+    case NONANTIALIASED_QUALITY:
+      return FT_RENDER_MODE_MONO;
+    case DRAFT_QUALITY:
+      return FT_RENDER_MODE_LIGHT;
+/*    case CLEARTYPE_QUALITY:
+        return FT_RENDER_MODE_LCD; */
   }
-
-  return Status;
+  return FT_RENDER_MODE_NORMAL;
 }
 
 int
@@ -377,7 +416,7 @@ NtGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl)
   PWSTR src;
   NTSTATUS Status;
   int Ret;
-  
+
   /* Copy the UNICODE_STRING structure */
   Status = MmCopyFromCaller(&SafeFileName, Filename, sizeof(UNICODE_STRING));
   if(!NT_SUCCESS(Status))
@@ -385,25 +424,32 @@ NtGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl)
     SetLastNtError(Status);
     return 0;
   }
-  
+
+  /* Reserve for prepending '\??\' */
+  SafeFileName.Length += 4 * sizeof(WCHAR);
+  SafeFileName.MaximumLength += 4 * sizeof(WCHAR);
+
   src = SafeFileName.Buffer;
-  SafeFileName.Buffer = (PWSTR)ExAllocatePool(PagedPool, SafeFileName.MaximumLength);
+  SafeFileName.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, SafeFileName.MaximumLength, TAG_STRING);
   if(!SafeFileName.Buffer)
   {
     SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
     return 0;
   }
-  
-  Status = MmCopyFromCaller(&SafeFileName.Buffer, src, SafeFileName.MaximumLength);
+
+  /* Prepend '\??\' */
+  RtlCopyMemory(SafeFileName.Buffer, L"\\??\\", 4 * sizeof(WCHAR));
+
+  Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR)));
   if(!NT_SUCCESS(Status))
   {
     ExFreePool(SafeFileName.Buffer);
     SetLastNtError(Status);
     return 0;
   }
-  
+
   Ret = IntGdiAddFontResource(&SafeFileName, fl);
-  
+
   ExFreePool(SafeFileName.Buffer);
   return Ret;
 }
@@ -426,13 +472,13 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont)
        /* this should really depend on whether GM_ADVANCED is set */
        TextObj->logfont.lfOrientation = TextObj->logfont.lfEscapement;
       }
-      TEXTOBJ_UnlockText(*NewFont);
+      TEXTOBJ_UnlockText(TextObj);
     }
     else
     {
 /* FIXME */
 /*      ASSERT(FALSE);*/
-      Status = STATUS_INVALID_HANDLE;      
+      Status = STATUS_INVALID_HANDLE;
     }
   }
   else
@@ -529,322 +575,1385 @@ NtGdiCreateScalableFontResource(DWORD  Hidden,
                                      LPCWSTR  FontFile,
                                      LPCWSTR  CurrentPath)
 {
-  UNIMPLEMENTED;
+       DPRINT1("NtGdiCreateScalableFontResource - is unimplemented, have a nice day and keep going");
+  return FALSE;
 }
 
-int
-STDCALL
-NtGdiEnumFontFamilies(HDC  hDC,
-                          LPCWSTR  Family,
-                          FONTENUMPROCW  EnumFontFamProc,
-                          LPARAM  lParam)
+/*************************************************************************
+ * TranslateCharsetInfo
+ *
+ * Fills a CHARSETINFO structure for a character set, code page, or
+ * font. This allows making the correspondance between different labelings
+ * (character set, Windows, ANSI, and OEM codepages, and Unicode ranges)
+ * of the same encoding.
+ *
+ * Only one codepage will be set in Cs->fs. If TCI_SRCFONTSIG is used,
+ * only one codepage should be set in *Src.
+ *
+ * RETURNS
+ *   TRUE on success, FALSE on failure.
+ *
+ */
+static BOOLEAN STDCALL
+IntTranslateCharsetInfo(PDWORD Src, /* [in]
+                         if flags == TCI_SRCFONTSIG: pointer to fsCsb of a FONTSIGNATURE
+                         if flags == TCI_SRCCHARSET: a character set value
+                         if flags == TCI_SRCCODEPAGE: a code page value */
+                        LPCHARSETINFO Cs, /* [out] structure to receive charset information */
+                        DWORD Flags /* [in] determines interpretation of lpSrc */)
 {
-  UNIMPLEMENTED;
-}
+  int Index = 0;
 
-int
-STDCALL
-NtGdiEnumFontFamiliesEx(HDC  hDC,
-                            LPLOGFONTW  Logfont,
-                            FONTENUMEXPROCW  EnumFontFamExProc,
-                            LPARAM  lParam,
-                            DWORD  Flags)
-{
-  UNIMPLEMENTED;
-}
+  switch (Flags)
+    {
+      case TCI_SRCFONTSIG:
+       while (0 == (*Src >> Index & 0x0001) && Index < MAXTCIINDEX)
+          {
+            Index++;
+          }
+        break;
+      case TCI_SRCCODEPAGE:
+        while ((UINT) (Src) != FontTci[Index].ciACP && Index < MAXTCIINDEX)
+          {
+            Index++;
+          }
+        break;
+      case TCI_SRCCHARSET:
+        while ((UINT) (Src) != FontTci[Index].ciCharset && Index < MAXTCIINDEX)
+          {
+            Index++;
+          }
+        break;
+      default:
+        return FALSE;
+    }
 
-int
-STDCALL
-NtGdiEnumFonts(HDC  hDC,
-                   LPCWSTR FaceName,
-                   FONTENUMPROCW  FontFunc,
-                   LPARAM  lParam)
-{
-  UNIMPLEMENTED;
+  if (MAXTCIINDEX <= Index || DEFAULT_CHARSET == FontTci[Index].ciCharset)
+    {
+      return FALSE;
+    }
+
+  memcpy(Cs, &FontTci[Index], sizeof(CHARSETINFO));
+
+  return TRUE;
 }
 
 BOOL STDCALL
-NtGdiExtTextOut(HDC hDC, int XStart, int YStart, UINT fuOptions,
-   CONST RECT *lprc, LPCWSTR String, UINT Count, CONST INT *lpDx)
+NtGdiTranslateCharsetInfo(PDWORD Src,
+                          LPCHARSETINFO UnsafeCs,
+                          DWORD Flags)
 {
-#if 1
-  /* FIXME: Implement */
-  return NtGdiTextOut(hDC, XStart, YStart, String, Count);
-#else
-  // Fixme: Call EngTextOut, which does the real work (calling DrvTextOut where appropriate)
-
-  DC *dc;
-  SURFOBJ *SurfObj;
-  int error, glyph_index, n, i;
-  FT_Face face;
-  FT_GlyphSlot glyph;
-  ULONG TextLeft, TextTop, pitch, previous, BackgroundLeft;
-  FT_Bool use_kerning;
-  RECTL DestRect, MaskRect;
-  POINTL SourcePoint, BrushOrigin;
-  HBRUSH hBrushFg = NULL;
-  PBRUSHOBJ BrushFg = NULL;
-  HBRUSH hBrushBg = NULL;
-  PBRUSHOBJ BrushBg = NULL;
-  HBITMAP HSourceGlyph;
-  PSURFOBJ SourceGlyphSurf;
-  SIZEL bitSize;
-  FT_CharMap found = 0, charmap;
-  INT yoff;
-  PFONTOBJ FontObj;
-  PFONTGDI FontGDI;
-  PTEXTOBJ TextObj;
-  PPALGDI PalDestGDI;
-  PXLATEOBJ XlateObj;
-  ULONG Mode;
-
-  dc = DC_LockDc(hDC);
-  if( !dc )
-       return FALSE;
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
+  CHARSETINFO Cs;
+  BOOLEAN Ret;
+  NTSTATUS Status;
 
-  XStart += dc->w.DCOrgX;
-  YStart += dc->w.DCOrgY;
-  TextLeft = XStart;
-  TextTop = YStart;
-  BackgroundLeft = XStart;
+  Ret = IntTranslateCharsetInfo(Src, &Cs, Flags);
+  if (Ret)
+    {
+      Status = MmCopyToCaller(UnsafeCs, &Cs, sizeof(CHARSETINFO));
+      if (! NT_SUCCESS(Status))
+        {
+          SetLastWin32Error(ERROR_INVALID_PARAMETER);
+          return FALSE;
+        }
+    }
 
-  TextObj = TEXTOBJ_LockText(dc->w.hFont);
+  return (BOOL) Ret;
+}
 
-  if (! NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, &FontObj, &FontGDI)))
-  {
-    goto fail;
-  }
-  face = FontGDI->face;
+static void FASTCALL
+FillTM(TEXTMETRICW *TM, FT_Face Face, TT_OS2 *pOS2, TT_HoriHeader *pHori)
+{
+  FT_Fixed XScale, YScale;
+  int Ascent, Descent;
 
-  if (face->charmap == NULL)
-  {
-    DPRINT("WARNING: No charmap selected!\n");
-    DPRINT("This font face has %d charmaps\n", face->num_charmaps);
+  XScale = Face->size->metrics.x_scale;
+  YScale = Face->size->metrics.y_scale;
 
-    for (n = 0; n < face->num_charmaps; n++)
+  if (0 == pOS2->usWinAscent + pOS2->usWinDescent)
     {
-      charmap = face->charmaps[n];
-      DPRINT("found charmap encoding: %u\n", charmap->encoding);
-      if (charmap->encoding != 0)
-      {
-        found = charmap;
-        break;
-      }
+      Ascent = pHori->Ascender;
+      Descent = -pHori->Descender;
     }
-    if (!found) DPRINT1("WARNING: Could not find desired charmap!\n");
-    ExAcquireFastMutex(&FreeTypeLock);
-    error = FT_Set_Charmap(face, found);
-    ExReleaseFastMutex(&FreeTypeLock);
-    if (error) DPRINT1("WARNING: Could not set the charmap!\n");
-  }
-
-  ExAcquireFastMutex(&FreeTypeLock);
-  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);
-  ExReleaseFastMutex(&FreeTypeLock);
-  if(error) {
-    DPRINT1("Error in setting pixel sizes: %u\n", error);
-       goto fail;
-  }
-
-  // Create the brushes
-  PalDestGDI = PALETTE_LockPalette(dc->w.hPalette);
-  Mode = PalDestGDI->Mode;
-  PALETTE_UnlockPalette(dc->w.hPalette);
-  XlateObj = (PXLATEOBJ)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL);
-  hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.textColor));
-  BrushFg = BRUSHOBJ_LockBrush(hBrushFg);
-  if (OPAQUE == dc->w.backgroundMode)
-    {
-      hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.backgroundColor));
-      if(hBrushBg)
-      {
-        BrushBg = BRUSHOBJ_LockBrush(hBrushBg);
-      }
-      else
-      {
-        EngDeleteXlate(XlateObj);
-        goto fail;
-      }
+  else
+    {
+      Ascent = pOS2->usWinAscent;
+      Descent = pOS2->usWinDescent;
     }
-  EngDeleteXlate(XlateObj);
 
-  SourcePoint.x = 0;
-  SourcePoint.y = 0;
-  MaskRect.left = 0;
-  MaskRect.top = 0;
-  BrushOrigin.x = 0;
-  BrushOrigin.y = 0;
+#if 0 /* This (Wine) code doesn't seem to work correctly for us */
+  TM->tmAscent = (FT_MulFix(Ascent, YScale) + 32) >> 6;
+  TM->tmDescent = (FT_MulFix(Descent, YScale) + 32) >> 6;
+#else
+  TM->tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* units above baseline */
+  TM->tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */
+#endif
+  TM->tmInternalLeading = (FT_MulFix(Ascent + Descent
+                                     - Face->units_per_EM, YScale) + 32) >> 6;
 
-  // Determine the yoff from the dc's w.textAlign
-  if (dc->w.textAlign & TA_BASELINE) {
-    yoff = 0;
-  }
-  else
-  if (dc->w.textAlign & TA_BOTTOM) {
-    yoff = -face->size->metrics.descender / 64;
-  }
-  else { // TA_TOP
-    yoff = face->size->metrics.ascender / 64;
-  }
+  TM->tmHeight = TM->tmAscent + TM->tmDescent;
 
-  use_kerning = FT_HAS_KERNING(face);
-  previous = 0;
+  /* MSDN says:
+   *  el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender)))
+   */
+  TM->tmExternalLeading = max(0, (FT_MulFix(pHori->Line_Gap
+                                            - ((Ascent + Descent)
+                                               - (pHori->Ascender - pHori->Descender)),
+                                            YScale) + 32) >> 6);
 
-  for(i=0; i<Count; i++)
-  {
-    ExAcquireFastMutex(&FreeTypeLock);
-    glyph_index = FT_Get_Char_Index(face, *String);
-    error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
-    ExReleaseFastMutex(&FreeTypeLock);
-    if(error) {
-      DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index);
-      goto fail;
+  TM->tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6;
+  if (0 == TM->tmAveCharWidth)
+    {
+      TM->tmAveCharWidth = 1;
     }
-    glyph = face->glyph;
-
-    // retrieve kerning distance and move pen position
-    if (use_kerning && previous && glyph_index)
+  TM->tmMaxCharWidth = (FT_MulFix(Face->bbox.xMax - Face->bbox.xMin,
+                                  XScale) + 32) >> 6;
+  TM->tmWeight = pOS2->usWeightClass;
+  TM->tmOverhang = 0;
+  TM->tmDigitizedAspectX = 300;
+  TM->tmDigitizedAspectY = 300;
+  TM->tmFirstChar = pOS2->usFirstCharIndex;
+  TM->tmLastChar = pOS2->usLastCharIndex;
+  TM->tmDefaultChar = pOS2->usDefaultChar;
+  TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' ';
+  TM->tmItalic = (Face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0;
+  TM->tmUnderlined = 0; /* entry in OS2 table */
+  TM->tmStruckOut = 0; /* entry in OS2 table */
+
+  /* Yes TPMF_FIXED_PITCH is correct; braindead api */
+  if (! FT_IS_FIXED_WIDTH(Face))
+    {
+      TM->tmPitchAndFamily = TMPF_FIXED_PITCH;
+    }
+  else
     {
-      FT_Vector delta;
-      ExAcquireFastMutex(&FreeTypeLock);
-      FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
-      ExReleaseFastMutex(&FreeTypeLock);
-      TextLeft += delta.x >> 6;
+      TM->tmPitchAndFamily = 0;
     }
 
-    if (glyph->format == ft_glyph_format_outline)
+  switch (pOS2->panose[PAN_FAMILYTYPE_INDEX])
     {
-      ExAcquireFastMutex(&FreeTypeLock);
-      error = FT_Render_Glyph(glyph, IntGetFontRenderMode(&TextObj->logfont));
-      ExReleaseFastMutex(&FreeTypeLock);
-      if(error) {
-        DPRINT1("WARNING: Failed to render glyph!\n");
-               goto fail;
-      }
-      pitch = glyph->bitmap.pitch;
-    } else {
-      pitch = glyph->bitmap.width;
+      case PAN_FAMILY_SCRIPT:
+        TM->tmPitchAndFamily |= FF_SCRIPT;
+        break;
+      case PAN_FAMILY_DECORATIVE:
+      case PAN_FAMILY_PICTORIAL:
+        TM->tmPitchAndFamily |= FF_DECORATIVE;
+        break;
+      case PAN_FAMILY_TEXT_DISPLAY:
+        if (0 == TM->tmPitchAndFamily) /* fixed */
+          {
+            TM->tmPitchAndFamily = FF_MODERN;
+          }
+        else
+          {
+            switch (pOS2->panose[PAN_SERIFSTYLE_INDEX])
+              {
+                case PAN_SERIF_NORMAL_SANS:
+                case PAN_SERIF_OBTUSE_SANS:
+                case PAN_SERIF_PERP_SANS:
+                  TM->tmPitchAndFamily |= FF_SWISS;
+                  break;
+                default:
+                  TM->tmPitchAndFamily |= FF_ROMAN;
+                  break;
+              }
+          }
+        break;
+      default:
+        TM->tmPitchAndFamily |= FF_DONTCARE;
     }
 
-    if (OPAQUE == dc->w.backgroundMode)
-      {
-       DestRect.left = BackgroundLeft;
-       DestRect.right = TextLeft + (glyph->advance.x + 32) / 64;
-       DestRect.top = TextTop + yoff - (face->size->metrics.ascender + 32) / 64;
-       DestRect.bottom = TextTop + yoff + (- face->size->metrics.descender + 32) / 64;
-       if (fuOptions & ETO_CLIPPED)
-       {
-          if (DestRect.left > lprc->right || DestRect.right < lprc->left ||
-              DestRect.top > lprc->bottom || DestRect.bottom < lprc->top)
-          {
-             DestRect.right = DestRect.left;
-          }
-          else
-          {
-              DestRect.left = max(DestRect.left, lprc->left);
-              DestRect.right = min(DestRect.right, lprc->right);
-              DestRect.top = max(DestRect.top, lprc->top);
-              DestRect.bottom = min(DestRect.bottom, lprc->bottom);
-          }
-       }
-       IntEngBitBlt(SurfObj,
-                    NULL,
-                    NULL,
-                    dc->CombinedClip,
-                    NULL,
-                    &DestRect,
-                    &SourcePoint,
-                    &SourcePoint,
-                    BrushBg,
-                    &BrushOrigin,
-                    PATCOPY);
-       BackgroundLeft = DestRect.right;
+  if (FT_IS_SCALABLE(Face))
+    {
+      TM->tmPitchAndFamily |= TMPF_VECTOR;
+    }
+  if (FT_IS_SFNT(Face))
+    {
+      TM->tmPitchAndFamily |= TMPF_TRUETYPE;
+    }
+
+  TM->tmCharSet = DEFAULT_CHARSET;
+}
+
+/*************************************************************
+ * IntGetOutlineTextMetrics
+ *
+ */
+static unsigned FASTCALL
+IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size,
+                         OUTLINETEXTMETRICW *Otm)
+{
+  unsigned Needed;
+  TT_OS2 *pOS2;
+  TT_HoriHeader *pHori;
+  TT_Postscript *pPost;
+  FT_Fixed XScale, YScale;
+  ANSI_STRING FamilyNameA, StyleNameA;
+  UNICODE_STRING FamilyNameW, StyleNameW, Regular;
+  char *Cp;
+
+  Needed = sizeof(OUTLINETEXTMETRICW);
+
+  RtlInitAnsiString(&FamilyNameA, FontGDI->face->family_name);
+  RtlAnsiStringToUnicodeString(&FamilyNameW, &FamilyNameA, TRUE);
+
+  RtlInitAnsiString(&StyleNameA, FontGDI->face->style_name);
+  RtlAnsiStringToUnicodeString(&StyleNameW, &StyleNameA, TRUE);
+
+  /* These names should be read from the TT name table */
+
+  /* length of otmpFamilyName */
+  Needed += FamilyNameW.Length + sizeof(WCHAR);
+
+  RtlInitUnicodeString(&Regular, L"regular");
+  /* length of otmpFaceName */
+  if (0 == RtlCompareUnicodeString(&StyleNameW, &Regular, TRUE))
+    {
+      Needed += FamilyNameW.Length + sizeof(WCHAR); /* just the family name */
+    }
+  else
+    {
+      Needed += FamilyNameW.Length + StyleNameW.Length + (sizeof(WCHAR) << 1); /* family + " " + style */
+    }
+
+  /* length of otmpStyleName */
+  Needed += StyleNameW.Length + sizeof(WCHAR);
+
+  /* length of otmpFullName */
+  Needed += FamilyNameW.Length + StyleNameW.Length + (sizeof(WCHAR) << 1);
+
+  if (Size < Needed)
+    {
+      RtlFreeUnicodeString(&FamilyNameW);
+      RtlFreeUnicodeString(&StyleNameW);
+      return Needed;
+    }
+
+  XScale = FontGDI->face->size->metrics.x_scale;
+  YScale = FontGDI->face->size->metrics.y_scale;
+
+  IntLockFreeType;
+  pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2);
+  if (NULL == pOS2)
+    {
+      IntUnLockFreeType;
+      DPRINT1("Can't find OS/2 table - not TT font?\n");
+      RtlFreeUnicodeString(&StyleNameW);
+      RtlFreeUnicodeString(&FamilyNameW);
+      return 0;
+    }
+
+  pHori = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_hhea);
+  if (NULL == pHori)
+    {
+      IntUnLockFreeType;
+      DPRINT1("Can't find HHEA table - not TT font?\n");
+      RtlFreeUnicodeString(&StyleNameW);
+      RtlFreeUnicodeString(&FamilyNameW);
+      return 0;
+    }
+
+  pPost = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_post); /* we can live with this failing */
+
+  Otm->otmSize = Needed;
+
+  FillTM(&Otm->otmTextMetrics, FontGDI->face, pOS2, pHori);
+
+  Otm->otmFiller = 0;
+  memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT);
+  Otm->otmfsSelection = pOS2->fsSelection;
+  Otm->otmfsType = pOS2->fsType;
+  Otm->otmsCharSlopeRise = pHori->caret_Slope_Rise;
+  Otm->otmsCharSlopeRun = pHori->caret_Slope_Run;
+  Otm->otmItalicAngle = 0; /* POST table */
+  Otm->otmEMSquare = FontGDI->face->units_per_EM;
+  Otm->otmAscent = (FT_MulFix(pOS2->sTypoAscender, YScale) + 32) >> 6;
+  Otm->otmDescent = (FT_MulFix(pOS2->sTypoDescender, YScale) + 32) >> 6;
+  Otm->otmLineGap = (FT_MulFix(pOS2->sTypoLineGap, YScale) + 32) >> 6;
+  Otm->otmsCapEmHeight = (FT_MulFix(pOS2->sCapHeight, YScale) + 32) >> 6;
+  Otm->otmsXHeight = (FT_MulFix(pOS2->sxHeight, YScale) + 32) >> 6;
+  Otm->otmrcFontBox.left = (FT_MulFix(FontGDI->face->bbox.xMin, XScale) + 32) >> 6;
+  Otm->otmrcFontBox.right = (FT_MulFix(FontGDI->face->bbox.xMax, XScale) + 32) >> 6;
+  Otm->otmrcFontBox.top = (FT_MulFix(FontGDI->face->bbox.yMax, YScale) + 32) >> 6;
+  Otm->otmrcFontBox.bottom = (FT_MulFix(FontGDI->face->bbox.yMin, YScale) + 32) >> 6;
+  Otm->otmMacAscent = 0; /* where do these come from ? */
+  Otm->otmMacDescent = 0;
+  Otm->otmMacLineGap = 0;
+  Otm->otmusMinimumPPEM = 0; /* TT Header */
+  Otm->otmptSubscriptSize.x = (FT_MulFix(pOS2->ySubscriptXSize, XScale) + 32) >> 6;
+  Otm->otmptSubscriptSize.y = (FT_MulFix(pOS2->ySubscriptYSize, YScale) + 32) >> 6;
+  Otm->otmptSubscriptOffset.x = (FT_MulFix(pOS2->ySubscriptXOffset, XScale) + 32) >> 6;
+  Otm->otmptSubscriptOffset.y = (FT_MulFix(pOS2->ySubscriptYOffset, YScale) + 32) >> 6;
+  Otm->otmptSuperscriptSize.x = (FT_MulFix(pOS2->ySuperscriptXSize, XScale) + 32) >> 6;
+  Otm->otmptSuperscriptSize.y = (FT_MulFix(pOS2->ySuperscriptYSize, YScale) + 32) >> 6;
+  Otm->otmptSuperscriptOffset.x = (FT_MulFix(pOS2->ySuperscriptXOffset, XScale) + 32) >> 6;
+  Otm->otmptSuperscriptOffset.y = (FT_MulFix(pOS2->ySuperscriptYOffset, YScale) + 32) >> 6;
+  Otm->otmsStrikeoutSize = (FT_MulFix(pOS2->yStrikeoutSize, YScale) + 32) >> 6;
+  Otm->otmsStrikeoutPosition = (FT_MulFix(pOS2->yStrikeoutPosition, YScale) + 32) >> 6;
+  if (NULL == pPost)
+    {
+      Otm->otmsUnderscoreSize = 0;
+      Otm->otmsUnderscorePosition = 0;
+    }
+  else
+    {
+      Otm->otmsUnderscoreSize = (FT_MulFix(pPost->underlineThickness, YScale) + 32) >> 6;
+      Otm->otmsUnderscorePosition = (FT_MulFix(pPost->underlinePosition, YScale) + 32) >> 6;
+    }
+
+  IntUnLockFreeType;
+
+  /* otmp* members should clearly have type ptrdiff_t, but M$ knows best */
+  Cp = (char*) Otm + sizeof(OUTLINETEXTMETRICW);
+  Otm->otmpFamilyName = (LPSTR)(Cp - (char*) Otm);
+  wcscpy((WCHAR*) Cp, FamilyNameW.Buffer);
+  Cp += FamilyNameW.Length + sizeof(WCHAR);
+  Otm->otmpStyleName = (LPSTR)(Cp - (char*) Otm);
+  wcscpy((WCHAR*) Cp, StyleNameW.Buffer);
+  Cp += StyleNameW.Length + sizeof(WCHAR);
+  Otm->otmpFaceName = (LPSTR)(Cp - (char*) Otm);
+  wcscpy((WCHAR*) Cp, FamilyNameW.Buffer);
+  if (0 != RtlCompareUnicodeString(&StyleNameW, &Regular, TRUE))
+    {
+      wcscat((WCHAR*) Cp, L" ");
+      wcscat((WCHAR*) Cp, StyleNameW.Buffer);
+      Cp += FamilyNameW.Length + StyleNameW.Length + (sizeof(WCHAR) << 1);
+    }
+  else
+    {
+      Cp += FamilyNameW.Length + sizeof(WCHAR);
+    }
+  Otm->otmpFullName = (LPSTR)(Cp - (char*) Otm);
+  wcscpy((WCHAR*) Cp, FamilyNameW.Buffer);
+  wcscat((WCHAR*) Cp, L" ");
+  wcscat((WCHAR*) Cp, StyleNameW.Buffer);
+
+  RtlFreeUnicodeString(&StyleNameW);
+  RtlFreeUnicodeString(&FamilyNameW);
+
+  return Needed;
+}
+
+static PFONTGDI FASTCALL
+FindFaceNameInList(PUNICODE_STRING FaceName, PLIST_ENTRY Head)
+{
+  PLIST_ENTRY Entry;
+  PFONT_ENTRY CurrentEntry;
+  ANSI_STRING EntryFaceNameA;
+  UNICODE_STRING EntryFaceNameW;
+  FONTGDI *FontGDI;
+
+  Entry = Head->Flink;
+  while (Entry != Head)
+    {
+      CurrentEntry = (PFONT_ENTRY) CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
+
+      FontGDI = CurrentEntry->Font;
+      ASSERT(FontGDI);
+
+      RtlInitAnsiString(&EntryFaceNameA, FontGDI->face->family_name);
+      RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE);
+      if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length)
+        {
+          EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR);
+          EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0';
+        }
+
+      if (0 == RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE))
+        {
+          RtlFreeUnicodeString(&EntryFaceNameW);
+          return FontGDI;
+        }
+
+      RtlFreeUnicodeString(&EntryFaceNameW);
+      Entry = Entry->Flink;
+    }
+
+  return NULL;
+}
+
+static PFONTGDI FASTCALL
+FindFaceNameInLists(PUNICODE_STRING FaceName)
+{
+  PW32PROCESS Win32Process;
+  PFONTGDI Font;
+
+  /* Search the process local list */
+  Win32Process = PsGetWin32Process();
+  IntLockProcessPrivateFonts(Win32Process);
+  Font = FindFaceNameInList(FaceName, &Win32Process->PrivateFontListHead);
+  IntUnLockProcessPrivateFonts(Win32Process);
+  if (NULL != Font)
+    {
+      return Font;
+    }
+
+  /* Search the global list */
+  IntLockGlobalFonts;
+  Font = FindFaceNameInList(FaceName, &FontListHead);
+  IntUnLockGlobalFonts;
+
+  return Font;
+}
+
+static void FASTCALL
+FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI)
+{
+  ANSI_STRING StyleA;
+  UNICODE_STRING StyleW;
+  TT_OS2 *pOS2;
+  FONTSIGNATURE fs;
+  DWORD fs_fsCsb0;
+  CHARSETINFO CharSetInfo;
+  unsigned i, Size;
+  OUTLINETEXTMETRICW *Otm;
+  LOGFONTW *Lf;
+  TEXTMETRICW *TM;
+  NEWTEXTMETRICW *Ntm;
+
+  RtlZeroMemory(Info, sizeof(FONTFAMILYINFO));
+  Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
+  Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT);
+  if (NULL == Otm)
+    {
+      return;
+    }
+  IntGetOutlineTextMetrics(FontGDI, Size, Otm);
+
+  Lf = &Info->EnumLogFontEx.elfLogFont;
+  TM = &Otm->otmTextMetrics;
+
+  Lf->lfHeight = TM->tmHeight;
+  Lf->lfWidth = TM->tmAveCharWidth;
+  Lf->lfWeight = TM->tmWeight;
+  Lf->lfItalic = TM->tmItalic;
+  Lf->lfPitchAndFamily = (TM->tmPitchAndFamily & 0xf1) + 1;
+  Lf->lfCharSet = TM->tmCharSet;
+  Lf->lfOutPrecision = OUT_STROKE_PRECIS;
+  Lf->lfClipPrecision = CLIP_STROKE_PRECIS;
+  Lf->lfQuality = DRAFT_QUALITY;
+
+  Ntm = &Info->NewTextMetricEx.ntmTm;
+  Ntm->tmHeight = TM->tmHeight;
+  Ntm->tmAscent = TM->tmAscent;
+  Ntm->tmDescent = TM->tmDescent;
+  Ntm->tmInternalLeading = TM->tmInternalLeading;
+  Ntm->tmExternalLeading = TM->tmExternalLeading;
+  Ntm->tmAveCharWidth = TM->tmAveCharWidth;
+  Ntm->tmMaxCharWidth = TM->tmMaxCharWidth;
+  Ntm->tmWeight = TM->tmWeight;
+  Ntm->tmOverhang = TM->tmOverhang;
+  Ntm->tmDigitizedAspectX = TM->tmDigitizedAspectX;
+  Ntm->tmDigitizedAspectY = TM->tmDigitizedAspectY;
+  Ntm->tmFirstChar = TM->tmFirstChar;
+  Ntm->tmLastChar = TM->tmLastChar;
+  Ntm->tmDefaultChar = TM->tmDefaultChar;
+  Ntm->tmBreakChar = TM->tmBreakChar;
+  Ntm->tmItalic = TM->tmItalic;
+  Ntm->tmUnderlined = TM->tmUnderlined;
+  Ntm->tmStruckOut = TM->tmStruckOut;
+  Ntm->tmPitchAndFamily = TM->tmPitchAndFamily;
+  Ntm->tmCharSet = TM->tmCharSet;
+  Ntm->ntmFlags = TM->tmItalic ? NTM_ITALIC : 0;
+  if (550 < TM->tmWeight)
+    {
+      Ntm->ntmFlags |= NTM_BOLD;
+    }
+  if (0 == Ntm->ntmFlags)
+    {
+      Ntm->ntmFlags = NTM_REGULAR;
+    }
+
+  Ntm->ntmSizeEM = Otm->otmEMSquare;
+  Ntm->ntmCellHeight = 0;
+  Ntm->ntmAvgWidth = 0;
+
+  Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE)
+                    ? TRUETYPE_FONTTYPE : 0);
+  if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR))
+    {
+      Info->FontType |= RASTER_FONTTYPE;
+    }
+
+  ExFreePool(Otm);
+
+  wcsncpy(Info->EnumLogFontEx.elfLogFont.lfFaceName, FaceName, LF_FACESIZE);
+  wcsncpy(Info->EnumLogFontEx.elfFullName, FaceName, LF_FULLFACESIZE);
+  RtlInitAnsiString(&StyleA, FontGDI->face->style_name);
+  RtlAnsiStringToUnicodeString(&StyleW, &StyleA, TRUE);
+  wcsncpy(Info->EnumLogFontEx.elfStyle, StyleW.Buffer, LF_FACESIZE);
+  RtlFreeUnicodeString(&StyleW);
+
+  Info->EnumLogFontEx.elfLogFont.lfCharSet = DEFAULT_CHARSET;
+  Info->EnumLogFontEx.elfScript[0] = L'\0';
+  IntLockFreeType;
+  pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2);
+  IntUnLockFreeType;
+  if (NULL != pOS2)
+    {
+      Info->NewTextMetricEx.ntmFontSig.fsCsb[0] = pOS2->ulCodePageRange1;
+      Info->NewTextMetricEx.ntmFontSig.fsCsb[1] = pOS2->ulCodePageRange2;
+      Info->NewTextMetricEx.ntmFontSig.fsUsb[0] = pOS2->ulUnicodeRange1;
+      Info->NewTextMetricEx.ntmFontSig.fsUsb[1] = pOS2->ulUnicodeRange2;
+      Info->NewTextMetricEx.ntmFontSig.fsUsb[2] = pOS2->ulUnicodeRange3;
+      Info->NewTextMetricEx.ntmFontSig.fsUsb[3] = pOS2->ulUnicodeRange4;
+
+      fs_fsCsb0 = pOS2->ulCodePageRange1;
+      if (0 == pOS2->version)
+        {
+          FT_UInt Dummy;
+
+          if (FT_Get_First_Char(FontGDI->face, &Dummy) < 0x100)
+            {
+              fs_fsCsb0 |= 1;
+            }
+          else
+            {
+              fs_fsCsb0 |= 1L << 31;
+            }
+        }
+      if (0 == fs_fsCsb0)
+        { /* let's see if we can find any interesting cmaps */
+          for (i = 0; i < FontGDI->face->num_charmaps; i++)
+            {
+              switch (FontGDI->face->charmaps[i]->encoding)
+                {
+                  case ft_encoding_unicode:
+                  case ft_encoding_apple_roman:
+                    fs_fsCsb0 |= 1;
+                    break;
+                  case ft_encoding_symbol:
+                    fs_fsCsb0 |= 1L << 31;
+                    break;
+                  default:
+                    break;
+                }
+            }
+        }
+
+      for(i = 0; i < 32; i++)
+        {
+          if (0 != (fs_fsCsb0 & (1L << i)))
+            {
+              fs.fsCsb[0] = 1L << i;
+              fs.fsCsb[1] = 0;
+              if (! IntTranslateCharsetInfo(fs.fsCsb, &CharSetInfo, TCI_SRCFONTSIG))
+                {
+                  CharSetInfo.ciCharset = DEFAULT_CHARSET;
+                }
+              if (31 == i)
+                {
+                  CharSetInfo.ciCharset = SYMBOL_CHARSET;
+                }
+              if (DEFAULT_CHARSET != CharSetInfo.ciCharset)
+                {
+                  Info->EnumLogFontEx.elfLogFont.lfCharSet = CharSetInfo.ciCharset;
+                  if (NULL != ElfScripts[i])
+                    {
+                      wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]);
+                    }
+                  else
+                    {
+                      DPRINT1("Unknown elfscript for bit %d\n", i);
+                    }
+                }
+            }
+        }
+    }
+}
+
+static int FASTCALL
+FindFaceNameInInfo(PUNICODE_STRING FaceName, PFONTFAMILYINFO Info, DWORD InfoEntries)
+{
+  DWORD i;
+  UNICODE_STRING InfoFaceName;
+
+  for (i = 0; i < InfoEntries; i++)
+    {
+      RtlInitUnicodeString(&InfoFaceName, Info[i].EnumLogFontEx.elfLogFont.lfFaceName);
+      if (0 == RtlCompareUnicodeString(&InfoFaceName, FaceName, TRUE))
+        {
+          return i;
+        }
+    }
+
+  return -1;
+}
+
+static BOOLEAN FASTCALL
+FontFamilyInclude(LPLOGFONTW LogFont, PUNICODE_STRING FaceName,
+                  PFONTFAMILYINFO Info, DWORD InfoEntries)
+{
+  UNICODE_STRING LogFontFaceName;
+
+  RtlInitUnicodeString(&LogFontFaceName, LogFont->lfFaceName);
+  if (0 != LogFontFaceName.Length
+      && 0 != RtlCompareUnicodeString(&LogFontFaceName, FaceName, TRUE))
+    {
+      return FALSE;
+    }
+
+  return FindFaceNameInInfo(FaceName, Info, InfoEntries) < 0;
+}
+
+static BOOLEAN FASTCALL
+GetFontFamilyInfoForList(LPLOGFONTW LogFont,
+                         PFONTFAMILYINFO Info,
+                         DWORD *Count,
+                         DWORD Size,
+                         PLIST_ENTRY Head)
+{
+  PLIST_ENTRY Entry;
+  PFONT_ENTRY CurrentEntry;
+  ANSI_STRING EntryFaceNameA;
+  UNICODE_STRING EntryFaceNameW;
+  FONTGDI *FontGDI;
+
+  Entry = Head->Flink;
+  while (Entry != Head)
+    {
+      CurrentEntry = (PFONT_ENTRY) CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
+
+      FontGDI = CurrentEntry->Font;
+      ASSERT(FontGDI);
+
+      RtlInitAnsiString(&EntryFaceNameA, FontGDI->face->family_name);
+      RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE);
+      if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length)
+        {
+          EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR);
+          EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0';
+        }
+
+      if (FontFamilyInclude(LogFont, &EntryFaceNameW, Info, min(*Count, Size)))
+        {
+          if (*Count < Size)
+            {
+              FontFamilyFillInfo(Info + *Count, EntryFaceNameW.Buffer, FontGDI);
+            }
+          (*Count)++;
+        }
+      RtlFreeUnicodeString(&EntryFaceNameW);
+      Entry = Entry->Flink;
+    }
+
+  return TRUE;
+}
+
+typedef struct FontFamilyInfoCallbackContext
+{
+  LPLOGFONTW LogFont;
+  PFONTFAMILYINFO Info;
+  DWORD Count;
+  DWORD Size;
+} FONT_FAMILY_INFO_CALLBACK_CONTEXT, *PFONT_FAMILY_INFO_CALLBACK_CONTEXT;
+
+static NTSTATUS STDCALL
+FontFamilyInfoQueryRegistryCallback(IN PWSTR ValueName, IN ULONG ValueType,
+                                    IN PVOID ValueData, IN ULONG ValueLength,
+                                    IN PVOID Context, IN PVOID EntryContext)
+{
+  PFONT_FAMILY_INFO_CALLBACK_CONTEXT InfoContext;
+  UNICODE_STRING RegistryName, RegistryValue;
+  int Existing;
+  PFONTGDI FontGDI;
+
+  if (REG_SZ != ValueType)
+    {
+      return STATUS_SUCCESS;
+    }
+  InfoContext = (PFONT_FAMILY_INFO_CALLBACK_CONTEXT) Context;
+  RtlInitUnicodeString(&RegistryName, ValueName);
+
+  /* Do we need to include this font family? */
+  if (FontFamilyInclude(InfoContext->LogFont, &RegistryName, InfoContext->Info,
+                        min(InfoContext->Count, InfoContext->Size)))
+    {
+      RtlInitUnicodeString(&RegistryValue, (PCWSTR) ValueData);
+      Existing = FindFaceNameInInfo(&RegistryValue, InfoContext->Info,
+                                    min(InfoContext->Count, InfoContext->Size));
+      if (0 <= Existing)
+        {
+          /* We already have the information about the "real" font. Just copy it */
+          if (InfoContext->Count < InfoContext->Size)
+            {
+              InfoContext->Info[InfoContext->Count] = InfoContext->Info[Existing];
+              wcsncpy(InfoContext->Info[InfoContext->Count].EnumLogFontEx.elfLogFont.lfFaceName,
+                      RegistryName.Buffer, LF_FACESIZE);
+            }
+          InfoContext->Count++;
+          return STATUS_SUCCESS;
+        }
+
+      /* Try to find information about the "real" font */
+      FontGDI = FindFaceNameInLists(&RegistryValue);
+      if (NULL == FontGDI)
+        {
+          /* "Real" font not found, discard this registry entry */
+          return STATUS_SUCCESS;
+        }
+
+      /* Return info about the "real" font but with the name of the alias */
+      if (InfoContext->Count < InfoContext->Size)
+        {
+          FontFamilyFillInfo(InfoContext->Info + InfoContext->Count,
+                             RegistryName.Buffer, FontGDI);
+        }
+      InfoContext->Count++;
+      return STATUS_SUCCESS;
+    }
+
+  return STATUS_SUCCESS;
+}
+
+static BOOLEAN FASTCALL
+GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont,
+                                PFONTFAMILYINFO Info,
+                                DWORD *Count,
+                                DWORD Size)
+{
+  RTL_QUERY_REGISTRY_TABLE QueryTable[2];
+  FONT_FAMILY_INFO_CALLBACK_CONTEXT Context;
+  NTSTATUS Status;
+
+  /* Enumerate font families found in HKLM\Software\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes
+     The real work is done in the registry callback function */
+  Context.LogFont = LogFont;
+  Context.Info = Info;
+  Context.Count = *Count;
+  Context.Size = Size;
+
+  QueryTable[0].QueryRoutine = FontFamilyInfoQueryRegistryCallback;
+  QueryTable[0].Flags = 0;
+  QueryTable[0].Name = NULL;
+  QueryTable[0].EntryContext = NULL;
+  QueryTable[0].DefaultType = REG_NONE;
+  QueryTable[0].DefaultData = NULL;
+  QueryTable[0].DefaultLength = 0;
+
+  QueryTable[1].QueryRoutine = NULL;
+  QueryTable[1].Name = NULL;
+
+  Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT,
+                                  L"SysFontSubstitutes",
+                                  QueryTable,
+                                  &Context,
+                                  NULL);
+  if (NT_SUCCESS(Status))
+    {
+      *Count = Context.Count;
+    }
+
+  return NT_SUCCESS(Status) || STATUS_OBJECT_NAME_NOT_FOUND == Status;
+}
+
+int STDCALL
+NtGdiGetFontFamilyInfo(HDC Dc,
+                       LPLOGFONTW UnsafeLogFont,
+                       PFONTFAMILYINFO UnsafeInfo,
+                       DWORD Size)
+{
+  NTSTATUS Status;
+  LOGFONTW LogFont;
+  PFONTFAMILYINFO Info;
+  DWORD Count;
+  PW32PROCESS Win32Process;
+
+  /* Make a safe copy */
+  Status = MmCopyFromCaller(&LogFont, UnsafeLogFont, sizeof(LOGFONTW));
+  if (! NT_SUCCESS(Status))
+    {
+      SetLastWin32Error(ERROR_INVALID_PARAMETER);
+      return -1;
+    }
+
+  /* Allocate space for a safe copy */
+  Info = ExAllocatePoolWithTag(PagedPool, Size * sizeof(FONTFAMILYINFO), TAG_GDITEXT);
+  if (NULL == Info)
+    {
+      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+      return -1;
+    }
+
+  /* Enumerate font families in the global list */
+  IntLockGlobalFonts;
+  Count = 0;
+  if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &FontListHead) )
+    {
+      IntUnLockGlobalFonts;
+      ExFreePool(Info);
+      return -1;
+    }
+  IntUnLockGlobalFonts;
+
+  /* Enumerate font families in the process local list */
+  Win32Process = PsGetWin32Process();
+  IntLockProcessPrivateFonts(Win32Process);
+  if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size,
+                                 &Win32Process->PrivateFontListHead))
+    {
+      IntUnLockProcessPrivateFonts(Win32Process);
+      ExFreePool(Info);
+      return -1;
+    }
+  IntUnLockProcessPrivateFonts(Win32Process);
+
+  /* Enumerate font families in the registry */
+  if (! GetFontFamilyInfoForSubstitutes(&LogFont, Info, &Count, Size))
+    {
+      ExFreePool(Info);
+      return -1;
+    }
+
+  /* Return data to caller */
+  if (0 != Count)
+    {
+      Status = MmCopyToCaller(UnsafeInfo, Info,
+                              (Count < Size ? Count : Size) * sizeof(FONTFAMILYINFO));
+      if (! NT_SUCCESS(Status))
+        {
+          ExFreePool(Info);
+          SetLastWin32Error(ERROR_INVALID_PARAMETER);
+          return -1;
+        }
+    }
+
+  ExFreePool(Info);
+
+  return Count;
+}
+
+int
+STDCALL
+NtGdiEnumFonts(HDC  hDC,
+                   LPCWSTR FaceName,
+                   FONTENUMPROCW  FontFunc,
+                   LPARAM  lParam)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+BOOL STDCALL
+NtGdiExtTextOut(
+   HDC hDC,
+   INT XStart,
+   INT YStart,
+   UINT fuOptions,
+   CONST RECT *lprc,
+   LPCWSTR String,
+   UINT Count,
+   CONST INT *UnsafeDx)
+{
+   /*
+    * FIXME:
+    * Call EngTextOut, which does the real work (calling DrvTextOut where
+    * appropriate)
+    */
+
+   DC *dc;
+   SURFOBJ *SurfObj;
+   BITMAPOBJ *BitmapObj = NULL;
+   int error, glyph_index, n, i;
+   FT_Face face;
+   FT_GlyphSlot glyph;
+   LONGLONG TextLeft, RealXStart;
+   ULONG TextTop, previous, BackgroundLeft;
+   FT_Bool use_kerning;
+   RECTL DestRect, MaskRect, SpecifiedDestRect;
+   POINTL SourcePoint, BrushOrigin;
+   HBRUSH hBrushFg = NULL;
+   PGDIBRUSHOBJ BrushFg = NULL;
+   GDIBRUSHINST BrushFgInst;
+   HBRUSH hBrushBg = NULL;
+   PGDIBRUSHOBJ BrushBg = NULL;
+   GDIBRUSHINST BrushBgInst;
+   HBITMAP HSourceGlyph;
+   SURFOBJ *SourceGlyphSurf;
+   SIZEL bitSize;
+   FT_CharMap found = 0, charmap;
+   INT yoff;
+   FONTOBJ *FontObj;
+   PFONTGDI FontGDI;
+   PTEXTOBJ TextObj = NULL;
+   PPALGDI PalDestGDI;
+   XLATEOBJ *XlateObj=NULL, *XlateObj2=NULL;
+   ULONG Mode;
+   FT_Render_Mode RenderMode;
+   BOOLEAN Render;
+   NTSTATUS Status;
+   INT *Dx = NULL;
+   POINT Start;
+   BOOL DoBreak = FALSE;
+
+   // TODO: Write test-cases to exactly match real Windows in different
+   // bad parameters (e.g. does Windows check the DC or the RECT first?).
+   if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED)))
+   {
+      // At least one of the two flags were specified. Copy lprc. Once.
+      Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT));
+      if (!NT_SUCCESS(Status))
+      {
+         SetLastWin32Error(ERROR_INVALID_PARAMETER);
+         return FALSE;
+      }
+   }
+
+   dc = DC_LockDc(hDC);
+   if (!dc)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return FALSE;
+   }
+   if (dc->IsIC)
+   {
+      DC_UnlockDc(dc);
+      /* Yes, Windows really returns TRUE in this case */
+      return TRUE;
+   }
+
+   if (NULL != UnsafeDx && Count > 0)
+   {
+      Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT);
+      if (NULL == Dx)
+      {
+         goto fail;
+      }
+      Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT));
+      if (! NT_SUCCESS(Status))
+      {
+         goto fail;
+      }
+   }
+
+   BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+   if ( !BitmapObj )
+   {
+      goto fail;
+   }
+   SurfObj = &BitmapObj->SurfObj;
+   ASSERT(SurfObj);
+
+   Start.x = XStart; Start.y = YStart;
+   IntLPtoDP(dc, &Start, 1);
+
+   RealXStart = (Start.x + dc->w.DCOrgX) << 6;
+   YStart = Start.y + dc->w.DCOrgY;
+
+   /* Create the brushes */
+   PalDestGDI = PALETTE_LockPalette(dc->w.hPalette);
+   if ( !PalDestGDI )
+      Mode = PAL_RGB;
+   else
+   {
+      Mode = PalDestGDI->Mode;
+      PALETTE_UnlockPalette(PalDestGDI);
+   }
+   XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL);
+   if ( !XlateObj )
+   {
+      goto fail;
+   }
+   hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.textColor), 0);
+   if ( !hBrushFg )
+   {
+      goto fail;
+   }
+   BrushFg = BRUSHOBJ_LockBrush(hBrushFg);
+   if ( !BrushFg )
+   {
+      goto fail;
+   }
+   IntGdiInitBrushInstance(&BrushFgInst, BrushFg, NULL);
+   if ((fuOptions & ETO_OPAQUE) || dc->w.backgroundMode == OPAQUE)
+   {
+      hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.backgroundColor), 0);
+      if ( !hBrushBg )
+      {
+         goto fail;
+      }
+      BrushBg = BRUSHOBJ_LockBrush(hBrushBg);
+      if ( !BrushBg )
+      {
+         goto fail;
       }
+      IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL);
+   }
+   XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, dc->w.hPalette);
+   if ( !XlateObj2 )
+   {
+      goto fail;
+   }
+
+   SourcePoint.x = 0;
+   SourcePoint.y = 0;
+   MaskRect.left = 0;
+   MaskRect.top = 0;
+   BrushOrigin.x = 0;
+   BrushOrigin.y = 0;
+
+   if ((fuOptions & ETO_OPAQUE) && lprc)
+   {
+      DestRect.left   = SpecifiedDestRect.left   + dc->w.DCOrgX;
+      DestRect.top    = SpecifiedDestRect.top    + dc->w.DCOrgY;
+      DestRect.right  = SpecifiedDestRect.right  + dc->w.DCOrgX;
+      DestRect.bottom = SpecifiedDestRect.bottom + dc->w.DCOrgY;
+      IntLPtoDP(dc, (LPPOINT)&DestRect, 2);
+      IntEngBitBlt(
+         &BitmapObj->SurfObj,
+         NULL,
+         NULL,
+         dc->CombinedClip,
+         NULL,
+         &DestRect,
+         &SourcePoint,
+         &SourcePoint,
+         &BrushBgInst.BrushObject,
+         &BrushOrigin,
+         ROP3_TO_ROP4(PATCOPY));
+      fuOptions &= ~ETO_OPAQUE;
+   }
+   else
+   {
+      if (dc->w.backgroundMode == OPAQUE)
+      {
+         fuOptions |= ETO_OPAQUE;
+      }
+   }
+
+   TextObj = TEXTOBJ_LockText(dc->w.hFont);
+   if(TextObj == NULL)
+   {
+      goto fail;
+   }
+
+   FontObj = TextObj->Font;
+   ASSERT(FontObj);
+   FontGDI = ObjToGDI(FontObj, FONT);
+   ASSERT(FontGDI);
+
+   IntLockFreeType;
+   face = FontGDI->face;
+   if (face->charmap == NULL)
+   {
+      DPRINT("WARNING: No charmap selected!\n");
+      DPRINT("This font face has %d charmaps\n", face->num_charmaps);
+
+      for (n = 0; n < face->num_charmaps; n++)
+      {
+         charmap = face->charmaps[n];
+         DPRINT("found charmap encoding: %u\n", charmap->encoding);
+         if (charmap->encoding != 0)
+         {
+            found = charmap;
+            break;
+         }
+      }
+      if (!found)
+      {
+         DPRINT1("WARNING: Could not find desired charmap!\n");
+      }
+      error = FT_Set_Charmap(face, found);
+         if (error)
+      {
+         DPRINT1("WARNING: Could not set the charmap!\n");
+      }
+   }
+
+   Render = IntIsFontRenderingEnabled();
+   if (Render)
+      RenderMode = IntGetFontRenderMode(&TextObj->logfont);
+   else
+      RenderMode = FT_RENDER_MODE_MONO;
+
+   error = FT_Set_Pixel_Sizes(
+      face,
+      TextObj->logfont.lfWidth,
+      /* FIXME should set character height if neg */
+      (TextObj->logfont.lfHeight < 0 ?
+      - TextObj->logfont.lfHeight :
+      TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
+   if (error)
+   {
+      DPRINT1("Error in setting pixel sizes: %u\n", error);
+      IntUnLockFreeType;
+      goto fail;
+   }
+
+   /*
+    * Process the vertical alignment and determine the yoff.
+    */
+
+   if (dc->w.textAlign & TA_BASELINE)
+      yoff = 0;
+   else if (dc->w.textAlign & TA_BOTTOM)
+      yoff = -face->size->metrics.descender >> 6;
+   else /* TA_TOP */
+      yoff = face->size->metrics.ascender >> 6;
+
+   use_kerning = FT_HAS_KERNING(face);
+   previous = 0;
+
+   /*
+    * Process the horizontal alignment and modify XStart accordingly.
+    */
+
+   if (dc->w.textAlign & (TA_RIGHT | TA_CENTER))
+   {
+      ULONGLONG TextWidth = 0;
+      LPCWSTR TempText = String;
+      int Start;
+
+      /*
+       * Calculate width of the text.
+       */
+
+      if (NULL != Dx)
+      {
+         Start = Count < 2 ? 0 : Count - 2;
+         TextWidth = Count < 2 ? 0 : (Dx[Count - 2] << 6);
+      }
+      else
+      {
+         Start = 0;
+      }
+      TempText = String + Start;
+
+      for (i = Start; i < Count; i++)
+      {
+         glyph_index = FT_Get_Char_Index(face, *TempText);
+         error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+
+         if (error)
+         {
+            DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index);
+         }
+
+         glyph = face->glyph;
+
+         /* retrieve kerning distance */
+         if (use_kerning && previous && glyph_index)
+         {
+            FT_Vector delta;
+            FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
+            TextWidth += delta.x;
+         }
+
+         TextWidth += glyph->advance.x;
+
+         previous = glyph_index;
+         TempText++;
+      }
+
+      previous = 0;
+
+      if (dc->w.textAlign & TA_RIGHT)
+      {
+         RealXStart -= TextWidth;
+      }
+      else
+      {
+         RealXStart -= TextWidth / 2;
+      }
+   }
+
+   TextLeft = RealXStart;
+   TextTop = YStart;
+   BackgroundLeft = (RealXStart + 32) >> 6;
+
+   /*
+    * The main rendering loop.
+    */
+
+   for (i = 0; i < Count; i++)
+   {
+      glyph_index = FT_Get_Char_Index(face, *String);
+      error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+
+      if (error)
+      {
+         DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index);
+        IntUnLockFreeType;
+         goto fail;
+      }
+
+      glyph = face->glyph;
+
+      /* retrieve kerning distance and move pen position */
+      if (use_kerning && previous && glyph_index && NULL == Dx)
+      {
+         FT_Vector delta;
+         FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
+         TextLeft += delta.x;
+      }
+
+      if (glyph->format == ft_glyph_format_outline)
+      {
+         error = FT_Render_Glyph(glyph, RenderMode);
+         if (error)
+         {
+            DPRINT1("WARNING: Failed to render glyph!\n");
+            goto fail;
+         }
+      }
+
+      if (fuOptions & ETO_OPAQUE)
+      {
+         DestRect.left = BackgroundLeft;
+         DestRect.right = (TextLeft + glyph->advance.x + 32) >> 6;
+         DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6);
+         DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6);
+         IntEngBitBlt(
+            &BitmapObj->SurfObj,
+            NULL,
+            NULL,
+            dc->CombinedClip,
+            NULL,
+            &DestRect,
+            &SourcePoint,
+            &SourcePoint,
+            &BrushBgInst.BrushObject,
+            &BrushOrigin,
+            ROP3_TO_ROP4(PATCOPY));
+         BackgroundLeft = DestRect.right;
+      }
+
+      DestRect.left = ((TextLeft + 32) >> 6) + glyph->bitmap_left;
+      DestRect.right = DestRect.left + glyph->bitmap.width;
+      DestRect.top = TextTop + yoff - glyph->bitmap_top;
+      DestRect.bottom = DestRect.top + glyph->bitmap.rows;
+
+      bitSize.cx = glyph->bitmap.width;
+      bitSize.cy = glyph->bitmap.rows;
+      MaskRect.right = glyph->bitmap.width;
+      MaskRect.bottom = glyph->bitmap.rows;
+
+      /*
+       * We should create the bitmap out of the loop at the biggest possible
+       * glyph size. Then use memset with 0 to clear it and sourcerect to
+       * limit the work of the transbitblt.
+       *
+       * FIXME: DIB bitmaps should have an lDelta which is a multiple of 4.
+       * Here we pass in the pitch from the FreeType bitmap, which is not
+       * guaranteed to be a multiple of 4. If it's not, we should expand
+       * the FreeType bitmap to a temporary bitmap.
+       */
+
+      HSourceGlyph = EngCreateBitmap(bitSize, glyph->bitmap.pitch,
+                                     (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ?
+                                     BMF_8BPP : BMF_1BPP, BMF_TOPDOWN,
+                                     glyph->bitmap.buffer);
+      if ( !HSourceGlyph )
+      {
+        DPRINT1("WARNING: EngLockSurface() failed!\n");
+       IntUnLockFreeType;
+        goto fail;
+      }
+      SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph);
+      if ( !SourceGlyphSurf )
+      {
+        EngDeleteSurface((HSURF)HSourceGlyph);
+        DPRINT1("WARNING: EngLockSurface() failed!\n");
+       IntUnLockFreeType;
+        goto fail;
+      }
+
+      /*
+       * Use the font data as a mask to paint onto the DCs surface using a
+       * brush.
+       */
+
+      if (lprc &&
+          (fuOptions & ETO_CLIPPED) &&
+          DestRect.right >= SpecifiedDestRect.right + dc->w.DCOrgX)
+      {
+         // We do the check '>=' instead of '>' to possibly save an iteration
+         // through this loop, since it's breaking after the drawing is done,
+         // and x is always incremented.
+         DestRect.right = SpecifiedDestRect.right + dc->w.DCOrgX;
+         DoBreak = TRUE;
+      }
+
+      IntEngMaskBlt(
+         SurfObj,
+         SourceGlyphSurf,
+         dc->CombinedClip,
+         XlateObj,
+         XlateObj2,
+         &DestRect,
+         &SourcePoint,
+         (PPOINTL)&MaskRect,
+         &BrushFgInst.BrushObject,
+         &BrushOrigin);
+
+      EngUnlockSurface(SourceGlyphSurf);
+      EngDeleteSurface((HSURF)HSourceGlyph);
+
+      if (DoBreak)
+      {
+         break;
+      }
+
+      if (NULL == Dx)
+      {
+         TextLeft += glyph->advance.x;
+      }
+      else
+      {
+         TextLeft += Dx[i] << 6;
+      }
+      previous = glyph_index;
+
+      String++;
+   }
+
+   IntUnLockFreeType;
+
+   EngDeleteXlate(XlateObj);
+   EngDeleteXlate(XlateObj2);
+   BITMAPOBJ_UnlockBitmap(BitmapObj);
+   if(TextObj != NULL)
+     TEXTOBJ_UnlockText(TextObj);
+   if (hBrushBg != NULL)
+   {
+      BRUSHOBJ_UnlockBrush(BrushBg);
+      NtGdiDeleteObject(hBrushBg);
+   }
+   BRUSHOBJ_UnlockBrush(BrushFg);
+   NtGdiDeleteObject(hBrushFg);
+   if (NULL != Dx)
+   {
+      ExFreePool(Dx);
+   }
+   DC_UnlockDc( dc );
 
-    DestRect.left = TextLeft;
-    DestRect.right = TextLeft + glyph->bitmap.width;
-    DestRect.top = TextTop + yoff - glyph->bitmap_top;
-    DestRect.bottom = DestRect.top + glyph->bitmap.rows;
-       
-    if (fuOptions & ETO_CLIPPED)
-    {
-       if (DestRect.left > lprc->right || DestRect.right < lprc->left ||
-           DestRect.top > lprc->bottom || DestRect.bottom < lprc->top)
-       {
-          break;
-       }
-       else
-       {
-          DestRect.left = max(DestRect.left, lprc->left);
-          DestRect.right = min(DestRect.right, lprc->right);
-          DestRect.top = max(DestRect.top, lprc->top);
-          DestRect.bottom = min(DestRect.bottom, lprc->bottom);
-       }
-    }
-
-    bitSize.cx = glyph->bitmap.width;
-    bitSize.cy = glyph->bitmap.rows;
-    MaskRect.right = glyph->bitmap.width;
-    MaskRect.bottom = glyph->bitmap.rows;
-
-    // We should create the bitmap out of the loop at the biggest possible glyph size
-    // Then use memset with 0 to clear it and sourcerect to limit the work of the transbitblt
-    HSourceGlyph = EngCreateBitmap(bitSize, pitch, BMF_1BPP, 0, glyph->bitmap.buffer);
-    SourceGlyphSurf = (PSURFOBJ)AccessUserObject((ULONG) HSourceGlyph);
-
-    // Use the font data as a mask to paint onto the DCs surface using a brush
-    IntEngBitBlt (
-               SurfObj,
-               NULL,
-               SourceGlyphSurf,
-               dc->CombinedClip,
-               NULL,
-               &DestRect,
-               &SourcePoint,
-               (PPOINTL)&MaskRect,
-               BrushFg,
-               &BrushOrigin,
-               0xAACC );
-
-    EngDeleteSurface(HSourceGlyph);
-
-    TextLeft += (glyph->advance.x + 32) / 64;
-    previous = glyph_index;
-
-    String++;
-  }
-  TEXTOBJ_UnlockText(dc->w.hFont);
-  if (NULL != hBrushBg)
-    {
-      BRUSHOBJ_UnlockBrush(hBrushBg);
-      NtGdiDeleteObject(hBrushBg);
-    }
-  BRUSHOBJ_UnlockBrush(hBrushFg);
-  NtGdiDeleteObject(hBrushFg);
-  DC_UnlockDc(hDC);
-  return TRUE;
+   return TRUE;
 
 fail:
-  TEXTOBJ_UnlockText( dc->w.hFont );
-  if (NULL != hBrushBg)
-    {
-      BRUSHOBJ_UnlockBrush(hBrushBg);
+   if ( XlateObj2 != NULL )
+      EngDeleteXlate(XlateObj2);
+   if ( XlateObj != NULL )
+      EngDeleteXlate(XlateObj);
+   if(TextObj != NULL)
+     TEXTOBJ_UnlockText(TextObj);
+   BITMAPOBJ_UnlockBitmap(BitmapObj);
+   if (hBrushBg != NULL)
+   {
+      BRUSHOBJ_UnlockBrush(BrushBg);
       NtGdiDeleteObject(hBrushBg);
-    }
-  if (NULL != hBrushFg)
-    {
-      BRUSHOBJ_UnlockBrush(hBrushFg);
+   }
+   if (hBrushFg != NULL)
+   {
+      BRUSHOBJ_UnlockBrush(BrushFg);
       NtGdiDeleteObject(hBrushFg);
-    }
-  DC_UnlockDc( hDC );
-  return FALSE;
-#endif
+   }
+   if (NULL != Dx)
+   {
+      ExFreePool(Dx);
+   }
+   DC_UnlockDc(dc);
+
+   return FALSE;
 }
 
 BOOL
@@ -853,6 +1962,7 @@ NtGdiGetAspectRatioFilterEx(HDC  hDC,
                                  LPSIZE  AspectRatio)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -862,7 +1972,8 @@ NtGdiGetCharABCWidths(HDC  hDC,
                            UINT  LastChar,
                            LPABC  abc)
 {
-  UNIMPLEMENTED;
+  DPRINT1("NtGdiGetCharABCWidths Is unimplemented, keep going anyway\n");
+  return 1;
 }
 
 BOOL
@@ -873,6 +1984,7 @@ NtGdiGetCharABCWidthsFloat(HDC  hDC,
                                 LPABCFLOAT  abcF)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 DWORD
@@ -885,16 +1997,7 @@ NtGdiGetCharacterPlacement(HDC  hDC,
                                  DWORD  Flags)
 {
   UNIMPLEMENTED;
-}
-
-BOOL
-STDCALL
-NtGdiGetCharWidth(HDC  hDC,
-                       UINT  FirstChar,
-                       UINT  LastChar,
-                       LPINT  Buffer)
-{
-  UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -911,6 +2014,7 @@ NtGdiGetCharWidth32(HDC  hDC,
    FT_Face face;
    FT_CharMap charmap, found = NULL;
    UINT i, glyph_index, BufferSize;
+   HFONT hFont = 0;
 
    if (LastChar < FirstChar)
    {
@@ -918,8 +2022,8 @@ NtGdiGetCharWidth32(HDC  hDC,
       return FALSE;
    }
 
-   BufferSize = (LastChar - FirstChar) * sizeof(INT);
-   SafeBuffer = ExAllocatePool(PagedPool, BufferSize);
+   BufferSize = (LastChar - FirstChar + 1) * sizeof(INT);
+   SafeBuffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT);
    if (SafeBuffer == NULL)
    {
       SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
@@ -933,11 +2037,19 @@ NtGdiGetCharWidth32(HDC  hDC,
       SetLastWin32Error(ERROR_INVALID_HANDLE);
       return FALSE;
    }
-   TextObj = TEXTOBJ_LockText(dc->w.hFont);
-   DC_UnlockDc(hDC);
+   hFont = dc->w.hFont;
+   TextObj = TEXTOBJ_LockText(hFont);
+   DC_UnlockDc(dc);
+
+   if (TextObj == NULL)
+   {
+      ExFreePool(SafeBuffer);
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return FALSE;
+   }
+
+   FontGDI = ObjToGDI(TextObj->Font, FONT);
 
-   GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI);
-   
    face = FontGDI->face;
    if (face->charmap == NULL)
    {
@@ -959,27 +2071,27 @@ NtGdiGetCharWidth32(HDC  hDC,
          return FALSE;
       }
 
-      ExAcquireFastMutex(&FreeTypeLock);
+      IntLockFreeType;
       FT_Set_Charmap(face, found);
-      ExReleaseFastMutex(&FreeTypeLock);
+      IntUnLockFreeType;
    }
 
-   ExAcquireFastMutex(&FreeTypeLock);
+   IntLockFreeType;
    FT_Set_Pixel_Sizes(face,
+                      TextObj->logfont.lfWidth,
                       /* FIXME should set character height if neg */
                       (TextObj->logfont.lfHeight < 0 ?
                        - TextObj->logfont.lfHeight :
-                       TextObj->logfont.lfHeight),
-                      TextObj->logfont.lfWidth);
+                       TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
 
    for (i = FirstChar; i <= LastChar; i++)
    {
       glyph_index = FT_Get_Char_Index(face, i);
       FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
-      SafeBuffer[i] = face->glyph->advance.x >> 6;
+      SafeBuffer[i - FirstChar] = (face->glyph->advance.x + 32) >> 6;
    }
-   ExReleaseFastMutex(&FreeTypeLock);
-   TEXTOBJ_UnlockText(dc->w.hFont);
+   IntUnLockFreeType;
+   TEXTOBJ_UnlockText(TextObj);
    MmCopyToCaller(Buffer, SafeBuffer, BufferSize);
    ExFreePool(SafeBuffer);
    return TRUE;
@@ -993,6 +2105,7 @@ NtGdiGetCharWidthFloat(HDC  hDC,
                             PFLOAT  Buffer)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 DWORD
@@ -1000,21 +2113,23 @@ STDCALL
 NtGdiGetFontLanguageInfo(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
-DWORD
-STDCALL
-NtGdiGetGlyphOutline(HDC  hDC,
-                           UINT  Char,
-                           UINT  Format,
-                           LPGLYPHMETRICS  gm,
-                           DWORD  Bufsize,
-                           LPVOID  Buffer,
-                           CONST LPMAT2 mat2)
+ULONG
+APIENTRY
+NtGdiGetGlyphOutline(
+    IN HDC hdc,
+    IN WCHAR wch,
+    IN UINT iFormat,
+    OUT LPGLYPHMETRICS pgm,
+    IN ULONG cjBuf,
+    OUT OPTIONAL PVOID pvBuf,
+    IN LPMAT2 pmat2,
+    IN BOOL bIgnoreRotation)
 {
   UNIMPLEMENTED;
-
-
+  return 0;
 }
 
 DWORD
@@ -1024,6 +2139,7 @@ NtGdiGetKerningPairs(HDC  hDC,
                            LPKERNINGPAIR  krnpair)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -1033,14 +2149,17 @@ NtGdiGetOutlineTextMetrics(HDC  hDC,
                                 LPOUTLINETEXTMETRICW  otm)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
-STDCALL
-NtGdiGetRasterizerCaps(LPRASTERIZER_STATUS  rs,
-                            UINT  Size)
+APIENTRY
+NtGdiGetRasterizerCaps(
+    OUT LPRASTERIZER_STATUS praststat,
+    IN ULONG cjBytes)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 UINT
@@ -1048,20 +2167,23 @@ STDCALL
 NtGdiGetTextCharset(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
-UINT
-STDCALL
-NtGdiGetTextCharsetInfo(HDC  hDC,
-                             LPFONTSIGNATURE  Sig,
-                             DWORD  Flags)
+INT
+APIENTRY
+NtGdiGetTextCharsetInfo(
+    IN HDC hdc,
+    OUT OPTIONAL LPFONTSIGNATURE lpSig,
+    IN DWORD dwFlags)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 static BOOL
 FASTCALL
-TextIntGetTextExtentPoint(HDC hDC,
+TextIntGetTextExtentPoint(PDC dc,
                           PTEXTOBJ TextObj,
                           LPCWSTR String,
                           int Count,
@@ -1074,11 +2196,12 @@ TextIntGetTextExtentPoint(HDC hDC,
   FT_Face face;
   FT_GlyphSlot glyph;
   INT error, n, glyph_index, i, previous;
-  LONG TotalWidth = 0;
+  ULONGLONG TotalWidth = 0;
   FT_CharMap charmap, found = NULL;
   BOOL use_kerning;
 
-  GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI);
+  FontGDI = ObjToGDI(TextObj->Font, FONT);
+
   face = FontGDI->face;
   if (NULL != Fit)
     {
@@ -1106,23 +2229,23 @@ TextIntGetTextExtentPoint(HDC hDC,
          DPRINT1("WARNING: Could not find desired charmap!\n");
        }
 
-      ExAcquireFastMutex(&FreeTypeLock);
+      IntLockFreeType;
       error = FT_Set_Charmap(face, found);
-      ExReleaseFastMutex(&FreeTypeLock);
+      IntUnLockFreeType;
       if (error)
        {
          DPRINT1("WARNING: Could not set the charmap!\n");
        }
     }
 
-  ExAcquireFastMutex(&FreeTypeLock);
+  IntLockFreeType;
   error = FT_Set_Pixel_Sizes(face,
+                             TextObj->logfont.lfWidth,
                              /* FIXME should set character height if neg */
                              (TextObj->logfont.lfHeight < 0 ?
                               - TextObj->logfont.lfHeight :
-                              TextObj->logfont.lfHeight),
-                             TextObj->logfont.lfWidth);
-  ExReleaseFastMutex(&FreeTypeLock);
+                              TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
+  IntUnLockFreeType;
   if (error)
     {
       DPRINT1("Error in setting pixel sizes: %u\n", error);
@@ -1133,10 +2256,10 @@ TextIntGetTextExtentPoint(HDC hDC,
 
   for (i = 0; i < Count; i++)
     {
-      ExAcquireFastMutex(&FreeTypeLock);
+      IntLockFreeType;
       glyph_index = FT_Get_Char_Index(face, *String);
       error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
-      ExReleaseFastMutex(&FreeTypeLock);
+      IntUnLockFreeType;
       if (error)
        {
          DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index);
@@ -1147,40 +2270,30 @@ TextIntGetTextExtentPoint(HDC hDC,
       if (use_kerning && previous && glyph_index)
        {
          FT_Vector delta;
-          ExAcquireFastMutex(&FreeTypeLock);
+          IntLockFreeType;
          FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
-          ExReleaseFastMutex(&FreeTypeLock);
-         TotalWidth += delta.x >> 6;
+          IntUnLockFreeType;
+         TotalWidth += delta.x;
        }
 
-      TotalWidth += glyph->advance.x >> 6;
-      if (glyph->format == ft_glyph_format_outline)
-       {
-          ExAcquireFastMutex(&FreeTypeLock);
-         error = FT_Render_Glyph(glyph, FT_RENDER_MODE_MONO);
-          ExReleaseFastMutex(&FreeTypeLock);
-         if (error)
-           {
-             DPRINT1("WARNING: Failed to render glyph!\n");
-           }
-       }
+      TotalWidth += glyph->advance.x;
 
-      if (TotalWidth <= MaxExtent && NULL != Fit)
+      if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit)
        {
          *Fit = i + 1;
        }
       if (NULL != Dx)
        {
-         Dx[i] = TotalWidth;
+         Dx[i] = (TotalWidth + 32) >> 6;
        }
 
       previous = glyph_index;
       String++;
     }
 
-  Size->cx = TotalWidth;
+  Size->cx = (TotalWidth + 32) >> 6;
   Size->cy = (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : TextObj->logfont.lfHeight);
-  Size->cy = EngMulDiv(Size->cy, NtGdiGetDeviceCaps(hDC, LOGPIXELSY), 72);
+  Size->cy = EngMulDiv(Size->cy, IntGdiGetDeviceCaps(dc, LOGPIXELSY), 72);
 
   return TRUE;
 }
@@ -1222,7 +2335,7 @@ NtGdiGetTextExtentExPoint(HDC hDC,
       return TRUE;
     }
 
-  String = ExAllocatePool(PagedPool, Count * sizeof(WCHAR));
+  String = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT);
   if (NULL == String)
     {
       SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
@@ -1231,7 +2344,7 @@ NtGdiGetTextExtentExPoint(HDC hDC,
 
   if (NULL != UnsafeDx)
     {
-      Dx = ExAllocatePool(PagedPool, Count * sizeof(INT));
+      Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT);
       if (NULL == Dx)
        {
          ExFreePool(String);
@@ -1268,10 +2381,15 @@ NtGdiGetTextExtentExPoint(HDC hDC,
       return FALSE;
     }
   TextObj = TEXTOBJ_LockText(dc->w.hFont);
-  DC_UnlockDc(hDC);
-  Result = TextIntGetTextExtentPoint(hDC, TextObj, String, Count, MaxExtent,
+  if ( TextObj )
+  {
+    Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent,
                                      NULL == UnsafeFit ? NULL : &Fit, Dx, &Size);
-  TEXTOBJ_UnlockText(dc->w.hFont);
+  }
+  else
+    Result = FALSE;
+  TEXTOBJ_UnlockText(TextObj);
+  DC_UnlockDc(dc);
 
   ExFreePool(String);
   if (! Result)
@@ -1390,13 +2508,15 @@ NtGdiGetTextExtentPoint32(HDC hDC,
       return FALSE;
     }
   TextObj = TEXTOBJ_LockText(dc->w.hFont);
-  DC_UnlockDc(hDC);
-  Result = TextIntGetTextExtentPoint (
-         hDC, TextObj, String, Count, 0, NULL, NULL, &Size);
-  dc = DC_LockDc(hDC);
-  ASSERT(dc); // it succeeded earlier, it should now, too
-  TEXTOBJ_UnlockText(dc->w.hFont);
-  DC_UnlockDc(hDC);
+  if ( TextObj != NULL )
+  {
+    Result = TextIntGetTextExtentPoint (
+      dc, TextObj, String, Count, 0, NULL, NULL, &Size);
+    TEXTOBJ_UnlockText(TextObj);
+  }
+  else
+    Result = FALSE;
+  DC_UnlockDc(dc);
 
   ExFreePool(String);
   if (! Result)
@@ -1414,19 +2534,41 @@ NtGdiGetTextExtentPoint32(HDC hDC,
   return TRUE;
 }
 
-int
-STDCALL
-NtGdiGetTextFace(HDC  hDC,
-                     int  Count,
-                     LPWSTR  FaceName)
+INT STDCALL
+NtGdiGetTextFace(HDC hDC, INT Count, LPWSTR FaceName)
 {
-  UNIMPLEMENTED;
+   PDC Dc;
+   HFONT hFont;
+   PTEXTOBJ TextObj;
+   NTSTATUS Status;
+
+   Dc = DC_LockDc(hDC);
+   if (Dc == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return FALSE;
+   }
+   hFont = Dc->w.hFont;
+   DC_UnlockDc(Dc);
+
+   TextObj = TEXTOBJ_LockText(hFont);
+   ASSERT(TextObj != NULL);
+   Count = min(Count, wcslen(TextObj->logfont.lfFaceName));
+   Status = MmCopyToCaller(FaceName, TextObj->logfont.lfFaceName, Count * sizeof(WCHAR));
+   TEXTOBJ_UnlockText(TextObj);
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(Status);
+      return 0;
+   }
+
+   return Count;
 }
 
 BOOL
 STDCALL
 NtGdiGetTextMetrics(HDC hDC,
-                   LPTEXTMETRICW tm)
+                    LPTEXTMETRICW tm)
 {
   PDC dc;
   PTEXTOBJ TextObj;
@@ -1435,68 +2577,83 @@ NtGdiGetTextMetrics(HDC hDC,
   TEXTMETRICW SafeTm;
   FT_Face Face;
   TT_OS2 *pOS2;
+  TT_HoriHeader *pHori;
   ULONG Error;
 
-  dc = DC_LockDc(hDC);
-  if (NULL == dc || NULL == tm)
+  if (NULL == tm)
   {
-    Status = STATUS_INVALID_PARAMETER;
+    SetLastWin32Error(STATUS_INVALID_PARAMETER);
+    return FALSE;
   }
-  else
+
+  if(!(dc = DC_LockDc(hDC)))
   {
-    TextObj = TEXTOBJ_LockText(dc->w.hFont);
-    if (NULL != TextObj)
+    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;
-        ExAcquireFastMutex(&FreeTypeLock);
-       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);
-        ExReleaseFastMutex(&FreeTypeLock);
-       if (0 != Error)
-         {
-         DPRINT1("Error in setting pixel sizes: %u\n", Error);
-         Status = STATUS_UNSUCCESSFUL;
-         }
-        else
-         {
-         memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW));
-          ExAcquireFastMutex(&FreeTypeLock);
-          pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
-          ExReleaseFastMutex(&FreeTypeLock);
+      FontGDI = ObjToGDI(TextObj->Font, FONT);
+
+      Face = FontGDI->face;
+      IntLockFreeType;
+      Error = FT_Set_Pixel_Sizes(Face,
+                                TextObj->logfont.lfWidth,
+                                /* FIXME should set character height if neg */
+                                 (TextObj->logfont.lfHeight < 0 ?
+                                  - TextObj->logfont.lfHeight :
+                                  TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
+      IntUnLockFreeType;
+      if (0 != Error)
+       {
+          DPRINT1("Error in setting pixel sizes: %u\n", Error);
+          Status = STATUS_UNSUCCESSFUL;
+       }
+      else
+       {
+          memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW));
+
+          Status = STATUS_SUCCESS;
+          IntLockFreeType;
+          pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2);
           if (NULL == pOS2)
             {
               DPRINT1("Can't find OS/2 table - not TT font?\n");
-              Status = STATUS_UNSUCCESSFUL;
+              Status = STATUS_INTERNAL_ERROR;
             }
-          else
+
+          pHori = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_hhea);
+          if (NULL == pHori)
             {
-              SafeTm.tmAveCharWidth = (pOS2->xAvgCharWidth + 32) / 64;
+              DPRINT1("Can't find HHEA table - not TT font?\n");
+              Status = STATUS_INTERNAL_ERROR;
             }
-         SafeTm.tmAscent = (Face->size->metrics.ascender + 32) / 64; // units above baseline
-         SafeTm.tmDescent = (- Face->size->metrics.descender + 32) / 64; // units below baseline
-         SafeTm.tmHeight = SafeTm.tmAscent + SafeTm.tmDescent;
-          SafeTm.tmMaxCharWidth = (Face->size->metrics.max_advance + 32) / 64;
-         Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW));
-         }
-      }
-      TEXTOBJ_UnlockText(dc->w.hFont);
+
+          IntUnLockFreeType;
+
+          if (NT_SUCCESS(Status))
+            {
+              FillTM(&SafeTm, FontGDI->face, pOS2, pHori);
+              Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW));
+            }
+       }
+      TEXTOBJ_UnlockText(TextObj);
     }
-    else
+  else
     {
-      ASSERT(FALSE);
       Status = STATUS_INVALID_HANDLE;
     }
-    DC_UnlockDc(hDC);
-  }
+  DC_UnlockDc(dc);
 
-  return NT_SUCCESS(Status);
+  if(!NT_SUCCESS(Status))
+    {
+      SetLastNtError(Status);
+      return FALSE;
+    }
+
+  return TRUE;
 }
 
 BOOL
@@ -1506,13 +2663,15 @@ NtGdiPolyTextOut(HDC  hDC,
                       int  Count)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
 STDCALL
 NtGdiRemoveFontResource(LPCWSTR  FileName)
 {
-  UNIMPLEMENTED;
+  DPRINT1("NtGdiRemoveFontResource is UNIMPLEMENTED\n");
+  return FALSE;
 }
 
 DWORD
@@ -1521,6 +2680,7 @@ NtGdiSetMapperFlags(HDC  hDC,
                           DWORD  Flag)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -1534,11 +2694,12 @@ NtGdiSetTextAlign(HDC  hDC,
   dc = DC_LockDc(hDC);
   if (!dc)
     {
-      return  0;
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return GDI_ERROR;
     }
   prevAlign = dc->w.textAlign;
   dc->w.textAlign = Mode;
-  DC_UnlockDc( hDC );
+  DC_UnlockDc( dc );
   return  prevAlign;
 }
 
@@ -1549,15 +2710,19 @@ NtGdiSetTextColor(HDC hDC,
 {
   COLORREF  oldColor;
   PDC  dc = DC_LockDc(hDC);
+  HBRUSH hBrush;
 
   if (!dc)
   {
-    return 0x80000000;
+    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    return CLR_INVALID;
   }
 
   oldColor = dc->w.textColor;
   dc->w.textColor = color;
-  DC_UnlockDc( hDC );
+  hBrush = dc->w.hBrush;
+  DC_UnlockDc( dc );
+  NtGdiSelectObject(hDC, hBrush);
   return  oldColor;
 }
 
@@ -1568,282 +2733,205 @@ NtGdiSetTextJustification(HDC  hDC,
                                int  BreakCount)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
-BOOL
-STDCALL
-NtGdiTextOut(HDC  hDC,
-                  int  XStart,
-                  int  YStart,
-                  LPCWSTR  String,
-                  int  Count)
+BOOL STDCALL
+NtGdiTextOut(
+   HDC hDC,
+   INT XStart,
+   INT YStart,
+   LPCWSTR String,
+   INT Count)
 {
-  // Fixme: Call EngTextOut, which does the real work (calling DrvTextOut where appropriate)
+   return NtGdiExtTextOut(hDC, XStart, YStart, 0, NULL, String, Count, NULL);
+}
 
-  DC *dc;
-  SURFOBJ *SurfObj;
-  int error, glyph_index, n, i;
-  FT_Face face;
-  FT_GlyphSlot glyph;
-  ULONG TextLeft, TextTop, pitch, previous, BackgroundLeft;
-  FT_Bool use_kerning;
-  RECTL DestRect, MaskRect;
-  POINTL SourcePoint, BrushOrigin;
-  HBRUSH hBrushFg = NULL;
-  PBRUSHOBJ BrushFg = NULL;
-  HBRUSH hBrushBg = NULL;
-  PBRUSHOBJ BrushBg = NULL;
-  HBITMAP HSourceGlyph;
-  PSURFOBJ SourceGlyphSurf;
-  SIZEL bitSize;
-  FT_CharMap found = 0, charmap;
-  INT yoff;
-  PFONTOBJ FontObj;
-  PFONTGDI FontGDI;
-  PTEXTOBJ TextObj;
-  PPALGDI PalDestGDI;
-  PXLATEOBJ XlateObj, XlateObj2;
-  ULONG Mode;
-  FT_Render_Mode RenderMode;
-  BOOL Render;
+DWORD STDCALL
+NtGdiGetFontData(
+   HDC hDC,
+   DWORD Table,
+   DWORD Offset,
+   LPVOID Buffer,
+   DWORD Size)
+{
+   PDC Dc;
+   HFONT hFont;
+   PTEXTOBJ TextObj;
+   PFONTGDI FontGdi;
+   DWORD Result = GDI_ERROR;
 
-  dc = DC_LockDc(hDC);
-  if( !dc )
-       return FALSE;
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
+   Dc = DC_LockDc(hDC);
+   if (Dc == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return GDI_ERROR;
+   }
+   hFont = Dc->w.hFont;
+   TextObj = TEXTOBJ_LockText(hFont);
+   DC_UnlockDc(Dc);
 
-  XStart += dc->w.DCOrgX;
-  YStart += dc->w.DCOrgY;
-  TextLeft = XStart;
-  TextTop = YStart;
-  BackgroundLeft = XStart;
+   if (TextObj == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return GDI_ERROR;
+   }
 
-  TextObj = TEXTOBJ_LockText(dc->w.hFont);
+   FontGdi = ObjToGDI(TextObj->Font, FONT);
 
-  if (! NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, &FontObj, &FontGDI)))
-  {
-    goto fail;
-  }
-  face = FontGDI->face;
+   IntLockFreeType;
 
-  if (face->charmap == NULL)
-  {
-    DPRINT("WARNING: No charmap selected!\n");
-    DPRINT("This font face has %d charmaps\n", face->num_charmaps);
+   if (FT_IS_SFNT(FontGdi->face))
+   {
+       if (Table)
+          Table = Table >> 24 | Table << 24 | (Table >> 8 & 0xFF00) |
+                  (Table << 8 & 0xFF0000);
 
-    for (n = 0; n < face->num_charmaps; n++)
-    {
-      charmap = face->charmaps[n];
-      DPRINT("found charmap encoding: %u\n", charmap->encoding);
-      if (charmap->encoding != 0)
-      {
-        found = charmap;
-        break;
-      }
-    }
-    if (!found) DPRINT1("WARNING: Could not find desired charmap!\n");
-    ExAcquireFastMutex(&FreeTypeLock);
-    error = FT_Set_Charmap(face, found);
-    ExReleaseFastMutex(&FreeTypeLock);
-    if (error) DPRINT1("WARNING: Could not set the charmap!\n");
-  }
+       if (Buffer == NULL)
+          Size = 0;
 
+       if (!FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, Buffer, &Size))
+          Result = Size;
+   }
 
-  Render = IntIsFontRenderingEnabled();
-  
-  if(Render)
-    RenderMode = IntGetFontRenderMode(&TextObj->logfont);
-  else
-    RenderMode = FT_RENDER_MODE_MONO;
-  
-  ExAcquireFastMutex(&FreeTypeLock);
-  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);
-  ExReleaseFastMutex(&FreeTypeLock);
-  if(error) {
-    DPRINT1("Error in setting pixel sizes: %u\n", error);
-       goto fail;
-  }
+   IntUnLockFreeType;
 
-  // Create the brushes
-  PalDestGDI = PALETTE_LockPalette(dc->w.hPalette);
-  Mode = PalDestGDI->Mode;
-  PALETTE_UnlockPalette(dc->w.hPalette);
-  XlateObj = (PXLATEOBJ)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL);
-  hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.textColor));
-  BrushFg = BRUSHOBJ_LockBrush(hBrushFg);
-  if (OPAQUE == dc->w.backgroundMode)
-    {
-      hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.backgroundColor));
-      if(hBrushBg)
-      {
-        BrushBg = BRUSHOBJ_LockBrush(hBrushBg);
-      }
-      else
-      {
-        EngDeleteXlate(XlateObj);
-        goto fail;
-      }
-    }
-  XlateObj2 = (PXLATEOBJ)IntEngCreateXlate(PAL_RGB, Mode, NULL, dc->w.hPalette);
-  
-  SourcePoint.x = 0;
-  SourcePoint.y = 0;
-  MaskRect.left = 0;
-  MaskRect.top = 0;
-  BrushOrigin.x = 0;
-  BrushOrigin.y = 0;
-
-  // Determine the yoff from the dc's w.textAlign
-  if (dc->w.textAlign & TA_BASELINE) {
-    yoff = 0;
-  }
-  else
-  if (dc->w.textAlign & TA_BOTTOM) {
-    yoff = -face->size->metrics.descender / 64;
-  }
-  else { // TA_TOP
-    yoff = face->size->metrics.ascender / 64;
-  }
+   TEXTOBJ_UnlockText(TextObj);
 
-  use_kerning = FT_HAS_KERNING(face);
-  previous = 0;
+   return Result;
+}
 
-  for(i=0; i<Count; i++)
-  {
-    ExAcquireFastMutex(&FreeTypeLock);
-    glyph_index = FT_Get_Char_Index(face, *String);
-    error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
-    ExReleaseFastMutex(&FreeTypeLock);
-    if(error) {
-      EngDeleteXlate(XlateObj);
-      EngDeleteXlate(XlateObj2);
-      DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index);
-      goto fail;
-    }
-    glyph = face->glyph;
+static UINT FASTCALL
+GetFontScore(LOGFONTW *LogFont, PUNICODE_STRING FaceName, PFONTGDI FontGDI)
+{
+  ANSI_STRING EntryFaceNameA;
+  UNICODE_STRING EntryFaceNameW;
+  unsigned Size;
+  OUTLINETEXTMETRICW *Otm;
+  LONG WeightDiff;
+  NTSTATUS Status;
+  UINT Score = 1;
 
-    // retrieve kerning distance and move pen position
-    if (use_kerning && previous && glyph_index)
+  RtlInitAnsiString(&EntryFaceNameA, FontGDI->face->family_name);
+  Status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE);
+  if (NT_SUCCESS(Status))
     {
-      FT_Vector delta;
-      ExAcquireFastMutex(&FreeTypeLock);
-      FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
-      ExReleaseFastMutex(&FreeTypeLock);
-      TextLeft += delta.x >> 6;
+      if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length)
+        {
+          EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR);
+          EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0';
+        }
+      if (0 == RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE))
+        {
+          Score += 49;
+        }
+      RtlFreeUnicodeString(&EntryFaceNameW);
     }
 
-    if (glyph->format == ft_glyph_format_outline)
+  Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
+  Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT);
+  if (NULL == Otm)
     {
-      ExAcquireFastMutex(&FreeTypeLock);
-      error = FT_Render_Glyph(glyph, RenderMode);
-      ExReleaseFastMutex(&FreeTypeLock);
-      if(error) {
-        EngDeleteXlate(XlateObj);
-        EngDeleteXlate(XlateObj2);
-        DPRINT1("WARNING: Failed to render glyph!\n");
-               goto fail;
-      }
-      pitch = glyph->bitmap.pitch;
-    } else {
-      pitch = glyph->bitmap.width;
+      return Score;
     }
+  IntGetOutlineTextMetrics(FontGDI, Size, Otm);
 
-    if (OPAQUE == dc->w.backgroundMode)
-      {
-       DestRect.left = BackgroundLeft;
-       DestRect.right = TextLeft + (glyph->advance.x + 32) / 64;
-       DestRect.top = TextTop + yoff - (face->size->metrics.ascender + 32) / 64;
-       DestRect.bottom = TextTop + yoff + (- face->size->metrics.descender + 32) / 64;
-       IntEngBitBlt(SurfObj,
-                    NULL,
-                    NULL,
-                    dc->CombinedClip,
-                    NULL,
-                    &DestRect,
-                    &SourcePoint,
-                    &SourcePoint,
-                    BrushBg,
-                    &BrushOrigin,
-                    PATCOPY);
-       BackgroundLeft = DestRect.right;
-      }
-
-    DestRect.left = TextLeft;
-    DestRect.right = TextLeft + glyph->bitmap.width;
-    DestRect.top = TextTop + yoff - glyph->bitmap_top;
-    DestRect.bottom = DestRect.top + glyph->bitmap.rows;
-       
-    bitSize.cx = glyph->bitmap.width;
-    bitSize.cy = glyph->bitmap.rows;
-    MaskRect.right = glyph->bitmap.width;
-    MaskRect.bottom = glyph->bitmap.rows;
-    
-    // We should create the bitmap out of the loop at the biggest possible glyph size
-    // Then use memset with 0 to clear it and sourcerect to limit the work of the transbitblt
-    HSourceGlyph = EngCreateBitmap(bitSize, pitch, (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? BMF_8BPP : BMF_1BPP, 0, glyph->bitmap.buffer);
-    SourceGlyphSurf = (PSURFOBJ)AccessUserObject((ULONG) HSourceGlyph);
-    
-    // Use the font data as a mask to paint onto the DCs surface using a brush
-    IntEngMaskBlt (
-               SurfObj,
-               SourceGlyphSurf,
-               dc->CombinedClip,
-               XlateObj,
-               XlateObj2,
-               &DestRect,
-               &SourcePoint,
-               (PPOINTL)&MaskRect,
-               BrushFg,
-               &BrushOrigin);
-
-    EngDeleteSurface(HSourceGlyph);
-
-    TextLeft += (glyph->advance.x + 32) / 64;
-    previous = glyph_index;
-
-    String++;
-  }
-  EngDeleteXlate(XlateObj);
-  EngDeleteXlate(XlateObj2);
-  TEXTOBJ_UnlockText(dc->w.hFont);
-  if (NULL != hBrushBg)
+  if ((0 != LogFont->lfItalic && 0 != Otm->otmTextMetrics.tmItalic) ||
+      (0 == LogFont->lfItalic && 0 == Otm->otmTextMetrics.tmItalic))
     {
-      BRUSHOBJ_UnlockBrush(hBrushBg);
-      NtGdiDeleteObject(hBrushBg);
+      Score += 25;
     }
-  BRUSHOBJ_UnlockBrush(hBrushFg);
-  NtGdiDeleteObject(hBrushFg);
-  DC_UnlockDc(hDC);
-  return TRUE;
+  if (LogFont->lfWeight < Otm->otmTextMetrics.tmWeight)
+    {
+      WeightDiff = Otm->otmTextMetrics.tmWeight - LogFont->lfWeight;
+    }
+  else
+    {
+      WeightDiff = LogFont->lfWeight - Otm->otmTextMetrics.tmWeight;
+    }
+  Score += (1000 - WeightDiff) / (1000 / 25);
 
-fail:
-  TEXTOBJ_UnlockText( dc->w.hFont );
-  if (NULL != hBrushBg)
+  ExFreePool(Otm);
+
+  return Score;
+}
+
+static __inline VOID
+FindBestFontFromList(FONTOBJ **FontObj, UINT *MatchScore, LOGFONTW *LogFont,
+                     PUNICODE_STRING FaceName, PLIST_ENTRY Head)
+{
+  PLIST_ENTRY Entry;
+  PFONT_ENTRY CurrentEntry;
+  FONTGDI *FontGDI;
+  UINT Score;
+
+  Entry = Head->Flink;
+  while (Entry != Head)
     {
-      BRUSHOBJ_UnlockBrush(hBrushBg);
-      NtGdiDeleteObject(hBrushBg);
+      CurrentEntry = (PFONT_ENTRY) CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
+
+      FontGDI = CurrentEntry->Font;
+      ASSERT(FontGDI);
+
+      Score = GetFontScore(LogFont, FaceName, FontGDI);
+      if (*MatchScore == 0 || *MatchScore < Score)
+        {
+          *FontObj = GDIToObj(FontGDI, FONT);
+          *MatchScore = Score;
+        }
+      Entry = Entry->Flink;
     }
-  if (NULL != hBrushFg)
+}
+
+static __inline BOOLEAN
+SubstituteFontFamilyKey(PUNICODE_STRING FaceName,
+                        LPCWSTR Key)
+{
+  RTL_QUERY_REGISTRY_TABLE QueryTable[2];
+  NTSTATUS Status;
+  UNICODE_STRING Value;
+
+  RtlInitUnicodeString(&Value, NULL);
+
+  QueryTable[0].QueryRoutine = NULL;
+  QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND |
+                        RTL_QUERY_REGISTRY_REQUIRED;
+  QueryTable[0].Name = FaceName->Buffer;
+  QueryTable[0].EntryContext = &Value;
+  QueryTable[0].DefaultType = REG_NONE;
+  QueryTable[0].DefaultData = NULL;
+  QueryTable[0].DefaultLength = 0;
+
+  QueryTable[1].QueryRoutine = NULL;
+  QueryTable[1].Name = NULL;
+
+  Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT,
+                                  Key,
+                                  QueryTable,
+                                  NULL,
+                                  NULL);
+  if (NT_SUCCESS(Status))
     {
-      BRUSHOBJ_UnlockBrush(hBrushFg);
-      NtGdiDeleteObject(hBrushFg);
+      RtlFreeUnicodeString(FaceName);
+      *FaceName = Value;
     }
-  DC_UnlockDc( hDC );
-  return FALSE;
+
+  return NT_SUCCESS(Status);
 }
 
-UINT
-STDCALL
-NtGdiTranslateCharsetInfo(PDWORD  Src,
-                               LPCHARSETINFO  CSI,
-                               DWORD  Flags)
+static __inline void
+SubstituteFontFamily(PUNICODE_STRING FaceName, UINT Level)
 {
-  UNIMPLEMENTED;
+  if (10 < Level) /* Enough is enough */
+    {
+      return;
+    }
+
+  if (SubstituteFontFamilyKey(FaceName, L"SysFontSubstitutes") ||
+      SubstituteFontFamilyKey(FaceName, L"FontSubstitutes"))
+    {
+      SubstituteFontFamily(FaceName, Level + 1);
+    }
 }
 
 NTSTATUS FASTCALL
@@ -1852,86 +2940,77 @@ TextIntRealizeFont(HFONT FontHandle)
   NTSTATUS Status = STATUS_SUCCESS;
   PTEXTOBJ TextObj;
   UNICODE_STRING FaceName;
-  PLIST_ENTRY Entry;
-  PFONT_ENTRY CurrentEntry;
   PW32PROCESS Win32Process;
-  BOOL Private = FALSE;
+  UINT MatchScore;
 
   TextObj = TEXTOBJ_LockText(FontHandle);
-  ASSERT(TextObj);
-  if (NULL != TextObj)
+  if (NULL == TextObj)
     {
-    RtlInitUnicodeString(&FaceName, TextObj->logfont.lfFaceName);
-    
-    /* find font in private fonts */
-    Win32Process = PsGetWin32Process();
-    
-    ExAcquireFastMutex(&Win32Process->PrivateFontListLock);
-    
-    Entry = Win32Process->PrivateFontListHead.Flink;
-    while(Entry != &Win32Process->PrivateFontListHead)
-    {
-      CurrentEntry = (PFONT_ENTRY)CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
-      
-      if (0 == RtlCompareUnicodeString(&CurrentEntry->FaceName, &FaceName, TRUE))
-      {
-           TextObj->GDIFontHandle = CurrentEntry->hFont;
-           Private = TRUE;
-           goto check;
-      }
-      Entry = Entry->Flink;
+      return STATUS_INVALID_HANDLE;
     }
-    ExReleaseFastMutex(&Win32Process->PrivateFontListLock);
-    
-    /* find font in system fonts */
-    ExAcquireFastMutex(&FontListLock);
-    
-    Entry = FontListHead.Flink;
-    while(Entry != &FontListHead)
-    {
-      CurrentEntry = (PFONT_ENTRY)CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
-      
-      if (0 == RtlCompareUnicodeString(&CurrentEntry->FaceName, &FaceName, TRUE))
-      {
-           TextObj->GDIFontHandle = CurrentEntry->hFont;
-           break;
-      }
-      Entry = Entry->Flink;
+
+  if (TextObj->Initialized)
+    {
+      TEXTOBJ_UnlockText(TextObj);
+      return STATUS_SUCCESS;
     }
-    
-    check:
-    if (NULL == TextObj->GDIFontHandle)
+
+  if (! RtlCreateUnicodeString(&FaceName, TextObj->logfont.lfFaceName))
     {
-      Entry = (Private ? Win32Process->PrivateFontListHead.Flink : FontListHead.Flink);
-      
-      if(Entry != (Private ? &Win32Process->PrivateFontListHead : &FontListHead))
-      {
-           DPRINT("Requested font %S not found, using first available font\n",
-                    TextObj->logfont.lfFaceName)
-        CurrentEntry = (PFONT_ENTRY)CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
-        TextObj->GDIFontHandle = CurrentEntry->hFont;
-      }
-      else
-      {
-        DPRINT1("Requested font %S not found, no fonts loaded at all\n",
-                TextObj->logfont.lfFaceName);
-        Status = STATUS_NOT_FOUND;
-      }
-      
+      TEXTOBJ_UnlockText(TextObj);
+      return STATUS_NO_MEMORY;
+    }
+  SubstituteFontFamily(&FaceName, 0);
+  MatchScore = 0;
+  TextObj->Font = NULL;
+
+  /* First search private fonts */
+  Win32Process = PsGetWin32Process();
+  IntLockProcessPrivateFonts(Win32Process);
+  FindBestFontFromList(&TextObj->Font, &MatchScore,
+                       &TextObj->logfont, &FaceName,
+                       &Win32Process->PrivateFontListHead);
+  IntUnLockProcessPrivateFonts(Win32Process);
+
+  /* Search system fonts */
+  IntLockGlobalFonts;
+  FindBestFontFromList(&TextObj->Font, &MatchScore,
+                       &TextObj->logfont, &FaceName,
+                       &FontListHead);
+  IntUnLockGlobalFonts;
+
+  if (NULL == TextObj->Font)
+    {
+      DPRINT1("Requested font %S not found, no fonts loaded at all\n",
+              TextObj->logfont.lfFaceName);
+      Status = STATUS_NOT_FOUND;
+    }
+  else
+    {
+      TextObj->Initialized = TRUE;
+      Status = STATUS_SUCCESS;
     }
-    
-    ExReleaseFastMutex((Private ? &Win32Process->PrivateFontListLock : &FontListLock));
 
-    ASSERT(! NT_SUCCESS(Status) || NULL != TextObj->GDIFontHandle);
+  RtlFreeUnicodeString(&FaceName);
+  TEXTOBJ_UnlockText(TextObj);
 
-    TEXTOBJ_UnlockText(FontHandle);
-  }
-  else
-  {
-    Status = STATUS_INVALID_HANDLE;
-  }
+  ASSERT((NT_SUCCESS(Status) ^ (NULL == TextObj->Font)) != 0);
 
   return Status;
 }
 
+INT FASTCALL
+FontGetObject(PTEXTOBJ Font, INT Count, PVOID Buffer)
+{
+  if (Count < sizeof(LOGFONTW))
+    {
+      SetLastWin32Error(ERROR_BUFFER_OVERFLOW);
+      return 0;
+    }
+
+  RtlCopyMemory(Buffer, &Font->logfont, sizeof(LOGFONTW));
+
+  return sizeof(LOGFONTW);
+}
+
 /* EOF */