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

Rémi Bernon : ntdll: Ignore HEAP_(TAIL|FREE)_CHECKING_ENABLED flags in RtlCreateHeap.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: wine Branch: master Commit: 00c64fcb014c850ad6a22ec949564a12d4cdeef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c64fcb014c850ad6a22ec9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 22:40:27 2022 +0200 ntdll: Ignore HEAP_(TAIL|FREE)_CHECKING_ENABLED flags in RtlCreateHeap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 -- dlls/ntdll/heap.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f437a13a63e..5b7b0aacfc0 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2435,9 +2435,7 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags if (global_flag & FLG_HEAP_ENABLE_TAGGING) heap_flags |= HEAP_SHARED; if (!(global_flag & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); - todo_wine_if( (heap->force_flags & ~heap_flags) & (HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED) ) ok( heap->force_flags == force_flags, "got force_flags %#x\n", heap->force_flags ); - todo_wine_if( (heap->flags & ~heap_flags) & (HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED) ) ok( heap->flags == heap_flags, "got flags %#x\n", heap->flags ); if (heap->flags & HEAP_PAGE_ALLOCS) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1aa064723a8..d7ac44a4247 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1570,6 +1570,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c /* Allocate the heap block */ + flags &= ~(HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED); if (processHeap) flags |= HEAP_PRIVATE; if (!processHeap || !totalSize || (flags & HEAP_SHARED)) flags |= HEAP_GROWABLE; if (!totalSize) totalSize = HEAP_DEF_SIZE;

1 0

Jacek Caban : winex11: Use unixlib interface for IME calls.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: wine Branch: master Commit: 6290d0599d1a9f28c99970127ffb233b5abd1bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6290d0599d1a9f28c9997012… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 23:10:15 2022 +0200 winex11: Use unixlib interface for IME calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 7 ++++++ dlls/winex11.drv/ime.c | 58 ++++++++++++++++++++++++++-------------------- dlls/winex11.drv/unixlib.h | 7 ++++++ dlls/winex11.drv/x11drv.h | 19 ++++++--------- dlls/winex11.drv/xim.c | 27 ++++++++++----------- 5 files changed, 66 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6290d0599d1a9f28c999…

1 0

Jacek Caban : winex11: Introduce x11drv_client_call.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: wine Branch: master Commit: 040d1f9bbd20c9d507279ea5585188db15ff3a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=040d1f9bbd20c9d507279ea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 01:07:17 2022 +0200 winex11: Introduce x11drv_client_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/event.c | 15 +++++---------- dlls/winex11.drv/unixlib.h | 42 +++++++++++++++++++++++++++--------------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 16 +++++++++++----- dlls/winex11.drv/x11drv_main.c | 15 +++++++++++++++ dlls/winex11.drv/xdnd.c | 41 ++++++++++++----------------------------- include/ntuser.h | 3 +++ 8 files changed, 110 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=040d1f9bbd20c9d50727…

1 0

Rémi Bernon : kernel32/tests: Add some RtlWalkHeap and more HeapWalk tests.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: wine Branch: master Commit: d823e344c80067c2059d6c70472e9385447e635c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d823e344c80067c2059d6c70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 1 10:42:27 2022 +0200 kernel32/tests: Add some RtlWalkHeap and more HeapWalk tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 262 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 259 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d823e344c80067c2059d…

1 0

Francois Gouget : winetest/build-patterns: Show failure counts <= 9 when over a pattern.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: b7387722ec5c12b237b7a597d105e92e0465de6a URL: https://source.winehq.org/git/tools.git/?a=commit;h=b7387722ec5c12b237b7a59… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 5 16:57:26 2022 +0200 winetest/build-patterns: Show failure counts <= 9 when over a pattern. The failure count can help distinguish the failure counts when there are many different values. But this makes the patterns more noisy so only show them when hovering over the pattern. Also each build result only gets one character so this is only possible if the failure count is 9 or less. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 4 ++++ winetest/patterns.js | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index b6e5531..7acb153 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -975,6 +975,10 @@ sub get_status_html($$) return @{$status2html{$status}} if ($status2html{$status}); + if ($status =~ /^[1-9]$/) + { + return ("F", "F", "$status failures", "t", " fcount='$status' style='background-color: $failcolors->{$status}'"); + } if ($status =~ /^[0-9]+$/) { return ("F", "F", "$status failures", "t", " style='background-color: $failcolors->{$status}'"); diff --git a/winetest/patterns.js b/winetest/patterns.js index 65e9cb8..4591903 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -170,6 +170,24 @@ function toggledReportCB(e) refreshPage(changes); } +function showRangeCounts(e) +{ + const domtest = e.target.closest("div.testfile"); + domtest.querySelectorAll(":scope [fcount]").forEach(frange => { + const fcount = frange.getAttribute("fcount"); + frange.innerHTML = fcount.repeat(frange.innerHTML.length); + }); +} + +function hideRangeCounts(e) +{ + const domtest = e.target.closest("div.testfile"); + domtest.querySelectorAll(":scope [fcount]").forEach(frange => { + const fcount = frange.getAttribute("fcount"); + frange.innerHTML = "F".repeat(frange.innerHTML.length); + }); +} + function init() { hide_reruns = false; /* reruns are shown by default */ @@ -225,6 +243,9 @@ function init() cb.patlines.push(patline); test.patlines.push(patline); if (cb.checked) test.linecount++; + const pattern = domline.querySelector("div.pattern"); + pattern.addEventListener('mouseenter', showRangeCounts); + pattern.addEventListener('mouseleave', hideRangeCounts); } }); if (test.linecount < test.patlines.length)

1 0

Francois Gouget : winetest/build-patterns: Use CSS to highlight the new failure modes.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: 96a6a0db927096e2069998a0b752ead28978951d URL: https://source.winehq.org/git/tools.git/?a=commit;h=96a6a0db927096e2069998a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 5 16:57:21 2022 +0200 winetest/build-patterns: Use CSS to highlight the new failure modes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 20 ++++++++++++-------- winetest/report.css | 4 ++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index aa6a6e4..b6e5531 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -999,7 +999,7 @@ sub write_newmodes_line($$) foreach my $status (sort cmpstatus keys %{$test->{newmodes}}) { my ($symbol, $class, $title, $_link, $attrs) = get_status_html($status, $test->{colors}); - print $html " <span class='pat$class'$attrs title='$title'><b><i>$symbol</i></b></span>"; + print $html " <span class='pat$class newM'$attrs title='$title'>$symbol</span>"; } print $html "\n"; } @@ -1016,7 +1016,7 @@ sub write_pattern_line($$$) my ($range_start, $range_end, $range_title); foreach my $build (@sortedbuilds) { - my ($symbol, $class, $title); + my ($symbol, $class, $title, $is_new_mode); my ($tag, $attrs) = ("span", ""); my $status = $testreport->{status}->{$build->{name}}; @@ -1066,11 +1066,7 @@ sub write_pattern_line($$$) $attrs .= sprintf " href='%s/%s/%s.html#%s'", $build->{name}, $reportdir, $link, $dll; } - if ($test->{newmodes}->{$status}) - { - $symbol = "<b><i>$symbol</i></b>"; - $has_newmode = 1; - } + $is_new_mode = $test->{newmodes}->{$status}; } if ($range_symbol eq $symbol) @@ -1091,7 +1087,15 @@ sub write_pattern_line($$$) } # Start a new pattern range - $class = " class='pat$class'" if ($class); + if ($is_new_mode) + { + $class = $class ? " class='pat$class newM'" : " class='newM'"; + $has_newmode = 1; + } + elsif ($class) + { + $class = " class='pat$class'"; + } print $html "<$tag$class$attrs"; if ($tag eq "a") { diff --git a/winetest/report.css b/winetest/report.css index 25f156d..4b2d126 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -134,6 +134,10 @@ div.pattern :hover { color: black; text-decoration: underline; } .patV { /* test blocked by the anti-virus */ background-color: #99e6ff; } +.newM { /* new failure mode */ + font-style: italic; + font-weight: bold; +} .commitR { color: #cc0000;

1 0

Francois Gouget : winetest/build-patterns: Include the trailing space in the pattern.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: c4e8a8b5f6f6ddc43d1da495b96898f2faf95989 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4e8a8b5f6f6ddc43d1da49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 5 16:57:29 2022 +0200 winetest/build-patterns: Include the trailing space in the pattern. Hovering over the trailing space will show the low failure counts without also popping up a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 7acb153..0bad351 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1122,7 +1122,7 @@ sub write_pattern_line($$$) $range_title, $range_symbol x $range_count; } my $newmode = $has_newmode ? " newmode" : ""; - print $html "</div> <span class='label$newmode'>$reportdir</span>\n</div>"; + print $html " </div><span class='label$newmode'>$reportdir</span>\n</div>"; } sub index2symbol($)

1 0

Jeremy White : Send a note when an MR is approved.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: cb5a963c89165cf3a262e84a4313229ba29549df URL: https://source.winehq.org/git/tools.git/?a=commit;h=cb5a963c89165cf3a262e84… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu May 5 09:21:59 2022 -0500 Send a note when an MR is approved. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 2b0b111..bd56033 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -365,9 +365,9 @@ def process_commented_on(event): return mail -def process_closed(event): +def process_status(event): if event['target_type'] != 'MergeRequest': - log(f"unknow target_type {event['target_type']}, skipping") + log(f"unknown target_type {event['target_type']}, skipping") return date = event['created_at'] @@ -401,14 +401,14 @@ def process_unknown(event): def process_ignore(event): - log(f"event {event['id']} ignored") + log(f"event {event['id']} {event['action_name']} ignored") EVENT_ACTION_TYPES = { "commented on": process_commented_on, "accepted": process_ignore, - "approved": process_ignore, - "closed": process_closed, + "approved": process_status, + "closed": process_status, "pushed to": process_ignore, "pushed new": process_ignore, "opened": process_ignore,

1 0

Jeremy White : Make event subjects match the MR cover letter.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: 58a574fcad7161adf6213c0fed85fdabfda2134b URL: https://source.winehq.org/git/tools.git/?a=commit;h=58a574fcad7161adf6213c0… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 14:30:45 2022 -0500 Make event subjects match the MR cover letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 45f829f..6aa16be 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -349,9 +349,12 @@ def process_commented_on(event): log("comment was originally from the mailing list.") return + patches = split_mbox_into_messages(fetch_mr_patches(mr_iid)) + nr_patches = len(patches) + mail = email.message.Message() mail['From'] = email.utils.formataddr((author, settings.BRIDGE_FROM_EMAIL)) - mail['Subject'] = f"Re: {BRIDGE_TAG_FULL}MR{mr_iid}v{mr_version} - {title}" + mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version, note_id=note_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname) @@ -377,9 +380,12 @@ def process_closed(event): action_name = event['action_name'] event_id = event['id'] + patches = split_mbox_into_messages(fetch_mr_patches(mr_iid)) + nr_patches = len(patches) + mail = email.message.Message() mail['From'] = email.utils.formataddr((author, settings.BRIDGE_FROM_EMAIL)) - mail['Subject'] = f"{BRIDGE_TAG_FULL}MR{mr_iid}v{mr_version} - {title} - {action_name}" + mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) + f" - {action_name}" mail['Message-ID'] = create_message_id(mr_iid, mr_version, event_id=event_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname) @@ -518,6 +524,12 @@ def get_changes(iid, version, versionid, old_versionid, mr): return "\n" + version_string + changes +def cover_subject(mr_version, nr_patches, mr_iid, title): + vstring = "" + if mr_version > 1: + vstring = f" v{mr_version}" + return f"[PATCH{BRIDGE_TAG_INFIX}{vstring} 0/{nr_patches}] MR{mr_iid}: {title}" + 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'] @@ -525,10 +537,8 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): mail = email.message.Message() mail['From'] = email.utils.formataddr((author_name, settings.BRIDGE_FROM_EMAIL)) - vstring = "" changes = "" if mr_version > 1: - vstring = f" v{mr_version}" if len(versions) > 1: # The versions array seems to be most recent first, while mr_version # is the positive version number. TODO: this assumes that the @@ -539,7 +549,7 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): if changes is None: return None - mail['Subject'] = f"[PATCH{BRIDGE_TAG_INFIX}{vstring} 0/{nr_patches}] MR{mr_iid}: {title}" + mail['Subject'] = cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname)

1 0

Jeremy White : Add the In-Reply-To id to References.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: 754130bc4af8d8f99e4a3e9285042fb5a7b7f5ce URL: https://source.winehq.org/git/tools.git/?a=commit;h=754130bc4af8d8f99e4a3e9… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 15:11:34 2022 -0500 Add the In-Reply-To id to References. It does no harm, and may help some utilities such as the winehq patch tracker to keep patches together. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 6aa16be..15fa5dd 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -357,7 +357,7 @@ def process_commented_on(event): mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version, note_id=note_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) - mail['References'] = create_reference(mr_id, gitlab_hostname) + mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To'] mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date)) mail.set_payload(f"{body}\n\n-- \n{mr_url}") @@ -388,7 +388,7 @@ def process_closed(event): mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) + f" - {action_name}" mail['Message-ID'] = create_message_id(mr_iid, mr_version, event_id=event_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) - mail['References'] = create_reference(mr_id, gitlab_hostname) + mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To'] mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date)) mail.set_payload(f"\nThis merge request was {action_name} by {event['author']['name']}.\n-- \n{mr_url}") @@ -620,7 +620,7 @@ def process_mr(mr, update_db): fixup_date(mail, date) fixup_version(mail, version) create_headers_from_mr(mail, mr) - mail['References'] = create_reference(mr['id'], gitlab_hostname) + mail['References'] = create_reference(mr['id'], gitlab_hostname) + " " + mail['In-Reply-To'] log(f"MR{iid}v{version} - sent email") send_email(mail) if update_db:

1 0