Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 13:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 47800 from yarotows branch.

Browse source 
Changelog should have been:
[GDI32]
  - Use default LOGFONT in EnumFontFamilies if none is given.
+ ~3000 gdi32:font winetests

svn path=/trunk/; revision=47802
This commit is contained in:
Jérôme Gardou 2010-06-18 22:46:34 +00:00
parent b00db8b8a6
commit a8c547f091
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/gdi32/objects/font.c
View file

@ -154,6 +154,7 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam,
int i;
ENUMLOGFONTEXA EnumLogFontExA;
NEWTEXTMETRICEXA NewTextMetricExA;
LOGFONTW lfW;
Info = RtlAllocateHeap(GetProcessHeap(), 0,
INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO));
@ -161,6 +162,15 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam,
{
return 0;
}
if (!LogFont)
{
lfW.lfCharSet = DEFAULT_CHARSET;
lfW.lfPitchAndFamily = 0;
lfW.lfFaceName[0] = 0;
LogFont = &lfW;
}
FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, INITIAL_FAMILY_COUNT);
if (FontFamilyCount < 0)
{