ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Move the generic part of FontIsLinked() to font.c.

This commit is contained in:
Alexandre Julliard 2007-09-26 20:21:34 +02:00
parent 543270dfb5
commit 3363d65f16
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/gdi32/font.c
View File

@ -3422,3 +3422,19 @@ DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs)
DC_ReleaseDCPtr(dc);
return ret;
}
/*************************************************************
* FontIsLinked (GDI32.@)
*/
BOOL WINAPI FontIsLinked(HDC hdc)
{
DC *dc = DC_GetDCPtr(hdc);
BOOL ret = FALSE;
if (!dc) return FALSE;
if (dc->gdiFont) ret = WineEngFontIsLinked(dc->gdiFont);
DC_ReleaseDCPtr(dc);
TRACE("returning %d\n", ret);
return ret;
}

14
dlls/gdi32/freetype.c
View File

@ -4651,17 +4651,9 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset)
/*************************************************************
* FontIsLinked
*/
BOOL WINAPI FontIsLinked(HDC hdc)
BOOL WineEngFontIsLinked(GdiFont *font)
{
DC *dc = DC_GetDCPtr(hdc);
BOOL ret = FALSE;
if(!dc) return FALSE;
if(dc->gdiFont && !list_empty(&dc->gdiFont->child_fonts))
ret = TRUE;
DC_ReleaseDCPtr(dc);
TRACE("returning %d\n", ret);
return ret;
return !list_empty(&font->child_fonts);
}
static BOOL is_hinting_enabled(void)
@ -5074,7 +5066,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset)
return 0;
}
BOOL WINAPI FontIsLinked(HDC hdc)
BOOL WineEngFontIsLinked(GdiFont *font)
{
return FALSE;
}

1
dlls/gdi32/gdi_private.h
View File

@ -444,6 +444,7 @@ extern BOOL WineEngGetTextExtentExPoint(GdiFont*, LPCWSTR, INT, INT, LPINT, LPIN
extern BOOL WineEngGetTextExtentPointI(GdiFont*, const WORD *, INT, LPSIZE);
extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR);
extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW);
extern BOOL WineEngFontIsLinked(GdiFont*);
extern BOOL WineEngInit(void);
extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID);