wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Rémi Bernon : ntdll: Factor out heap serialization to heap_(lock|unlock) helpers.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 005ed5773c8d78e0a05b84768a88abd04fb506bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=005ed5773c8d78e0a05b8476… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 14:33:18 2022 +0200 ntdll: Factor out heap serialization to heap_(lock|unlock) helpers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 119 +++++++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=005ed5773c8d78e0a05b…

1 0

Rémi Bernon : kernel32/tests: Add some HEAP_NO_SERIALIZE flag / LFH locking tests.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 2e47e23df16a96d146c7edf090c8f73b48e8b8da URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e47e23df16a96d146c7edf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 15:07:32 2022 +0200 kernel32/tests: Add some HEAP_NO_SERIALIZE flag / LFH locking 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 | 202 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 586c9a1ed0b..d40549e999b 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -88,18 +88,76 @@ struct heap }; +struct heap_thread_params +{ + HANDLE ready_event; + HANDLE start_event; + BOOL done; + + HANDLE heap; + DWORD flags; + BOOL lock; +}; + +DWORD WINAPI heap_thread_proc( void *arg ) +{ + struct heap_thread_params *params = arg; + void *ptr; + DWORD res; + BOOL ret; + + SetEvent( params->ready_event ); + + while (!(res = WaitForSingleObject( params->start_event, INFINITE )) && !params->done) + { + if (params->lock) + { + ret = HeapLock( params->heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + } + + ptr = HeapAlloc( params->heap, params->flags, 0 ); + ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); + ret = HeapFree( params->heap, params->flags, ptr ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + if (params->lock) + { + ret = HeapUnlock( params->heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + } + + SetEvent( params->ready_event ); + } + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + return 0; +} + + static void test_HeapCreate(void) { static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; + struct heap_thread_params thread_params = {0}; PROCESS_HEAP_ENTRY entry, entries[256]; - HANDLE heap, heap1, heaps[8]; + HANDLE heap, heap1, heaps[8], thread; BYTE *ptr, *ptr1, *ptrs[128]; DWORD heap_count, count; ULONG compat_info; UINT_PTR align; + DWORD res; BOOL ret; + thread_params.ready_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!thread_params.ready_event, "CreateEventW failed, error %lu\n", GetLastError() ); + thread_params.start_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!thread_params.start_event, "CreateEventW failed, error %lu\n", GetLastError() ); + thread = CreateThread( NULL, 0, heap_thread_proc, &thread_params, 0, NULL ); + ok( !!thread, "CreateThread failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, INFINITE ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + heap_count = GetProcessHeaps( 0, NULL ); ok( heap_count <= 6, "GetProcessHeaps returned %lu\n", heap_count ); @@ -879,6 +937,148 @@ static void test_HeapCreate(void) ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check HEAP_NO_SERIALIZE HeapCreate flag effect */ + + heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + todo_wine + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + if (res) WaitForSingleObject( thread_params.ready_event, 100 ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check HEAP_NO_SERIALIZE HeapAlloc / HeapFree flag effect */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = HEAP_NO_SERIALIZE; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check LFH heap locking */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + ok( compat_info == 0, "got HeapCompatibilityInformation %lu\n", compat_info ); + + for (i = 0; i < 0x12; i++) ptrs[i] = pHeapAlloc( heap, 0, 0 ); + for (i = 0; i < 0x12; i++) HeapFree( heap, 0, ptrs[i] ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + todo_wine + ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info ); + + /* locking is serialized */ + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + /* but allocation is not */ + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + todo_wine + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + if (res) res = WaitForSingleObject( thread_params.ready_event, 100 ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + thread_params.done = TRUE; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread, INFINITE ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + CloseHandle( thread_params.start_event ); + CloseHandle( thread_params.ready_event ); + CloseHandle( thread ); }

1 0

Rémi Bernon : kernel32/tests: Reduce layout tests verbosity by skipping some sizes.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: f555b1b3bbd614ef10d0703921d1b64b4693c455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f555b1b3bbd614ef10d07039… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 10:06:19 2022 +0200 kernel32/tests: Reduce layout tests verbosity by skipping some sizes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 63 +++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index fded1c69f1e..586c9a1ed0b 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1762,17 +1762,18 @@ static void test_LocalAlloc(void) static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ) { DWORD padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS; - SIZE_T expect_size, alloc_size, extra_size, tail_size = 0; - unsigned char *ptr0, *ptr1, *ptr2; + SIZE_T expect_size, diff, alloc_size, extra_size, tail_size = 0; + unsigned char *ptr0, *ptr1, *ptr2, tail; char tail_buf[64], padd_buf[64]; void *tmp_ptr, **user_ptr; ULONG tmp_flags; + UINT_PTR align; BOOL ret; if (global_flags & (FLG_HEAP_DISABLE_COALESCING|FLG_HEAP_PAGE_ALLOCS|FLG_POOL_ENABLE_TAGGING| FLG_HEAP_ENABLE_TAGGING|FLG_HEAP_ENABLE_TAG_BY_DLL)) { - skip( "skipping not yet implemented block layout tests\n" ); + skip( "skipping block tests\n" ); return; } @@ -1796,16 +1797,17 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ptr2 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); - ok( !((UINT_PTR)ptr0 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); - ok( !((UINT_PTR)ptr1 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); - ok( !((UINT_PTR)ptr2 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + align = (UINT_PTR)ptr0 | (UINT_PTR)ptr1 | (UINT_PTR)ptr2; + ok( !(align & (2 * sizeof(void *) - 1)), "wrong align\n" ); expect_size = max( alloc_size, 2 * sizeof(void *) ); expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size ); - todo_wine_if( heap_flags & (HEAP_VALIDATE_PARAMS|HEAP_VALIDATE_ALL) || - min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) != expect_size ) - ok( min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) == expect_size, "got diff %#I64x\n", - min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) ); + diff = min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ); + todo_wine_if( (heap_flags & (HEAP_VALIDATE_PARAMS|HEAP_VALIDATE_ALL)) || + ((global_flags & ~FLG_HEAP_ENABLE_TAIL_CHECK) && alloc_size < 0x10000) || + (!global_flags && alloc_size < 2 * sizeof(void *)) || + (alloc_size == 0xfd000 && sizeof(void *) == 8) ) + ok( diff == expect_size, "got diff %#Ix exp %#Ix\n", diff, expect_size ); ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); @@ -1819,6 +1821,13 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); winetest_pop_context(); + + if (diff != expect_size) + { + todo_wine + win_skip("skipping sizes\n"); + break; + } } @@ -1850,25 +1859,19 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ptr2 = pHeapAlloc( heap, 0, alloc_size ); ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); + align = (UINT_PTR)ptr0 | (UINT_PTR)ptr1 | (UINT_PTR)ptr2; todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) - ok( !((UINT_PTR)ptr0 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); - todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) - ok( !((UINT_PTR)ptr1 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); - todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) - ok( !((UINT_PTR)ptr2 & (8 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); + ok( !(align & (8 * sizeof(void *) - 1)), "wrong align\n" ); expect_size = max( alloc_size, 2 * sizeof(void *) ); expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size ); + diff = min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ); todo_wine_if( alloc_size == 0x7efe9 ) - ok( min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) > expect_size, "got diff %#I64x\n", - min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ) ); + ok( diff > expect_size, "got diff %#Ix\n", diff ); + tail = ptr0[alloc_size] | ptr1[alloc_size] | ptr2[alloc_size]; todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) - ok( !ptr0[alloc_size], "got block tail\n" ); - todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) - ok( !ptr1[alloc_size], "got block tail\n" ); - todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) - ok( !ptr2[alloc_size], "got block tail\n" ); + ok( !tail, "got tail\n" ); ret = HeapFree( heap, 0, ptr2 ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); @@ -1877,6 +1880,13 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ret = HeapFree( heap, 0, ptr0 ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); winetest_pop_context(); + + if (diff == expect_size || (align & (8 * sizeof(void *) - 1)) || tail) + { + todo_wine + win_skip("skipping sizes\n"); + break; + } } /* Undocumented HEAP_ADD_USER_INFO flag can be used to force an additional padding @@ -1899,10 +1909,9 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags expect_size = max( alloc_size, 2 * sizeof(void *) ); expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size + 2 * sizeof(void *) ); - todo_wine_if( heap_flags & (HEAP_VALIDATE_PARAMS|HEAP_VALIDATE_ALL) || - (ptr2 - ptr1 != expect_size && ptr1 - ptr0 != expect_size) ) - ok( ptr2 - ptr1 == expect_size || ptr1 - ptr0 == expect_size, - "got diff %#Ix %#Ix\n", ptr2 - ptr1, ptr1 - ptr0 ); + diff = min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ); + todo_wine + ok( diff == expect_size, "got diff %#Ix\n", diff ); ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); @@ -1956,8 +1965,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags user_ptr = (void **)(ptr0 + alloc_size + tail_size); todo_wine - ok( user_ptr[0] == 0, "unexpected padding\n" ); - todo_wine ok( user_ptr[1] == (void *)0xdeadbeef, "unexpected user value\n" ); if (user_ptr[1] == (void *)0xdeadbeef) {

1 0

Alexandre Julliard : nls: Update sort keys to NLS version 6.3.5.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 6d41270147470b471eeb1c1679045fd9cda511fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d41270147470b471eeb1c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 09:15:11 2022 +0200 nls: Update sort keys to NLS version 6.3.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/sortdefault.nls | Bin 3354836 -> 3357452 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/nls/sortdefault.nls b/nls/sortdefault.nls index 43f86fb1678..d67da7215d6 100644 Binary files a/nls/sortdefault.nls and b/nls/sortdefault.nls differ

1 0

Jeremy White : Send a note when an MR is approved.
by Alexandre Julliard 05 May '22

05 May '22

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

Francois Gouget : winetest/build-patterns: Include the trailing space in the pattern.
by Alexandre Julliard 05 May '22

05 May '22

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

Francois Gouget : winetest/build-patterns: Show failure counts <= 9 when over a pattern.
by Alexandre Julliard 05 May '22

05 May '22

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 05 May '22

05 May '22

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

Jeremy White : Add blank lines to pacify flake8.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: 05e11de3dd776015ede06872971f9108fc38c2f5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=05e11de3dd776015ede0687… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 15:23:44 2022 -0500 Add blank lines to pacify flake8. This reduces the concerns it raises. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index db74b5b..2b0b111 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -531,6 +531,7 @@ def cover_subject(mr_version, nr_patches, mr_iid, title): 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']

1 0

Jeremy White : Add a 100ms delay when sending patches.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: 80005171b3d0b727d8dc2a394b3ab41d8152b29c URL: https://source.winehq.org/git/tools.git/?a=commit;h=80005171b3d0b727d8dc2a3… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 15:21:36 2022 -0500 Add a 100ms delay when sending patches. The hope is that this will cause the timing of message arrival to work out well for naive mail display programs, such as the winehq patch tracker. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 15fa5dd..db74b5b 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -7,6 +7,7 @@ import re import sys import datetime import dateutil.parser +import time import requests import mailbox import smtplib @@ -615,6 +616,8 @@ def process_mr(mr, update_db): send_email(cover) if nr_patches <= settings.MAXIMUM_PATCHES: for nr, mail in enumerate(patches): + # The hope is that a slight delay will allow receivers to order the patches correctly. + time.sleep(0.1) fixup_patch(mail, iid, version, nr+1) date = date + datetime.timedelta(seconds=1) fixup_date(mail, date)

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
91
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 May 2022