February 2020 - Wine-commits

Francois Gouget : testbot/Engine: Importing LogUtils is not necessary anymore.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: 4cb372688361401742ebb9291020b12c7277f88e URL: https://source.winehq.org/git/tools.git/?a=commit;h=4cb372688361401742ebb92… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:03:16 2020 +0100 testbot/Engine: Importing LogUtils is not necessary anymore. The log renaming code has been removed already. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a8fc2f0..48bb797 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -51,7 +51,6 @@ use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::LogUtils; # FIXME Temporary, for the log renaming use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::RecordGroups;

1 0

Francois Gouget : testbot/LogUtils: Don't modify ParseWineTestReport()'s timeout lines.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: 24592cf8576879d60c63a3f9b62672eaf2c4877a URL: https://source.winehq.org/git/tools.git/?a=commit;h=24592cf8576879d60c63a3f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 11:37:05 2020 +0100 testbot/LogUtils: Don't modify ParseWineTestReport()'s timeout lines. Changing the timeout lines for reporting prevented the parser from recognizing them and lead to extraneous missing failure / todo / skip errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 734d322..12decee 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -532,17 +532,18 @@ sub ParseWineTestReport($$$) if (GetReportLineCategory($Line) eq "error") { # Make the timeout messages more user-friendly - if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + my $ErrLine = $Line; + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) { my $Unit = $1; - $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; } if (!$CurGroup) { $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); } - _AddLogError($LogInfo, $CurGroup, $Line, $LineNo); + _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); } if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%)

1 0

Francois Gouget : testbot/LogUtils: Lines have no trailing CRs in ParseWineTestReport().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: cfeb9ba2cdb60b646b6e52c3a1716f678a1d2f14 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cfeb9ba2cdb60b646b6e52c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 11:37:18 2020 +0100 testbot/LogUtils: Lines have no trailing CRs in ParseWineTestReport(). The trailing CRs are removed at the start of the parser's loop. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 12decee..f7b6f42 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -546,7 +546,7 @@ sub ParseWineTestReport($$$) _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); } - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -563,7 +563,7 @@ sub ParseWineTestReport($$$) $CurGroupLineNo = $LineNo; $CurGroup = undef; } - elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) { my ($Unit, $SubUnit) = ($1, $2); if ($Cur->{Units}->{$Unit})

1 0

Francois Gouget : testbot/LogUtils: Identify invalid line numbers in the .errors file.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: 26e7a912c68a9d98fa974f0e1f758d1199a035b6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=26e7a912c68a9d98fa974f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:00:04 2020 +0100 testbot/LogUtils: Identify invalid line numbers in the .errors file. This should never happen but if it does this helps with diagnosis. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 863cca6..690bc03 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -848,9 +848,10 @@ sub LoadLogErrors($) return $LogInfo; } - my $CurGroup; + my ($LineNo, $CurGroup); foreach my $Line (<$ErrorsFile>) { + $LineNo++; chomp $Line; my ($Type, $Property, $Value) = split / /, $Line, 3; if ($Type eq "p") @@ -861,7 +862,7 @@ sub LoadLogErrors($) } else { - $LogInfo->{BadLog} = "Cannot set $Property = $Value because it is already set to $LogInfo->{$Property}"; + $LogInfo->{BadLog} = "$LineNo: Cannot set $Property = $Value because it is already set to $LogInfo->{$Property}"; last; } } @@ -871,7 +872,7 @@ sub LoadLogErrors($) } elsif (!$CurGroup) { - $LogInfo->{BadLog} = "Got a $Type line with no group"; + $LogInfo->{BadLog} = "$LineNo: Got a $Type line with no group"; last; } elsif ($Type eq "o") @@ -884,7 +885,7 @@ sub LoadLogErrors($) } else { - $LogInfo->{BadLog} = "Found an unknown line type ($Type)"; + $LogInfo->{BadLog} = "$LineNo: Found an unknown line type ($Type)"; last; } }

1 0

Francois Gouget : testbot/LogUtils: Report validation errors must not contain LFs.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: b172d243d7de8f60fa7e5e648802926ca0f02b4d URL: https://source.winehq.org/git/tools.git/?a=commit;h=b172d243d7de8f60fa7e5e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:00:12 2020 +0100 testbot/LogUtils: Report validation errors must not contain LFs. Otherwise the LF translates into an empty line in the .errors file, which is not a valid line format and gets rejected by LoadLogErrors(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 690bc03..a95eeca 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -572,7 +572,7 @@ sub ParseWineTestReport($$$) } else { - _AddExtra($LogInfo, "Misplaced $SubUnit subtest\n"); + _AddExtra($LogInfo, "Misplaced $SubUnit subtest"); } } elsif (($Cur->{Unit} ne "" and

1 0

Francois Gouget : msvcrt: Add _CRT_INT_MAX to corecrt.h.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 7df0f4a1da5a9f6406f06bc6fecb0acfbe508a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df0f4a1da5a9f6406f06bc6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 20 19:27:41 2020 +0100 msvcrt: Add _CRT_INT_MAX to corecrt.h. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index cff4549d37..ea81e95db3 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -158,6 +158,7 @@ #endif #define _ARGMAX 100 +#define _CRT_INT_MAX 0x7fffffff #ifndef _MSVCRT_LONG_DEFINED #define _MSVCRT_LONG_DEFINED

1 0

Francois Gouget : msvcrt: Old versions of _vsnprintf() treat the size as a signed int.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: c2404ba333abd08054084285191f22eba5c9f7fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2404ba333abd08054084285… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 20 19:27:49 2020 +0100 msvcrt: Old versions of _vsnprintf() treat the size as a signed int. When they see -1 they consider that the buffer is too small and return an error. So impose a 2 GB limit on sprintf() for backward compatibility with XP and 2003. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 33d33aa7b4..be8c1e485f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -286,7 +286,7 @@ static inline int WINAPIV sprintf(char *buffer, const char *format, ...) __ms_va_list args; __ms_va_start(args, format); - ret = _vsnprintf(buffer, (size_t)-1, format, args); + ret = _vsnprintf(buffer, (size_t)_CRT_INT_MAX, format, args); __ms_va_end(args); return ret; }

1 0

Nikolay Sivov : kernel32/tests: Link to activation context API directly.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: e7c735b825b504b7742fdfa991a1cbc462e9c622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7c735b825b504b7742fdfa9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 23:48:10 2020 +0300 kernel32/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 333 +++++++++++++++++-------------------------- 1 file changed, 130 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7c735b825b504b7742f…

1 0

Olivier F. R. Dierick : shell32: Move _SHCreateSymbolicLinks() above shell folders lookup functions.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 81b4dba58a241af77dc1a3dcde5092e6b1c0bd39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81b4dba58a241af77dc1a3dc… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:36 2020 +0100 shell32: Move _SHCreateSymbolicLinks() above shell folders lookup functions. Looking up shell folders creates real directories when the folder is inexistant, but the intended behavior for some folders is to create symbolic links by default. Prepare that change by moving the helper function above shell folders lookup functions. Also fix whitespace issues in the moved code. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 534 +++++++++++++++++++++++------------------------ 1 file changed, 267 insertions(+), 267 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81b4dba58a241af77dc1…

1 0

Olivier F. R. Dierick : shell32: Add helper functions for XDG directories lookup and resource deallocation.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 8c7c6e9b79c0818a5c0da0a3af812d28053bbf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7c6e9b79c0818a5c0da0a3… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:37 2020 +0100 shell32: Add helper functions for XDG directories lookup and resource deallocation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9bec7091ae..8caf68dc55 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3948,6 +3948,43 @@ end: return hr; } +/************************************************************************* + * _SHGetXDGUserDirs [Internal] + * + * Get XDG directories paths from XDG configuration. + * + * PARAMS + * xdg_dirs [I] Array of XDG directories to look for. + * num_dirs [I] Number of elements in xdg_dirs. + * xdg_results [O] An array of the XDG directories paths. + */ +static inline void _SHGetXDGUserDirs(const char * const *xdg_dirs, const unsigned int num_dirs, char *** xdg_results) { + HRESULT hr; + + hr = XDG_UserDirLookup(xdg_dirs, num_dirs, xdg_results); + if (FAILED(hr)) *xdg_results = NULL; +} + +/************************************************************************* + * _SHFreeXDGUserDirs [Internal] + * + * Free resources allocated by XDG_UserDirLookup(). + * + * PARAMS + * num_dirs [I] Number of elements in xdg_results. + * xdg_results [I] An array of the XDG directories paths. + */ +static inline void _SHFreeXDGUserDirs(const unsigned int num_dirs, char ** xdg_results) { + UINT i; + + if (xdg_results) + { + for (i = 0; i < num_dirs; i++) + heap_free(xdg_results[i]); + heap_free(xdg_results); + } +} + /************************************************************************* * _SHAppendToUnixPath [Internal] * @@ -4069,8 +4106,7 @@ static void _SHCreateSymbolicLinks(void) pszPersonal = wine_get_unix_file_name(wszTempPath); if (!pszPersonal) return; - hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); - if (FAILED(hr)) xdg_results = NULL; + _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); pszHome = getenv("HOME"); if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) @@ -4204,13 +4240,7 @@ static void _SHCreateSymbolicLinks(void) } } - /* Free resources allocated by XDG_UserDirLookup() */ - if (xdg_results) - { - for (i = 0; i < num; i++) - heap_free(xdg_results[i]); - heap_free(xdg_results); - } + _SHFreeXDGUserDirs(num, xdg_results); } /******************************************************************************

1 0