Commit 0b58ab7a authored by Akihiro Sagawa's avatar Akihiro Sagawa Committed by Alexandre Julliard

gdi32/tests: Skip linked font like SimSun-ExtB in fixed-pitch font selection.

parent bb2c32d7
...@@ -4009,6 +4009,7 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, ...@@ -4009,6 +4009,7 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe,
CHARSETINFO csi; CHARSETINFO csi;
LOGFONT lf = *lpelfe; LOGFONT lf = *lpelfe;
HFONT hfont; HFONT hfont;
DWORD found_subset;
/* skip bitmap, proportional or vertical font */ /* skip bitmap, proportional or vertical font */
if ((FontType & TRUETYPE_FONTTYPE) == 0 || if ((FontType & TRUETYPE_FONTTYPE) == 0 ||
...@@ -4021,6 +4022,25 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, ...@@ -4021,6 +4022,25 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe,
(lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0) (lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0)
return 1; return 1;
/* skip linked font, like SimSun-ExtB */
switch (lpelfe->lfCharSet) {
case SHIFTJIS_CHARSET:
found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 17); /* Hiragana */
break;
case GB2312_CHARSET:
case CHINESEBIG5_CHARSET:
found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 16); /* CJK Symbols And Punctuation */
break;
case HANGEUL_CHARSET:
found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 24); /* Hangul Syllables */
break;
default:
found_subset = lpntmex->ntmFontSig.fsUsb[0] & (1 << 0); /* Basic Latin */
break;
}
if (!found_subset)
return 1;
/* test with an odd height */ /* test with an odd height */
lf.lfHeight = -19; lf.lfHeight = -19;
lf.lfWidth = 0; lf.lfWidth = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment