Alexandre Julliard : gdi32: Get rid of the non-standard flags in GetRasterizerCaps.
Alexandre Julliard
julliard at winehq.org
Tue Nov 6 14:27:28 CST 2012
Module: wine
Branch: master
Commit: ddba05547f6c92a8f7a5f0b9c8c81ee19e8e870f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddba05547f6c92a8f7a5f0b9c8c81ee19e8e870f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Nov 5 22:31:31 2012 +0100
gdi32: Get rid of the non-standard flags in GetRasterizerCaps.
---
dlls/gdi32/freetype.c | 23 +++++------------------
include/wingdi.h | 5 -----
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index fcdcca9..9ef8b7b 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -916,6 +916,7 @@ static BOOL is_hinting_enabled(void)
}
#endif
else enabled = FALSE;
+ TRACE("hinting is %senabled\n", enabled ? "" : "NOT ");
}
return enabled;
}
@@ -925,8 +926,11 @@ static BOOL is_subpixel_rendering_enabled( void )
#ifdef HAVE_FREETYPE_FTLCDFIL_H
static int enabled = -1;
if (enabled == -1)
+ {
enabled = (pFT_Library_SetLcdFilter &&
pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature);
+ TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
+ }
return enabled;
#else
return FALSE;
@@ -7556,25 +7560,8 @@ static BOOL freetype_FontIsLinked( PHYSDEV dev )
*/
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->wFlags = TT_AVAILABLE | TT_ENABLED | (hinting ? WINE_TT_HINTER_ENABLED : 0);
- if ( subpixel )
- lprs->wFlags |= WINE_TT_SUBPIXEL_RENDERING_ENABLED;
+ lprs->wFlags = TT_AVAILABLE | TT_ENABLED;
lprs->nLanguageID = 0;
return TRUE;
}
diff --git a/include/wingdi.h b/include/wingdi.h
index 782c4b7..ca98b3e 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -1459,11 +1459,6 @@ typedef struct
#define TT_AVAILABLE 0x0001
#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_QSPLINE 2
#define TT_PRIM_CSPLINE 3
More information about the wine-cvs
mailing list