April 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineboot: Run wine.inf for all supported architectures.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: f87e8ec2c5e99c6685755e8e4a92d8324eb47513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87e8ec2c5e99c6685755e8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 10:03:36 2021 +0200 wineboot: Run wine.inf for all supported architectures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 2552f69990a..0a1f5e4152f 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 ws2_32 +IMPORTS = uuid advapi32 ws2_32 kernelbase DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 3dfa39ad7c0..20d17116888 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1327,7 +1327,7 @@ static HWND show_wait_window(void) return hwnd; } -static HANDLE start_rundll32( const WCHAR *inf_path, BOOL wow64 ) +static HANDLE start_rundll32( const WCHAR *inf_path, WORD machine ) { WCHAR app[MAX_PATH + ARRAY_SIZE(L"\\rundll32.exe" )]; STARTUPINFOW si; @@ -1338,13 +1338,9 @@ static HANDLE start_rundll32( const WCHAR *inf_path, BOOL wow64 ) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - if (wow64) - { - if (!GetSystemWow64DirectoryW( app, MAX_PATH )) return 0; /* not on 64-bit */ - } - else GetSystemDirectoryW( app, MAX_PATH ); - + if (!GetSystemWow64Directory2W( app, MAX_PATH, machine )) return 0; lstrcatW( app, L"\\rundll32.exe" ); + TRACE( "machine %x starting %s\n", machine, debugstr_w(app) ); len = lstrlenW(app) + ARRAY_SIZE(L" setupapi,InstallHinfSection DefaultInstall 128 ") + lstrlenW(inf_path); @@ -1352,7 +1348,7 @@ static HANDLE start_rundll32( const WCHAR *inf_path, BOOL wow64 ) lstrcpyW( buffer, app ); lstrcatW( buffer, L" setupapi,InstallHinfSection" ); - lstrcatW( buffer, wow64 ? L" Wow64Install" : L" DefaultInstall" ); + lstrcatW( buffer, machine != IMAGE_FILE_MACHINE_TARGET_HOST ? L" Wow64Install" : L" DefaultInstall" ); lstrcatW( buffer, L" 128 " ); lstrcatW( buffer, inf_path ); @@ -1477,10 +1473,14 @@ static void update_wineprefix( BOOL force ) if (update_timestamp( config_dir, st.st_mtime ) || force) { - HANDLE process; + ULONG machines[8]; + HANDLE process = 0; DWORD count = 0; - if ((process = start_rundll32( inf_path, FALSE ))) + if (NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + machines, sizeof(machines), NULL )) machines[0] = 0; + + if ((process = start_rundll32( inf_path, IMAGE_FILE_MACHINE_TARGET_HOST ))) { HWND hwnd = show_wait_window(); for (;;) @@ -1490,7 +1490,9 @@ static void update_wineprefix( BOOL force ) if (res == WAIT_OBJECT_0) { CloseHandle( process ); - if (count++ || !(process = start_rundll32( inf_path, TRUE ))) break; + if (HIWORD(machines[count]) & 4 /* native machine */) count++; + if (!machines[count]) break; + if (!(process = start_rundll32( inf_path, LOWORD(machines[count++]) ))) break; } else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); }

1 0

Hugh McMaster : reg: Print a new line when recursing and the current key has no registry values.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 35ccb87a767394ea3054c8890ad7b245e431290d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ccb87a767394ea3054c889… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:31 2021 +1000 reg: Print a new line when recursing and the current key has no registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 2 +- programs/reg/tests/query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 4af6c7f5449..66e54548688 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -262,7 +262,7 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) free(data); free(value_name); - if (i || recurse) + if (i || recursing) output_string(newlineW); subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 4ccbab58cb8..76186794f5e 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -286,7 +286,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test8b, FALSE, TODO_REG_COMPARE); + compare_query(buf, test8b, FALSE, 0); delete_tree(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Zhiyi Zhang : comctl32/theming: Register themed dialog and scrollbar even when theming is not active.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 277daa7ea7e8a953a2f726ce9354af82ab4635da URL: https://source.winehq.org/git/wine.git/?a=commit;h=277daa7ea7e8a953a2f726ce… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:08 2021 +0800 comctl32/theming: Register themed dialog and scrollbar even when theming is not active. So that we can turn on theming in runtime. Otherwise, themed dialog and scrollbar are not enabled even if a theme is made active in winecfg if theming is disabled at start. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/theming.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 4b0c1f9a4d0..15ff3b2d099 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -580,7 +580,7 @@ static void test_WM_THEMECHANGED(void) {TRACKBAR_CLASSA, wm_themechanged_paint_seq}, {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}}, {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq}, - {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, + {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}}, }; parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index ed7bb0a5b33..8078e661b76 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "winuser.h" #include "comctl32.h" -#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(theming); @@ -96,8 +95,6 @@ void THEMING_Initialize (void) { unsigned int i; - if (!IsThemeActive()) return; - atSubclassProp = GlobalAddAtomW (L"CC32ThemingSubCl"); atRefDataProp = GlobalAddAtomW (L"CC32ThemingData");

1 0

Alexandre Julliard : makefiles: Install libwine into the architecture-specific directory.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: a5aaa41069fab4719ec84cea790d69b7710c701c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5aaa41069fab4719ec84cea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:41:27 2021 +0200 makefiles: Install libwine into the architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ntdll/unix/loader.c | 2 +- tools/makedep.c | 6 ++---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure b/configure index d22c0cf89cc..e1699b7e765 100755 --- a/configure +++ b/configure @@ -5868,7 +5868,6 @@ if test "x$enable_win64" = "xyes" then test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 - test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi case $host_cpu in diff --git a/configure.ac b/configure.ac index c90e78d8bb7..ebe9497522c 100644 --- a/configure.ac +++ b/configure.ac @@ -235,7 +235,6 @@ if test "x$enable_win64" = "xyes" then test -z "$with_wine64" || AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) - test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi dnl Normalize CPU architecture diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a575fb21b76..e4c062cea98 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -977,7 +977,7 @@ static void load_libwine(void) void *handle; if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); - else path = build_path( dll_dir, "../" LIBWINE ); + else path = build_path( ntdll_dir, LIBWINE ); handle = dlopen( path, RTLD_NOW ); free( path ); diff --git a/tools/makedep.c b/tools/makedep.c index 638af2b6a44..f19ddfc6b74 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3525,14 +3525,12 @@ static void output_shared_lib( struct makefile *make ) output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); - add_install_rule( make, make->sharedlib, make->sharedlib, - strmake( "p$(libdir)/%s", make->sharedlib )); + add_install_rule( make, make->sharedlib, make->sharedlib, strmake( "p%s/%s", so_dir, make->sharedlib )); for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); - add_install_rule( make, names.str[i], names.str[i-1], - strmake( "y$(libdir)/%s", names.str[i] )); + add_install_rule( make, names.str[i], names.str[i-1], strmake( "y%s/%s", so_dir, names.str[i] )); } strarray_addall( &make->all_targets, names ); }

1 0

Alexandre Julliard : dbghelp: Look for .so files in the architecture-specific directory.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: f2838cc1d4c63c9f0987b4e4db1e397d588c2349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2838cc1d4c63c9f0987b4e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:41:51 2021 +0200 dbghelp: Look for .so files in the architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index b281c19de88..ba757a55b0c 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -33,14 +33,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); #ifdef __i386__ static const WCHAR pe_dir[] = L"\\i386-windows"; +static const WCHAR so_dir[] = L"\\i386-unix"; #elif defined __x86_64__ static const WCHAR pe_dir[] = L"\\x86_64-windows"; +static const WCHAR so_dir[] = L"\\x86_64-unix"; #elif defined __arm__ static const WCHAR pe_dir[] = L"\\arm-windows"; +static const WCHAR so_dir[] = L"\\arm-unix"; #elif defined __aarch64__ static const WCHAR pe_dir[] = L"\\aarch64-windows"; +static const WCHAR so_dir[] = L"\\aarch64-unix"; #else static const WCHAR pe_dir[] = L""; +static const WCHAR so_dir[] = L""; #endif static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} @@ -769,16 +774,16 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if (!(env = process_getenv(process, env_name))) return FALSE; len = wcslen(env) + wcslen(pe_dir) + wcslen(name) + 2; if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; - if (!(p = wcsrchr(name, '.')) || lstrcmpW(p, L".so")) - { + if ((p = wcsrchr(name, '.')) && !lstrcmpW(p, L".so")) + swprintf(buf, len, L"%s%s\\%s", env, so_dir, name); + else swprintf(buf, len, L"%s%s\\%s", env, pe_dir, name); - file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - { - ret = match(param, file, buf); - CloseHandle(file); - if (ret) goto found; - } + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; } swprintf(buf, len, L"%s\\%s", env, name); file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Francois Gouget : winetest/build-patterns: Use color gradients for the failures.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: tools Branch: master Commit: fb6a47743a4fed412f88318b7a1e24d7d9e11944 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb6a47743a4fed412f88318… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:25:30 2021 +0200 winetest/build-patterns: Use color gradients for the failures. This makes it possible to identify when the failure count changes, such as when a patch adds two new failures to a test that already had five, or when the failure count depending on the test configuration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 116 ++++++++++++++++++++++++++++++++++++++---------- winetest/report.css | 4 +- 2 files changed, 93 insertions(+), 27 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index f470c26..9dc2581 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -247,6 +247,9 @@ my %reports; # - name # The uniquely identifying test name in the form 'module:unit'. # +# - colors +# A hashtable of colors indexed by failure count. +# # - testreports # A hashtable mapping report directory names to objects storing the results # for that test and report combination. Each testreport object has the @@ -421,44 +424,101 @@ foreach my $testname (keys %tests) } +# +# Compute color gradients +# + +sub color2html($) +{ + my ($c) = @_; + return sprintf "#%02x%02x%02x", $c->[0], $c->[1], $c->[2]; +} + +sub blend($$$) +{ + my ($p, $start, $end) = @_; + my $r = [int($start->[0] * (1 - $p) + $end->[0] * $p + 0.5), + int($start->[1] * (1 - $p) + $end->[1] * $p + 0.5), + int($start->[2] * (1 - $p) + $end->[2] * $p + 0.5)]; + return $r; +} + +my @keycolors = ([0, 255, 255], # cyan + [0, 255, 0], # green + [255, 255, 0], # yellow + [255, 0, 0], # red +); + +# Use colors to differentiate the set values. Each unique value is assigned +# a color (in HTML format) picked along a series of gradients passing by the +# colors defined in @keycolors. +sub compute_set_colors($) +{ + my ($set) = @_; + my @values = sort { $a <=> $b } keys %$set; + my $count = @values; + if ($count == 1) + { + $set->{$values[0]} = color2html($keycolors[0]); + } + else + { + my $k = 0; + my ($start, $end) = (-1, 0); + for (0..$count-1) + { + while (!$end or $_ > $end) + { + $k++; + $start = $end; + $end = ($count-1) * $k / (@keycolors-1); + } + $set->{$values[$_]} = color2html(blend(($_-$start)/($end-$start), + $keycolors[$k-1], + $keycolors[$k])); + } + } +} + + # # Write the failure patterns page for the given set of reports # my %status2html = ( # Dll information status values - # <status> => [ <symbol>, <class-char>, <title>, <link> ] - "missing" => ["n", "n", "not run for an unknown reason", "report"], - "missingdll" => ["m", "m", "missing dll", "version"], - "missingentrypoint" => ["e", "e", "missing entry point", "version"], - "missingordinal" => ["o", "o", "missing ordinal", "version"], - "missingsxs" => ["v", "v", "missing side-by-side dll version", "version"], - "stub" => ["u", "u", "stub Windows dll", "version"], - "native" => ["N", "N", "native Windows dll", "version"], - "loaderror258" => ["I", "I", "timed out while getting the test list", "version"], + # <status> => [ <symbol>, <class-char>, <title>, <link>, <attrs> ] + "missing" => ["n", "n", "not run for an unknown reason", "report", ""], + "missingdll" => ["m", "m", "missing dll", "version", ""], + "missingentrypoint" => ["e", "e", "missing entry point", "version", ""], + "missingordinal" => ["o", "o", "missing ordinal", "version", ""], + "missingsxs" => ["v", "v", "missing side-by-side dll version", "version", ""], + "stub" => ["u", "u", "stub Windows dll", "version", ""], + "native" => ["N", "N", "native Windows dll", "version", ""], + "loaderror258" => ["I", "I", "timed out while getting the test list", "version", ""], # Other status values - "skipped" => ["-", "s", "skipped by user request", ""], - "crash" => ["C", "C", "crash", "t"], - "258" => ["T", "T", "timeout", "t"], + "skipped" => ["-", "s", "skipped by user request", "", ""], + "crash" => ["C", "C", "crash", "t", ""], + "258" => ["T", "T", "timeout", "t", ""], ); -# Returns a tuple containing the symbol, CSS class, title and link type -# for the specified status. -sub get_status_html($) +# Returns a tuple containing the symbol, CSS class, title, link type and +# HTML attributes for the specified status. +sub get_status_html($$) { - my ($status) = @_; + my ($status, $failcolors) = @_; return @{$status2html{$status}} if ($status2html{$status}); if ($status =~ /^[0-9]+$/) { - return ("F", "F", "$status failures", "t"); + return ("F", "F", "$status failures", "t", " style='background-color: $failcolors->{$status}'"); } if ($status =~ /^loaderror(.*)$/) { - return ("L", "L", "got error $1 while getting the test list", "version"); + return ("L", "L", "got error $1 while getting the test list", "version", ""); } - return ("?", "", "unknown status $status", "report"); + return ("?", "", "unknown status $status", "report", ""); } sub write_patterns_list($$) @@ -481,6 +541,8 @@ sub write_patterns_list($$) print $html "</div></div>\n"; + compute_set_colors($test->{colors}); + print $html "<div class='test'>\n"; foreach my $reportdir (@sortedreports) { @@ -519,7 +581,7 @@ sub write_patterns_list($$) } else { - ($symbol, $class, $title, my $link) = get_status_html($status); + ($symbol, $class, $title, my $link, $attrs) = get_status_html($status, $test->{colors}); if ($link eq "t") { $tag = "a"; @@ -606,17 +668,23 @@ EOF # Build a list of test units that will appear on this page so we can # link them to each other. my $testnames = []; - unit: foreach my $testname (sort keys %tests) + foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; + my $addtest; foreach my $testreport (values %{$test->{testreports}}) { - if ($testreport->{failed}) + next if (!$testreport->{failed}); + $addtest = 1; + + foreach my $status (values %{$testreport->{status}}) { - push @$testnames, $testname; - next unit; + next if ($status !~ /^[0-9]+$/); + next if ($status eq "258"); # timeouts have their own color + $test->{colors}->{$status} = undef; } } + push @$testnames, $testname if ($addtest); } print $html "<h2>$title</h2>\n"; diff --git a/winetest/report.css b/winetest/report.css index cca1ba9..2cc4663 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -89,9 +89,7 @@ div.pattern :hover { color: black; text-decoration: underline; } .patC { /* crash */ background-color: #ff5555; } -.patF { /* failure(s) */ - background-color: #ff0000; -} +/* .patF failure(s) */ /* .patn not run for an unknown reason */ /* .patm missing dll */ .pate { /* missing entrypoint */

1 0

Francois Gouget : winetest/build-index: Link the test unit pages to the failure patterns.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: tools Branch: master Commit: 940756efbf128034638e41e4b14e1842ab0c6012 URL: https://source.winehq.org/git/tools.git/?a=commit;h=940756efbf128034638e41e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:20:45 2021 +0200 winetest/build-index: Link the test unit pages to the failure patterns. Only for the test units that have failures in any of the buids / platforms since there is no pattern in case of success. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 7eacb87..6a3356a 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -259,6 +259,7 @@ foreach my $build (@too_old) # my %alltests = (); +my %haspattern = (); foreach my $build (@builds) { @@ -268,6 +269,10 @@ foreach my $build (@builds) chomp; my ($test, $group, $cell) = split / +/, $_, 3; $alltests{$test}->{$build->{name}}->{$group} = $cell; + if (!$haspattern{$test} and $cell =~ /result (?:fail|mixed)/) + { + $haspattern{$test} = 1; + } } close SUM; } @@ -294,6 +299,8 @@ foreach my $test (keys %alltests) { my $filename = "data/tests/$test.html"; open OUT, ">", "$filename.new" or die "could not open '$filename.new' for writing: $!"; + + my $title_link = $haspattern{$test} ? " | <a href=\"/data/patterns.html#$test\">failure patterns</a>" : ""; print OUT <<EOF; <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> @@ -312,7 +319,7 @@ EOF | <a href="..">index</a> </div> <div class="main"> -<h2>$test test runs</h2> +<h2>$test test runs$title_link</h2> <table class="report"> <thead> <tr><th class="test">Build</th><th class="test">Date</th>

1 0

Alexandre Julliard : packaging: Add Ubuntu 21.04.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: tools Branch: master Commit: 4b729b58c9913c568cd0900b4fc9d41d3cf97644 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4b729b58c9913c568cd0900… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 22:14:36 2021 +0200 packaging: Add Ubuntu 21.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 3 ++- packaging/obs/rsync-filter | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 299a524..4f8757b 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,4 +34,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index d7405f1..4ab9f4b 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="32 33 buster bullseye bionic focal groovy" +distros="32 33 buster bullseye bionic focal groovy hirsute" dry_run= while [ $# -ge 1 ] @@ -221,6 +221,7 @@ do bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; groovy) add_deb ubuntu groovy xUbuntu_20.10 ;; + hirsute) add_deb ubuntu hirsute xUbuntu_21.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index b9eec32..823558e 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -17,6 +17,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/groovy ++ /ubuntu/dists/hirsute - /ubuntu/dists/* - /ubuntu/*

1 0

Francois Gouget : winetest/build-patterns: Add TestBot-specific failure pattern pages.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: tools Branch: master Commit: d895deb83cefc8da6d17f7971eb7051f70de0c7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d895deb83cefc8da6d17f79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:26:18 2021 +0200 winetest/build-patterns: Add TestBot-specific failure pattern pages. One page only shows the failure patterns of the Windows TestBot machines, and another just the Wine TestBot machines. This also cleanly separates the Windows and Wine failure modes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/build-patterns | 48 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 6a3356a..e69ea1f 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -220,7 +220,7 @@ foreach my $build (readdir(DIR)) { if ($build !~ /^[0-9a-f]{40}$/) { - if ($build !~ /^(?:\.\.?|(?:errors|index|patterns)\.html|tests)$/) + if ($build !~ /^(?:\.\.?|(?:errors|index|patterns.*)\.html|tests)$/) { error("'data/$build' is not a valid build directory\n"); } @@ -430,7 +430,7 @@ print OUT <<"EOF"; <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> -<div class="navbar"><a href="patterns.html">failure patterns</a></div> +<div class="navbar">Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> <div class="main"> <h2>Wine test runs</h2> EOF diff --git a/winetest/build-patterns b/winetest/build-patterns index 9dc2581..e87fabc 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -168,6 +168,8 @@ Actions: Generated files: \$workdir/data/patterns.html + \$workdir/data/patterns-tb-win.html + \$workdir/data/patterns-tb-wine.html Exit: 0 - success @@ -206,7 +208,7 @@ foreach my $build (readdir(DIR)) { if ($build !~ /^[0-9a-f]{40}$/) { - if ($build !~ /^(?:\.\.?|(?:errors|index|patterns)\.html|tests)$/) + if ($build !~ /^(?:\.\.?|(?:errors|index|patterns.*)\.html|tests)$/) { error("'data/$build' is not a valid build directory\n"); } @@ -521,9 +523,9 @@ sub get_status_html($$) return ("?", "", "unknown status $status", "report", ""); } -sub write_patterns_list($$) +sub write_patterns_list($$$$) { - my ($html, $testnames) = @_; + my ($html, $pagereports, $mainpage, $testnames) = @_; for my $i (0..@$testnames-1) { @@ -532,6 +534,7 @@ sub write_patterns_list($$) print $html "<div class='testfile' id='$testname'>\n"; print $html "<div class='updownbar'><a href='tests/$testname.html'>$testname</a>"; + print $html " <small>(<a href='$mainpage#$testname'>see all results</a></small>)" if ($mainpage); print $html "<div class='ralign'>"; my $href = $i ? $testnames->[$i-1] : ""; @@ -546,6 +549,7 @@ sub write_patterns_list($$) print $html "<div class='test'>\n"; foreach my $reportdir (@sortedreports) { + next if (!$pagereports->{$reportdir}); my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); print $html "<div class='pattern'>"; @@ -644,11 +648,11 @@ sub write_patterns_list($$) } } -sub write_patterns_page($) +sub write_patterns_page($$$) { - my ($title) = (@_); + my ($pagereports, $subpage, $title) = (@_); - my $filename = "data/patterns.html"; + my $filename = "data/patterns$subpage.html"; open(my $html, ">", "$filename.new") or die "could not open '$filename.new' for writing: $!"; print $html <<"EOF"; @@ -661,7 +665,7 @@ sub write_patterns_page($) <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> -<div class="navbar"><a href="..">index</a></div> +<div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> <div class="main"> EOF @@ -672,8 +676,9 @@ EOF { my $test = $tests{$testname}; my $addtest; - foreach my $testreport (values %{$test->{testreports}}) + foreach my $reportdir (keys %$pagereports) { + my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); $addtest = 1; @@ -687,8 +692,9 @@ EOF push @$testnames, $testname if ($addtest); } + my $mainpage = $subpage ? "patterns.html" : ""; print $html "<h2>$title</h2>\n"; - write_patterns_list($html, $testnames); + write_patterns_list($html, $pagereports, $mainpage, $testnames); print $html "</div></body></html>\n"; close($html); @@ -699,6 +705,28 @@ EOF } } -write_patterns_page("Test failure patterns"); +write_patterns_page(\%reports, "", "All test patterns"); + +my %tbreports; +foreach my $report (values %reports) +{ + next if ($report->{tag} !~ /^newtb-/); # ignore non-TestBot reports + if ($report->{is_rerun}) + { + # Skip reruns because they are infrequent and thus usually do not + # meaningfully contribute to the patterns. + # They can still be checked on the 'all reports' page. + next; + } + # Windows and Wine have different failure modes so put them on separate + # pages. + my $page = ($report->{platform} =~ /^(?:linux|mac|bsd|solaris|wine)$/) ? "wine" : "win"; + $tbreports{$page}->{$report->{dir}} = 1; +} + +write_patterns_page($tbreports{win}, "-tb-win", + "Windows test patterns (TestBot only)"); +write_patterns_page($tbreports{wine}, "-tb-wine", + "Wine test patterns (TestBot only)"); exit 0;

1 0

Zebediah Figura : rpcrt4: Avoid gai_strerror().
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: be101103dbee37d0b382032c2a8bc1d53f333a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be101103dbee37d0b382032c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 27 11:07:22 2021 -0500 rpcrt4: Avoid gai_strerror(). It's not thread-safe. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4f2c6642792..d1a2f99c147 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -941,7 +941,7 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, ret = getaddrinfo("0.0.0.0", endpoint, &hints, &ai); if (ret) { - ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); + ERR("getaddrinfo failed, error %u\n", WSAGetLastError()); return 0; } } @@ -1147,8 +1147,8 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) ret = getaddrinfo(Connection->NetworkAddr, Connection->Endpoint, &hints, &ai); if (ret) { - ERR("getaddrinfo for %s:%s failed: %s\n", Connection->NetworkAddr, - Connection->Endpoint, gai_strerror(ret)); + ERR("getaddrinfo for %s:%s failed, error %u\n", Connection->NetworkAddr, + Connection->Endpoint, WSAGetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -1228,8 +1228,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr ret = getaddrinfo(NULL, endpoint ? endpoint : "0", &hints, &ai); if (ret) { - ERR("getaddrinfo for port %s failed: %s\n", endpoint, - gai_strerror(ret)); + ERR("getaddrinfo for port %s failed, error %u\n", endpoint, WSAGetLastError()); if ((ret == EAI_SERVICE) || (ret == EAI_NONAME)) return RPC_S_INVALID_ENDPOINT_FORMAT; return RPC_S_CANT_CREATE_ENDPOINT; @@ -1293,7 +1292,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr NI_NUMERICSERV); if (ret) { - WARN("getnameinfo failed: %s\n", gai_strerror(ret)); + WARN("getnameinfo failed, error %u\n", WSAGetLastError()); closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue;

1 0