From c3586e7347929ab91ed84e497f0e4e4d5f6fc637 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 10 Mar 2009 02:49:45 +0000
Subject: [PATCH] Make freetype ddi compliant, by linking to win32k only. Clean
 up excessive header usage in rosglue.c

svn path=/trunk/; revision=39928
---
 reactos/dll/3rdparty/freetype/freetype.rbuild |  3 ++-
 reactos/dll/3rdparty/freetype/rosglue.c       | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/reactos/dll/3rdparty/freetype/freetype.rbuild b/reactos/dll/3rdparty/freetype/freetype.rbuild
index fd84d9d74d2..d92963e8e98 100644
--- a/reactos/dll/3rdparty/freetype/freetype.rbuild
+++ b/reactos/dll/3rdparty/freetype/freetype.rbuild
@@ -13,7 +13,8 @@
 	<if property="NSWPAT" value="1">
 		<define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" />
 	</if>
-	<library>ntoskrnl</library>
+	<library>win32k</library>
+	<library>libcntpr</library>
 	<if property="ARCH" value="i386">
 		<directory name="i386">
 			<file>setjmplongjmp.s</file>
diff --git a/reactos/dll/3rdparty/freetype/rosglue.c b/reactos/dll/3rdparty/freetype/rosglue.c
index 5a0a25ee637..26f3f3f3256 100644
--- a/reactos/dll/3rdparty/freetype/rosglue.c
+++ b/reactos/dll/3rdparty/freetype/rosglue.c
@@ -8,13 +8,11 @@
  * NOTES:
  */
 
-#include <ntddk.h>
-#include <ctype.h>
-#include <errno.h>
-#include <setjmp.h>
+#include <windef.h>
+#include <wingdi.h>
+#include <winddi.h>
+#include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -26,7 +24,16 @@
  * First some generic routines
  */
 
+ULONG
+DbgPrint(IN PCCH Format, IN ...)
+{
+    va_list args;
 
+    va_start(args, Format);
+    EngDebugPrint("ft2: ", (PCHAR)Format, args);
+    va_end(args);
+    return 0;
+}
 
 /*
  * Memory allocation
@@ -42,7 +49,7 @@ malloc(size_t Size)
 {
   void *Object;
 
-  Object = ExAllocatePoolWithTag(PagedPool, sizeof(size_t) + Size, TAG_FREETYPE);
+  Object = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE);
   if (NULL != Object)
     {
     *((size_t *) Object) = Size;
@@ -58,7 +65,7 @@ realloc(void *Object, size_t Size)
   void *NewObject;
   size_t CopySize;
 
-  NewObject = ExAllocatePoolWithTag(PagedPool, sizeof(size_t) + Size, TAG_FREETYPE);
+  NewObject = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE);
   if (NULL != NewObject)
     {
     *((size_t *) NewObject) = Size;
@@ -69,7 +76,7 @@ realloc(void *Object, size_t Size)
       CopySize = Size;
       }
     memcpy(NewObject, Object, CopySize);
-    ExFreePool((size_t *) Object - 1);
+    EngFreeMem((size_t *) Object - 1);
     }
 
   return NewObject;
@@ -78,7 +85,7 @@ realloc(void *Object, size_t Size)
 void
 free(void *Object)
 {
-  ExFreePool((size_t *) Object - 1);
+  EngFreeMem((size_t *) Object - 1);
 }
 
 /*