Alexandre Julliard : gdi32: Implement GetCharABCWidthsI as a standard driver entry point.
Alexandre Julliard
julliard at winehq.org
Tue Oct 25 13:50:28 CDT 2011
Module: wine
Branch: master
Commit: 27208a0ec5800277831e7764a97e42237fa1fffc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=27208a0ec5800277831e7764a97e42237fa1fffc
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Oct 19 22:00:55 2011 +0200
gdi32: Implement GetCharABCWidthsI as a standard driver entry point.
---
dlls/gdi32/font.c | 11 ++++-------
dlls/gdi32/freetype.c | 26 ++++++++++++--------------
dlls/gdi32/gdi_private.h | 2 --
3 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index d12e73b..e8d10f1 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2434,8 +2434,9 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count,
LPWORD pgi, LPABC abc)
{
DC *dc = get_dc_ptr(hdc);
+ PHYSDEV dev;
unsigned int i;
- BOOL ret = FALSE;
+ BOOL ret;
if (!dc) return FALSE;
@@ -2445,11 +2446,8 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count,
return FALSE;
}
- if(dc->gdiFont)
- ret = WineEngGetCharABCWidthsI( dc->gdiFont, firstChar, count, pgi, abc );
- else
- FIXME(": stub\n");
-
+ dev = GET_DC_PHYSDEV( dc, pGetCharABCWidthsI );
+ ret = dev->funcs->pGetCharABCWidthsI( dev, firstChar, count, pgi, abc );
if (ret)
{
/* convert device units to logical */
@@ -2458,7 +2456,6 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count,
abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB);
abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC);
}
- ret = TRUE;
}
release_dc_ptr( dc );
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 00ea0ec..fa3f72b 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -6419,25 +6419,30 @@ BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLO
}
/*************************************************************
- * WineEngGetCharABCWidthsI
- *
+ * freetype_GetCharABCWidthsI
*/
-BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi,
- LPABC buffer)
+static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer )
{
static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
UINT c;
GLYPHMETRICS gm;
FT_UInt glyph_index;
GdiFont *linked_font;
+ struct freetype_physdev *physdev = get_freetype_dev( dev );
+
+ if (!physdev->font)
+ {
+ dev = GET_NEXT_PHYSDEV( dev, pGetCharABCWidthsI );
+ return dev->funcs->pGetCharABCWidthsI( dev, firstChar, count, pgi, buffer );
+ }
- if(!FT_HAS_HORIZONTAL(font->ft_face))
+ if(!FT_HAS_HORIZONTAL(physdev->font->ft_face))
return FALSE;
GDI_CheckNotLock();
EnterCriticalSection( &freetype_cs );
- get_glyph_index_linked(font, 'a', &linked_font, &glyph_index);
+ get_glyph_index_linked(physdev->font, 'a', &linked_font, &glyph_index);
if (!pgi)
for(c = firstChar; c < firstChar+count; c++) {
get_glyph_outline(linked_font, c, GGO_METRICS | GGO_GLYPH_INDEX,
@@ -7094,7 +7099,7 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pGdiComment */
NULL, /* pGdiRealizationInfo */
freetype_GetCharABCWidths, /* pGetCharABCWidths */
- NULL, /* pGetCharABCWidthsI */
+ freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */
freetype_GetCharWidth, /* pGetCharWidth */
NULL, /* pGetDeviceCaps */
NULL, /* pGetDeviceGammaRamp */
@@ -7229,13 +7234,6 @@ BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLO
return FALSE;
}
-BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi,
- LPABC buffer)
-{
- ERR("called but we don't have FreeType\n");
- return FALSE;
-}
-
BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count,
INT max_ext, LPINT nfit, LPINT dx, LPSIZE size)
{
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 413d61f..fff72b1 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -294,8 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC
extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN;
extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar,
UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN;
-extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar,
- UINT count, LPWORD pgi, LPABC buffer) DECLSPEC_HIDDEN;
extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN;
extern DWORD WineEngGetFontUnicodeRanges(GdiFont *, LPGLYPHSET) DECLSPEC_HIDDEN;
extern DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count,
More information about the wine-cvs
mailing list