user32/tests: Add more margin tests in CJK font case.
In WM_SETFONT with a combination of CJK font and non-CJK charset, Unicode version control uses ABC width for margins, while ANSI version one uses EC_USEFONTINFO width for margins. Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a41c73d43e
commit
491b061123
|
@ -1549,6 +1549,14 @@ static void test_margins_usefontinfo(UINT charset)
|
||||||
DeleteObject(hfont);
|
DeleteObject(hfont);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static BOOL is_cjk_font(HDC dc)
|
||||||
|
{
|
||||||
|
const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB;
|
||||||
|
FONTSIGNATURE fs;
|
||||||
|
return (GetTextCharsetInfo(dc, &fs, 0) != DEFAULT_CHARSET &&
|
||||||
|
(fs.fsCsb[0] & FS_DBCS_MASK));
|
||||||
|
}
|
||||||
|
|
||||||
static INT get_cjk_fontinfo_margin(INT width, INT side_bearing)
|
static INT get_cjk_fontinfo_margin(INT width, INT side_bearing)
|
||||||
{
|
{
|
||||||
INT margin;
|
INT margin;
|
||||||
|
@ -1587,7 +1595,7 @@ static void test_margins_default(const char* facename, UINT charset)
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
TEXTMETRICW tm;
|
TEXTMETRICW tm;
|
||||||
SIZE size;
|
SIZE size;
|
||||||
BOOL cjk_charset;
|
BOOL cjk_charset, cjk_font;
|
||||||
LOGFONTA lf;
|
LOGFONTA lf;
|
||||||
HFONT hfont;
|
HFONT hfont;
|
||||||
RECT rect;
|
RECT rect;
|
||||||
|
@ -1631,7 +1639,9 @@ static void test_margins_default(const char* facename, UINT charset)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
cjk_charset = is_cjk_charset(hdc);
|
cjk_charset = is_cjk_charset(hdc);
|
||||||
if (cjk_charset && pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) {
|
cjk_font = is_cjk_font(hdc);
|
||||||
|
if ((cjk_charset || cjk_font) &&
|
||||||
|
pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) {
|
||||||
short left, right;
|
short left, right;
|
||||||
|
|
||||||
left = get_cjk_fontinfo_margin(size.cx, info.lsb);
|
left = get_cjk_fontinfo_margin(size.cx, info.lsb);
|
||||||
|
@ -1654,10 +1664,12 @@ static void test_margins_default(const char* facename, UINT charset)
|
||||||
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
||||||
SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0));
|
SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0));
|
||||||
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
||||||
|
todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET))
|
||||||
ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins));
|
ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins));
|
||||||
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
||||||
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));
|
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));
|
||||||
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
||||||
|
todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET))
|
||||||
ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins));
|
ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins));
|
||||||
DestroyWindow(hwnd);
|
DestroyWindow(hwnd);
|
||||||
|
|
||||||
|
@ -1677,16 +1689,21 @@ static void test_margins_default(const char* facename, UINT charset)
|
||||||
hfont = SelectObject(hdc, hfont);
|
hfont = SelectObject(hdc, hfont);
|
||||||
ReleaseDC(hwnd, hdc);
|
ReleaseDC(hwnd, hdc);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
/* we expect EC_USEFONTINFO size */
|
||||||
|
font_expect = expect;
|
||||||
|
|
||||||
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
||||||
ok(margins == 0, "got %x\n", margins);
|
ok(margins == 0, "got %x\n", margins);
|
||||||
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
||||||
SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0));
|
SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0));
|
||||||
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
||||||
|
todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET))
|
||||||
ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins));
|
ok(margins == font_expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(font_expect), LOWORD(font_expect), HIWORD(margins), LOWORD(margins));
|
||||||
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins);
|
||||||
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));
|
SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));
|
||||||
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);
|
||||||
|
todo_wine_if(cjk_font && (charset == GREEK_CHARSET || charset == ANSI_CHARSET))
|
||||||
ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins));
|
ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins));
|
||||||
DestroyWindow(hwnd);
|
DestroyWindow(hwnd);
|
||||||
|
|
||||||
|
@ -1791,18 +1808,24 @@ static void test_margins(void)
|
||||||
test_margins_default("Tahoma", HANGUL_CHARSET);
|
test_margins_default("Tahoma", HANGUL_CHARSET);
|
||||||
test_margins_default("Tahoma", CHINESEBIG5_CHARSET);
|
test_margins_default("Tahoma", CHINESEBIG5_CHARSET);
|
||||||
|
|
||||||
if (is_font_installed("MS PGothic"))
|
if (is_font_installed("MS PGothic")) {
|
||||||
test_margins_default("MS PGothic", SHIFTJIS_CHARSET);
|
test_margins_default("MS PGothic", SHIFTJIS_CHARSET);
|
||||||
|
test_margins_default("MS PGothic", GREEK_CHARSET);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
skip("MS PGothic is not available, skipping some margin tests\n");
|
skip("MS PGothic is not available, skipping some margin tests\n");
|
||||||
|
|
||||||
if (is_font_installed("Ume P Gothic"))
|
if (is_font_installed("Ume P Gothic")) {
|
||||||
test_margins_default("Ume P Gothic", SHIFTJIS_CHARSET);
|
test_margins_default("Ume P Gothic", SHIFTJIS_CHARSET);
|
||||||
|
test_margins_default("Ume P Gothic", GREEK_CHARSET);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
skip("Ume P Gothic is not available, skipping some margin tests\n");
|
skip("Ume P Gothic is not available, skipping some margin tests\n");
|
||||||
|
|
||||||
if (is_font_installed("SimSun"))
|
if (is_font_installed("SimSun")) {
|
||||||
test_margins_default("SimSun", GB2312_CHARSET);
|
test_margins_default("SimSun", GB2312_CHARSET);
|
||||||
|
test_margins_default("SimSun", ANSI_CHARSET);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
skip("SimSun is not available, skipping some margin tests\n");
|
skip("SimSun is not available, skipping some margin tests\n");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue