system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 09:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

gdi32: Using a bitmap font as the fallback sans serif is a very bad idea.

Browse source
This commit is contained in:
Huw Davies 2007-07-05 15:27:20 +01:00 committed by Alexandre Julliard
parent ffbd30dd88
commit 7495d81495
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/gdi32/freetype.c
View file

@ -337,7 +337,7 @@ static struct list font_subst_list = LIST_INIT(font_subst_list);
static struct list font_list = LIST_INIT(font_list);
static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'};
static const WCHAR defSans[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'};
static const WCHAR defSans[] = {'A','r','i','a','l','\0'};
static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'};
static const WCHAR RegularW[] = {'R','e','g','u','l','a','r','\0'};

32
dlls/gdi32/tests/font.c
View file

@ -1654,6 +1654,36 @@ static void test_GetTextMetrics(void)
ReleaseDC(0, hdc);
}
static void test_non_existent_font(void)
{
LOGFONTA lf;
HDC hdc;
HFONT hfont;
char buf[LF_FACESIZE];
if (!is_truetype_font_installed("Arial Black"))
{
skip("Arial not installed\n");
return;
}
hdc = GetDC(0);
memset(&lf, 0, sizeof(lf));
lf.lfHeight = 100;
lf.lfWeight = FW_REGULAR;
lf.lfCharSet = ANSI_CHARSET;
lf.lfPitchAndFamily = FF_SWISS;
strcpy(lf.lfFaceName, "Non existent font");
hfont = CreateFontIndirectA(&lf);
hfont = SelectObject(hdc, hfont);
GetTextFaceA(hdc, sizeof(buf), buf);
ok(!lstrcmpiA(buf, "Arial"), "Got %s\n", buf);
DeleteObject(SelectObject(hdc, hfont));
ReleaseDC(0, hdc);
}
START_TEST(font)
{
init();
@ -1670,6 +1700,8 @@ START_TEST(font)
test_SetTextJustification();
test_font_charset();
test_GetFontUnicodeRanges();
test_non_existent_font();
/* On Windows Arial has a lot of default charset aliases such as Arial Cyr,
* I'd like to avoid them in this test.
*/