Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 16:53:45 +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

20
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)
{
@ -464,7 +474,7 @@ NewGetCharacterPlacementW(
return 0;
}
nSet = uCount;
nSet = uCount;
if ( nSet > lpResults->nGlyphs )
nSet = lpResults->nGlyphs;
@ -522,7 +532,7 @@ GetCharWidthFloatW(HDC hdc,
iFirstChar,
(ULONG)(iLastChar - iFirstChar + 1),
(PWCHAR) NULL,
0,
0,
(PVOID) pxBuffer);
}
@ -688,7 +698,7 @@ GetCharWidth32A(
wstr[0],
(ULONG) count,
(PWCHAR) wstr,
GCW_NOFLOAT|GCW_WIN32,
GCW_NOFLOAT|GCW_WIN32,
(PVOID) lpBuffer);
HeapFree(GetProcessHeap(), 0, str);
@ -772,7 +782,7 @@ GetCharABCWidthsA(
return FALSE;
}
ret = NtGdiGetCharABCWidthsW( hdc,
ret = NtGdiGetCharABCWidthsW( hdc,
wstr[0],
(ULONG)count,
(PWCHAR)wstr,
@ -890,7 +900,7 @@ GetFontLanguageInfo(
if ((Ret == ARABIC_CHARSET) || (Ret == HEBREW_CHARSET))
Ret = (GCP_KASHIDA|GCP_DIACRITIC|GCP_LIGATE|GCP_GLYPHSHAPE|GCP_REORDER);
}
Gcp = GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR);
Gcp = GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR);
if ( Gcp == GCP_ERROR)
return Gcp;
else