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

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 15347f30e18c03c4cf9ce33a9386cbac2761d92c URL: https://gitlab.winehq.org/wine/wine/-/commit/15347f30e18c03c4cf9ce33a9386cb… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Sat Jul 9 19:40:25 2022 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 70 ++++++---------------------------------------------------------- 1 file changed, 6 insertions(+), 64 deletions(-) diff --git a/po/ko.po b/po/ko.po index b5afc3b292b..6876b9cf2b6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-02 01:13+0900\n" +"PO-Revision-Date: 2022-07-15 15:16+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -3972,10 +3972,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "쓰기 가능하지 않은 속성 '|'을(를) 수정할 수 없습니다" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this'는 Map 개체가 아닙니다" +msgstr "'this'는 '|' 개체가 아닙니다" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -15795,56 +15793,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -15925,7 +15873,7 @@ msgstr "" " <type>은 다음 중 하나여야 합니다:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " [/t]가 지정되지 않은 경우 기본 데이터 유형은 REG_SZ입니다.\n" "\n" @@ -16366,10 +16314,8 @@ msgstr "DWORD 값(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "DWORD 값(&D)" +msgstr "QWORD 값(&Q)" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16921,16 +16867,12 @@ msgid "Collapse" msgstr "축소" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "새 32비트 값 추가" +msgstr "새 64비트 값 추가" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "DWORD 편집" +msgstr "QWORD 편집" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Zhiyi Zhang : cryptui: Use 10 DLUs for check box height.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: decfcdd67e6bfd647a512a1a8a8e82812f29c0c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/decfcdd67e6bfd647a512a1a8a8e82… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 15 15:58:03 2022 +0800 cryptui: Use 10 DLUs for check box height. 10 DLUs is the recommended height for check boxes on Windows. 8 DLUs is not enough and may cause shrinking in HiDPI settings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/cryptui/cryptui.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index 311cff2a60d..a7a310c99ec 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -416,15 +416,15 @@ BEGIN AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)", IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON CHECKBOX "&Include all certificates in the certification path if possible", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,10, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (*.pfx)", IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Incl&ude all certificates in the certification path if possible", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,10, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "&Enable strong encryption", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,10, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "Delete the private &key if the export is successful", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,10, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END IDD_EXPORT_FILE DIALOG 0,0,317,143

1 0

Zhiyi Zhang : comctl32/button: Pass the destination rectangle to GetThemePartSize() when painting check boxes.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 830348d78c38e9f68772bd6e5a3ea2555a206dd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/830348d78c38e9f68772bd6e5a3ea2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 15 14:57:59 2022 +0800 comctl32/button: Pass the destination rectangle to GetThemePartSize() when painting check boxes. The destination rectangle may be smaller than that of theme parts, in which case, the draw size returned is adjusted to fit the destination rectangle. Without passing a destination rectangle to GetThemePartSize(), the function assumes that there is no limit for destination. This fixes winecfg check boxes missing the upper edge in 192 DPI. You may notice that the check box bitmap is slightly shrank and so the shape is a bit off. However, this is what happens on Windows as well when check box height is set to 8 DLUs. GetThemePartSize() without destination rectangles are also used in other controls, but manual tests showed that those controls don't shrink their theme background as check boxes do so they are left unchanged. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index ee7c2c288b1..089534b2b9d 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2830,7 +2830,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in GetThemeBackgroundContentRect(theme, hDC, part, state, &client_rect, &content_rect); region = set_control_clipping(hDC, &client_rect); - if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &box_size))) + if (FAILED(GetThemePartSize(theme, hDC, part, state, &content_rect, TS_DRAW, &box_size))) { box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; box_size.cy = box_size.cx;

1 0

Zebediah Figura : server: Do not set the socket state in complete_async_connect().
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: ea6f88d83fddfb88610f8457f68cbeb571140ec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea6f88d83fddfb88610f8457f68cbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 11:29:28 2022 -0500 server: Do not set the socket state in complete_async_connect(). It's already set previously in sock_poll_event(). Moreover, complete_async_connect() will not always be called. --- server/sock.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 5a4240e78f4..60b03c13bba 100644 --- a/server/sock.c +++ b/server/sock.c @@ -806,8 +806,6 @@ static void complete_async_connect( struct sock *sock ) if (debug_level) fprintf( stderr, "completing connect request for socket %p\n", sock ); - sock->state = SOCK_CONNECTED; - if (!req->send_len) { async_terminate( req->async, STATUS_SUCCESS );

1 0

Zebediah Figura : server: Set the connection time if connect() returns 0.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 869cbc4b4b7c46b0d94a34900daac849de860eea URL: https://gitlab.winehq.org/wine/wine/-/commit/869cbc4b4b7c46b0d94a34900daac8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 11:30:28 2022 -0500 server: Set the connection time if connect() returns 0. --- server/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/sock.c b/server/sock.c index 60b03c13bba..fed8e3b3093 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2359,6 +2359,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!ret) { sock->state = SOCK_CONNECTED; + sock->connect_time = current_time; if (!send_len) return; }

1 0

Zebediah Figura : server: Remove the unused "flags" field from struct sock.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: wine Branch: master Commit: 647bed72f5be32d00453d3caff1bbaf172e4f265 URL: https://gitlab.winehq.org/wine/wine/-/commit/647bed72f5be32d00453d3caff1bba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 19 21:42:52 2022 -0500 server: Remove the unused "flags" field from struct sock. --- server/sock.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/sock.c b/server/sock.c index 9f872c65637..5a4240e78f4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -187,7 +187,6 @@ struct sock * both pending_events and reported_events (as we should only ever report * any event once until it is reset.) */ unsigned int reported_events; - unsigned int flags; /* socket flags */ unsigned short proto; /* socket protocol */ unsigned short type; /* socket type */ unsigned short family; /* socket family */ @@ -1479,7 +1478,6 @@ static struct sock *create_socket(void) sock->mask = 0; sock->pending_events = 0; sock->reported_events = 0; - sock->flags = 0; sock->proto = 0; sock->type = 0; sock->family = 0; @@ -1594,7 +1592,7 @@ static void set_dont_fragment( int fd, int level, int value ) setsockopt( fd, level, optname, &value, sizeof(value) ); } -static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) +static int init_socket( struct sock *sock, int family, int type, int protocol ) { unsigned int options = 0; int sockfd, unix_type, unix_family, unix_protocol, value; @@ -1673,7 +1671,6 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u sock->sndbuf = value; sock->state = (type == WS_SOCK_STREAM ? SOCK_UNCONNECTED : SOCK_CONNECTIONLESS); - sock->flags = flags; sock->proto = protocol; sock->type = type; sock->family = family; @@ -1751,7 +1748,6 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->message = sock->message; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); - acceptsock->flags = sock->flags; if (!(acceptsock->fd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, get_fd_options( sock->fd ) ))) { @@ -2159,7 +2155,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_INVALID_PARAMETER ); return; } - init_socket( sock, params->family, params->type, params->protocol, params->flags ); + init_socket( sock, params->family, params->type, params->protocol ); return; }

1 0

Jeremy White : Improve diagnostic messages.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: tools Branch: master Commit: dd1f0c3aa2f23a65a594cf65a057b81d8c9158c0 URL: https://gitlab.winehq.org/winehq/tools/-/commit/dd1f0c3aa2f23a65a594cf65a05… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Jul 14 14:21:25 2022 -0500 Improve diagnostic messages. This includes printing who each MR is assigned to, so we can more readily check the work of this script. --- gitlab/gitlab-to-mail/assign.py | 49 +++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index 5a8b914d..9b6acb69 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -20,6 +20,8 @@ def empty_record(): 'globs': [], 'maintainers': [], 'people': [], + 'maintainer_ids': [], + 'people_ids': [], } return copy.deepcopy(m) @@ -27,7 +29,7 @@ def fetch_users(): url = urljoin(settings.GITLAB_URL, f"api/v4/projects/{settings.GITLAB_PROJECT_ID}/users") return fetch_all(url, settings) -def append_user(user_map, line, out, verbose=False): +def append_user(user_map, line, id_array, name_array, verbose=False): match = re.match("(.+)<", line) if match: name = match.group(1).strip() @@ -36,7 +38,8 @@ def append_user(user_map, line, out, verbose=False): return if name in user_map: - out.append(user_map[name]) + id_array.append(user_map[name]) + name_array.append(name) elif verbose: print("Cannot find GitLab account for [{}]".format(name), file=sys.stderr) @@ -69,9 +72,9 @@ def get_maintainers_map(verbose=False): glob += '*' m['globs'].append(glob) elif line.find("M:\t") == 0: - append_user(user_map, line[3:], m['maintainers'], verbose) + append_user(user_map, line[3:], m['maintainer_ids'], m['maintainers'], verbose) elif line.find("P:\t") == 0: - append_user(user_map, line[3:], m['people'], verbose) + append_user(user_map, line[3:], m['people_ids'], m['people'], verbose) elif line.find("W:\t") == 0: pass elif len(m['globs']) == 0: @@ -89,17 +92,21 @@ def post_reviewers(mr_iid, reviewers): r.raise_for_status() def get_assignees(maintainers_map, files): - maintainers = [] - people = [] + maintainer_ids = [] + people_ids = [] + maintainer_names = [] + people_names = [] for m in maintainers_map: for glob in m['globs']: for f in files: if fnmatch.fnmatch(f, glob): - maintainers = maintainers + m['maintainers'] - people = people + m['people'] - if len(maintainers) > 0: - return maintainers - return people + 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'] + if len(maintainer_ids) > 0: + return maintainer_ids, maintainer_names + return people_ids, people_names def assign_reviewers(mr_iid, version, maintainers_map, update_db): paths = [] @@ -108,23 +115,23 @@ def assign_reviewers(mr_iid, version, maintainers_map, update_db): for d in version['diffs']: if 'new_path' in d: paths.append(d['new_path']) - a = get_assignees(maintainers_map, paths) - if len(a) > 0: + ids, names = get_assignees(maintainers_map, paths) + if len(ids) > 0: if update_db: # set() prunes dupes, list() makes it json transmittable again - post_reviewers(mr_iid, list(set(a))) + post_reviewers(mr_iid, list(set(ids))) + print(f"Asking {names} to review MR {mr_iid}") else: - print("Debug: would set reviewers for {} to ids {}".format(mr_iid, a)) + print("Debug: would set reviewers for {} to {}".format(mr_iid, set(names))) + else: + print(f"No suitable reviewers found for MR {mr_iid}") def main(argv): """ Debug code; pass in a config file and the names of files you want to test """ maintainers_map = get_maintainers_map(True) - a = get_assignees(maintainers_map, argv[2:]) - users = fetch_users() - for id in a: - for u in users: - if id == u['id']: - print("{}: {}".format(id, u['name'])) + ids, names = get_assignees(maintainers_map, argv[2:]) + for i in range(len(ids)): + print("{}: {}".format(ids[i], names[i])) if __name__ == "__main__": main(sys.argv)

1 0

Jeremy White : Assign reviewers to merge requests with none.
by Alexandre Julliard July 15, 2022

July 15, 2022

Module: tools Branch: master Commit: e71c99a61b6b7e9cb20c2c88ba43fa212b039cbb URL: https://gitlab.winehq.org/winehq/tools/-/commit/e71c99a61b6b7e9cb20c2c88ba4… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Jul 13 16:52:11 2022 -0500 Assign reviewers to merge requests with none. The algorithm is intended to function as follows: 1. Gather all entries where the F: pattern matches at least one file changed in the MR. The wildcard pattern (THE REST) is skipped. 2. Build the union of the M: fields of all matched entries. If empty, build the union of the P: fields instead. Assign all members of the union as reviewers. If empty, do nothing. We ignore people that are not found in MAINTAINERS. --- gitlab/gitlab-to-mail/assign.py | 130 ++++++++++++++++++++++++++++++++++ gitlab/gitlab-to-mail/gitlabtomail.py | 18 +++-- 2 files changed, 143 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py new file mode 100755 index 00000000..5a8b914d --- /dev/null +++ b/gitlab/gitlab-to-mail/assign.py @@ -0,0 +1,130 @@ +#!/usr/bin/env -S python3 -B + +""" +Determine who should review a given MR and assign them as reviewers +""" + +import sys +import copy +import re +from urllib.parse import urljoin +import fnmatch +import requests + +from util import fetch_all, Settings + +settings = Settings(sys.argv[1]) + +def empty_record(): + m = { 'name': None, + 'globs': [], + 'maintainers': [], + 'people': [], + } + return copy.deepcopy(m) + +def fetch_users(): + url = urljoin(settings.GITLAB_URL, f"api/v4/projects/{settings.GITLAB_PROJECT_ID}/users") + return fetch_all(url, settings) + +def append_user(user_map, line, out, verbose=False): + match = re.match("(.+)<", line) + if match: + name = match.group(1).strip() + else: + print("Malformed person in MAINTAINERS: {}".format(line), file=sys.stderr) + return + + if name in user_map: + out.append(user_map[name]) + elif verbose: + print("Cannot find GitLab account for [{}]".format(name), file=sys.stderr) + +def get_maintainers_map(verbose=False): + url = urljoin(settings.GITLAB_URL, f"{settings.GITLAB_PROJECT_NAME}/-/raw/master/MAINTAINERS") + r = requests.get(url, headers={"PRIVATE-TOKEN": settings.GITLAB_TOKEN}) + r = requests.get(url) + r.raise_for_status() + + users = fetch_users() + user_map = {} + for u in users: + user_map[u['name']] = u['id'] + + maintainers = [] + + m = empty_record() + for utf_line in r.iter_lines(): + line = utf_line.decode(r.encoding) + if not line or len(line) < 3: + continue + if line.find("F:\t") == 0: + # Skip THE REST patterns for now + if line[3:4] == '*': + continue + glob = line[3:] + # The Wine patterns are a bit unusual. They are file globs, + # but with an implicit trailing * if the target is a directory. + if glob[-1] == '/': + glob += '*' + m['globs'].append(glob) + elif line.find("M:\t") == 0: + append_user(user_map, line[3:], m['maintainers'], verbose) + elif line.find("P:\t") == 0: + append_user(user_map, line[3:], m['people'], verbose) + elif line.find("W:\t") == 0: + pass + elif len(m['globs']) == 0: + m['name'] = line + else: + maintainers.append(m) + m = empty_record() + m['name'] = line + + return maintainers + +def post_reviewers(mr_iid, reviewers): + url = urljoin(settings.GITLAB_URL, f"api/v4/projects/{settings.GITLAB_PROJECT_ID}/merge_requests/{mr_iid}/") + r = requests.put(url, headers={"PRIVATE-TOKEN": settings.GITLAB_TOKEN}, json={'reviewer_ids': reviewers}) + r.raise_for_status() + +def get_assignees(maintainers_map, files): + maintainers = [] + people = [] + for m in maintainers_map: + for glob in m['globs']: + for f in files: + if fnmatch.fnmatch(f, glob): + maintainers = maintainers + m['maintainers'] + people = people + m['people'] + if len(maintainers) > 0: + return maintainers + return people + +def assign_reviewers(mr_iid, version, maintainers_map, update_db): + paths = [] + if 'diffs' not in version: + return + for d in version['diffs']: + if 'new_path' in d: + paths.append(d['new_path']) + a = get_assignees(maintainers_map, paths) + if len(a) > 0: + if update_db: + # set() prunes dupes, list() makes it json transmittable again + post_reviewers(mr_iid, list(set(a))) + else: + print("Debug: would set reviewers for {} to ids {}".format(mr_iid, a)) + +def main(argv): + """ Debug code; pass in a config file and the names of files you want to test """ + maintainers_map = get_maintainers_map(True) + a = get_assignees(maintainers_map, argv[2:]) + users = fetch_users() + for id in a: + for u in users: + if id == u['id']: + print("{}: {}".format(id, u['name'])) + +if __name__ == "__main__": + main(sys.argv) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 03824504..67909567 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -13,6 +13,7 @@ import mailbox import smtplib import email from util import fetch_all, Settings +from assign import get_maintainers_map, assign_reviewers settings = Settings(sys.argv[1]) @@ -570,7 +571,7 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): return mail -def process_mr(mr, update_db): +def process_mr(mr, update_db, maintainers_map): iid = mr['iid'] log(f"MR{iid} updated - processing") @@ -623,6 +624,11 @@ def process_mr(mr, update_db): log(f"MR{iid}v{version} - skipping, has no changes") return + # Assign reviewers if there are none currently + if len(mr['reviewers']) == 0: + full_version = fetch_mr_version(iid, versions[0]['id']) + assign_reviewers(iid, full_version, maintainers_map, update_db) + fixup_date(cover, date) create_headers_from_mr(cover, mr) send_email(cover) @@ -647,12 +653,12 @@ def process_mr(mr, update_db): db.set_last_mr_updated_at(updated_at) -def handle_debug_requests(): +def handle_debug_requests(maintainers_map): for arg in sys.argv[2:]: if arg.find("mr=") == 0: print(f"Processing MR iid {arg[3:]}") mr = fetch_specific_mr(int(arg[3:])) - process_mr(mr, False) + process_mr(mr, False, maintainers_map) elif arg.find("event=") == 0: print(f"Processing event id {arg[6:]}") # I did not immediately see a way to get a specific event. @@ -667,8 +673,10 @@ def handle_debug_requests(): def main(): + maintainers_map = get_maintainers_map() + if len(sys.argv) > 2: - handle_debug_requests() + handle_debug_requests(maintainers_map) return # Process any new merge requests @@ -679,7 +687,7 @@ def main(): db.set_last_mr_updated_at(last_mr_updated_at) for mr in fetch_recently_updated_mrs(last_mr_updated_at): - process_mr(mr, not settings.READ_ONLY) + process_mr(mr, not settings.READ_ONLY, maintainers_map) date = db.get_last_event_date() if not date:

1 0

Hans Leidekker : secur32: Fix GnuTLS system priority file override.
by Alexandre Julliard July 14, 2022

July 14, 2022

Module: wine Branch: master Commit: a0febe909780189fa2441635484cb592b9ab64b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0febe909780189fa2441635484cb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 14 12:56:22 2022 +0200 secur32: Fix GnuTLS system priority file override. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53344 --- dlls/secur32/schannel_gnutls.c | 88 ++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 30 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 58e787b7600..8a7b26bc997 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -54,6 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); +static const char *system_priority_file; + /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); @@ -109,6 +111,7 @@ MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); MAKE_FUNCPTR(gnutls_server_name_set); MAKE_FUNCPTR(gnutls_session_channel_binding); +MAKE_FUNCPTR(gnutls_set_default_priority); MAKE_FUNCPTR(gnutls_transport_get_ptr); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); @@ -408,37 +411,23 @@ static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) return 0; } -static NTSTATUS schan_create_session( void *args ) +static NTSTATUS set_priority(schan_credentials *cred, gnutls_session_t session) { - const struct create_session_params *params = args; - schan_credentials *cred = params->cred; char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; BOOL using_vers_all = FALSE, disabled; - unsigned int i, flags = (cred->credential_use == SECPKG_CRED_INBOUND) ? GNUTLS_SERVER : GNUTLS_CLIENT; - struct schan_transport *transport; - gnutls_session_t s; - int err; - - *params->session = 0; - - if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) - { - flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; - } - - err = pgnutls_init(&s, flags); - if (err != GNUTLS_E_SUCCESS) - { - pgnutls_perror(err); - return STATUS_INTERNAL_ERROR; - } + int i, err; - if (!(transport = calloc(1, sizeof(*transport)))) + if (system_priority_file && strcmp(system_priority_file, "/dev/null")) { - pgnutls_deinit(s); - return STATUS_INTERNAL_ERROR; + TRACE("Using defaults with system priority file override\n"); + err = pgnutls_set_default_priority(session); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + return STATUS_INTERNAL_ERROR; + } + return STATUS_SUCCESS; } - transport->session = s; p = priority + strlen(priority); @@ -466,14 +455,53 @@ static NTSTATUS schan_create_session( void *args ) } TRACE("Using %s priority\n", debugstr_a(priority)); - err = pgnutls_priority_set_direct(s, priority, NULL); + err = pgnutls_priority_set_direct(session, priority, NULL); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS schan_create_session( void *args ) +{ + const struct create_session_params *params = args; + schan_credentials *cred = params->cred; + unsigned int flags = (cred->credential_use == SECPKG_CRED_INBOUND) ? GNUTLS_SERVER : GNUTLS_CLIENT; + struct schan_transport *transport; + gnutls_session_t s; + NTSTATUS status; + int err; + + *params->session = 0; + + if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) + { + flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; + } + + err = pgnutls_init(&s, flags); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + return STATUS_INTERNAL_ERROR; + } + + if (!(transport = calloc(1, sizeof(*transport)))) + { pgnutls_deinit(s); - free(transport); return STATUS_INTERNAL_ERROR; } + transport->session = s; + + if ((status = set_priority(cred, s))) + { + pgnutls_deinit(s); + free(transport); + return status; + } err = pgnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, certificate_creds_from_handle(cred->credentials)); if (err != GNUTLS_E_SUCCESS) @@ -1329,12 +1357,11 @@ static void gnutls_log(int level, const char *msg) static NTSTATUS process_attach( void *args ) { - const char *env_str; int ret; - if ((env_str = getenv("GNUTLS_SYSTEM_PRIORITY_FILE"))) + if ((system_priority_file = getenv("GNUTLS_SYSTEM_PRIORITY_FILE"))) { - WARN("GNUTLS_SYSTEM_PRIORITY_FILE is %s.\n", debugstr_a(env_str)); + TRACE("GNUTLS_SYSTEM_PRIORITY_FILE is %s.\n", debugstr_a(system_priority_file)); } else { @@ -1385,6 +1412,7 @@ static NTSTATUS process_attach( void *args ) LOAD_FUNCPTR(gnutls_record_send); LOAD_FUNCPTR(gnutls_server_name_set) LOAD_FUNCPTR(gnutls_session_channel_binding) + LOAD_FUNCPTR(gnutls_set_default_priority) LOAD_FUNCPTR(gnutls_transport_get_ptr) LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr)

1 0

Zebediah Figura : wined3d: Pause transform feedback in wined3d_context_gl_draw_textured_quad().
by Alexandre Julliard July 14, 2022

July 14, 2022

Module: wine Branch: master Commit: 342299cbea3bb71221c7bc917b47bc10b6b1ec4f URL: https://gitlab.winehq.org/wine/wine/-/commit/342299cbea3bb71221c7bc917b47bc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri May 27 15:56:03 2022 -0500 wined3d: Pause transform feedback in wined3d_context_gl_draw_textured_quad(). --- dlls/wined3d/context_gl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a2d06039caa..7e00aa40d4c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -6029,6 +6029,8 @@ void wined3d_context_gl_draw_textured_quad(struct wined3d_context_gl *context_gl gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); + wined3d_context_gl_pause_transform_feedback(context_gl, FALSE); + /* Draw a quad. */ gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); gl_info->gl_ops.gl.p_glTexCoord3fv(&info.texcoords[0].x);

1 0