wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Piotr Caban : msvcp140_atomic_wait: Add __std_atomic_notify_one_direct implementation.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 32a369d6c2e7b526c2b3e4bf39304912cfa9a10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=32a369d6c2e7b526c2b3e4bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 20:22:15 2022 +0200 msvcp140_atomic_wait: Add __std_atomic_notify_one_direct implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/Makefile.in | 2 +- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/Makefile.in b/dlls/msvcp140_atomic_wait/Makefile.in index 42f8d7157b1..1be68bc5ce5 100644 --- a/dlls/msvcp140_atomic_wait/Makefile.in +++ b/dlls/msvcp140_atomic_wait/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp140_atomic_wait.dll -IMPORTS = msvcp140 +IMPORTS = kernelbase msvcp140 C_SRCS = \ main.c diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index f489a7d8e05..f27c1058d14 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -62,3 +62,9 @@ void __stdcall __std_wait_for_threadpool_work_callbacks(PTP_WORK work, BOOL canc TRACE("(%p %d)\n", work, cancel); return WaitForThreadpoolWorkCallbacks(work, cancel); } + +void __stdcall __std_atomic_notify_one_direct(void *addr) +{ + TRACE("(%p)\n", addr); + WakeByAddressSingle(addr); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index bb4edfb76e5..f28cfe9513c 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -4,7 +4,7 @@ @ stub __std_atomic_has_cmpxchg16b @ stub __std_atomic_notify_all_direct @ stub __std_atomic_notify_all_indirect -@ stub __std_atomic_notify_one_direct +@ stdcall __std_atomic_notify_one_direct(ptr) @ stub __std_atomic_notify_one_indirect @ stub __std_atomic_set_api_level @ stub __std_atomic_wait_direct

1 0

Nikolay Sivov : include: Add IParentAndItem definition.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 2b4b10be9ab89dd21d342f7fb063e715284d01ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b4b10be9ab89dd21d342f7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 28 08:39:05 2022 +0300 include: Add IParentAndItem definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/actxprxy/usrmarshal.c | 20 ++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 1 - include/shobjidl.idl | 25 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 33db1327a8d..e4eada6848f 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -227,3 +227,23 @@ HRESULT __RPC_STUB IFolderView2_GetGroupBy_Proxy( TRACE("(%p)->(%p %p)\n", This, pkey, ascending); return IFolderView2_RemoteGetGroupBy_Proxy(This, pkey, ascending); } + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Stub( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_GetParentAndItem(This, parent, folder, child); +} + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Proxy( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_RemoteGetParentAndItem_Proxy(This, parent, folder, child); +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f99045c33d5..abf2eeae17b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -40,7 +40,6 @@ #include "wine/test.h" #include <initguid.h> -DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36); DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0xaa,0x00,0x4a,0xe8,0x37); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a23f3cfdd36..8113d9a7ff6 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -501,6 +501,31 @@ interface IShellItemImageFactory : IUnknown [out] HBITMAP *phbm); } +[ + object, + uuid(b3a4b685-b685-4805-99d9-5dead2873236), + pointer_default(unique) +] +interface IParentAndItem : IUnknown +{ + HRESULT SetParentAndItem( + [in, unique] PCIDLIST_ABSOLUTE parent, + [in, unique] IShellFolder *folder, + [in] PCUITEMID_CHILD child); + + [local] + HRESULT GetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); + + [call_as(GetParentAndItem)] + HRESULT RemoteGetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); +} + typedef [v1_enum] enum tagNWMF { NWMF_UNLOADING = 0x00000001, NWMF_USERINITED = 0x00000002,

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 : 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

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 : 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 : 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 : 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

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 : include: Add Windows.Gaming.Input.ForceFeedback.RampForce runtimeclass declaration.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 2e9a72759cc8508d1ddb7be5d813fdd7bc64e6a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e9a72759cc8508d1ddb7be5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 08:26:34 2022 +0200 include: Add Windows.Gaming.Input.ForceFeedback.RampForce runtimeclass declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.forcefeedback.idl | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index 033cf09cc1f..290d1f62971 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -39,10 +39,12 @@ namespace Windows.Gaming.Input.ForceFeedback { interface IConditionForceEffect; interface IConditionForceEffectFactory; interface IConstantForceEffect; + interface IRampForceEffect; runtimeclass ForceFeedbackMotor; runtimeclass PeriodicForceEffect; runtimeclass ConditionForceEffect; runtimeclass ConstantForceEffect; + runtimeclass RampForceEffect; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; @@ -207,6 +209,22 @@ namespace Windows.Gaming.Input.ForceFeedback { [in] Windows.Foundation.TimeSpan release_duration, [in] UINT32 repeat_count); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.RampForceEffect), + uuid(f1f81259-1ca6-4080-b56d-b43f3354d052) + ] + interface IRampForceEffect : IInspectable + requires Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect + { + HRESULT SetParameters([in] Windows.Foundation.Numerics.Vector3 start_vector, [in] Windows.Foundation.Numerics.Vector3 end_vector, + [in] Windows.Foundation.TimeSpan duration); + HRESULT SetParametersWithEnvelope([in] Windows.Foundation.Numerics.Vector3 start_vector, [in] Windows.Foundation.Numerics.Vector3 end_vector, + [in] FLOAT attack_gain, [in] FLOAT sustain_gain, [in] FLOAT release_gain, [in] Windows.Foundation.TimeSpan start_delay, + [in] Windows.Foundation.TimeSpan attack_duration, [in] Windows.Foundation.TimeSpan sustain_duration, + [in] Windows.Foundation.TimeSpan release_duration, [in] UINT32 repeat_count); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), marshaling_behavior(agile), @@ -252,4 +270,16 @@ namespace Windows.Gaming.Input.ForceFeedback { [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; interface Windows.Gaming.Input.ForceFeedback.IConstantForceEffect; } + + [ + activatable(Windows.Foundation.UniversalApiContract, 3.0), + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass RampForceEffect + { + [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect; + interface Windows.Gaming.Input.ForceFeedback.IRampForceEffect; + } }

1 0

← Newer
1
2
3
4
5
6
7
8
...
103
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022