system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 13:44:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdi32: Get rid of the non-standard flags in GetRasterizerCaps.

Browse source
This commit is contained in:
Alexandre Julliard 2012-11-05 22:31:31 +01:00
parent 3176d4d495
commit ddba05547f
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dlls/gdi32/freetype.c
View file

@ -916,6 +916,7 @@ static BOOL is_hinting_enabled(void)
} }
#endif #endif
else enabled = FALSE; else enabled = FALSE;
TRACE("hinting is %senabled\n", enabled ? "" : "NOT ");
} }
return enabled; return enabled;
} }
@ -925,8 +926,11 @@ static BOOL is_subpixel_rendering_enabled( void )
#ifdef HAVE_FREETYPE_FTLCDFIL_H #ifdef HAVE_FREETYPE_FTLCDFIL_H
static int enabled = -1; static int enabled = -1;
if (enabled == -1) if (enabled == -1)
{
enabled = (pFT_Library_SetLcdFilter && enabled = (pFT_Library_SetLcdFilter &&
pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature);
TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
}
return enabled; return enabled;
#else #else
return FALSE; return FALSE;
@ -7556,25 +7560,8 @@ static BOOL freetype_FontIsLinked( PHYSDEV dev )
*/ */
BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes)
{ {
static int hinting = -1;
static int subpixel = -1;
if(hinting == -1)
{
hinting = is_hinting_enabled();
TRACE("hinting is %senabled\n", hinting ? "" : "NOT ");
}
if ( subpixel == -1 )
{
subpixel = is_subpixel_rendering_enabled();
TRACE("subpixel rendering is %senabled\n", subpixel ? "" : "NOT ");
}
lprs->nSize = sizeof(RASTERIZER_STATUS); lprs->nSize = sizeof(RASTERIZER_STATUS);
lprs->wFlags = TT_AVAILABLE | TT_ENABLED | (hinting ? WINE_TT_HINTER_ENABLED : 0); lprs->wFlags = TT_AVAILABLE | TT_ENABLED;
if ( subpixel )
lprs->wFlags |= WINE_TT_SUBPIXEL_RENDERING_ENABLED;
lprs->nLanguageID = 0; lprs->nLanguageID = 0;
return TRUE; return TRUE;
} }

5
include/wingdi.h
View file

@ -1459,11 +1459,6 @@ typedef struct
#define TT_AVAILABLE 0x0001 #define TT_AVAILABLE 0x0001
#define TT_ENABLED 0x0002 #define TT_ENABLED 0x0002
#ifdef __WINESRC__
#define WINE_TT_SUBPIXEL_RENDERING_ENABLED 0x4000
#define WINE_TT_HINTER_ENABLED 0x8000
#endif
#define TT_PRIM_LINE 1 #define TT_PRIM_LINE 1
#define TT_PRIM_QSPLINE 2 #define TT_PRIM_QSPLINE 2
#define TT_PRIM_CSPLINE 3 #define TT_PRIM_CSPLINE 3