April 2019 - Wine-commits - list.winehq.org

Vijay Kiran Kamuju : kernel32: Add implementation for CAL_SMONTHDAY.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 9ed363a1fe7ab6fc8c6564de690f387f34bee1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed363a1fe7ab6fc8c6564de… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 11:17:24 2019 +0200 kernel32: Add implementation for CAL_SMONTHDAY. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 7807f99..4a4c494 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1067,6 +1067,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME11: case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: + case CAL_SMONTHDAY: case CAL_SYEARMONTH: case CAL_SSHORTESTDAYNAME1: case CAL_SSHORTESTDAYNAME2: @@ -1097,9 +1098,6 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; - case CAL_SMONTHDAY: - FIXME("Unimplemented caltype %d\n", calinfo); - return 0; case CAL_SABBREVERASTRING: FIXME("Unimplemented caltype %d\n", calinfo); return 0;

1 0

Nikolay Sivov : comctl32/button: Improve repainting on WM_SETFOCUS.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: a058c72b0a5a5c6ca08f11a68ef663772597ff63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a058c72b0a5a5c6ca08f11a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 12:20:47 2019 +0300 comctl32/button: Improve repainting on WM_SETFOCUS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 7 ++++++- dlls/comctl32/tests/button.c | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0a8bdf1..0078bd0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -815,7 +815,12 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_SETFOCUS: TRACE("WM_SETFOCUS %p\n",hWnd); infoPtr->state |= BST_FOCUS; - paint_button( infoPtr, btn_type, ODA_FOCUS ); + + if (btn_type == BS_OWNERDRAW) + paint_button( infoPtr, btn_type, ODA_FOCUS ); + else + InvalidateRect(hWnd, NULL, FALSE); + if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); break; diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index e7789dc..dd05a98 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -782,12 +782,11 @@ static void test_button_messages(void) set_test_cd_ret(CDRF_DODEFAULT); set_test_cd_state(CDIS_FOCUS); - todo = button[i].style != BS_OWNERDRAW; ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); SetFocus(hwnd); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setfocus, "SetFocus(hwnd) on a button", todo); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); check_cd_seq(cd_setfocus_type, "SetFocus(hwnd)"); set_test_cd_state(0);

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 57d6c541b93bf82919a9862cd36f038a24e6a80b URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d6c541b93bf82919a9862c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 15:31:14 2019 +0200 kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/srb.nls | 2 +- dlls/kernel32/nls/srl.nls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 4d1049b..8664244 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "пон" LOCALE_SABBREVDAYNAME2 "уто" LOCALE_SABBREVDAYNAME3 "сре" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index fb6ba8b..0c4b2f5 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre"

1 0

Akihiro Sagawa : comctl32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 48d86f8931d9e3673f31e4584773abdc2d98b967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d86f8931d9e3673f31e458… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:31 2019 +0900 comctl32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature. Due to Associated Charset feature, we currently use Chinese typeface in the test in zh_CN locale. For consistency with another locale, we should avoid the fature in tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index bc44d0c..64d2fe8 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1699,7 +1699,7 @@ static void test_margins_font_change(void) memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Arial"); lf.lfHeight = 16; - lf.lfCharSet = DEFAULT_CHARSET; + lf.lfCharSet = GREEK_CHARSET; /* to avoid associated charset feature */ hfont = CreateFontIndirectA(&lf); lf.lfHeight = 30; hfont2 = CreateFontIndirectA(&lf);

1 0

Akihiro Sagawa : comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: a0e6d45519ff440a060311a865f32c7bfb3ad2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0e6d45519ff440a060311a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:33 2019 +0900 comctl32/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/comctl32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 64d2fe8..3e0239c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1490,6 +1490,7 @@ static void test_margins_usefontinfo(UINT charset) INT margins, threshold, expect, empty_expect, small_expect; HWND hwnd; HDC hdc; + TEXTMETRICW tm; SIZE size; BOOL cjk; LOGFONTA lf; @@ -1513,7 +1514,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

Akihiro Sagawa : comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 81c30446d9b13c6e68d4b6b84523d801c7db3cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c30446d9b13c6e68d4b6b8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:35 2019 +0900 comctl32/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/comctl32/tests/edit.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 3e0239c..521daff 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1485,17 +1485,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) { - INT margins, threshold, expect, empty_expect, small_expect; HWND hwnd; HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk; + BOOL cjk, cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; + INT margins, threshold, expect, empty_expect; + const UINT small_margins = MAKELONG(1, 5); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1525,8 +1536,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) @@ -1540,26 +1549,35 @@ static void test_margins_usefontinfo(UINT charset) default: cjk = FALSE; } + 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); @@ -1569,11 +1587,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); @@ -1583,6 +1604,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); @@ -1597,6 +1620,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 : comctl32/edit: Fix minimum control size conditions when using EC_USEFONTINFO.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 05864617bbe9d4278b06d3a312c804b6410808cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=05864617bbe9d4278b06d3a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:37 2019 +0900 comctl32/edit: 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/comctl32/edit.c | 47 +++++++++++++--------------------------------- dlls/comctl32/tests/edit.c | 16 +--------------- 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 1f17276..38a0d97 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2694,26 +2694,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) { @@ -2725,25 +2709,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/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 521daff..70cb94e 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1501,7 +1501,7 @@ static void test_margins_usefontinfo(UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk, cjk_charset; + BOOL cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1536,19 +1536,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; - break; - default: - cjk = FALSE; - } cjk_charset = is_cjk_charset(hdc); hfont = SelectObject(hdc, hfont); @@ -1590,7 +1577,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

Jacek Caban : ntoskrnl.exe/tests: Add more NtOpenThread tests.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: c448550e7435946ac5501100ef06245fa9e5482e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c448550e7435946ac5501100… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 16:22:50 2019 +0200 ntoskrnl.exe/tests: Add more NtOpenThread tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 2 +- dlls/ntdll/tests/info.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index ac5d465..d167abe 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -142,7 +142,7 @@ HANDLE WINAPI OpenThread( DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwTh attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - cid.UniqueProcess = 0; /* FIXME */ + cid.UniqueProcess = 0; cid.UniqueThread = ULongToHandle(dwThreadId); status = NtOpenThread( &handle, dwDesiredAccess, &attr, &cid ); if (status) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c278c8d..262d2f4 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -39,6 +39,8 @@ static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); static DEP_SYSTEM_POLICY_TYPE (WINAPI * pGetSystemDEPPolicy)(void); +static NTSTATUS (WINAPI * pNtOpenThread)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID *); +static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void *, ULONG, ULONG *); static BOOL is_wow64; @@ -84,6 +86,8 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtCreateSection); NTDLL_GET_PROC(NtMapViewOfSection); NTDLL_GET_PROC(NtUnmapViewOfSection); + NTDLL_GET_PROC(NtOpenThread); + NTDLL_GET_PROC(NtQueryObject); /* not present before XP */ pNtGetCurrentProcessorNumber = (void *) GetProcAddress(hntdll, "NtGetCurrentProcessorNumber"); @@ -2247,6 +2251,61 @@ static void test_query_data_alignment(void) ok(value == 64, "Expected 64, got %u\n", value); } +static void test_thread_lookup(void) +{ + OBJECT_BASIC_INFORMATION obj_info; + THREAD_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; + HANDLE handle; + NTSTATUS status; + + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + cid.UniqueProcess = ULongToHandle(GetCurrentProcessId()); + cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + ok(!status, "NtOpenThread returned %#x\n", status); + + status = pNtQueryObject(handle, ObjectBasicInformation, &obj_info, sizeof(obj_info), NULL); + ok(!status, "NtQueryObject returned: %#x\n", status); + ok(obj_info.GrantedAccess == (THREAD_QUERY_LIMITED_INFORMATION | THREAD_QUERY_INFORMATION) + || broken(obj_info.GrantedAccess == THREAD_QUERY_INFORMATION), /* winxp */ + "GrantedAccess = %x\n", obj_info.GrantedAccess); + + status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL); + ok(!status, "NtQueryInformationThread returned %#x\n", status); + ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()), + "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); + ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), + "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId()); + pNtClose(handle); + + cid.UniqueProcess = 0; + cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + ok(!status, "NtOpenThread returned %#x\n", status); + status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL); + ok(!status, "NtQueryInformationThread returned %#x\n", status); + ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()), + "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); + ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), + "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId()); + pNtClose(handle); + + cid.UniqueProcess = ULongToHandle(0xdeadbeef); + cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + todo_wine + ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#x\n", status); + if (!status) pNtClose(handle); + + cid.UniqueProcess = 0; + cid.UniqueThread = ULongToHandle(0xdeadbeef); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + ok(status == STATUS_INVALID_CID || broken(status == STATUS_INVALID_PARAMETER) /* winxp */, + "NtOpenThread returned %#x\n", status); +} + START_TEST(info) { char **argv; @@ -2390,4 +2449,6 @@ START_TEST(info) trace("Starting test_query_data_alignment()\n"); test_query_data_alignment(); + + test_thread_lookup(); }

1 0

Alistair Leslie-Hughes : winex11/wintab: Set all Device Orientation values.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 13243a28b2493a8760f7d3041998b14412d3d281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13243a28b2493a8760f7d304… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 23 03:39:41 2019 +0000 winex11/wintab: Set all Device Orientation values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 486c356..fe3d4a8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -717,6 +717,11 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.ORIENTATION[1].axUnits = TU_CIRCLE; gSysDevice.ORIENTATION[1].axResolution = CASTFIX32(3600); + gSysDevice.ORIENTATION[2].axMin = 0; + gSysDevice.ORIENTATION[2].axMax = 3600; + gSysDevice.ORIENTATION[2].axUnits = TU_CIRCLE; + gSysDevice.ORIENTATION[2].axResolution + = CASTFIX32(3600); Axis++; } }

1 0

Nikolay Sivov : ntdll/tests: Add some tests for unloaded modules traces.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 91763843b76fd36c00522e9b3fabaad1b2a3f1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91763843b76fd36c00522e9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 08:47:29 2019 +0300 ntdll/tests: Add some tests for unloaded modules traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 147 ++++++++++++++++++++++++++++++------------- 1 file changed, 102 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3b3f72f..d2e0317 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -56,6 +56,21 @@ static NTSTATUS (WINAPI *pNtClose)(HANDLE); static NTSTATUS (WINAPI *pNtSuspendProcess)(HANDLE process); static NTSTATUS (WINAPI *pNtResumeProcess)(HANDLE process); +#define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 + +typedef struct _RTL_UNLOAD_EVENT_TRACE +{ + void *BaseAddress; + SIZE_T SizeOfImage; + ULONG Sequence; + ULONG TimeDateStamp; + ULONG CheckSum; + WCHAR ImageName[32]; +} RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; + +static RTL_UNLOAD_EVENT_TRACE *(WINAPI *pRtlGetUnloadEventTrace)(void); +static void (WINAPI *pRtlGetUnloadEventTraceEx)(ULONG **element_size, ULONG **element_count, void **event_trace); + #if defined(__x86_64__) typedef struct { @@ -3325,6 +3340,53 @@ static void test_suspend_process(void) CloseHandle(event2); } +static void test_unload_trace(void) +{ + static const WCHAR imageW[] = {'m','s','x','m','l','3','.','d','l','l',0}; + RTL_UNLOAD_EVENT_TRACE *unload_trace, *ptr; + ULONG *element_size, *element_count, size; + BOOL found = FALSE; + HMODULE hmod; + + unload_trace = pRtlGetUnloadEventTrace(); +todo_wine + ok(unload_trace != NULL, "Failed to get unload events pointer.\n"); + + if (pRtlGetUnloadEventTraceEx) + { + ptr = NULL; + pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&ptr); + todo_wine { + ok(*element_size >= sizeof(*ptr), "Unexpected element size.\n"); + ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %u.\n", *element_count); + ok(ptr != NULL, "Unexpected pointer %p.\n", ptr); + } + size = *element_size; + } + else + size = sizeof(*unload_trace); + + hmod = LoadLibraryA("msxml3.dll"); + ok(hmod != NULL, "Failed to load library.\n"); + FreeLibrary(hmod); + +if (unload_trace) +{ + ptr = unload_trace; + while (ptr->BaseAddress != NULL) + { + if (!lstrcmpW(imageW, ptr->ImageName)) + { + found = TRUE; + break; + } + ptr = (RTL_UNLOAD_EVENT_TRACE *)((char *)ptr + size); + } +} +todo_wine + ok(found, "Unloaded module wasn't found.\n"); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3346,29 +3408,28 @@ START_TEST(exception) return; } - pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); - pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); - pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); - pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); - pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); - pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); - pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" ); - pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); - pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, - "RtlAddVectoredExceptionHandler" ); - pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, - "RtlRemoveVectoredExceptionHandler" ); - pRtlAddVectoredContinueHandler = (void *)GetProcAddress( hntdll, - "RtlAddVectoredContinueHandler" ); - pRtlRemoveVectoredContinueHandler = (void *)GetProcAddress( hntdll, - "RtlRemoveVectoredContinueHandler" ); - pNtQueryInformationProcess = (void*)GetProcAddress( hntdll, - "NtQueryInformationProcess" ); - pNtSetInformationProcess = (void*)GetProcAddress( hntdll, - "NtSetInformationProcess" ); +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f) + X(NtGetContextThread); + X(NtSetContextThread); + X(NtReadVirtualMemory); + X(NtClose); + X(RtlUnwind); + X(RtlRaiseException); + X(RtlCaptureContext); + X(NtTerminateProcess); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); + X(RtlAddVectoredContinueHandler); + X(RtlRemoveVectoredContinueHandler); + X(NtQueryInformationProcess); + X(NtSetInformationProcess); + X(NtSuspendProcess); + X(NtResumeProcess); + X(RtlGetUnloadEventTrace); + X(RtlGetUnloadEventTraceEx); +#undef X + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); - pNtSuspendProcess = (void *)GetProcAddress( hntdll, "NtSuspendProcess" ); - pNtResumeProcess = (void *)GetProcAddress( hntdll, "NtResumeProcess" ); #ifdef __i386__ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -3455,31 +3516,26 @@ START_TEST(exception) test_thread_context(); test_suspend_thread(); test_suspend_process(); + test_unload_trace(); #elif defined(__x86_64__) - pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, - "RtlAddFunctionTable" ); - pRtlDeleteFunctionTable = (void *)GetProcAddress( hntdll, - "RtlDeleteFunctionTable" ); - pRtlInstallFunctionTableCallback = (void *)GetProcAddress( hntdll, - "RtlInstallFunctionTableCallback" ); - pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, - "RtlLookupFunctionEntry" ); - pRtlAddGrowableFunctionTable = (void *)GetProcAddress( hntdll, "RtlAddGrowableFunctionTable" ); - pRtlGrowFunctionTable = (void *)GetProcAddress( hntdll, "RtlGrowFunctionTable" ); - pRtlDeleteGrowableFunctionTable = (void *)GetProcAddress( hntdll, "RtlDeleteGrowableFunctionTable" ); - p__C_specific_handler = (void *)GetProcAddress( hntdll, - "__C_specific_handler" ); - pRtlCaptureContext = (void *)GetProcAddress( hntdll, - "RtlCaptureContext" ); - pRtlRestoreContext = (void *)GetProcAddress( hntdll, - "RtlRestoreContext" ); - pRtlUnwindEx = (void *)GetProcAddress( hntdll, - "RtlUnwindEx" ); - pRtlWow64GetThreadContext = (void *)GetProcAddress( hntdll, - "RtlWow64GetThreadContext" ); - pRtlWow64SetThreadContext = (void *)GetProcAddress( hntdll, - "RtlWow64SetThreadContext" ); + +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f) + X(RtlAddFunctionTable); + X(RtlDeleteFunctionTable); + X(RtlInstallFunctionTableCallback); + X(RtlLookupFunctionEntry); + X(RtlAddGrowableFunctionTable); + X(RtlGrowFunctionTable); + X(RtlDeleteGrowableFunctionTable); + X(__C_specific_handler); + X(RtlCaptureContext); + X(RtlRestoreContext); + X(RtlUnwindEx); + X(RtlWow64GetThreadContext); + X(RtlWow64SetThreadContext); +#undef X + p_setjmp = (void *)GetProcAddress( hmsvcrt, "_setjmp" ); @@ -3498,6 +3554,7 @@ START_TEST(exception) test_wow64_context(); test_suspend_thread(); test_suspend_process(); + test_unload_trace(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0