July 2022 - Wine-commits - list.winehq.org

Hugh McMaster : regedit: Use zero as a REG_DWORD/REG_QWORD default if edit control is empty.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: e604f3e2ef7d202ecfa9927d1e39706956c9d6aa URL: https://gitlab.winehq.org/wine/wine/-/commit/e604f3e2ef7d202ecfa9927d1e3970… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 28 14:53:49 2022 +1000 regedit: Use zero as a REG_DWORD/REG_QWORD default if edit control is empty. --- programs/regedit/edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 79151ee1af6..181672b4da6 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -235,6 +235,8 @@ static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpar break; case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + if (!SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, EM_LINELENGTH, 0, 0)) + SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, L"0"); ret = update_registry_value(hwndDlg, params); /* fall through */ case IDCANCEL:

1 0

Hugh McMaster : regedit: Limit REG_DWORD/REG_QWORD input length by value type and format.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: b8b87e55a6afbe23597d51308e89d3bd9f9f4c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/b8b87e55a6afbe23597d51308e89d3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 28 22:19:14 2022 +1000 regedit: Limit REG_DWORD/REG_QWORD input length by value type and format. --- programs/regedit/edit.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 181672b4da6..66d3a27dc68 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -184,7 +184,15 @@ static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpa return FALSE; } -static void change_dword_base(HWND hwndDlg, BOOL toHex) +static void set_dword_edit_limit(HWND hwndDlg, DWORD type) +{ + if (isDecimal) + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, EM_SETLIMITTEXT, type == REG_DWORD ? 10 : 20, 0); + else + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, EM_SETLIMITTEXT, type == REG_DWORD ? 8 : 16, 0); +} + +static void change_dword_base(HWND hwndDlg, BOOL toHex, DWORD type) { WCHAR buf[64]; unsigned int len; @@ -204,11 +212,13 @@ static void change_dword_base(HWND hwndDlg, BOOL toHex) } isDecimal = !toHex; + + set_dword_edit_limit(hwndDlg, type); } static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) { - struct edit_params *params; + static struct edit_params *params; WCHAR buf[64]; int ret = 0; @@ -223,15 +233,16 @@ static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpar isDecimal = FALSE; if (params->type == REG_QWORD && LoadStringW(GetModuleHandleW(0), IDS_EDIT_QWORD, buf, ARRAY_SIZE(buf))) SetWindowTextW(hwndDlg, buf); + set_dword_edit_limit(hwndDlg, params->type); return TRUE; case WM_COMMAND: switch (LOWORD(wparam)) { case IDC_DWORD_HEX: - change_dword_base(hwndDlg, TRUE); + change_dword_base(hwndDlg, TRUE, params->type); break; case IDC_DWORD_DEC: - change_dword_base(hwndDlg, FALSE); + change_dword_base(hwndDlg, FALSE, params->type); break; case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER);

1 0

Gabriel Ivăncescu : mshtml: Fix string leak on NamespaceError.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: fab55e22b725798e4d6da4736d178ce0d2f63c1b URL: https://gitlab.winehq.org/wine/wine/-/commit/fab55e22b725798e4d6da4736d178c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 28 16:05:35 2022 +0300 mshtml: Fix string leak on NamespaceError. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 826d131df77..f8fa285999e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4857,6 +4857,7 @@ static HRESULT WINAPI HTMLElement6_setAttributeNS(IHTMLElement6 *iface, VARIANT return hres; nsAString_GetData(&ns_str, &ns); if((!ns || !ns[0]) && wcschr(strAttributeName, ':')) { + nsAString_Finish(&ns_str); /* FIXME: Return NamespaceError */ return E_FAIL; }

1 0

Santino Mazza : riched20/tests: When selection is out of view, the scrollbar should move.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: ee131e9eba7dad090f0baf4a73fab2d62dc73b52 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee131e9eba7dad090f0baf4a73fab2… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 14:11:27 2022 -0300 riched20/tests: When selection is out of view, the scrollbar should move. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 03c07829ee4..2667e7d3fdc 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5018,6 +5018,24 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } +/* When the selection is out of the windows view, the scrollbar should move. */ +static void check_EM_SETSEL_multiline(HWND hwnd) +{ + int oldY; + int curY; + const char textwithlines[] = "This is a text\n" + "with lines\n" + "I expect this text\n" + "to be\nlarge\nenough\n"; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)textwithlines); + oldY = get_scroll_pos_y(hwnd); + SendMessageA(hwnd, EM_SETSEL, 59, 59); + curY = get_scroll_pos_y(hwnd); + todo_wine + ok(oldY < curY, "oldY %d >= curY %d\n", oldY, curY); +} + static void test_EM_SETSEL(void) { char buffA[32] = {0}; @@ -5058,6 +5076,8 @@ static void test_EM_SETSEL(void) ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); } + check_EM_SETSEL_multiline(hwndRichEdit); + DestroyWindow(hwndRichEdit); }

1 0

Santino Mazza : riched20: Ensure that cursor is visible when selecting text.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 25209c162fc209124b369abbad55d915d31909b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/25209c162fc209124b369abbad55d9… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 14:13:58 2022 -0300 riched20: Ensure that cursor is visible when selecting text. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40444 Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/riched20/editor.c | 1 + dlls/riched20/tests/editor.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 108c37a7f30..57601745ab2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2142,6 +2142,7 @@ int set_selection( ME_TextEditor *editor, int to, int from ) if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); + editor_ensure_visible( editor, &editor->pCursors[0] ); if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2667e7d3fdc..1661654aa11 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5032,7 +5032,6 @@ static void check_EM_SETSEL_multiline(HWND hwnd) oldY = get_scroll_pos_y(hwnd); SendMessageA(hwnd, EM_SETSEL, 59, 59); curY = get_scroll_pos_y(hwnd); - todo_wine ok(oldY < curY, "oldY %d >= curY %d\n", oldY, curY); }

1 0

Santino Mazza : riched20/test: Add scrolling test for richole.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 059c70d736baa164a1b246e949acd006cf83ab5a URL: https://gitlab.winehq.org/wine/wine/-/commit/059c70d736baa164a1b246e949acd0… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Jul 25 19:08:52 2022 -0300 riched20/test: Add scrolling test for richole. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/riched20/tests/richole.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 1ebc12a27ab..d648354729e 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3579,13 +3579,25 @@ static void test_ITextRange_IsEqual(void) ITextSelection_Release(selection); } +static int get_scroll_pos_y(HWND hwnd) +{ + POINT p = {-1, -1}; + SendMessageA(hwnd, EM_GETSCROLLPOS, 0, (LPARAM)&p); + ok(p.x != -1 && p.y != -1, "p.x:%ld p.y:%ld\n", p.x, p.y); + return p.y; +} + static void test_Select(void) { static const CHAR test_text1[] = "TestSomeText"; + static const CHAR test_text2[] = "text\nwith\nbreak\n" + "lines\ntest\ntest\n"; IRichEditOle *reOle = NULL; ITextDocument *doc = NULL; ITextSelection *selection; ITextRange *range; + int scroll_pos1; + int scroll_pos2; LONG value; HRESULT hr; HWND hwnd; @@ -3597,8 +3609,11 @@ static void test_Select(void) hr = ITextDocument_Range(doc, 0, 4, &range); ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos1 = get_scroll_pos_y(hwnd); hr = ITextRange_Select(range); ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos2 = get_scroll_pos_y(hwnd); + ok(scroll_pos1 == scroll_pos2, "%d != %d\n", scroll_pos1, scroll_pos2); value = 1; hr = ITextSelection_GetStart(selection, &value); @@ -3611,6 +3626,16 @@ static void test_Select(void) hr = ITextSelection_Select(selection); ok(hr == S_OK, "got 0x%08lx\n", hr); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text2); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + hr = ITextDocument_Range(doc, 10, 16, &range); + ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos1 = get_scroll_pos_y(hwnd); + hr = ITextRange_Select(range); + ok(hr == S_OK, "got 0x%08lx\n", hr); + scroll_pos2 = get_scroll_pos_y(hwnd); + ok(scroll_pos1 != scroll_pos2, "%d == %d\n", scroll_pos1, scroll_pos2); + release_interfaces(&hwnd, &reOle, &doc, NULL); hr = ITextRange_Select(range);

1 0

Jeremy White : gitlab: Use a class for the assignment logic.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: tools Branch: master Commit: 7792ce8b434654f138bf92d6831484de8fdba82c URL: https://gitlab.winehq.org/winehq/tools/-/commit/7792ce8b434654f138bf92d6831… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Jul 26 15:56:26 2022 -0500 gitlab: Use a class for the assignment logic. This avoids the use of global variables or holding a bunch of state structures and passing them around. This is motivated by the further patch to assign reviewers based on commits in a merge request not by the submitter. --- gitlab/gitlab-to-mail/assign.py | 206 +++++++++++++++++----------------- gitlab/gitlab-to-mail/gitlabtomail.py | 16 +-- 2 files changed, 113 insertions(+), 109 deletions(-)

1 0

Jeremy White : gitlab: Assign extra commit authors as reviewers.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: tools Branch: master Commit: 6452a67926c0f71aa36f730a9d1943da2a7d4b48 URL: https://gitlab.winehq.org/winehq/tools/-/commit/6452a67926c0f71aa36f730a9d1… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Jul 28 13:13:51 2022 -0500 gitlab: Assign extra commit authors as reviewers. If a merge request contains commits by authors other than the submitting author, and we can find the commit author in GitLab, ask them to review the merge request as well. --- gitlab/gitlab-to-mail/assign.py | 28 ++++++++++++++++++++++++---- gitlab/gitlab-to-mail/gitlabtomail.py | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index bd156b2e..4538a701 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -96,7 +96,7 @@ class Assign: r = requests.put(url, headers={"PRIVATE-TOKEN": self.settings.GITLAB_TOKEN}, json={'reviewer_ids': reviewers}) r.raise_for_status() - def get_assignees(self, files): + def get_assignees_from_files(self, files): maintainer_ids = [] people_ids = [] maintainer_names = [] @@ -113,14 +113,34 @@ class Assign: return maintainer_ids, maintainer_names return people_ids, people_names - def assign_reviewers(self, mr_iid, version, update_db): + def get_assignees_from_commits(self, version): + author_names = [] + for c in version['commits']: + if c['author_name'] != c['committer_name']: + author_names.append(c['committer_name']) + ids = [] + names = [] + for name in set(author_names): + if name in self.user_map: + ids.append(self.user_map[name]) + names.append(name) + else: + print(f"MR includes a commit by {name}, but unable to find a GitLab ID in order to assign as reviewer.") + return ids, names + + def get_assignees(self, files, author, version): + ids, names = self.get_assignees_from_files(files) + commit_ids, commit_names = self.get_assignees_from_commits(version) + return list(set(ids + commit_ids)), list(set(names + commit_names)) + + def assign_reviewers(self, mr_iid, author, version, update_db): paths = [] if 'diffs' not in version: return for d in version['diffs']: if 'new_path' in d: paths.append(d['new_path']) - ids, names = self.get_assignees(paths) + ids, names = self.get_assignees(paths, author, version) if len(ids) > 0: unique_names = list(set(names)) print(f"Asking {unique_names} to review MR {mr_iid}") @@ -133,7 +153,7 @@ def main(argv): """ Debug code; pass in a config file and the names of files you want to test """ settings = Settings(argv[1]) a = Assign(settings) - ids, names = a.get_assignees(argv[2:]) + ids, names = a.get_assignees_from_files(argv[2:]) for i in range(len(ids)): print("{}: {}".format(ids[i], names[i])) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 915392d1..525130e8 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -628,7 +628,7 @@ def process_mr(mr, update_db, assigner): # Assign reviewers if there are none currently if len(mr['reviewers']) == 0: full_version = fetch_mr_version(iid, versions[0]['id']) - assigner.assign_reviewers(iid, full_version, update_db) + assigner.assign_reviewers(iid, mr['author'], full_version, update_db) fixup_date(cover, date) create_headers_from_mr(cover, mr)

1 0

Jeremy White : gitlab: Exclude the MR submitter from reviewers.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: tools Branch: master Commit: 34b1a84e0ca9f3327d63e78a78382500f7e8f449 URL: https://gitlab.winehq.org/winehq/tools/-/commit/34b1a84e0ca9f3327d63e78a783… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Jul 28 09:36:09 2022 -0500 gitlab: Exclude the MR submitter from reviewers. Also add a more full featured test mode. --- gitlab/gitlab-to-mail/assign.py | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index 4538a701..f5959d7a 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -10,6 +10,7 @@ import re from urllib.parse import urljoin import fnmatch import requests +import argparse from util import fetch_all, Settings @@ -23,6 +24,12 @@ def empty_record(): } return copy.deepcopy(m) +def add_but_exclude_author(out_ids, out_names, in_ids, in_names, author): + for i in range(len(in_ids)): + if in_names[i] != author: + out_ids.append(in_ids[i]) + out_names.append(in_names[i]) + class Assign: settings = None users = {} @@ -96,7 +103,7 @@ class Assign: r = requests.put(url, headers={"PRIVATE-TOKEN": self.settings.GITLAB_TOKEN}, json={'reviewer_ids': reviewers}) r.raise_for_status() - def get_assignees_from_files(self, files): + def get_assignees_from_files(self, files, author): maintainer_ids = [] people_ids = [] maintainer_names = [] @@ -105,10 +112,8 @@ class Assign: for glob in m['globs']: for f in files: if fnmatch.fnmatch(f, glob): - maintainer_ids = maintainer_ids + m['maintainer_ids'] - maintainer_names = maintainer_names + m['maintainers'] - people_ids = people_ids + m['people_ids'] - people_names = people_names + m['people'] + add_but_exclude_author(maintainer_ids, maintainer_names, m['maintainer_ids'], m['maintainers'], author['name']) + add_but_exclude_author(people_ids, people_names, m['people_ids'], m['people'], author['name']) if len(maintainer_ids) > 0: return maintainer_ids, maintainer_names return people_ids, people_names @@ -129,7 +134,7 @@ class Assign: return ids, names def get_assignees(self, files, author, version): - ids, names = self.get_assignees_from_files(files) + ids, names = self.get_assignees_from_files(files, author) commit_ids, commit_names = self.get_assignees_from_commits(version) return list(set(ids + commit_ids)), list(set(names + commit_names)) @@ -151,9 +156,26 @@ class Assign: def main(argv): """ Debug code; pass in a config file and the names of files you want to test """ - settings = Settings(argv[1]) + parser = argparse.ArgumentParser(description="Debug code to test the assignment code") + parser.add_argument('settings', nargs=1) + parser.add_argument('--author', nargs=1, help='name of the person supposed to have submitted the MR') + parser.add_argument('--committer', action='append', help='repeat to specify multiple committers in our fake MR.') + parser.add_argument('files', nargs='*', help='name of Wine files supposedly in MR to pattern match') + args = parser.parse_args() + settings = Settings(args.settings) + print(args) a = Assign(settings) - ids, names = a.get_assignees_from_files(argv[2:]) + if args.author: + author = { 'name': args.author[0] } + else: + author = { 'name': None } + version = { 'commits' : [] } + if args.committer: + for commit in args.committer: + vcommit = { 'author_name' : commit } + version['commits'].append(vcommit) + print(version) + ids, names = a.get_assignees(args.files, author, version) for i in range(len(ids)): print("{}: {}".format(ids[i], names[i]))

1 0

Jacek Caban : winevulkan: Use syscall interface for driver functions.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: bb94ec19435be0668dda5a74e1b544de97345cb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb94ec19435be0668dda5a74e1b544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 25 20:21:24 2022 +0200 winevulkan: Use syscall interface for driver functions. --- dlls/winevulkan/loader_thunks.c | 34 +++++++++++++++++----------------- dlls/winevulkan/make_vulkan | 8 ++------ 2 files changed, 19 insertions(+), 23 deletions(-)

1 0