ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make freetype ddi compliant, by linking to win32k only. Clean up excessive header usage in rosglue.c

Browse Source 
svn path=/trunk/; revision=39928
This commit is contained in:
Timo Kreuzer
2009-03-10 02:49:45 +00:00
parent 26593d0ac7
commit c3586e7347
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/3rdparty/freetype/freetype.rbuild
Vendored
+2 -1
View File
@@ -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>
reactos/dll/3rdparty/freetype/rosglue.c
Vendored
+17 -10
View File
@@ -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);
}
/*