November 2012 - Wine-Commits

Piotr Caban : msvcrt: Allocate buffer in fwrite function.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: ec26342c88fb48954cad9044fecce336e1be31d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec26342c88fb48954cad9044f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 17:18:34 2012 +0100 msvcrt: Allocate buffer in fwrite function. --- dlls/msvcrt/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 185b1e2..1b87dd2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2919,8 +2919,13 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } } if(wrcnt) { + int res; + + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + msvcrt_alloc_buffer(file); + /* Flush buffer */ - int res=msvcrt_flush_buffer(file); + res=msvcrt_flush_buffer(file); if(!res) { int pwritten = MSVCRT__write(file->_file, ptr, wrcnt); if (pwritten <= 0)

1 0

Michael Stefaniuc : itss: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 815031d8325482cd09d3387564df1587f14d60f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815031d8325482cd09d338756… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 2 15:17:06 2012 +0100 itss: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/itss/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index dedf4e5..0509c9e 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -354,7 +354,7 @@ static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPCWSTR name, DWORD n ) DWORD sz; /* szFile[1] has space for one character already */ - sz = sizeof(ITS_IMonikerImpl) + strlenW( name )*sizeof(WCHAR); + sz = FIELD_OFFSET( ITS_IMonikerImpl, szFile[strlenW( name ) + 1] ); itsmon = HeapAlloc( GetProcessHeap(), 0, sz ); itsmon->IMoniker_iface.lpVtbl = &ITS_IMonikerImpl_Vtbl;

1 0

Michael Stefaniuc : gdi.exe16: Use FIELD_OFFSET to calculate the size of structs with variable length array .
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: fb724cfd7be65905eadcb832794f83a9bb1ff383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb724cfd7be65905eadcb8327… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 2 15:13:55 2012 +0100 gdi.exe16: Use FIELD_OFFSET to calculate the size of structs with variable length array. --- dlls/gdi.exe16/gdi.c | 2 +- dlls/gdi.exe16/metafile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index ef460b3..2bd070b 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -1982,7 +1982,7 @@ void WINAPI SetRectRgn16( HRGN16 hrgn, INT16 left, INT16 top, INT16 right, INT16 */ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, UINT16 handles ) { - HANDLETABLE *ht32 = HeapAlloc( GetProcessHeap(), 0, handles * sizeof(*ht32) ); + HANDLETABLE *ht32 = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(HANDLETABLE, objectHandle[handles] )); unsigned int i; for (i = 0; i < handles; i++) ht32->objectHandle[i] = HGDIOBJ_32(ht->objectHandle[i]); diff --git a/dlls/gdi.exe16/metafile.c b/dlls/gdi.exe16/metafile.c index dfde8f7..2f0ccfe 100644 --- a/dlls/gdi.exe16/metafile.c +++ b/dlls/gdi.exe16/metafile.c @@ -213,7 +213,7 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc16, HMETAFILE16 hmf, /* create the handle table */ hHT = GlobalAlloc16(GMEM_MOVEABLE | GMEM_ZEROINIT, - sizeof(HANDLETABLE16) * mh->mtNoObjects); + FIELD_OFFSET(HANDLETABLE16, objectHandle[mh->mtNoObjects])); spht = WOWGlobalLock16(hHT); seg = hmf | 7;

1 0

Michael Stefaniuc : localspl: Avoid using sizeof on structs with variable length array.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: e67deeb8a139f51e63d5f7142c259ca6cd235a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67deeb8a139f51e63d5f7142… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 2 15:11:26 2012 +0100 localspl: Avoid using sizeof on structs with variable length array. --- dlls/localspl/localmon.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index f4e1739..8737a06 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -513,7 +513,6 @@ cleanup: static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) { port_t * port; - DWORD len; DWORD type; TRACE("%s, %p)\n", debugstr_w(pName), phPort); @@ -525,12 +524,11 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) type = get_type_from_local_name(pName); if (!type) return FALSE; - len = (lstrlenW(pName) + 1) * sizeof(WCHAR); - port = heap_alloc(sizeof(port_t) + len); + port = heap_alloc(FIELD_OFFSET(port_t, nameW[lstrlenW(pName) + 1])); if (!port) return FALSE; port->type = type; - memcpy(port->nameW, pName, len); + lstrcpyW(port->nameW, pName); *phPort = port; EnterCriticalSection(&port_handles_cs); @@ -734,16 +732,14 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE */ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess, PHANDLE phXcv) { - DWORD len; xcv_t * xcv; TRACE("%s, 0x%x, %p)\n", debugstr_w(pName), GrantedAccess, phXcv); /* No checks for any field is done in Windows */ - len = (lstrlenW(pName) + 1) * sizeof(WCHAR); - xcv = heap_alloc( sizeof(xcv_t) + len); + xcv = heap_alloc(FIELD_OFFSET(xcv_t, nameW[lstrlenW(pName) + 1])); if (xcv) { xcv->GrantedAccess = GrantedAccess; - memcpy(xcv->nameW, pName, len); + lstrcpyW(xcv->nameW, pName); *phXcv = xcv; EnterCriticalSection(&xcv_handles_cs); list_add_tail(&xcv_handles, &xcv->entry);

1 0

Hans Leidekker : msi: Return length for the empty string in msi_string_lookup.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 31ea3f44ddd5f964e7479f1f10c53392f06f18e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ea3f44ddd5f964e7479f1f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 2 15:35:34 2012 +0100 msi: Return length for the empty string in msi_string_lookup. --- dlls/msi/string.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 5e2c574..486cdf9 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -352,8 +352,10 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) { if( id == 0 ) + { + if (len) *len = 0; return szEmpty; - + } if( id >= st->maxcount ) return NULL;

1 0

Piotr Caban : msvcp71: Ignore prot argument in Fiopen_wchar function.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 79f314c31a2659ca820a49a843ed1771d98fdecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f314c31a2659ca820a49a84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 17:18:07 2012 +0100 msvcp71: Ignore prot argument in Fiopen_wchar function. --- dlls/msvcp71/ios.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index c538cf7..12e217f 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -2587,8 +2587,9 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) return NULL; } + /* msvcp60 - msvcp71 are ignoring prot argument */ f = _wfsopen(name, (mode & OPENMODE_binary) ? str_mode[mode_idx].str_bin - : str_mode[mode_idx].str, prot); + : str_mode[mode_idx].str, SH_DENYNO); if(!f) return NULL;

1 0

Andrew Eikum : oleaut32: helpcontext is not an offset.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 561e46c435b824489922476fb448531e74ca482e URL: http://source.winehq.org/git/wine.git/?a=commit;h=561e46c435b824489922476fb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 2 12:53:36 2012 -0500 oleaut32: helpcontext is not an offset. --- dlls/oleaut32/typelib.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3d94164..cb179f9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4092,9 +4092,6 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pOtherTypeInfoBlks[i].name_offs + pNameTable); (*ppTypeInfoImpl)->dwHelpContext = pOtherTypeInfoBlks[i].helpcontext; - (*ppTypeInfoImpl)->DocString = TLB_MultiByteToBSTR( - pOtherTypeInfoBlks[i].helpcontext + - pNameTable); (*ppTypeInfoImpl)->TypeAttr.guid = pOtherTypeInfoBlks[i].uuid; (*ppTypeInfoImpl)->TypeAttr.typekind = pTIHeader->typekind; (*ppTypeInfoImpl)->TypeAttr.wMajorVerNum = pTIHeader->major_version;

1 0

Alexandre Julliard : gdi32: Store the anti-aliasing flags in the DC when selecting a font.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: ccc034c27e7595662c9c02b86de1b660ac680536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc034c27e7595662c9c02b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 15:55:29 2012 +0100 gdi32: Store the anti-aliasing flags in the DC when selecting a font. --- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- dlls/gdi32/font.c | 20 ++++++++------------ dlls/gdi32/freetype.c | 2 ++ dlls/gdi32/gdi_private.h | 3 ++- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 450ecad..6f936e0 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -665,7 +665,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); struct clipped_rects clipped_rects; - UINT aa_flags; + DC *dc; RECT bounds; DWORD text_color; struct intensity_range ranges[17]; @@ -700,10 +700,10 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); - aa_flags = get_font_aa_flags( dev->hdc ); - - render_string( dev->hdc, &pdev->dib, x, y, flags, aa_flags, str, count, dx, + dc = get_dc_ptr( dev->hdc ); + render_string( dev->hdc, &pdev->dib, x, y, flags, dc->aa_flags, str, count, dx, text_color, ranges, &clipped_rects, &bounds ); + release_dc_ptr( dc ); done: add_clipped_bounds( pdev, &bounds, pdev->clip ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6179230..d5396ff 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -390,9 +390,8 @@ static UINT get_subpixel_orientation( void ) return GGO_GRAY4_BITMAP; } -UINT get_font_aa_flags( HDC hdc ) +UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) { - LOGFONTW lf; WORD gasp_flags; static int hinter = -1; static int subpixel_enabled = -1; @@ -406,9 +405,6 @@ UINT get_font_aa_flags( HDC hdc ) } else if (GetDeviceCaps( hdc, BITSPIXEL ) <= 8) return GGO_BITMAP; - GetObjectW( GetCurrentObject( hdc, OBJ_FONT ), sizeof(lf), &lf ); - if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; - if (hinter == -1 || subpixel_enabled == -1) { RASTERIZER_STATUS status; @@ -417,8 +413,10 @@ UINT get_font_aa_flags( HDC hdc ) subpixel_enabled = status.wFlags & WINE_TT_SUBPIXEL_RENDERING_ENABLED; } - switch (lf.lfQuality) + switch (lf->lfQuality) { + case NONANTIALIASED_QUALITY: + return GGO_BITMAP; case ANTIALIASED_QUALITY: smoothing = aa_smoothing; break; @@ -731,6 +729,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { ret = dc->hFont; dc->hFont = handle; + dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc ); GDI_dec_ref_count( ret ); } @@ -1948,7 +1947,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect LPCWSTR str, UINT count, const INT *dx ) { DC *dc = get_nulldrv_dc( dev ); - UINT aa_flags, i; + UINT i; DWORD err; HGDIOBJ orig; HPEN pen; @@ -1970,18 +1969,15 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect if (!count) return TRUE; - aa_flags = get_font_aa_flags( dev->hdc ); - - if (aa_flags != GGO_BITMAP) + if (dc->aa_flags != GGO_BITMAP) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; struct gdi_image_bits bits; struct bitblt_coords src, dst; PHYSDEV dst_dev; - /* FIXME Subpixel modes */ - aa_flags = GGO_GRAY4_BITMAP; + UINT aa_flags = GGO_GRAY4_BITMAP; dst_dev = GET_DC_PHYSDEV( dc, pPutImage ); src.visrect = get_total_extents( dev->hdc, x, y, flags, aa_flags, str, count, dx ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b747f6f..ad179f1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4459,6 +4459,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) GetObjectW( hfont, sizeof(lf), &lf ); lf.lfWidth = abs(lf.lfWidth); + if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + can_use_bitmap = GetDeviceCaps(dev->hdc, TEXTCAPS) & TC_RA_ABLE; TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 792a9e4..084245e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -88,6 +88,7 @@ typedef struct tagDC RECT vis_rect; /* visible rectangle in screen coords */ RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ + UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ FLOAT miterLimit; int flags; @@ -278,7 +279,7 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; /* font.c */ -extern UINT get_font_aa_flags( HDC hdc ) DECLSPEC_HIDDEN; +extern UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alexandre Julliard : gdi32: Move checking of the subpixel support and gasp flags to freetype.c.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 123da6f888b954c242bd49a4abab8cad0e1436fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=123da6f888b954c242bd49a4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 17:21:28 2012 +0100 gdi32: Move checking of the subpixel support and gasp flags to freetype.c. --- dlls/gdi32/font.c | 101 ++--------------------------------- dlls/gdi32/freetype.c | 138 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 110 insertions(+), 129 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a2d4d3e..09ea1b7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -39,12 +39,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef WORDS_BIGENDIAN -#define get_be_word(x) (x) -#else -#define get_be_word(x) RtlUshortByteSwap(x) -#endif - WINE_DEFAULT_DEBUG_CHANNEL(font); /* Device -> World size conversion */ @@ -266,69 +260,6 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } -static DWORD get_font_ppem( HDC hdc ) -{ - TEXTMETRICW tm; - DWORD ppem; - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return GDI_ERROR; - - GetTextMetricsW( hdc, &tm ); - ppem = abs( INTERNAL_YWSTODS( dc, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading ) ); - release_dc_ptr( dc ); - return ppem; -} - -#define GASP_GRIDFIT 0x01 -#define GASP_DOGRAY 0x02 - -static BOOL get_gasp_flags( HDC hdc, WORD *flags ) -{ - DWORD size, gasp_tag = 0x70736167; - WORD buf[16]; /* Enough for seven ranges before we need to alloc */ - WORD *alloced = NULL, *ptr = buf; - WORD num_recs, version; - DWORD ppem = get_font_ppem( hdc ); - BOOL ret = FALSE; - - *flags = 0; - if (ppem == GDI_ERROR) return FALSE; - - size = GetFontData( hdc, gasp_tag, 0, NULL, 0 ); - if (size == GDI_ERROR) return FALSE; - if (size < 4 * sizeof(WORD)) return FALSE; - if (size > sizeof(buf)) - { - ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); - if (!ptr) return FALSE; - } - - GetFontData( hdc, gasp_tag, 0, ptr, size ); - - version = get_be_word( *ptr++ ); - num_recs = get_be_word( *ptr++ ); - - if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) - { - FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); - goto done; - } - - while (num_recs--) - { - *flags = get_be_word( *(ptr + 1) ); - if (ppem <= get_be_word( *ptr )) break; - ptr += 2; - } - TRACE( "got flags %04x for ppem %d\n", *flags, ppem ); - ret = TRUE; - -done: - HeapFree( GetProcessHeap(), 0, alloced ); - return ret; -} - enum smoothing { no_smoothing, aa_smoothing, subpixel_smoothing }; static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) @@ -392,19 +323,8 @@ static UINT get_subpixel_orientation( void ) UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) { - WORD gasp_flags; - static int hinter = -1; - static int subpixel_enabled = -1; enum smoothing smoothing; - if (hinter == -1 || subpixel_enabled == -1) - { - RASTERIZER_STATUS status; - GetRasterizerCaps(&status, sizeof(status)); - hinter = status.wFlags & WINE_TT_HINTER_ENABLED; - subpixel_enabled = status.wFlags & WINE_TT_SUBPIXEL_RENDERING_ENABLED; - } - switch (lf->lfQuality) { case NONANTIALIASED_QUALITY: @@ -423,24 +343,15 @@ UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) smoothing = get_default_smoothing(); } - if (smoothing == subpixel_smoothing) - { - if (subpixel_enabled) - { - UINT ret = get_subpixel_orientation(); - if (ret != GGO_GRAY4_BITMAP) return ret; - } - smoothing = aa_smoothing; - } - - if (smoothing == aa_smoothing) + switch (smoothing) { - if (hinter && get_gasp_flags( hdc, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) - return GGO_BITMAP; + case subpixel_smoothing: + return get_subpixel_orientation(); + case aa_smoothing: return GGO_GRAY4_BITMAP; + default: + return GGO_BITMAP; } - - return GGO_BITMAP; } /*********************************************************************** diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ad179f1..a70b853 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -894,6 +894,44 @@ static inline FT_Fixed FT_FixedFromFIXED(FIXED f) return (FT_Fixed)((int)f.value << 16 | (unsigned int)f.fract); } +static BOOL is_hinting_enabled(void) +{ + static int enabled = -1; + + if (enabled == -1) + { + /* Use the >= 2.2.0 function if available */ + if (pFT_Get_TrueType_Engine_Type) + { + FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); + enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED); + } +#ifdef FT_DRIVER_HAS_HINTER + else + { + /* otherwise if we've been compiled with < 2.2.0 headers use the internal macro */ + FT_Module mod = pFT_Get_Module(library, "truetype"); + enabled = (mod && FT_DRIVER_HAS_HINTER(mod)); + } +#endif + else enabled = FALSE; + } + return enabled; +} + +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); + return enabled; +#else + return FALSE; +#endif +} + static const struct list *get_face_list_from_family(const Family *family) { @@ -4426,6 +4464,53 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 +#define GASP_TAG MS_MAKE_TAG('g','a','s','p') + +static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) +{ + DWORD size; + WORD buf[16]; /* Enough for seven ranges before we need to alloc */ + WORD *alloced = NULL, *ptr = buf; + WORD num_recs, version; + BOOL ret = FALSE; + + *flags = 0; + size = get_font_data( font, GASP_TAG, 0, NULL, 0 ); + if (size == GDI_ERROR) return FALSE; + if (size < 4 * sizeof(WORD)) return FALSE; + if (size > sizeof(buf)) + { + ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); + if (!ptr) return FALSE; + } + + get_font_data( font, GASP_TAG, 0, ptr, size ); + + version = GET_BE_WORD( *ptr++ ); + num_recs = GET_BE_WORD( *ptr++ ); + + if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) + { + FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); + goto done; + } + + while (num_recs--) + { + *flags = GET_BE_WORD( *(ptr + 1) ); + if (font->ft_face->size->metrics.y_ppem <= GET_BE_WORD( *ptr )) break; + ptr += 2; + } + TRACE( "got flags %04x for ppem %d\n", *flags, font->ft_face->size->metrics.y_ppem ); + ret = TRUE; + +done: + HeapFree( GetProcessHeap(), 0, alloced ); + return ret; +} + /************************************************************* * freetype_SelectFont */ @@ -4868,6 +4953,25 @@ found_face: done: if (ret) { + /* fixup the antialiasing flags for that font */ + switch (*aa_flags) + { + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + if (is_subpixel_rendering_enabled()) break; + *aa_flags = GGO_GRAY4_BITMAP; + /* fall through */ + case GGO_GRAY4_BITMAP: + if (is_hinting_enabled()) + { + WORD gasp_flags; + if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + *aa_flags = GGO_BITMAP; + } + break; + } dc->gdiFont = ret; physdev->font = ret; } @@ -7430,40 +7534,6 @@ static BOOL freetype_FontIsLinked( PHYSDEV dev ) return ret; } -static BOOL is_hinting_enabled(void) -{ - /* Use the >= 2.2.0 function if available */ - if(pFT_Get_TrueType_Engine_Type) - { - FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); - return type == FT_TRUETYPE_ENGINE_TYPE_PATENTED; - } -#ifdef FT_DRIVER_HAS_HINTER - else - { - FT_Module mod; - - /* otherwise if we've been compiled with < 2.2.0 headers - use the internal macro */ - mod = pFT_Get_Module(library, "truetype"); - if(mod && FT_DRIVER_HAS_HINTER(mod)) - return TRUE; - } -#endif - - return FALSE; -} - -static BOOL is_subpixel_rendering_enabled( void ) -{ -#ifdef HAVE_FREETYPE_FTLCDFIL_H - return pFT_Library_SetLcdFilter && - pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature; -#else - return FALSE; -#endif -} - /************************************************************************* * GetRasterizerCaps (GDI32.@) */

1 0

Alexandre Julliard : gdi32: Disable anti-aliasing when necessary in the various drivers.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 9cdb0e1ca6d9cdbe5d40d5a544629d6f21baff2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdb0e1ca6d9cdbe5d40d5a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 16:07:51 2012 +0100 gdi32: Disable anti-aliasing when necessary in the various drivers. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 13 +++++++++++++ dlls/gdi32/enhmfdrv/objects.c | 1 + dlls/gdi32/font.c | 8 -------- dlls/gdi32/mfdrv/objects.c | 1 + dlls/wineps.drv/font.c | 2 ++ dlls/winex11.drv/init.c | 12 +++++++++++- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0b6013d..4d84452 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -484,7 +484,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_SelectBitmap, /* pSelectBitmap */ dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ + dibdrv_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ dibdrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 564fe95..1cd87e3 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -141,6 +141,7 @@ extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT extern BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ) DECLSPEC_HIDDEN; extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 6f936e0..0b54188 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -712,6 +712,19 @@ done: } /*********************************************************************** + * dibdrv_SelectFont + */ +HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (pdev->dib.bit_count <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */ + + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, font, aa_flags ); +} + +/*********************************************************************** * dibdrv_Arc */ BOOL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 8dd88f6..4c85fe7 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -314,6 +314,7 @@ HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, UINT *aa_flags ) if(!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; done: + *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); dev->funcs->pSelectFont( dev, hFont, aa_flags ); return hFont; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d5396ff..a2d4d3e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -397,14 +397,6 @@ UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) static int subpixel_enabled = -1; enum smoothing smoothing; - if (GetObjectType( hdc ) == OBJ_MEMDC) - { - BITMAP bm; - GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bm), &bm ); - if (bm.bmBitsPixel <= 8) return GGO_BITMAP; - } - else if (GetDeviceCaps( hdc, BITSPIXEL ) <= 8) return GGO_BITMAP; - if (hinter == -1 || subpixel_enabled == -1) { RASTERIZER_STATUS status; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 07e66b7..697644d 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -290,6 +290,7 @@ HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LOGFONTW font; INT16 index; + *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ index = MFDRV_FindObject(dev, hfont); if( index < 0 ) { diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index f04d069..4888af3 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -47,6 +47,8 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (!GetObjectW( hfont, sizeof(lf), &lf )) return 0; + *aa_flags = GGO_BITMAP; /* no anti-aliasing on printer devices */ + TRACE("FaceName = %s Height = %d Italic = %d Weight = %d\n", debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic, lf.lfWeight); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d729fd0..7cf318f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -295,6 +295,16 @@ static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } +/*********************************************************************** + * SelectFont + */ +static HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) +{ + if (default_visual.depth <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */ + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, hfont, aa_flags ); +} + /********************************************************************** * ExtEscape (X11DRV.@) */ @@ -532,7 +542,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSelectBitmap */ X11DRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ + X11DRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ X11DRV_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */

1 0