wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alexandre Julliard : gdi32: Implement FontIsLinked as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 8796831a9f567ee1ea94a47b0f5f30a98693e3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8796831a9f567ee1ea94a47b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 11:37:48 2011 +0200 gdi32: Implement FontIsLinked as a standard driver entry point. --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 21 ++++++++++++--------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0416103..700fc27 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3378,10 +3378,12 @@ DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs) BOOL WINAPI FontIsLinked(HDC hdc) { DC *dc = get_dc_ptr(hdc); - BOOL ret = FALSE; + PHYSDEV dev; + BOOL ret; if (!dc) return FALSE; - if (dc->gdiFont) ret = WineEngFontIsLinked(dc->gdiFont); + dev = GET_DC_PHYSDEV( dc, pFontIsLinked ); + ret = dev->funcs->pFontIsLinked( dev ); release_dc_ptr(dc); TRACE("returning %d\n", ret); return ret; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f11d935..81115ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6748,14 +6748,22 @@ static DWORD freetype_GetFontUnicodeRanges( PHYSDEV dev, LPGLYPHSET glyphset ) } /************************************************************* - * FontIsLinked + * freetype_FontIsLinked */ -BOOL WineEngFontIsLinked(GdiFont *font) +static BOOL freetype_FontIsLinked( PHYSDEV dev ) { + struct freetype_physdev *physdev = get_freetype_dev( dev ); BOOL ret; + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pFontIsLinked ); + return dev->funcs->pFontIsLinked( dev ); + } + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = !list_empty(&font->child_fonts); + ret = !list_empty(&physdev->font->child_fonts); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7130,7 +7138,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFlattenPath */ - NULL, /* pFontIsLinked */ + freetype_FontIsLinked, /* pFontIsLinked */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ @@ -7266,11 +7274,6 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) return FALSE; } -BOOL WineEngFontIsLinked(GdiFont *font) -{ - return FALSE; -} - /************************************************************************* * GetRasterizerCaps (GDI32.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 40c3cba..f9c86d0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -293,7 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetFontData as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: e31c51b65e63e159b6361abba5aa8825c3fbb5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31c51b65e63e159b6361abba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 17:58:09 2011 +0200 gdi32: Implement GetFontData as a standard driver entry point. --- dlls/gdi32/font.c | 8 ++-- dlls/gdi32/freetype.c | 110 +++++++++++++++++++++++----------------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 59 insertions(+), 60 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ae00b89..0416103 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2759,13 +2759,13 @@ DWORD WINAPI GetFontData(HDC hdc, DWORD table, DWORD offset, LPVOID buffer, DWORD length) { DC *dc = get_dc_ptr(hdc); - DWORD ret = GDI_ERROR; + PHYSDEV dev; + DWORD ret; if(!dc) return GDI_ERROR; - if(dc->gdiFont) - ret = WineEngGetFontData(dc->gdiFont, table, offset, buffer, length); - + dev = GET_DC_PHYSDEV( dc, pGetFontData ); + ret = dev->funcs->pGetFontData( dev, table, offset, buffer, length ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3ac3677..f11d935 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3440,6 +3440,40 @@ static void free_font(GdiFont *font) } +static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData) +{ + FT_Face ft_face = font->ft_face; + FT_ULong len; + FT_Error err; + + if (!FT_IS_SFNT(ft_face)) return GDI_ERROR; + + if(!buf) + len = 0; + else + len = cbData; + + table = RtlUlongByteSwap( table ); /* MS tags differ in endianness from FT ones */ + + /* make sure value of len is the value freetype says it needs */ + if (buf && len) + { + FT_ULong needed = 0; + err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; + } + err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); + if (err) + { + TRACE("Can't find table %c%c%c%c\n", + /* bytes were reversed */ + HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)), + HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table))); + return GDI_ERROR; + } + return len; +} + /************************************************************* * load_VDMX * @@ -3477,7 +3511,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - result = WineEngGetFontData(font, MS_VDMX_TAG, 0, hdr, 6); + result = get_font_data(font, MS_VDMX_TAG, 0, hdr, 6); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ return ppem; @@ -3494,7 +3528,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) Ratios ratio; offset = (3 * 2) + (i * sizeof(Ratios)); - WineEngGetFontData(font, MS_VDMX_TAG, offset, &ratio, sizeof(Ratios)); + get_font_data(font, MS_VDMX_TAG, offset, &ratio, sizeof(Ratios)); offset = -1; TRACE("Ratios[%d] %d %d : %d -> %d\n", i, ratio.bCharSet, ratio.xRatio, ratio.yStartRatio, ratio.yEndRatio); @@ -3507,7 +3541,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) devYRatio <= ratio.yEndRatio)) { offset = (3 * 2) + (numRatios * 4) + (i * 2); - WineEngGetFontData(font, MS_VDMX_TAG, offset, &tmp, 2); + get_font_data(font, MS_VDMX_TAG, offset, &tmp, 2); offset = GET_BE_WORD(tmp); break; } @@ -3518,7 +3552,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) return ppem; } - if(WineEngGetFontData(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { + if(get_font_data(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { USHORT recs; BYTE startsz, endsz; WORD *vTable; @@ -3530,7 +3564,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) TRACE("recs=%d startsz=%d endsz=%d\n", recs, startsz, endsz); vTable = HeapAlloc(GetProcessHeap(), 0, recs * 6); - result = WineEngGetFontData(font, MS_VDMX_TAG, offset + 4, vTable, recs * 6); + result = get_font_data(font, MS_VDMX_TAG, offset + 4, vTable, recs * 6); if(result == GDI_ERROR) { FIXME("Failed to retrieve vTable\n"); goto end; @@ -4217,11 +4251,11 @@ found_face: if (lf.lfFaceName[0]=='@') /* We need to try to load the GSUB table */ { - int length = WineEngGetFontData (ret, GSUB_TAG , 0, NULL, 0); + int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR) { ret->GSUB_Table = HeapAlloc(GetProcessHeap(),0,length); - WineEngGetFontData(ret, GSUB_TAG , 0, ret->GSUB_Table, length); + get_font_data(ret, GSUB_TAG , 0, ret->GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); } } @@ -6548,50 +6582,23 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN } /************************************************************* - * WineEngGetFontData - * + * freetype_GetFontData */ -DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, - DWORD cbData) +static DWORD freetype_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, LPVOID buf, DWORD cbData ) { - FT_Face ft_face = font->ft_face; - FT_ULong len; - FT_Error err; - - TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", - font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), - LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); - - if(!FT_IS_SFNT(ft_face)) - return GDI_ERROR; - - if(!buf) - len = 0; - else - len = cbData; - - if(table) { /* MS tags differ in endianness from FT ones */ - table = table >> 24 | table << 24 | - (table >> 8 & 0xff00) | (table << 8 & 0xff0000); - } + struct freetype_physdev *physdev = get_freetype_dev( dev ); - /* make sure value of len is the value freetype says it needs */ - if(buf && len) + if (!physdev->font) { - FT_ULong needed = 0; - err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); - if( !err && needed < len) len = needed; + dev = GET_NEXT_PHYSDEV( dev, pGetFontData ); + return dev->funcs->pGetFontData( dev, table, offset, buf, cbData ); } - err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); - if(err) { - TRACE("Can't find table %c%c%c%c\n", - /* bytes were reversed */ - HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)), - HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table))); - return GDI_ERROR; - } - return len; + TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", + physdev->font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), + LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); + + return get_font_data( physdev->font, table, offset, buf, cbData ); } /************************************************************* @@ -6963,7 +6970,7 @@ static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *k font->total_kern_pairs = 0; - length = WineEngGetFontData(font, MS_KERN_TAG, 0, NULL, 0); + length = get_font_data(font, MS_KERN_TAG, 0, NULL, 0); if (length == GDI_ERROR) { @@ -6980,7 +6987,7 @@ static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *k return 0; } - WineEngGetFontData(font, MS_KERN_TAG, 0, buf, length); + get_font_data(font, MS_KERN_TAG, 0, buf, length); /* build a glyph index to char code map */ glyph_to_char = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(USHORT) * 65536); @@ -7132,7 +7139,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetCharWidth, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ - NULL, /* pGetFontData */ + freetype_GetFontData, /* pGetFontData */ freetype_GetFontUnicodeRanges, /* pGetFontUnicodeRanges */ freetype_GetGlyphIndices, /* pGetGlyphIndices */ freetype_GetGlyphOutline, /* pGetGlyphOutline */ @@ -7236,13 +7243,6 @@ BOOL WineEngDestroyFontInstance(HFONT hfont) return FALSE; } -DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, - DWORD cbData) -{ - ERR("called but we don't have FreeType\n"); - return GDI_ERROR; -} - INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2e1a650..40c3cba 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -292,7 +292,6 @@ typedef struct extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; -extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetTextFace as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 441d6cfcd4649af7df4f81f1f2217c0348b559ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=441d6cfcd4649af7df4f81f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 17:14:53 2011 +0200 gdi32: Implement GetTextFace as a standard driver entry point. --- dlls/gdi32/driver.c | 15 ++++++++++++++- dlls/gdi32/font.c | 19 ++++--------------- dlls/gdi32/freetype.c | 35 +++++++++++++++++++---------------- dlls/gdi32/gdi_private.h | 1 - 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d2883a7..ea15eab 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -434,7 +434,20 @@ static BOOL nulldrv_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT static INT nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) { - return 0; + INT ret = 0; + LOGFONTW font; + HFONT hfont = GetCurrentObject( dev->hdc, OBJ_FONT ); + + if (GetObjectW( hfont, sizeof(font), &font )) + { + ret = strlenW( font.lfFaceName ) + 1; + if (name) + { + lstrcpynW( name, font.lfFaceName, size ); + ret = min( size, ret ); + } + } + return ret; } static BOOL nulldrv_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98529db..ae00b89 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -852,25 +852,14 @@ INT WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name ) */ INT WINAPI GetTextFaceW( HDC hdc, INT count, LPWSTR name ) { - FONTOBJ *font; - INT ret = 0; + PHYSDEV dev; + INT ret; DC * dc = get_dc_ptr( hdc ); if (!dc) return 0; - if(dc->gdiFont) - ret = WineEngGetTextFace(dc->gdiFont, count, name); - else if ((font = GDI_GetObjPtr( dc->hFont, OBJ_FONT ))) - { - INT n = strlenW(font->logfont.lfFaceName) + 1; - if (name) - { - lstrcpynW( name, font->logfont.lfFaceName, count ); - ret = min(count, n); - } - else ret = n; - GDI_ReleaseObj( dc->hFont ); - } + dev = GET_DC_PHYSDEV( dc, pGetTextFace ); + ret = dev->funcs->pGetTextFace( dev, count, name ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7ca7262..3ac3677 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6595,17 +6595,26 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, } /************************************************************* - * WineEngGetTextFace - * + * freetype_GetTextFace */ -INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) +static INT freetype_GetTextFace( PHYSDEV dev, INT count, LPWSTR str ) { - INT n = strlenW(font->name) + 1; - if(str) { - lstrcpynW(str, font->name, count); - return min(count, n); - } else - return n; + INT n; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextFace ); + return dev->funcs->pGetTextFace( dev, count, str ); + } + + n = strlenW(physdev->font->name) + 1; + if (str) + { + lstrcpynW(str, physdev->font->name, count); + n = min(count, n); + } + return n; } /************************************************************* @@ -7138,7 +7147,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ freetype_GetTextExtentExPointI, /* pGetTextExtentExPointI */ - NULL, /* pGetTextFace */ + freetype_GetTextFace, /* pGetTextFace */ freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ @@ -7234,12 +7243,6 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, return GDI_ERROR; } -INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) -{ - ERR("called but we don't have FreeType\n"); - return 0; -} - INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ee7aacf..2e1a650 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetTextExtentExPointI as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: a2de6a8766e1b28288f18983741ffd35d502fcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2de6a8766e1b28288f189837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 17:03:17 2011 +0200 gdi32: Implement GetTextExtentExPointI as a standard driver entry point. --- dlls/gdi32/font.c | 22 +++++++--------------- dlls/gdi32/freetype.c | 31 +++++++++++++++---------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 38ad477..98529db 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -945,7 +945,8 @@ BOOL WINAPI GetTextExtentPoint32W( BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT max_ext, LPINT nfit, LPINT dxs, LPSIZE size ) { - BOOL ret = FALSE; + PHYSDEV dev; + BOOL ret; DC *dc; if (count < 0) return FALSE; @@ -953,20 +954,11 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if(dc->gdiFont) - { - ret = WineEngGetTextExtentExPointI(dc->gdiFont, indices, count, max_ext, nfit, dxs, size); - size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); - size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); - size->cx += count * dc->charExtra; - } - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); - FIXME("calling GetTextExtentExPoint\n"); - ret = physdev->funcs->pGetTextExtentExPoint( physdev, indices, count, max_ext, nfit, dxs, size ); - } - + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPointI ); + ret = dev->funcs->pGetTextExtentExPointI( dev, indices, count, max_ext, nfit, dxs, size ); + size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); + size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); + size->cx += count * dc->charExtra; release_dc_ptr( dc ); TRACE("(%p %p %d %p): returning %d x %d\n", diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31f52b8..7ca7262 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6501,30 +6501,36 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, } /************************************************************* - * WineEngGetTextExtentExPointI - * + * freetype_GetTextExtentExPointI */ -BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, - INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size) +static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, + INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; GLYPHMETRICS gm; TEXTMETRICW tm; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPointI ); + return dev->funcs->pGetTextExtentExPointI( dev, indices, count, max_ext, pnfit, dxs, size ); + } - TRACE("%p, %p, %d, %d, %p\n", font, indices, count, max_ext, size); + TRACE("%p, %p, %d, %d, %p\n", physdev->font, indices, count, max_ext, size); GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); size->cx = 0; - get_text_metrics(font, &tm); + get_text_metrics(physdev->font, &tm); size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_outline(font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); - size->cx += FONT_GM(font,indices[idx])->adv; + get_glyph_outline(physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); + size->cx += FONT_GM(physdev->font,indices[idx])->adv; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit; @@ -7131,7 +7137,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetSystemPaletteEntries */ freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ - NULL, /* pGetTextExtentExPointI */ + freetype_GetTextExtentExPointI, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ @@ -7221,13 +7227,6 @@ BOOL WineEngDestroyFontInstance(HFONT hfont) return FALSE; } -BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, - INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 365d158..ee7aacf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetTextCharsetInfo as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 1740f34ffbafc3f250a225ffbdb1d859726711d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1740f34ffbafc3f250a225ffb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:55:16 2011 +0200 gdi32: Implement GetTextCharsetInfo as a standard driver entry point. --- dlls/gdi32/font.c | 11 ++++------- dlls/gdi32/freetype.c | 24 ++++++++++++++---------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5e55e31..38ad477 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -472,10 +472,7 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, static void update_font_code_page( DC *dc ) { CHARSETINFO csi; - int charset = DEFAULT_CHARSET; - - if (dc->gdiFont) - charset = WineEngGetTextCharsetInfo( dc->gdiFont, NULL, 0 ); + int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) @@ -3261,12 +3258,12 @@ UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) { UINT ret = DEFAULT_CHARSET; DC *dc = get_dc_ptr(hdc); + PHYSDEV dev; if (dc) { - if (dc->gdiFont) - ret = WineEngGetTextCharsetInfo(dc->gdiFont, fs, flags); - + dev = GET_DC_PHYSDEV( dc, pGetTextCharsetInfo ); + ret = dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); release_dc_ptr( dc ); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5d5e8a5..31f52b8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6602,10 +6602,20 @@ INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) return n; } -UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) +/************************************************************* + * freetype_GetTextCharsetInfo + */ +static UINT freetype_GetTextCharsetInfo( PHYSDEV dev, LPFONTSIGNATURE fs, DWORD flags ) { - if (fs) *fs = font->fs; - return font->charset; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextCharsetInfo ); + return dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); + } + if (fs) *fs = physdev->font->fs; + return physdev->font->charset; } BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) @@ -7119,7 +7129,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ - NULL, /* pGetTextCharsetInfo */ + freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ @@ -7249,12 +7259,6 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD return NULL; } -UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) -{ - FIXME("(%p, %p, %u): stub\n", font, fs, flags); - return DEFAULT_CHARSET; -} - BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) { return FALSE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3e9cad6..365d158 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetOutlineTextMetrics as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: ce8d7b4601b00f75ecec28e69780fe29e147fdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8d7b4601b00f75ecec28e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:49:18 2011 +0200 gdi32: Implement GetOutlineTextMetrics as a standard driver entry point. --- dlls/gdi32/font.c | 113 ++++++++++++++++++++-------------------------- dlls/gdi32/freetype.c | 36 +++++++-------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 66 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce8d7b4601b00f75ecec2…

1 0

Alexandre Julliard : gdi32: Implement GetKerningPairs as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 0c968201047ffe13054e2f3f1ee62eace252709f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c968201047ffe13054e2f3f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:39:53 2011 +0200 gdi32: Implement GetKerningPairs as a standard driver entry point. --- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/freetype.c | 33 +++++++++++++++++++-------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 26eba55..9859f3c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2664,7 +2664,8 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, LPKERNINGPAIR lpKerningPairs ) { DC *dc; - DWORD ret = 0; + DWORD ret; + PHYSDEV dev; TRACE("(%p,%d,%p)\n", hDC, cPairs, lpKerningPairs); @@ -2677,9 +2678,8 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, dc = get_dc_ptr(hDC); if (!dc) return 0; - if (dc->gdiFont) - ret = WineEngGetKerningPairs(dc->gdiFont, cPairs, lpKerningPairs); - + dev = GET_DC_PHYSDEV( dc, pGetKerningPairs ); + ret = dev->funcs->pGetKerningPairs( dev, cPairs, lpKerningPairs ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a98cf36..6d21cc9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6896,7 +6896,10 @@ static DWORD parse_format0_kern_subtable(GdiFont *font, return nPairs; } -DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair) +/************************************************************* + * freetype_GetKerningPairs + */ +static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *kern_pair ) { DWORD length; void *buf; @@ -6904,6 +6907,14 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair const struct TT_kern_subtable *tt_kern_subtable; USHORT i, nTables; USHORT *glyph_to_char; + GdiFont *font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!(font = physdev->font)) + { + dev = GET_NEXT_PHYSDEV( dev, pGetKerningPairs ); + return dev->funcs->pGetKerningPairs( dev, cPairs, kern_pair ); + } GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); @@ -6913,11 +6924,11 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair { cPairs = min(cPairs, font->total_kern_pairs); memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - LeaveCriticalSection( &freetype_cs ); - return cPairs; } + else cPairs = font->total_kern_pairs; + LeaveCriticalSection( &freetype_cs ); - return font->total_kern_pairs; + return cPairs; } font->total_kern_pairs = 0; @@ -7038,11 +7049,11 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair { cPairs = min(cPairs, font->total_kern_pairs); memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - LeaveCriticalSection( &freetype_cs ); - return cPairs; } + else cPairs = font->total_kern_pairs; + LeaveCriticalSection( &freetype_cs ); - return font->total_kern_pairs; + return cPairs; } static const struct gdi_dc_funcs freetype_funcs = @@ -7097,7 +7108,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetGlyphOutline, /* pGetGlyphOutline */ NULL, /* pGetICMProfile */ NULL, /* pGetImage */ - NULL, /* pGetKerningPairs */ + freetype_GetKerningPairs, /* pGetKerningPairs */ NULL, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetPixel */ @@ -7267,12 +7278,6 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } -DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair) -{ - ERR("called but we don't have FreeType\n"); - return 0; -} - BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) { ERR("called but we don't have FreeType\n"); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d0727a2..5e685d3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -293,7 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; -extern DWORD WineEngGetKerningPairs(GdiFont*, DWORD, KERNINGPAIR *) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) DECLSPEC_HIDDEN; extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN;

1 0

André Hentschel : winex11.drv: Remove remaining pixmap prefix to fix compilation without libxrender.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: d63651fe183715f8ef12ea31c5c6485a78c7f9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63651fe183715f8ef12ea31c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 25 19:39:22 2011 +0200 winex11.drv: Remove remaining pixmap prefix to fix compilation without libxrender. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 59035d6..8ee3f59 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -3149,10 +3149,10 @@ void X11DRV_XRender_Finalize(void) void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) { wine_tsx11_lock(); - physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, physBitmap->pixmap_depth); + physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, physBitmap->depth); XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 ); + get_bitmap_gc(physBitmap->depth), 0, 0, width, height, 0, 0 ); wine_tsx11_unlock(); }

1 0

Aric Stewart : user32: When building linedefs prev can be less than 0 if the format width is less than the width of a single character .
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 94bd422f8918306203a7b4beaa45cb68ca71dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bd422f8918306203a7b4bea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 25 08:30:52 2011 -0500 user32: When building linedefs prev can be less than 0 if the format width is less than the width of a single character. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e0e0bba..f8cf757 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -638,7 +638,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->width -= piDx[prev]; prev--; } while ( prev > 0 && current_line->width > fw); - if (prev==0) + if (prev<=0) prev = 1; HeapFree(GetProcessHeap(),0,piDx); }

1 0

André Hentschel : cmdlgtst: Add OFN_EXPLORER to allow testing modern file dialogs with multiselection.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 65092bbe94596c4e5984d712252611dd2a385e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65092bbe94596c4e5984d7122… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 24 21:56:39 2011 +0200 cmdlgtst: Add OFN_EXPLORER to allow testing modern file dialogs with multiselection. --- programs/cmdlgtst/Cs.rc | 27 +++++++++++---------- programs/cmdlgtst/Da.rc | 27 +++++++++++---------- programs/cmdlgtst/De.rc | 27 +++++++++++---------- programs/cmdlgtst/En.rc | 27 +++++++++++---------- programs/cmdlgtst/Es.rc | 27 +++++++++++---------- programs/cmdlgtst/Fr.rc | 27 +++++++++++---------- programs/cmdlgtst/He.rc | 27 +++++++++++---------- programs/cmdlgtst/It.rc | 27 +++++++++++---------- programs/cmdlgtst/Ja.rc | 27 +++++++++++---------- programs/cmdlgtst/Ko.rc | 27 +++++++++++---------- programs/cmdlgtst/Lt.rc | 27 +++++++++++---------- programs/cmdlgtst/Nl.rc | 27 +++++++++++---------- programs/cmdlgtst/No.rc | 27 +++++++++++---------- programs/cmdlgtst/Pl.rc | 27 +++++++++++---------- programs/cmdlgtst/Pt.rc | 54 +++++++++++++++++++++-------------------- programs/cmdlgtst/Ro.rc | 27 +++++++++++---------- programs/cmdlgtst/Ru.rc | 27 +++++++++++---------- programs/cmdlgtst/Si.rc | 27 +++++++++++---------- programs/cmdlgtst/Sv.rc | 27 +++++++++++---------- programs/cmdlgtst/Tr.rc | 27 +++++++++++---------- programs/cmdlgtst/Uk.rc | 27 +++++++++++---------- programs/cmdlgtst/cmdlgtst.c | 1 + programs/cmdlgtst/cmdlgtst.h | 5 ++- 23 files changed, 312 insertions(+), 288 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65092bbe94596c4e5984d…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011