Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-01 12:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GDI32]

Browse source 
- Use default LOGFONT in EnumFontFamilies.
+ ~3000 gdi32:font winetests

svn path=/branches/reactos-yarotows/; revision=47800
This commit is contained in:
Jérôme Gardou 2010-06-18 21:12:29 +00:00
parent 3dbb216746
commit 256a4e1060
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dll/win32/gdi32/objects/font.c
View file

@ -154,6 +154,7 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam,
int i; int i;
ENUMLOGFONTEXA EnumLogFontExA; ENUMLOGFONTEXA EnumLogFontExA;
NEWTEXTMETRICEXA NewTextMetricExA; NEWTEXTMETRICEXA NewTextMetricExA;
LOGFONTW lfW;
Info = RtlAllocateHeap(GetProcessHeap(), 0, Info = RtlAllocateHeap(GetProcessHeap(), 0,
INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO)); INITIAL_FAMILY_COUNT * sizeof(FONTFAMILYINFO));
@ -161,6 +162,15 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam,
{ {
return 0; 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); FontFamilyCount = NtGdiGetFontFamilyInfo(Dc, LogFont, Info, INITIAL_FAMILY_COUNT);
if (FontFamilyCount < 0) if (FontFamilyCount < 0)
{ {
@ -464,7 +474,7 @@ NewGetCharacterPlacementW(
return 0; return 0;
} }
nSet = uCount; nSet = uCount;
if ( nSet > lpResults->nGlyphs ) if ( nSet > lpResults->nGlyphs )
nSet = lpResults->nGlyphs; nSet = lpResults->nGlyphs;
@ -522,7 +532,7 @@ GetCharWidthFloatW(HDC hdc,
iFirstChar, iFirstChar,
(ULONG)(iLastChar - iFirstChar + 1), (ULONG)(iLastChar - iFirstChar + 1),
(PWCHAR) NULL, (PWCHAR) NULL,
0, 0,
(PVOID) pxBuffer); (PVOID) pxBuffer);
} }
@ -688,7 +698,7 @@ GetCharWidth32A(
wstr[0], wstr[0],
(ULONG) count, (ULONG) count,
(PWCHAR) wstr, (PWCHAR) wstr,
GCW_NOFLOAT|GCW_WIN32, GCW_NOFLOAT|GCW_WIN32,
(PVOID) lpBuffer); (PVOID) lpBuffer);
HeapFree(GetProcessHeap(), 0, str); HeapFree(GetProcessHeap(), 0, str);
@ -772,7 +782,7 @@ GetCharABCWidthsA(
return FALSE; return FALSE;
} }
ret = NtGdiGetCharABCWidthsW( hdc, ret = NtGdiGetCharABCWidthsW( hdc,
wstr[0], wstr[0],
(ULONG)count, (ULONG)count,
(PWCHAR)wstr, (PWCHAR)wstr,
@ -890,7 +900,7 @@ GetFontLanguageInfo(
if ((Ret == ARABIC_CHARSET) || (Ret == HEBREW_CHARSET)) if ((Ret == ARABIC_CHARSET) || (Ret == HEBREW_CHARSET))
Ret = (GCP_KASHIDA|GCP_DIACRITIC|GCP_LIGATE|GCP_GLYPHSHAPE|GCP_REORDER); 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) if ( Gcp == GCP_ERROR)
return Gcp; return Gcp;
else else