[ros-diffs] [tkreuzer] 39928: Make freetype ddi compliant, by linking to win32k only. Clean up excessive header usage in rosglue.c

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Tue Mar 10 05:49:45 2009
New Revision: 39928

URL: http://svn.reactos.org/svn/reactos?rev=39928&view=rev
Log:
Make freetype ddi compliant, by linking to win32k only. Clean up excessive header usage in rosglue.c

Modified:
    trunk/reactos/dll/3rdparty/freetype/freetype.rbuild
    trunk/reactos/dll/3rdparty/freetype/rosglue.c

Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/freetype.rbuild?rev=39928&r1=39927&r2=39928&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Tue Mar 10 05:49:45 2009
@@ -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>

Modified: trunk/reactos/dll/3rdparty/freetype/rosglue.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/rosglue.c?rev=39928&r1=39927&r2=39928&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/freetype/rosglue.c [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/freetype/rosglue.c [iso-8859-1] Tue Mar 10 05:49:45 2009
@@ -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 @@
 {
   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 @@
   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 @@
       CopySize = Size;
       }
     memcpy(NewObject, Object, CopySize);
-    ExFreePool((size_t *) Object - 1);
+    EngFreeMem((size_t *) Object - 1);
     }
 
   return NewObject;
@@ -78,7 +85,7 @@
 void
 free(void *Object)
 {
-  ExFreePool((size_t *) Object - 1);
+  EngFreeMem((size_t *) Object - 1);
 }
 
 /*