Skip to content

W
wine-winehq
Commit 2b1b11d6 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

gdi32: Rename the EnumDeviceFonts entry point to EnumFonts since it's not limited to device fonts.

parent cbd81d39
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 25 deletions
dlls/gdi32/dibdrv/dc.c
View file @ 2b1b11d6
......@@ -535,7 +535,7 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pEndDoc */
NULL, /* pEndPage */
NULL, /* pEndPath */
NULL, /* pEnumDeviceFonts */
NULL, /* pEnumFonts */
NULL, /* pEnumICMProfiles */
NULL, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
......
dlls/gdi32/driver.c
View file @ 2b1b11d6
......@@ -274,7 +274,7 @@ static INT nulldrv_EndPage( PHYSDEV dev )
return 0;
}
static BOOL nulldrv_EnumDeviceFonts( PHYSDEV dev, LOGFONTW *logfont, FONTENUMPROCW proc, LPARAM lParam )
static BOOL nulldrv_EnumFonts( PHYSDEV dev, LOGFONTW *logfont, FONTENUMPROCW proc, LPARAM lParam )
{
return TRUE;
}
......@@ -679,7 +679,7 @@ const struct gdi_dc_funcs null_driver =
nulldrv_EndDoc, /* pEndDoc */
nulldrv_EndPage, /* pEndPage */
nulldrv_EndPath, /* pEndPath */
nulldrv_EnumDeviceFonts, /* pEnumDeviceFonts */
nulldrv_EnumFonts, /* pEnumFonts */
nulldrv_EnumICMProfiles, /* pEnumICMProfiles */
nulldrv_ExcludeClipRect, /* pExcludeClipRect */
nulldrv_ExtDeviceMode, /* pExtDeviceMode */
......
dlls/gdi32/enhmfdrv/init.c
View file @ 2b1b11d6
......@@ -60,7 +60,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pEndDoc */
NULL, /* pEndPage */
EMFDRV_EndPath, /* pEndPath */
NULL, /* pEnumDeviceFonts */
NULL, /* pEnumFonts */
NULL, /* pEnumICMProfiles */
EMFDRV_ExcludeClipRect, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
......
dlls/gdi32/font.c
View file @ 2b1b11d6
......@@ -647,7 +647,7 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro
if (dc)
{
PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEnumDeviceFonts );
PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEnumFonts );
if (plf) TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), plf->lfCharSet);
fe.lpLogFontParam = plf;
......@@ -655,7 +655,7 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro
fe.lpData = lParam;
fe.unicode = unicode;
fe.hdc = hDC;
ret = physdev->funcs->pEnumDeviceFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe );
ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe );
}
release_dc_ptr( dc );
return ret;
......
dlls/gdi32/freetype.c
View file @ 2b1b11d6
......@@ -4584,9 +4584,9 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list,
}
/*************************************************************
* freetype_EnumDeviceFonts
* freetype_EnumFonts
*/
static BOOL freetype_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam )
static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam )
{
Family *family;
Face *face;
......@@ -7073,7 +7073,7 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pEndDoc */
NULL, /* pEndPage */
NULL, /* pEndPath */
freetype_EnumDeviceFonts, /* pEnumDeviceFonts */
freetype_EnumFonts, /* pEnumFonts */
NULL, /* pEnumICMProfiles */
NULL, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
......
dlls/gdi32/mfdrv/init.c
View file @ 2b1b11d6
......@@ -105,7 +105,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pEndDoc */
NULL, /* pEndPage */
MFDRV_EndPath, /* pEndPath */
NULL, /* pEnumDeviceFonts */
NULL, /* pEnumFonts */
NULL, /* pEnumICMProfiles */
MFDRV_ExcludeClipRect, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
......
dlls/wineps.drv/builtin.c
View file @ 2b1b11d6
......@@ -423,12 +423,12 @@ static UINT PSDRV_GetFontMetric(HDC hdc, const AFM *afm,
}
/***********************************************************************
* PSDRV_EnumDeviceFonts
* PSDRV_EnumFonts
*/
BOOL PSDRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp )
BOOL PSDRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp )
{
PSDRV_PDEVICE *physDev = get_psdrv_dev( dev );
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEnumDeviceFonts );
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEnumFonts );
ENUMLOGFONTEXW lf;
NEWTEXTMETRICEXW tm;
BOOL ret;
......@@ -436,7 +436,7 @@ BOOL PSDRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPA
FONTFAMILY *family;
char FaceName[LF_FACESIZE];
ret = next->funcs->pEnumDeviceFonts( next, plf, proc, lp );
ret = next->funcs->pEnumFonts( next, plf, proc, lp );
if (!ret) return FALSE;
if( plf && plf->lfFaceName[0] ) {
......
dlls/wineps.drv/init.c
View file @ 2b1b11d6
......@@ -842,7 +842,7 @@ static const struct gdi_dc_funcs psdrv_funcs =
PSDRV_EndDoc, /* pEndDoc */
PSDRV_EndPage, /* pEndPage */
NULL, /* pEndPath */
PSDRV_EnumDeviceFonts, /* pEnumDeviceFonts */
PSDRV_EnumFonts, /* pEnumFonts */
NULL, /* pEnumICMProfiles */
NULL, /* pExcludeClipRect */
PSDRV_ExtDeviceMode, /* pExtDeviceMode */
......
dlls/wineps.drv/psdrv.h
View file @ 2b1b11d6
......@@ -425,7 +425,7 @@ extern DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCST
extern BOOL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN;
extern INT PSDRV_EndDoc( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern INT PSDRV_EndPage( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL PSDRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) DECLSPEC_HIDDEN;
extern BOOL PSDRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) DECLSPEC_HIDDEN;
extern INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput,
LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput,
LPSTR lpszProfile, DWORD dwMode) DECLSPEC_HIDDEN;
......
dlls/winex11.drv/init.c
View file @ 2b1b11d6
......@@ -489,7 +489,7 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pEndDoc */
NULL, /* pEndPage */
NULL, /* pEndPath */
X11DRV_EnumDeviceFonts, /* pEnumDeviceFonts */
X11DRV_EnumFonts, /* pEnumFonts */
X11DRV_EnumICMProfiles, /* pEnumICMProfiles */
NULL, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
......
dlls/winex11.drv/x11drv.h
View file @ 2b1b11d6
......@@ -186,8 +186,7 @@ extern HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap,
BITMAPINFO *bmi, UINT usage ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf,
FONTENUMPROCW dfeproc, LPARAM lp ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW dfeproc, LPARAM lp ) DECLSPEC_HIDDEN;
extern INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect,
......
dlls/winex11.drv/xfont.c
View file @ 2b1b11d6
......@@ -3321,19 +3321,19 @@ HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont )
/***********************************************************************
*
* X11DRV_EnumDeviceFonts
* X11DRV_EnumFonts
*/
BOOL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp )
BOOL X11DRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp )
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEnumDeviceFonts );
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEnumFonts );
ENUMLOGFONTEXW lf;
NEWTEXTMETRICEXW tm;
fontResource* pfr = fontList;
BOOL ret;
LOGFONTW lfW;
ret = next->funcs->pEnumDeviceFonts( next, plf, proc, lp );
ret = next->funcs->pEnumFonts( next, plf, proc, lp );
if (!ret) return FALSE;
/* don't enumerate x11 fonts if we're using client side fonts */
......
dlls/winex11.drv/xrender.c
View file @ 2b1b11d6
......@@ -3023,7 +3023,7 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pEndDoc */
NULL, /* pEndPage */
NULL, /* pEndPath */
NULL, /* pEnumDeviceFonts */
NULL, /* pEnumFonts */
NULL, /* pEnumICMProfiles */
NULL, /* pExcludeClipRect */
NULL, /* pExtDeviceMode */
......
include/wine/gdi_driver.h
View file @ 2b1b11d6
......@@ -78,7 +78,7 @@ struct gdi_dc_funcs
INT (*pEndDoc)(PHYSDEV);
INT (*pEndPage)(PHYSDEV);
BOOL (*pEndPath)(PHYSDEV);
BOOL (*pEnumDeviceFonts)(PHYSDEV,LPLOGFONTW,FONTENUMPROCW,LPARAM);
BOOL (*pEnumFonts)(PHYSDEV,LPLOGFONTW,FONTENUMPROCW,LPARAM);
INT (*pEnumICMProfiles)(PHYSDEV,ICMENUMPROCW,LPARAM);
INT (*pExcludeClipRect)(PHYSDEV,INT,INT,INT,INT);
INT (*pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment