wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Józef Kucia : vkd3d: Ignore redundant IASetPrimitiveTopology() calls.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: f3c9229cc342c4d9c10f52a61dde1fff48a74a93 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f3c9229cc342c4d9c10f52a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:40:58 2019 +0100 vkd3d: Ignore redundant IASetPrimitiveTopology() calls. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 33dfcaf..40c48cd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3008,6 +3008,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr return; } + if (list->primitive_topology == topology) + return; + list->primitive_topology = topology; d3d12_command_list_invalidate_current_pipeline(list); }

1 0

Akihiro Sagawa : user32/tests: Tests default margin size with various font face.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 3e61c7127ed7eb764a8b308fd8897cbc26a93a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e61c7127ed7eb764a8b308f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:28 2019 +0900 user32/tests: Tests default margin size with various font face. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 71 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 21bd833..b1223a9 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1549,7 +1549,7 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } -static void test_margins_default(UINT charset) +static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; HDC hdc; @@ -1567,7 +1567,7 @@ static void test_margins_default(UINT charset) lf.lfHeight = -11; lf.lfWeight = FW_NORMAL; lf.lfCharSet = charset; - strcpy(lf.lfFaceName, "Tahoma"); + strcpy(lf.lfFaceName, facename); hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); @@ -1602,16 +1602,16 @@ static void test_margins_default(UINT charset) SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); } DestroyWindow(hwnd); @@ -1627,22 +1627,39 @@ static void test_margins_default(UINT charset) SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); } DestroyWindow(hwnd); DeleteObject(hfont); } +static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const char*name) +{ + HDC hdc = GetDC(NULL); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, name, find_font_proc, 0)) + ret = TRUE; + + ReleaseDC(NULL, hdc); + return ret; +} + static void test_margins(void) { HWND hwEdit; @@ -1718,17 +1735,26 @@ static void test_margins(void) test_margins_usefontinfo(DEFAULT_CHARSET); - test_margins_default(ANSI_CHARSET); - test_margins_default(EASTEUROPE_CHARSET); + test_margins_default("Tahoma", ANSI_CHARSET); + test_margins_default("Tahoma", EASTEUROPE_CHARSET); - test_margins_default(SHIFTJIS_CHARSET); - test_margins_default(HANGUL_CHARSET); - test_margins_default(CHINESEBIG5_CHARSET); -} + test_margins_default("Tahoma", HANGUL_CHARSET); + test_margins_default("Tahoma", CHINESEBIG5_CHARSET); -static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) -{ - return 0; + if (is_font_installed("MS PGothic")) + test_margins_default("MS PGothic", SHIFTJIS_CHARSET); + else + skip("MS PGothic is not available, skipping some margin tests\n"); + + if (is_font_installed("Ume P Gothic")) + test_margins_default("Ume P Gothic", SHIFTJIS_CHARSET); + else + skip("Ume P Gothic is not available, skipping some margin tests\n"); + + if (is_font_installed("SimSun")) + test_margins_default("SimSun", GB2312_CHARSET); + else + skip("SimSun is not available, skipping some margin tests\n"); } static void test_margins_font_change(void) @@ -1737,15 +1763,12 @@ static void test_margins_font_change(void) DWORD margins, font_margins; LOGFONTA lf; HFONT hfont, hfont2; - HDC hdc = GetDC(0); - if(EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0)) + if (!is_font_installed("Arial")) { - trace("Arial not found - skipping font change margin tests\n"); - ReleaseDC(0, hdc); + skip("Arial not found - skipping font change margin tests\n"); return; } - ReleaseDC(0, hdc); hwEdit = create_child_editcontrol(0, 0);

1 0

Akihiro Sagawa : user32/tests: Add Unicode version tests for Edit control margins.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 11f059707482e6d26dde3afe8a54f96cc8cc2cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f059707482e6d26dde3afe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:26 2019 +0900 user32/tests: Add Unicode version tests for Edit control margins. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 107f190..21bd833 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1561,6 +1561,7 @@ static void test_margins_default(UINT charset) RECT rect; INT margins, expect; const UINT small_margins = MAKELONG(1, 5); + const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1571,8 +1572,8 @@ static void test_margins_default(UINT charset) hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); - /* Big window rectangle */ - hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + /* Unicode version */ + hwnd = CreateWindowExW(0, EditW, strW, WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); @@ -1614,6 +1615,31 @@ static void test_margins_default(UINT charset) } DestroyWindow(hwnd); + /* ANSI version */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + } + DestroyWindow(hwnd); + DeleteObject(hfont); }

1 0

Akihiro Sagawa : user32/tests: Move the default margin size tests into a separate function.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: c29f5803490db0e807d96e062e04f263ee593f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29f5803490db0e807d96e06… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:24 2019 +0900 user32/tests: Move the default margin size tests into a separate function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 93 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 41ed07a..107f190 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1451,7 +1451,6 @@ static void test_margins_usefontinfo(UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1486,29 +1485,14 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - cjk_charset = is_cjk_charset(hdc); - hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); - SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); - margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); - margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); - expect = margins; - } + expect = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); DestroyWindow(hwnd); threshold = HIWORD(expect) + LOWORD(expect) + size.cx * 2; @@ -1565,6 +1549,74 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static void test_margins_default(UINT charset) +{ + HWND hwnd; + HDC hdc; + TEXTMETRICW tm; + SIZE size; + BOOL cjk_charset; + LOGFONTA lf; + HFONT hfont; + RECT rect; + INT margins, expect; + const UINT small_margins = MAKELONG(1, 5); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = charset; + strcpy(lf.lfFaceName, "Tahoma"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "got %p\n", hfont); + + /* Big window rectangle */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } + expect = MAKELONG(size.cx / 2, size.cx / 2); + cjk_charset = is_cjk_charset(hdc); + + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + } + DestroyWindow(hwnd); + + DeleteObject(hfont); +} + static void test_margins(void) { HWND hwEdit; @@ -1639,6 +1691,13 @@ static void test_margins(void) but not by < Win 8 and Win 10. */ test_margins_usefontinfo(DEFAULT_CHARSET); + + test_margins_default(ANSI_CHARSET); + test_margins_default(EASTEUROPE_CHARSET); + + test_margins_default(SHIFTJIS_CHARSET); + test_margins_default(HANGUL_CHARSET); + test_margins_default(CHINESEBIG5_CHARSET); } static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)

1 0

Akihiro Sagawa : user32: Fix minimum control size conditions when using EC_USEFONTINFO.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 2b6f45066b903541205f55a8683691625b6cd07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6f45066b903541205f55a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:22 2019 +0900 user32: Fix minimum control size conditions when using EC_USEFONTINFO. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 47 +++++++++++++---------------------------------- dlls/user32/tests/edit.c | 13 +------------ 2 files changed, 14 insertions(+), 46 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 6f8f412..d1659b4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2850,26 +2850,10 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) * action wParam despite what the docs say. EC_USEFONTINFO calculates the * margin according to the textmetrics of the current font. * - * When EC_USEFONTINFO is used in the non_cjk case the margins only - * change if the edit control is equal to or larger than a certain - * size. Though there is an exception for the empty client rect case - * with small font sizes. + * When EC_USEFONTINFO is used, the margins only change if the edit control is + * equal to or larger than a certain size. The empty client rect is treated as + * 80 pixels width. */ -static BOOL is_cjk(UINT charset) -{ - switch(charset) - { - case SHIFTJIS_CHARSET: - case HANGUL_CHARSET: - case GB2312_CHARSET: - case CHINESEBIG5_CHARSET: - return TRUE; - } - /* HANGUL_CHARSET is strange, though treated as CJK by Win 8, it is - * not by other versions including Win 10. */ - return FALSE; -} - static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint) { @@ -2881,25 +2865,20 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, if (es->font && (left == EC_USEFONTINFO || right == EC_USEFONTINFO)) { HDC dc = GetDC(es->hwndSelf); HFONT old_font = SelectObject(dc, es->font); - LONG width = GdiGetCharDimensions(dc, &tm, NULL); + LONG width = GdiGetCharDimensions(dc, &tm, NULL), rc_width; RECT rc; /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { - if (!is_cjk(tm.tmCharSet)) { - default_left_margin = width / 2; - default_right_margin = width / 2; - - GetClientRect(es->hwndSelf, &rc); - if (rc.right - rc.left < (width / 2 + width) * 2 && - (width >= 28 || !IsRectEmpty(&rc)) ) { - default_left_margin = es->left_margin; - default_right_margin = es->right_margin; - } - } else { - /* FIXME: figure out the CJK values. They are not affected by the client rect. */ - default_left_margin = width / 2; - default_right_margin = width / 2; + /* FIXME: figure out the CJK values. */ + default_left_margin = width / 2; + default_right_margin = width / 2; + + GetClientRect(es->hwndSelf, &rc); + rc_width = !IsRectEmpty(&rc) ? rc.right - rc.left : 80; + if (rc_width < default_left_margin + default_right_margin + width * 2) { + default_left_margin = es->left_margin; + default_right_margin = es->right_margin; } } SelectObject(dc, old_font); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 72fad2d..41ed07a 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1451,7 +1451,7 @@ static void test_margins_usefontinfo(UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk = FALSE, cjk_charset; + BOOL cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1486,16 +1486,6 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - - charset = GetTextCharset(hdc); - switch (charset) - { - case SHIFTJIS_CHARSET: - case HANGUL_CHARSET: - case GB2312_CHARSET: - case CHINESEBIG5_CHARSET: - cjk = TRUE; - } cjk_charset = is_cjk_charset(hdc); hfont = SelectObject(hdc, hfont); @@ -1537,7 +1527,6 @@ static void test_margins_usefontinfo(UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == small_margins, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Akihiro Sagawa : user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 71523aeae9a729ef64c55f216a76492ac60b9605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71523aeae9a729ef64c55f21… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:21 2019 +0900 user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins. Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true when font's charset is CJK. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 326d7ec..72fad2d 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1435,17 +1435,28 @@ static void test_edit_control_scroll(void) DestroyWindow (hwEdit); } +static BOOL is_cjk_charset(HDC dc) +{ + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return FALSE; + } +} + static void test_margins_usefontinfo(UINT charset) { HWND hwnd; HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk = FALSE; + BOOL cjk = FALSE, cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; - INT margins, threshold, expect, empty_expect, small_expect; + INT margins, threshold, expect, empty_expect; + const UINT small_margins = MAKELONG(1, 5); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1475,8 +1486,6 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - small_expect = 0; - empty_expect = size.cx >= 28 ? small_expect : expect; charset = GetTextCharset(hdc); switch (charset) @@ -1487,26 +1496,35 @@ static void test_margins_usefontinfo(UINT charset) case CHINESEBIG5_CHARSET: cjk = TRUE; } + cjk_charset = is_cjk_charset(hdc); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) > 0 && LOWORD(margins) > 0, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - expect = empty_expect = small_expect = margins; + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + expect = margins; } DestroyWindow(hwnd); - threshold = (size.cx / 2 + size.cx) * 2; + threshold = HIWORD(expect) + LOWORD(expect) + size.cx * 2; + empty_expect = threshold > 80 ? small_margins : expect; - /* Size below which non-cjk margins are zero */ + /* Size below the threshold, margins remain unchanged */ hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold - 1, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); @@ -1516,11 +1534,14 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - ok(margins == small_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == small_margins, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); - /* Size at which non-cjk margins become non-zero */ + /* Size at the threshold, margins become non-zero */ hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); @@ -1530,6 +1551,8 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1544,6 +1567,8 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == empty_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Akihiro Sagawa : user32/tests: Skip margin tests if a font for the target charset isn't available.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: bde955f12b0bfeec767825737093a06b54a0a3aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde955f12b0bfeec76782573… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:19 2019 +0900 user32/tests: Skip margin tests if a font for the target charset isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 00c05fd..326d7ec 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1439,6 +1439,7 @@ static void test_margins_usefontinfo(UINT charset) { HWND hwnd; HDC hdc; + TEXTMETRICW tm; SIZE size; BOOL cjk = FALSE; LOGFONTA lf; @@ -1463,7 +1464,16 @@ static void test_margins_usefontinfo(UINT charset) hdc = GetDC(hwnd); hfont = SelectObject(hdc, hfont); - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } expect = MAKELONG(size.cx / 2, size.cx / 2); small_expect = 0; empty_expect = size.cx >= 28 ? small_expect : expect;

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList3 ThumbBarUpdateButtons method.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: be6a113190edeedd1f95f99cd84851dd311f807e URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6a113190edeedd1f95f99c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 18 17:42:27 2019 +0100 explorerframe: Return S_OK in ITaskbarList3 ThumbBarUpdateButtons method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index f029cb5..10ad84b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -205,9 +205,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarUpdateButtons(ITaskbarList UINT cButtons, LPTHUMBBUTTON pButton) { - FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub!\n", iface, hwnd, cButtons, pButton); + FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub, faking success!\n", iface, hwnd, cButtons, pButton); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarSetImageList(ITaskbarList4 *iface,

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList3 ThumbBarAddButtons.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 570ea014770fd62997be81e88f03829eded98390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=570ea014770fd62997be81e8… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 18 17:42:26 2019 +0100 explorerframe: Return S_OK in ITaskbarList3 ThumbBarAddButtons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index afcd7bf..f029cb5 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -195,9 +195,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarAddButtons(ITaskbarList4 * UINT cButtons, LPTHUMBBUTTON pButton) { - FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub!\n", iface, hwnd, cButtons, pButton); + FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub, faking success!\n", iface, hwnd, cButtons, pButton); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarUpdateButtons(ITaskbarList4 *iface,

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList3 SetThumbnailTooltip method.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 978b7c34740755d8d667e8fdefb126224a3aa866 URL: https://source.winehq.org/git/wine.git/?a=commit;h=978b7c34740755d8d667e8fd… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 18 17:42:25 2019 +0100 explorerframe: Return S_OK in ITaskbarList3 SetThumbnailTooltip method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index a50f8a9..afcd7bf 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -234,9 +234,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetThumbnailTooltip(ITaskbarList4 HWND hwnd, LPCWSTR pszTip) { - FIXME("iface %p, hwnd %p, pszTip %s stub!\n", iface, hwnd, debugstr_w(pszTip)); + FIXME("iface %p, hwnd %p, pszTip %s stub, faking success!\n", iface, hwnd, debugstr_w(pszTip)); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_SetThumbnailClip(ITaskbarList4 *iface,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019