mirror of
https://github.com/reactos/reactos.git
synced 2025-05-31 06:58:10 +00:00
- Move FreeType support to freetype.c.
- Add font.c to build system and picked our first victim to populate it. - Implemented NtGdiSetTextJustification in text.c. svn path=/trunk/; revision=37076
This commit is contained in:
parent
d47975c0db
commit
29ff9f55db
5 changed files with 4547 additions and 4467 deletions
reactos/subsystems/win32/win32k
|
@ -2167,6 +2167,7 @@ NtGdiSelectBrush(
|
||||||
if (pBrush == NULL)
|
if (pBrush == NULL)
|
||||||
{
|
{
|
||||||
SetLastWin32Error(ERROR_INVALID_HANDLE);
|
SetLastWin32Error(ERROR_INVALID_HANDLE);
|
||||||
|
DC_UnlockDc(pDC);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2174,6 +2175,7 @@ NtGdiSelectBrush(
|
||||||
BRUSHOBJ_UnlockBrush(pBrush);
|
BRUSHOBJ_UnlockBrush(pBrush);
|
||||||
if(bFailed)
|
if(bFailed)
|
||||||
{
|
{
|
||||||
|
DC_UnlockDc(pDC);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,65 @@
|
||||||
/* EMPTY FOR NOW */
|
/*
|
||||||
/* Hope I didn't delete existing defs!! Check CVS version of this file.. */
|
* PROJECT: ReactOS win32 kernel mode subsystem
|
||||||
|
* LICENSE: GPL - See COPYING in the top level directory
|
||||||
|
* FILE: subsystems/win32/win32k/objects/font.c
|
||||||
|
* PURPOSE: Font
|
||||||
|
* PROGRAMMER:
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** Includes ******************************************************************/
|
||||||
|
|
||||||
|
#include <w32k.h>
|
||||||
|
|
||||||
|
#define NDEBUG
|
||||||
|
#include <debug.h>
|
||||||
|
|
||||||
|
ULONG
|
||||||
|
FASTCALL
|
||||||
|
ftGdiGetGlyphOutline(
|
||||||
|
IN PDC pdc,
|
||||||
|
IN WCHAR wch,
|
||||||
|
IN UINT iFormat,
|
||||||
|
OUT LPGLYPHMETRICS pgm,
|
||||||
|
IN ULONG cjBuf,
|
||||||
|
OUT OPTIONAL PVOID UnsafeBuf,
|
||||||
|
IN LPMAT2 pmat2,
|
||||||
|
IN BOOL bIgnoreRotation);
|
||||||
|
|
||||||
|
/** Functions ******************************************************************/
|
||||||
|
|
||||||
|
ULONG
|
||||||
|
APIENTRY
|
||||||
|
NtGdiGetGlyphOutline(
|
||||||
|
IN HDC hdc,
|
||||||
|
IN WCHAR wch,
|
||||||
|
IN UINT iFormat,
|
||||||
|
OUT LPGLYPHMETRICS pgm,
|
||||||
|
IN ULONG cjBuf,
|
||||||
|
OUT OPTIONAL PVOID UnsafeBuf,
|
||||||
|
IN LPMAT2 pmat2,
|
||||||
|
IN BOOL bIgnoreRotation)
|
||||||
|
{
|
||||||
|
ULONG Ret;
|
||||||
|
PDC dc;
|
||||||
|
dc = DC_LockDc(hdc);
|
||||||
|
if (!dc)
|
||||||
|
{
|
||||||
|
SetLastWin32Error(ERROR_INVALID_HANDLE);
|
||||||
|
return GDI_ERROR;
|
||||||
|
}
|
||||||
|
Ret = ftGdiGetGlyphOutline( dc,
|
||||||
|
wch,
|
||||||
|
iFormat,
|
||||||
|
pgm,
|
||||||
|
cjBuf,
|
||||||
|
UnsafeBuf,
|
||||||
|
pmat2,
|
||||||
|
bIgnoreRotation);
|
||||||
|
DC_UnlockDc(dc);
|
||||||
|
return Ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* EOF */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
4456
reactos/subsystems/win32/win32k/objects/freetype.c
Normal file
4456
reactos/subsystems/win32/win32k/objects/freetype.c
Normal file
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -161,6 +161,8 @@
|
||||||
<file>dibobj.c</file>
|
<file>dibobj.c</file>
|
||||||
<file>drawing.c</file>
|
<file>drawing.c</file>
|
||||||
<file>fillshap.c</file>
|
<file>fillshap.c</file>
|
||||||
|
<file>font.c</file>
|
||||||
|
<file>freetype.c</file>
|
||||||
<file>gdibatch.c</file>
|
<file>gdibatch.c</file>
|
||||||
<file>gdiobj.c</file>
|
<file>gdiobj.c</file>
|
||||||
<file>icm.c</file>
|
<file>icm.c</file>
|
||||||
|
|
Loading…
Reference in a new issue