February 2020 - Wine-commits

Jacek Caban : user32: Allow using null driver as a normal graphics driver.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: beaef92010056d4048b3e98001779dc399a46571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beaef92010056d4048b3e980… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 20:45:27 2020 +0100 user32: Allow using null driver as a normal graphics driver. When explicitly requested by config, Wine will use null driver in the same way as we allow using it for invisible winstations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 33 +++++++++++++++++---------------- programs/explorer/desktop.c | 10 +++++++++- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 66b26ca51a..07be6a9a4a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -41,7 +41,7 @@ static char driver_load_error[80]; static BOOL CDECL nodrv_CreateWindow( HWND hwnd ); -static HMODULE load_desktop_driver( HWND hwnd ) +static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) { static const WCHAR display_device_guid_propW[] = { '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', @@ -53,7 +53,8 @@ static HMODULE load_desktop_driver( HWND hwnd ) 'V','i','d','e','o','\\','{',0}; static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; + static const WCHAR nullW[] = {'n','u','l','l',0}; + BOOL ret = FALSE; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; @@ -76,8 +77,9 @@ static HMODULE load_desktop_driver( HWND hwnd ) size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) { - if (!(ret = LoadLibraryW( path ))) ERR( "failed to load %s\n", debugstr_w(path) ); - TRACE( "%s %p\n", debugstr_w(path), ret ); + ret = !strcmpW( path, nullW ) || (*module = LoadLibraryW( path )); + if (!ret) ERR( "failed to load %s\n", debugstr_w(path) ); + TRACE( "%s %p\n", debugstr_w(path), *module ); } else { @@ -98,8 +100,17 @@ static const USER_DRIVER *load_driver(void) driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); *driver = null_driver; - graphics_driver = load_desktop_driver( GetDesktopWindow() ); - if (graphics_driver) + if (!load_desktop_driver( GetDesktopWindow(), &graphics_driver )) + { + USEROBJECTFLAGS flags; + HWINSTA winstation; + + winstation = GetProcessWindowStation(); + if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) + || (flags.dwFlags & WSF_VISIBLE)) + driver->pCreateWindow = nodrv_CreateWindow; + } + else if (graphics_driver) { #define GET_USER_FUNC(name) \ do { if ((ptr = GetProcAddress( graphics_driver, #name ))) driver->p##name = ptr; } while(0) @@ -153,16 +164,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ThreadDetach); #undef GET_USER_FUNC } - else - { - USEROBJECTFLAGS flags; - HWINSTA winstation; - - winstation = GetProcessWindowStation(); - if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) - || (flags.dwFlags & WSF_VISIBLE)) - driver->pCreateWindow = nodrv_CreateWindow; - } prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d4925f7c5b..bac17dcc5f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -766,6 +766,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; + BOOL null_driver = FALSE; HMODULE module = 0; HKEY hkey; char error[80]; @@ -790,6 +791,13 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) next = wcschr( name, ',' ); if (next) *next++ = 0; + if (!wcscmp( name, L"null" )) + { + TRACE( "display %s using null driver\n", debugstr_guid(guid) ); + null_driver = TRUE; + break; + } + swprintf( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) @@ -820,7 +828,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) { - if (module) + if (module || null_driver) RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); else

1 0

Michael Stefaniuc : msscript.ocx/tests: Get rid of a2bstr().
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: bd0886f333ee93993140ab51abc97407e44abda5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0886f333ee93993140ab51… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 12 00:32:50 2020 +0100 msscript.ocx/tests: Get rid of a2bstr(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 90 +++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd0886f333ee93993140…

1 0

Brendan Shanks : include: Fix size of tomConstants enum.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 0e408452a4fa8b4b1e02ec4bb16cba6822200b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e408452a4fa8b4b1e02ec4b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:55:53 2020 -0800 include: Fix size of tomConstants enum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tom.idl | 342 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 171 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e408452a4fa8b4b1e02…

1 0

Brendan Shanks : include: Fix size of RecordCreateOptionsEnum.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 61d0cc78b24cf591746ab62d21259fe3b8e4d7e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d0cc78b24cf591746ab62d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:57:02 2020 -0800 include: Fix size of RecordCreateOptionsEnum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msado15_backcompat.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..68fda6ab21 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -430,12 +430,12 @@ typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum { - adCreateCollection = 0x00002000, - adCreateStructDoc = 0x80000000, - adCreateNonCollection = 0x00000000, - adOpenIfExists = 0x02000000, - adCreateOverwrite = 0x04000000, - adFailIfNotExists = -1 + adCreateCollection = (int) 0x00002000, + adCreateStructDoc = (int) 0x80000000, + adCreateNonCollection = (int) 0x00000000, + adOpenIfExists = (int) 0x02000000, + adCreateOverwrite = (int) 0x04000000, + adFailIfNotExists = (int) -1 } RecordCreateOptionsEnum; typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum

1 0

Alexandre Julliard : libport: Move the codepage table functions back to libwine and make them obsolete.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 831f58caa56133f8522fad1ce2b7901e67c0d127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=831f58caa56133f8522fad1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:06:51 2020 +0100 libport: Move the codepage table functions back to libwine and make them obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 8 -------- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/cptable.c | 19 +++++++++++++++++-- libs/wine/port.c | 2 -- libs/wine/wine.map | 6 +++--- tools/make_unicode | 27 --------------------------- 7 files changed, 21 insertions(+), 43 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index d831f6282c..8d30e9f447 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -79,9 +79,6 @@ union cptable struct dbcs_table dbcs; }; -extern const union cptable *wine_cp_get_table( unsigned int codepage ); -extern const union cptable *wine_cp_enum_table( unsigned int index ); - extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); @@ -93,11 +90,6 @@ extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); -WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) -{ - return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); -} - WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { extern const WCHAR wine_casemap_lower[]; diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 4fc81fbbcb..6cb082838f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -68,7 +68,6 @@ C_SRCS = \ c_950.c \ casemap.c \ compose.c \ - cptable.c \ decompose.c \ ffs.c \ fstatvfs.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 569fd0869a..25cefa1c60 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -4,6 +4,7 @@ C_SRCS = \ collation.c \ config.c \ cpsymbol.c \ + cptable.c \ debug.c \ digitmap.c \ fold.c \ diff --git a/libs/port/cptable.c b/libs/wine/cptable.c similarity index 91% rename from libs/port/cptable.c rename to libs/wine/cptable.c index 89975487ec..f1191f2570 100644 --- a/libs/port/cptable.c +++ b/libs/wine/cptable.c @@ -20,6 +20,10 @@ #include <stdlib.h> +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" /* Everything below this line is generated automatically by make_unicode */ @@ -169,7 +173,7 @@ static int cmp_codepage( const void *codepage, const void *entry ) /* get the table of a given code page */ -const union cptable *wine_cp_get_table( unsigned int codepage ) +const union cptable *wine_cp_get_table_obsolete( unsigned int codepage ) { const union cptable **res; @@ -180,8 +184,19 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) /* enum valid codepages */ -const union cptable *wine_cp_enum_table( unsigned int index ) +const union cptable *wine_cp_enum_table_obsolete( unsigned int index ) { if (index >= ARRAY_SIZE( cptables )) return NULL; return cptables[index]; } + +int wine_is_dbcs_leadbyte_obsolete( const union cptable *table, unsigned char ch ) +{ + return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); +} + +__ASM_OBSOLETE(wine_cp_get_table); +__ASM_OBSOLETE(wine_cp_enum_table); +__ASM_OBSOLETE(wine_is_dbcs_leadbyte); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/port.c b/libs/wine/port.c index 1c345b5cd3..fb749bb75e 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -38,8 +38,6 @@ const void *libwine_port_functions[] = { strtolW, vsnprintfW, - wine_cp_enum_table, - wine_cp_get_table, }; /* no longer used, for backwards compatibility only */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index aeb9e2963b..3f2c430fa8 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -9,8 +9,6 @@ WINE_1.0 wine_anon_mmap; wine_casemap_lower; wine_casemap_upper; - wine_cp_enum_table; - wine_cp_get_table; wine_dlclose; wine_dll_enum_load_path; wine_dll_set_callback; @@ -32,7 +30,6 @@ WINE_1.0 wine_get_version; wine_init; wine_init_argv0_path; - wine_is_dbcs_leadbyte; wine_ldt_alloc_entries; wine_ldt_alloc_fs; wine_ldt_copy; @@ -100,6 +97,8 @@ WINE_1.0 vsprintfW; wine_call_on_stack; wine_compare_string; + wine_cp_enum_table; + wine_cp_get_table; wine_cp_mbstowcs; wine_cp_wcstombs; wine_cpsymbol_mbstowcs; @@ -115,6 +114,7 @@ WINE_1.0 wine_dll_unload; wine_fold_string; wine_get_sortkey; + wine_is_dbcs_leadbyte; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack; diff --git a/tools/make_unicode b/tools/make_unicode index c55ec5f3d7..80bf6304c3 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2556,31 +2556,6 @@ sub save_file($) } -################################################################ -# output the list of codepage tables into the cptable.c file -sub output_cptable($) -{ - my $output = shift; - my @tables_decl = (); - - printf "Building %s\n", $output; - - foreach my $file (@allfiles) - { - my ($codepage,$filename) = @$file; - push @tables_decl, sprintf("extern union cptable cptable_%03d;\n",$codepage); - } - - push @tables_decl, sprintf("\nstatic const union cptable * const cptables[%d] =\n{\n",$#allfiles+1); - foreach my $file (@allfiles) - { - my ($codepage,$filename) = @$file; - push @tables_decl, sprintf(" &cptable_%03d,\n", $codepage); - } - push @tables_decl, "};"; - REPLACE_IN_FILE( $output, @tables_decl ); -} - ################################################################ # replace the contents of a file between ### cpmap ### marks @@ -2641,8 +2616,6 @@ dump_intl_nls("nls/l_intl.nls"); foreach my $file (@allfiles) { handle_codepage_file( @{$file} ); } -output_cptable("libs/port/cptable.c"); - exit 0; # Local Variables:

1 0

Francois Gouget : testbot/Janitor: Avoid false positives when cleaning up staging.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: tools Branch: master Commit: 9d6a892b99a8757ccc8118bcfa4d782e5f1f4264 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d6a892b99a8757ccc8118b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:00 2020 +0100 testbot/Janitor: Avoid false positives when cleaning up staging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 0635b37..8d50349 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -273,10 +273,23 @@ if (opendir(my $dh, "$DataDir/staging")) if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) { - # These files always expire after one day + # We get these files whenever a developer abandons a job submission. + # So just delete them silently after a day. $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) + elsif ($Entry =~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) + { + # Janitor can only see these files if it ran during the brief interval + # between their creation and them being moved out of staging, or if + # something prevented the latter (power loss, bug, etc). So only complain + # after a day to avoid false positives. + if ($TTL >= 1) + { + my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; + Error "Found an old transient file$Deletion: staging/$Entry\n" + } + } + else { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n";

1 0

Francois Gouget : testbot/LogUtils: Share code between _SaveLogErrors() and _DumpErrors().
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: tools Branch: master Commit: 0cbb595564267b66cd7dcfeb9316a48ce286582f URL: https://source.winehq.org/git/tools.git/?a=commit;h=0cbb595564267b66cd7dcfe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:11 2020 +0100 testbot/LogUtils: Share code between _SaveLogErrors() and _DumpErrors(). _SaveLogErrors() provides more details about the errors than the old _DumpErrors() code did. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 90 ++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9bde76c..a5c6217 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -687,24 +687,6 @@ sub GetLogLabel($) return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } - -sub _DumpErrors($$) -{ - my ($Label, $LogInfo) = @_; - - print STDERR "$Label: ", join(" ", keys %$LogInfo), "\n"; - my $GroupNames = $LogInfo->{ErrGroupNames}; - print STDERR " Groups=", scalar(@$GroupNames), " [", join(",", @$GroupNames), "]\n"; - my @ErrorKeys = sort keys %{$LogInfo->{Groups}}; - print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; - foreach my $GroupName (@$GroupNames) - { - print STDERR " [$GroupName]\n"; - my $Group = $LogInfo->{Groups}->{$GroupName}; - print STDERR " [$_]\n" for (@{$Group->{Errors}}); - } -} - sub _AddLogGroup($$;$) { my ($LogInfo, $GroupName, $LineNo) = @_; @@ -859,21 +841,7 @@ sub GetLogErrors($) Loads the specified log errors file. -The file contains two types of lines: -* GroupName lines - <GroupName> - Where <GroupName> is a unique string which would typically be the name of a - WineTest dll or program, but may also be empty or be used to specify an - extra group errors. It must not start with a space. - -* Error lines - <Space> <New> <SrcLineNo> <Error> - Where: - - <Space> is a space, as well as the spaces in the line above. - - <New> is either 'n' for new errors, or 'o' for old ones. - - <SrcLineNo> is the 1-base line number of the error in the source log file. - If there is no source line then this should be 0. - - <Error> is the error message. +See _WriteLogErrors() for the format of the errors file. Returns the errors in the same format as TagNewErrors(). @@ -949,11 +917,11 @@ sub LoadLogErrors($) =pod =over 12 -=item C<_SaveLogErrors()> +=item C<_WriteLogErrors()> -Saves the LogInfo structure to <LogName>.errors. +Writes the LogInfo structure in text form to the specified file descriptor. -The file contains lines of the form: +All lines follow are of the following form: <type> <value1> <value2> The values depend on the <type> of the line. <type> and <value1> must not @@ -984,6 +952,27 @@ different type. =back =cut +sub _WriteLogErrors($$) +{ + my ($Fh, $LogInfo) = @_; + + foreach my $Name ("BadRef", "NoRef") + { + next if (!defined $LogInfo->{$Name}); + print $Fh "p $Name $LogInfo->{$Name}\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + print $Fh "g $Group->{LineNo} $GroupName\n"; + foreach my $Index (0..@{$Group->{Errors}} - 1) + { + my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; + print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; + } + } +} + sub _SaveLogErrors($) { my ($LogInfo) = @_; @@ -991,21 +980,7 @@ sub _SaveLogErrors($) my $ErrorsPath = "$LogInfo->{LogPath}.errors"; if (open(my $ErrorsFile, ">", $ErrorsPath)) { - foreach my $Name ("BadRef", "NoRef") - { - next if (!defined $LogInfo->{$Name}); - print $ErrorsFile "p $Name $LogInfo->{$Name}\n"; - } - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) - { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - print $ErrorsFile "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) - { - my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; - print $ErrorsFile "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; - } - } + _WriteLogErrors($ErrorsFile, $LogInfo); close($ErrorsFile); # Set the mtime so Janitor reaps both at the same time @@ -1015,6 +990,19 @@ sub _SaveLogErrors($) return "Could not open '$LogInfo->{LogName}.errors' for writing: $!"; } +sub _DumpErrors($$) +{ + my ($Label, $LogInfo) = @_; + + print STDERR "$Label:\n"; + foreach my $Key (sort keys %{$LogInfo}) + { + next if ($Key =~ /^(?:ErrGroupNames|ErrGroups|NewCount)$/); + print STDERR "+ $Key $LogInfo->{$Key}\n"; + } + _WriteLogErrors(*STDERR, $LogInfo); +} + # # New error detection

1 0

Francois Gouget : testbot/JobDetails: Improve the error reporting.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: tools Branch: master Commit: db7c14c09529b4b0a519fa91ba0e9fa28fd79fdb URL: https://source.winehq.org/git/tools.git/?a=commit;h=db7c14c09529b4b0a519fa9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:37 2020 +0100 testbot/JobDetails: Improve the error reporting. Clearly indicate when the log or its errors cache could not be read. Also show a note when new errors could not be detected, either because there is no reference WineTest results (which would typically happen shortly after a new test configuration has been added), or because there was an issue reading one or more of the reference reports. And don't claim there are no errors when the task has not run yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 59 +++++++++++++++++++++++++++++++++++++++------ testbot/web/WineTestBot.css | 1 + 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ccf3410..5a484da 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -351,6 +351,22 @@ sub GenerateFullLog($$$$) my ($self, $Dir, $LogName, $HideLog) = @_; my $LogInfo = LoadLogErrors("$Dir/$LogName"); + if (defined $LogInfo->{BadLog}) + { + print "<pre class='log-note'>Could not highlight new errors: ", ($LogInfo->{BadRef} || $LogInfo->{BadLog}), "</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } my %NewLineNos; if ($LogInfo->{ErrCount}) @@ -397,6 +413,11 @@ sub GenerateFullLog($$$$) } close($LogFile); } + else + { + print "<pre class='log-error'><code>Unable to open '$LogName' for reading: $!</code></pre>\n"; + $IsEmpty = 0; + } # And append the extra errors foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) @@ -535,16 +556,18 @@ EOF { next if ($LogName =~ /^old_/); my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); - next if (!$LogInfo->{ErrCount}); - $LogInfos->{$LogName} = $LogInfo; + if ($LogInfo->{ErrCount} or defined $LogInfo->{BadLog}) + { + $LogInfos->{$LogName} = $LogInfo; + } } my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogInfos) > 1); - my $LogIsEmpty = 1; + my $NoErrors = 1; foreach my $LogName (@{$MoreInfo->{Logs}}) { next if (!$LogInfos->{$LogName}); - $LogIsEmpty = 0; + $NoErrors = 0; if ($ShowLogName) { @@ -554,6 +577,24 @@ EOF } my $LogInfo = $LogInfos->{$LogName}; + if (defined $LogInfo->{BadLog}) + { + my ($_Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + print "<pre class='log-note'>The error summary is not available (<a href='$Url'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { print "<div class='LogDllName'>$GroupName</div>\n" if ($GroupName); @@ -576,9 +617,9 @@ EOF print "</code></pre>\n"; } } - - if ($LogIsEmpty) + if (!@{$MoreInfo->{Logs}}) { + # There is no log file or they are all empty if ($StepTask->Status eq "canceled") { print "No log, task was canceled\n"; @@ -589,9 +630,13 @@ EOF } else { - print "No errors\n"; + print "<pre class='log-note'>No result yet...</pre>\n"; } } + elsif ($NoErrors) + { + print "No errors\n"; + } } } print "</div>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 9a23f5f..3fccbd2 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -395,6 +395,7 @@ pre .userdisabled { color: red; } .userdeleted { color: red; } +.log-note { font-style: italic; color: blue; } .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; }

1 0

Francois Gouget : testbot: Identify testbot.log information and error messages.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: tools Branch: master Commit: 9d5bd059a2e4fa4597c3f7ce3c8104f5ba64fd29 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d5bd059a2e4fa4597c3f7c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:41 2020 +0100 testbot: Identify testbot.log information and error messages. The testbot.log error messages have no common prefix such as 'error:' which makes them hard to identify. Expand GetLogLineCategory() to identify the most important ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a5c6217..2104ffa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -86,7 +86,11 @@ sub GetLogLineCategory($) $Line =~ /^\+ \S/ or $Line =~ /^LANG=/ or $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + $Line =~ /^Task: (?:ok|tests|Updated)/ or + # testbot.log information messages + $Line =~ /^----- Run / or + $Line =~ /^The test VM has crashed/ or # Context for an error message + $Line =~ /^The previous \d+ run$s$ terminated abnormally/) { return "info"; } @@ -101,7 +105,12 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors - _IsPerlError($Line)) + _IsPerlError($Line) or + # The main testbot.log errors + $Line =~ /^An error occurred while / or + $Line =~ /^Could not create / or + $Line =~ /^Giving up after \d+ run$s$$/ or + $Line =~ /^The (?:build|task) timed out$/) { return "error"; }

1 0

Rémi Bernon : setupapi/tests: Fix some format-overflow warnings.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 1bd961219198e5c6e3ac33fffd29eb281f10448f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd961219198e5c6e3ac33ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:29 2020 +0100 setupapi/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 2 +- dlls/setupapi/tests/install.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index dcfe5cd231..a9ac0d849f 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2315,7 +2315,7 @@ static void test_get_actual_section(void) static void test_driver_list(void) { - char inf_dir[MAX_PATH], inf_path[MAX_PATH], inf_path2[MAX_PATH]; + char inf_dir[MAX_PATH], inf_path[MAX_PATH + 10], inf_path2[MAX_PATH + 10]; static const char hardware_id[] = "bogus_hardware_id\0"; static const char compat_id[] = "bogus_compat_id\0"; SP_DEVINSTALL_PARAMS_A params = {sizeof(params)}; diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 8a2f9eec35..c085b724b5 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -348,7 +348,7 @@ static void ok_registry(BOOL expectsuccess) static void test_cmdline(void) { static const char infwithspaces[] = "test file.inf"; - char path[MAX_PATH]; + char path[MAX_PATH + 16]; BOOL ret; create_inf_file(inffile, cmdline_inf); @@ -384,7 +384,7 @@ static void test_registry(void) { HKEY key; LONG res; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; BOOL ret; /* First create a registry structure we would like to be deleted */ @@ -414,7 +414,7 @@ static void test_registry(void) static void test_install_from(void) { - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HINF infhandle; HKEY key; LONG res; @@ -454,7 +454,7 @@ static void test_install_from(void) static void test_install_svc_from(void) { char inf[2048]; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HINF infhandle; BOOL ret; SC_HANDLE scm_handle, svc_handle; @@ -614,7 +614,7 @@ static void test_driver_install(void) HANDLE handle; SC_HANDLE scm_handle, svc_handle; BOOL ret; - char path[MAX_PATH], windir[MAX_PATH], driver[MAX_PATH]; + char path[MAX_PATH + 9], windir[MAX_PATH], driver[MAX_PATH]; DWORD attrs; /* Minimal stuff needed */ static const char *inf = @@ -683,7 +683,7 @@ static void test_driver_install(void) static void test_profile_items(void) { - char path[MAX_PATH], commonprogs[MAX_PATH]; + char path[MAX_PATH + 22], commonprogs[MAX_PATH]; static const char *inf = "[Version]\n" @@ -965,7 +965,7 @@ static const char dirid_inf[] = "[Version]\n" static void check_dirid(int dirid, LPCSTR expected) { char buffer[sizeof(dirid_inf)+11]; - char path[MAX_PATH], actual[MAX_PATH]; + char path[MAX_PATH + 9], actual[MAX_PATH]; LONG ret; DWORD size, type; HKEY key; @@ -1045,7 +1045,7 @@ static void test_install_files_queue(void) "[DestinationDirs]\n" "files_section=40000,dst\n"; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HSPFILEQ queue; void *context; HINF hinf; @@ -1367,7 +1367,7 @@ static void test_install_file(void) "[DestinationDirs]\n" "DefaultDestDir=40000,dst\n"; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; INFCONTEXT infctx; HINF hinf; BOOL ret; @@ -1466,7 +1466,7 @@ static void test_need_media(void) "DefaultDestDir=40000,dst\n"; SP_FILE_COPY_PARAMS_A copy_params = {sizeof(copy_params)}; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HSPFILEQ queue; HINF hinf; BOOL ret;

1 0