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

Louis Lenders : wbemprox: Add Organization property to Win32_Operatingsystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: b901f9ca6c803c52b889e21705fc1a37cbbd00cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b901f9ca6c803c52b889e217… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:21 2022 +0200 wbemprox: Add Organization property to Win32_Operatingsystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 52 +++++++++++++++++++++++++++------------------ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5c53aae8d3b..ba3e728c8c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -244,6 +244,7 @@ static const struct column col_operatingsystem[] = { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, { L"OperatingSystemSKU", CIM_UINT32 }, + { L"Organization", CIM_STRING|COL_FLAG_DYNAMIC }, { L"OSArchitecture", CIM_STRING }, { L"OSLanguage", CIM_UINT32 }, { L"OSProductSuite", CIM_UINT32 }, @@ -677,6 +678,7 @@ struct record_operatingsystem const WCHAR *manufacturer; const WCHAR *name; UINT32 operatingsystemsku; + const WCHAR *organization; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -3515,6 +3517,34 @@ static WCHAR *get_locale(void) if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, ret, 5 ); return ret; } + +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) +{ + HKEY hkey = 0; + DWORD size, type; + WCHAR *ret = NULL; + + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && + (ret = malloc( size + sizeof(WCHAR) ))) + { + size += sizeof(WCHAR); + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) + { + free( ret ); + ret = NULL; + } + } + if (hkey) RegCloseKey( hkey ); + return ret; +} + +static WCHAR *get_organization(void) +{ + return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", + L"RegisteredOrganization" ); +} + static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) { WCHAR *ret = malloc( 11 * sizeof(WCHAR) ); @@ -3574,27 +3604,6 @@ static WCHAR *get_osname( const WCHAR *caption ) return ret; } -static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) -{ - HKEY hkey = 0; - DWORD size, type; - WCHAR *ret = NULL; - - if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && - (ret = malloc( size + sizeof(WCHAR) ))) - { - size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) - { - free( ret ); - ret = NULL; - } - } - if (hkey) RegCloseKey( hkey ); - return ret; -} - static WCHAR *get_osserialnumber(void) { WCHAR *ret = get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"ProductId" ); @@ -3658,6 +3667,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->manufacturer = L"The Wine Project"; rec->name = get_osname( rec->caption ); rec->operatingsystemsku = get_operatingsystemsku(); + rec->organization = get_organization(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7cca770ffc7..b31506a12d6 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1428,6 +1428,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CSName", VT_BSTR, CIM_STRING ); check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + check_property( obj, L"Organization", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"RegisteredUser", VT_BSTR, CIM_STRING );

1 0

Louis Lenders : wbemprox: Add BootDevice property to Win32_Operatingsystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 77fc1cd0c609bc94b3a1a22316601b39b24b86ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fc1cd0c609bc94b3a1a223… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:22 2022 +0200 wbemprox: Add BootDevice property to Win32_Operatingsystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ba3e728c8c5..8c5a158fea3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -228,6 +228,7 @@ static const struct column col_networkadapterconfig[] = }; static const struct column col_operatingsystem[] = { + { L"BootDevice", CIM_STRING }, { L"BuildNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"BuildType", CIM_STRING }, { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -662,6 +663,7 @@ struct record_networkadapterconfig }; struct record_operatingsystem { + const WCHAR *bootdevice; const WCHAR *buildnumber; const WCHAR *buildtype; const WCHAR *caption; @@ -3651,6 +3653,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct RtlGetVersion( &ver ); rec = (struct record_operatingsystem *)table->data; + rec->bootdevice = L"\\Device\\HarddiskVolume1"; rec->buildnumber = get_osbuildnumber( &ver ); rec->buildtype = L"Wine build"; rec->caption = get_oscaption( &ver ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b31506a12d6..37c149fab26 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1388,6 +1388,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) hr = IWbemClassObject_EndEnumeration( obj ); ok( hr == S_OK, "got %#lx\n", hr ); + check_property( obj, L"BootDevice", VT_BSTR, CIM_STRING ); check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); check_property( obj, L"BuildType", VT_BSTR, CIM_STRING ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING );

1 0

Jeremy White : Do not send MR changes on apparent maintainer.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: tools Branch: master Commit: 894a49d2cb0069a98b962e5136a5d86d17230340 URL: https://source.winehq.org/git/tools.git/?a=commit;h=894a49d2cb0069a98b962e5… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 10:13:46 2022 -0500 Do not send MR changes on apparent maintainer. If we think that it was a maintainer and they only changed meta information, then do not send a new copy of the MR. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 41 +++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 3708679..a2f7079 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -467,7 +467,14 @@ def fixup_version(mail, version): mail['Subject'] = re.sub(r'PATCH ([0-9])', f"PATCH v{version} \\1", subject) -def commits_changed(new, old): +def done_by_maintainer(author, commits): + for commit in commits: + if commit['committer_name'] != author: + return True + return False + + +def commits_meta_changed(new, old): if len(old) != len(new): return True for i in range(0, len(old)): @@ -477,7 +484,7 @@ def commits_changed(new, old): return False -def get_changes(iid, version, versionid, old_versionid): +def get_changes(iid, version, versionid, old_versionid, mr): current_changes = fetch_mr_version(iid, versionid) old_changes = fetch_mr_version(iid, old_versionid) old_commits = [] @@ -487,12 +494,25 @@ def get_changes(iid, version, versionid, old_versionid): version_string = f" v{version}: " vstring_len = len(version_string) + # After a merge, the source branch is deleted, which will short + # circuit this logic. We cannot do any analysis on an MR in + # that condition. + if len(old_changes['diffs']) == 0: + return None + # We don't want to send an email notice on a rebase or other innocuous change + # But this gets complicated. There is a strong sense that if an + # author makes a change to their commit messages or description, + # that warrants another email. But if a maintainer adds a signed off + # or makes a similar small change at merge time, we *don't* want that. + # So we try to figure out if this is a maintainer merge, and if so + # we want to more aggressively 'quiet' this logic. So basically, + # if the messages are not changed, or only changed by a maintainer, let's be quiet. if 'commits' in current_changes and 'commits' in old_changes: - # If the commit messages / composition has not changed and - if not commits_changed(current_changes['commits'], old_changes['commits']): + changed = commits_meta_changed(current_changes['commits'], old_changes['commits']) + maintainer = done_by_maintainer(mr['author']['name'], current_changes['commits']) + if maintainer or not changed: if 'diffs' in current_changes and 'diffs' in old_changes: - # The diff is unchanged, then... if current_changes['diffs'] == old_changes['diffs']: return None @@ -510,7 +530,11 @@ def get_changes(iid, version, versionid, old_versionid): return "\n" + version_string + changes -def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, author_name, title, description): +def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): + author_name = f"{mr['author']['name']} (@{mr['author']['username']})" + title = mr['title'] + description = mr['description'] + mail = email.message.Message() mail['From'] = email.utils.formataddr((author_name, settings.BRIDGE_FROM_EMAIL)) vstring = "" @@ -523,7 +547,7 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, author_name, t # versions array is ordered, which Arek seems to not have found vindex = mr_version * -1 oindex = (mr_version - 1) * -1 - changes = get_changes(mr_iid, mr_version, versions[vindex]['id'], versions[oindex]['id']) + changes = get_changes(mr_iid, mr_version, versions[vindex]['id'], versions[oindex]['id'], mr) if changes is None: return None @@ -583,8 +607,7 @@ def process_mr(mr, update_db): return nr_patches = len(patches) - author = f"{mr['author']['name']} (@{mr['author']['username']})" - cover = create_cover(mr['id'], iid, version, versions, nr_patches, author, mr['title'], mr['description']) + cover = create_cover(mr['id'], iid, version, versions, nr_patches, mr) if cover is None: log(f"MR{iid}v{version} - skipping, has no changes") return

1 0

Jeremy White : Add a READ_ONLY flag to help with testing.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: tools Branch: master Commit: 25a13879d60b4d9c510942e13311d481c25d5b08 URL: https://source.winehq.org/git/tools.git/?a=commit;h=25a13879d60b4d9c510942e… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 06:45:57 2022 -0500 Add a READ_ONLY flag to help with testing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/example.cfg | 4 ++++ gitlab/gitlab-to-mail/gitlabtomail.py | 19 ++++++++++++------- gitlab/gitlab-to-mail/util.py | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gitlab/gitlab-to-mail/example.cfg b/gitlab/gitlab-to-mail/example.cfg index 19e877c..a0fc59d 100644 --- a/gitlab/gitlab-to-mail/example.cfg +++ b/gitlab/gitlab-to-mail/example.cfg @@ -6,6 +6,10 @@ DATABASE= "/home/wine/example/db_example.sqlite" # if True mails are dumped to mail_dump mbox file instead of being sent out DEBUG = False +# If True, no writes are done to the database. This allows a particular +# condition to be run again and again +#READ_ONLY = False + # https://docs.gitlab.com/ce/user/profile/personal_access_tokens.html with API access GITLAB_TOKEN = "secret" GITLAB_URL = "https://gitlab.example.com/" diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index dfe72e2..19eafa3 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -540,7 +540,8 @@ def main(): last_mr_updated_at = db.get_last_mr_updated_at() if not last_mr_updated_at: last_mr_updated_at = datetime.datetime.now() - datetime.timedelta(days=settings.INITIAL_BACKLOG_DAYS) - db.set_last_mr_updated_at(last_mr_updated_at) + if not settings.READ_ONLY: + db.set_last_mr_updated_at(last_mr_updated_at) for mr in fetch_recently_updated_mrs(last_mr_updated_at): iid = mr['iid'] @@ -575,7 +576,8 @@ def main(): if not error_in_notes(iid, error): post_note(iid, error) - db.set_last_mr_updated_at(updated_at) + if not settings.READ_ONLY: + db.set_last_mr_updated_at(updated_at) continue date = get_mr_version_date(versions, version) @@ -599,15 +601,17 @@ def main(): mail['References'] = create_reference(mr['id'], gitlab_hostname) log(f"MR{iid}v{version} - sent email") send_email(mail) - db.mark_mr_version_processed(iid, version) - db.set_last_mr_updated_at(updated_at) + if not settings.READ_ONLY: + db.mark_mr_version_processed(iid, version) + db.set_last_mr_updated_at(updated_at) else: log(f"MR{iid}v{version} - skipping, already processed") date = db.get_last_event_date() if not date: date = (datetime.datetime.now() - datetime.timedelta(days=settings.INITIAL_BACKLOG_DAYS)).date() - db.set_last_event_date(date) + if not settings.READ_ONLY: + db.set_last_event_date(date) date = date - datetime.timedelta(days=1) last_event_id = db.get_last_event_id() @@ -624,8 +628,9 @@ def main(): log(f"sending email {mail['Subject']}") send_email(mail) - db.set_last_event_date(parse_gitlab_datetime(event['created_at']).date()) - db.set_last_event_id(event['id']) + if not settings.READ_ONLY: + db.set_last_event_date(parse_gitlab_datetime(event['created_at']).date()) + db.set_last_event_id(event['id']) if __name__ == "__main__": diff --git a/gitlab/gitlab-to-mail/util.py b/gitlab/gitlab-to-mail/util.py index e37ead8..aef43c6 100644 --- a/gitlab/gitlab-to-mail/util.py +++ b/gitlab/gitlab-to-mail/util.py @@ -31,7 +31,7 @@ class Settings: else: self.__dict__[s] = None - for s in ['DEBUG']: + for s in ['DEBUG', 'READ_ONLY']: if s in self.cp['settings']: self.__dict__[s] = self.cp['settings'].getboolean(s) else:

1 0

Jeremy White : Refactor to create a function that handles MRs.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: tools Branch: master Commit: 538a9f53d13c1ad1f503a71f9490c4a9d0e4d33d URL: https://source.winehq.org/git/tools.git/?a=commit;h=538a9f53d13c1ad1f503a71… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 07:15:36 2022 -0500 Refactor to create a function that handles MRs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 131 ++++++++++++++++++---------------- 1 file changed, 69 insertions(+), 62 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 19eafa3..c46cc98 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -536,7 +536,75 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, author_name, t return mail +def process_mr(mr, update_db): + iid = mr['iid'] + log(f"MR{iid} updated - processing") + + if mr['merged_at']: + log(f"MR{iid} merged - skipping") + return + + # We jump through some hoops because the fetch_mr_patches + # entry point on GitLab does not allow one + # to specify a particular version. You can only get + # a nice set of patches for the most current version. + # Out of an abundance of caution, we make sure that the + # last sha1 matches a known version and then we use that. + updated_at = parse_gitlab_datetime(mr['updated_at']) + patches = split_mbox_into_messages(fetch_mr_patches(iid)) + sha1s = [get_patch_sha1(patch) for patch in patches] + versions = fetch_mr_versions(iid) + version = get_mr_version(versions, sha1s[-1]) + if not version: + # We can get an unusual case where we do not have a patch + # to go with the start of the versions chain. Andrew + # was able to do this in wine-demo MR 13, by somehow + # having a commit message only commit. Arek believes that + # this is not a sensible MR, and we should flag it as such. + log(f"Error: MR {iid} patch {sha1s[-1]} not in versions") + error = ("This merge request appears to be malformed.\n" + "This can be caused by a commit with no content.\n" + "Please check your merge request for errors.") + + if not error_in_notes(iid, error): + post_note(iid, error) + if update_db: + db.set_last_mr_updated_at(updated_at) + return + + date = get_mr_version_date(versions, version) + if db.was_mr_version_processed(iid, version): + log(f"MR{iid}v{version} - skipping, already processed") + return + + nr_patches = len(patches) + author = f"{mr['author']['name']} (@{mr['author']['username']})" + cover = create_cover(mr['id'], iid, version, versions, nr_patches, author, mr['title'], mr['description']) + if cover is None: + log(f"MR{iid}v{version} - skipping, has no changes") + return + + fixup_date(cover, date) + create_headers_from_mr(cover, mr) + send_email(cover) + if nr_patches <= settings.MAXIMUM_PATCHES: + for nr, mail in enumerate(patches): + fixup_patch(mail, iid, version, nr+1) + date = date + datetime.timedelta(seconds=1) + fixup_date(mail, date) + fixup_version(mail, version) + create_headers_from_mr(mail, mr) + mail['References'] = create_reference(mr['id'], gitlab_hostname) + log(f"MR{iid}v{version} - sent email") + send_email(mail) + if update_db: + db.mark_mr_version_processed(iid, version) + db.set_last_mr_updated_at(updated_at) + + def main(): + + # Process any new merge requests last_mr_updated_at = db.get_last_mr_updated_at() if not last_mr_updated_at: last_mr_updated_at = datetime.datetime.now() - datetime.timedelta(days=settings.INITIAL_BACKLOG_DAYS) @@ -544,68 +612,7 @@ def main(): db.set_last_mr_updated_at(last_mr_updated_at) for mr in fetch_recently_updated_mrs(last_mr_updated_at): - iid = mr['iid'] - - log(f"MR{iid} updated - processing") - if mr['merged_at']: - log(f"MR{iid} merged - skipping") - continue - - - # We jump through some hoops because the fetch_mr_patches - # entry point on GitLab does not allow one - # to specify a particular version. You can only get - # a nice set of patches for the most current version. - # Out of an abundance of caution, we make sure that the - # last sha1 matches a known version and then we use that. - updated_at = parse_gitlab_datetime(mr['updated_at']) - patches = split_mbox_into_messages(fetch_mr_patches(iid)) - sha1s = [get_patch_sha1(patch) for patch in patches] - versions = fetch_mr_versions(iid) - version = get_mr_version(versions, sha1s[-1]) - if not version: - # We can get an unusual case where we do not have a patch - # to go with the start of the versions chain. Andrew - # was able to do this in wine-demo MR 13, by somehow - # having a commit message only commit. Arek believes that - # this is not a sensible MR, and we should flag it as such. - log(f"Error: MR {iid} patch {sha1s[-1]} not in versions") - error = ("This merge request appears to be malformed.\n" - "This can be caused by a commit with no content.\n" - "Please check your merge request for errors.") - - if not error_in_notes(iid, error): - post_note(iid, error) - if not settings.READ_ONLY: - db.set_last_mr_updated_at(updated_at) - continue - - date = get_mr_version_date(versions, version) - if not db.was_mr_version_processed(iid, version): - nr_patches = len(patches) - author = f"{mr['author']['name']} (@{mr['author']['username']})" - cover = create_cover(mr['id'], iid, version, versions, nr_patches, author, mr['title'], mr['description']) - if cover is None: - log(f"MR{iid}v{version} - skipping, has no changes") - continue - fixup_date(cover, date) - create_headers_from_mr(cover, mr) - send_email(cover) - if nr_patches <= settings.MAXIMUM_PATCHES: - for nr, mail in enumerate(patches): - fixup_patch(mail, iid, version, nr+1) - date = date + datetime.timedelta(seconds=1) - fixup_date(mail, date) - fixup_version(mail, version) - create_headers_from_mr(mail, mr) - mail['References'] = create_reference(mr['id'], gitlab_hostname) - log(f"MR{iid}v{version} - sent email") - send_email(mail) - if not settings.READ_ONLY: - db.mark_mr_version_processed(iid, version) - db.set_last_mr_updated_at(updated_at) - else: - log(f"MR{iid}v{version} - skipping, already processed") + process_mr(mr, not settings.READ_ONLY) date = db.get_last_event_date() if not date:

1 0

Jeremy White : Make the process_event function send email.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: tools Branch: master Commit: d44f2d8ee171ea59a130b6f6eb7e1853d728f0f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d44f2d8ee171ea59a130b6f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 07:21:38 2022 -0500 Make the process_event function send email. This is in preparation for adding the ability to process a single MR or single event. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index c46cc98..74ea95e 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -423,7 +423,12 @@ EVENT_ACTION_TYPES = { def process_event(event): log(f"Event {event['id']} {event['action_name']} - processing") proc = EVENT_ACTION_TYPES.get(event["action_name"], process_unknown) - return proc(event) + mail = proc(event) + + if mail: + create_headers_from_event(mail, event) + log(f"sending email {mail['Subject']}") + send_email(mail) # MAIN @@ -628,12 +633,7 @@ def main(): for event in fetch_events(date): if event['id'] <= last_event_id: continue - mail = process_event(event) - - if mail: - create_headers_from_event(mail, event) - log(f"sending email {mail['Subject']}") - send_email(mail) + process_event(event) if not settings.READ_ONLY: db.set_last_event_date(parse_gitlab_datetime(event['created_at']).date())

1 0

Jeremy White : Add the ability to process select MRs and events.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: tools Branch: master Commit: 4089204f69f4d08da70951986f793de58e8f27d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4089204f69f4d08da709519… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 07:37:04 2022 -0500 Add the ability to process select MRs and events. This debug facility lets me test running just one MR or event to make development simpler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 74ea95e..d4d6972 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -607,8 +607,30 @@ def process_mr(mr, update_db): db.set_last_mr_updated_at(updated_at) +def handle_debug_requests(): + 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) + elif arg.find("event=") == 0: + print(f"Processing event id {arg[6:]}") + # I did not immediately see a way to get a specific event. + # This is debug code, so I'm at peace with doing this inefficiently + date = (datetime.datetime.now() - datetime.timedelta(days=365)).date() + for event in fetch_events(date): + if event['id'] == int(arg[6:]): + process_event(event) + else: + print(f"Error: unknown argument {arg}", file=sys.stderr) + + def main(): + if len(sys.argv) > 2: + handle_debug_requests() + return + # Process any new merge requests last_mr_updated_at = db.get_last_mr_updated_at() if not last_mr_updated_at:

1 0

Jeremy White : Call Python with -B to avoid __pycache__.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: tools Branch: master Commit: ce7c6171ac9e70104d83678c8f5e66e80f58a229 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ce7c6171ac9e70104d83678… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 10:22:31 2022 -0500 Call Python with -B to avoid __pycache__. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 2 +- gitlab/gitlab-to-mail/mailtogitlab.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index d4d6972..3708679 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env -S python3 -B from urllib.parse import urljoin, urlparse diff --git a/gitlab/gitlab-to-mail/mailtogitlab.py b/gitlab/gitlab-to-mail/mailtogitlab.py index 7fcb85b..d3eeee7 100755 --- a/gitlab/gitlab-to-mail/mailtogitlab.py +++ b/gitlab/gitlab-to-mail/mailtogitlab.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env -S python3 -B from email import message_from_binary_file from urllib.parse import urljoin

1 0

Austin English : template/en/default/index.html.tmpl: Remove a couple dead links.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: bugzilla Branch: master Commit: 19cada415ee5a581760f7126308b37a9b6f03485 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=19cada415ee5a581760f… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 17 04:56:48 2022 -0500 template/en/default/index.html.tmpl: Remove a couple dead links. Remove: * Add Bugzilla to Sidebar (requires a Mozilla browser like Mozilla Firefox) * Install the Quick Search plugin (requires Firefox 2 or Internet Explorer 7) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52802 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/index.html.tmpl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 7934785..e86f5ac 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -114,14 +114,6 @@ YAHOO.util.Event.onDOMReady(onLoadActions); [% IF Param('createemailregexp') && user.authorizer.user_can_create_account %] [% END %] [% END %] - - <ul> - <li id="bugsidebar"><a href="javascript:addSidebar()">Add [% terms.Bugzilla %] to Sidebar</a> (requires a Mozilla browser like Mozilla Firefox)</li> - <li id="quick_search_plugin"> - <a href="javascript:window.external.AddSearchProvider('[% urlbase FILTER html %]search_plugin.cgi')">Install - the Quick Search plugin</a> (requires Firefox 2 or Internet Explorer 7) - </li> - </ul> </div> </div>

1 0

Rémi Bernon : mf/tests: Only check sample data when length matches.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 4455f0c3546a07ee2069cda8df50ca9f271070e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4455f0c3546a07ee2069cda8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 10:30:55 2022 +0200 mf/tests: Only check sample data when length matches. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 57 +++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index abcb700329d..37520d48292 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5717,8 +5717,8 @@ static IMFSample *create_sample(const BYTE *data, ULONG size) return sample; } -#define check_sample(a, b, c, d) check_sample_(__LINE__, a, b, c, d) -static void check_sample_(int line, IMFSample *sample, const void *expect_buf, ULONG expect_len, HANDLE output_file) +#define check_sample(a, b, c) check_sample_(__LINE__, a, b, c) +static void check_sample_(int line, IMFSample *sample, const void *expect_buf, HANDLE output_file) { IMFMediaBuffer *media_buffer; DWORD length; @@ -5730,12 +5730,7 @@ static void check_sample_(int line, IMFSample *sample, const void *expect_buf, U ok_(__FILE__, line)(hr == S_OK, "ConvertToContiguousBuffer returned %#lx\n", hr); hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); ok_(__FILE__, line)(hr == S_OK, "Lock returned %#lx\n", hr); - ok_(__FILE__, line)(expect_len == length, "got length %lu\n", length); - if (length && length == expect_len) - { - ok_(__FILE__, line)(!memcmp(expect_buf, buffer, expect_len), - "unexpected buffer data\n"); - } + ok_(__FILE__, line)(!memcmp(expect_buf, buffer, length), "unexpected buffer data\n"); if (output_file) WriteFile(output_file, buffer, length, &length, NULL); hr = IMFMediaBuffer_Unlock(media_buffer); ok_(__FILE__, line)(hr == S_OK, "Unlock returned %#lx\n", hr); @@ -5809,11 +5804,11 @@ static void test_wma_encoder(void) ULONG wma_encoded_data_len; IMFMediaType *media_type; IMFTransform *transform; + DWORD status, length; HANDLE output_file; IMFSample *sample; HRSRC resource; GUID class_id; - DWORD status; ULONG i, ret; HRESULT hr; @@ -5899,7 +5894,10 @@ static void test_wma_encoder(void) "got dwStatus %#lx\n", output.dwStatus); ok(status == 0, "got status %#lx\n", status); ok(wma_encoded_data_len > i * wma_block_size, "got %lu blocks\n", i); - check_sample(sample, wma_encoded_data + i * wma_block_size, wma_block_size, output_file); + hr = IMFSample_GetTotalLength(sample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + ok(length == wma_block_size, "got length %lu\n", length); + check_sample(sample, wma_encoded_data + i * wma_block_size, output_file); winetest_pop_context(); i++; } @@ -5919,7 +5917,9 @@ static void test_wma_encoder(void) ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus); ok(status == 0, "got status %#lx\n", status); - check_sample(sample, NULL, 0, NULL); + hr = IMFSample_GetTotalLength(sample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + ok(length == 0, "got length %lu\n", length); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %lu\n", ret); @@ -6046,10 +6046,10 @@ static void test_wma_decoder(void) ULONG wma_encoded_data_len; IMFMediaType *media_type; IMFTransform *transform; + DWORD status, length; IMFSample *sample; HRSRC resource; GUID class_id; - DWORD status; ULONG i, ret; HRESULT hr; @@ -6290,26 +6290,23 @@ static void test_wma_decoder(void) broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7) || output.dwStatus == 7) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); ok(status == 0, "got status %#lx\n", status); + hr = IMFSample_GetTotalLength(sample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); if (output.dwStatus == MFT_OUTPUT_DATA_BUFFER_INCOMPLETE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7))) { - check_sample(sample, wma_decoded_data, sizeof(wma_decoded_data), NULL); + ok(length == sizeof(wma_decoded_data), "got length %lu\n", length); + check_sample(sample, wma_decoded_data, NULL); i += sizeof(wma_decoded_data); } else { - DWORD length; - /* FFmpeg doesn't seem to decode WMA buffers in the same way as native */ - - hr = IMFSample_GetTotalLength(sample, &length); - ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); todo_wine ok(length == sizeof(wma_decoded_data) / 2, "got length %lu\n", length); - if (length == sizeof(wma_decoded_data) / 2) { - check_sample(sample, wma_decoded_data, sizeof(wma_decoded_data) / 2, NULL); + check_sample(sample, wma_decoded_data, NULL); i += sizeof(wma_decoded_data) / 2; } } @@ -6343,7 +6340,9 @@ static void test_wma_decoder(void) broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7)) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); ok(status == 0, "got status %#lx\n", status); - check_sample(sample, NULL, 0, NULL); + hr = IMFSample_GetTotalLength(sample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + ok(length == 0, "got length %lu\n", length); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %lu\n", ret); @@ -6902,7 +6901,9 @@ static void test_h264_decoder(void) ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); ok(status == 0, "got status %#lx\n", status); - check_sample(output.pSample, NULL, 0, NULL); + hr = IMFSample_GetTotalLength(output.pSample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + ok(length == 0, "got length %lu\n", length); ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); @@ -6937,8 +6938,10 @@ static void test_h264_decoder(void) todo_wine ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS, "got status %#lx\n", status); - if (status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS) - check_sample(output.pSample, NULL, 0, NULL); + hr = IMFSample_GetTotalLength(output.pSample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + todo_wine_if(length == 1920 * 1080 * 3 / 2) + ok(length == 0, "got length %lu\n", length); ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); @@ -7021,7 +7024,7 @@ static void test_h264_decoder(void) IMFMediaBuffer_Release(media_buffer); if (length == nv12_frame_len) - check_sample(output.pSample, nv12_frame_data, nv12_frame_len, output_file); + check_sample(output.pSample, nv12_frame_data, output_file); } ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); @@ -7063,7 +7066,9 @@ static void test_h264_decoder(void) ok(!output.pEvents, "got pEvents %p\n", output.pEvents); todo_wine ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS, "got status %#lx\n", status); - check_sample(output.pSample, NULL, 0, NULL); + hr = IMFSample_GetTotalLength(output.pSample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + ok(length == 0, "got length %lu\n", length); ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret);

1 0