wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

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

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

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

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

Kevin Puetz : include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: c2679945dd1ffddbc8e8a43dc7263be7738d4a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2679945dd1ffddbc8e8a43d… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Feb 11 19:52:22 2020 +0100 include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR. This is useful for winelib applications that don't use -fshort-wchar. They may use u"" for string literals and u16string. However, C++ has builtin char16_t type, so we need WCHAR to be compatible with that. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqltypes.h | 4 +++- include/tchar.h | 4 +++- include/winnt.h | 9 ++++++--- include/winnt.rh | 6 ++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/sqltypes.h b/include/sqltypes.h index 4f3f8fe9f1..0923f6b362 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -28,8 +28,10 @@ extern "C" { #endif typedef unsigned char SQLCHAR; -#ifdef WINE_UNICODE_NATIVE +#if defined(WINE_UNICODE_NATIVE) typedef wchar_t SQLWCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t SQLWCHAR; #else typedef unsigned short SQLWCHAR; #endif diff --git a/include/tchar.h b/include/tchar.h index 5234a70bd9..d5e4983756 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -244,8 +244,10 @@ typedef unsigned short wctype_t; #endif #ifndef __TCHAR_DEFINED -#ifdef WINE_UNICODE_NATIVE +#if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t _TCHAR; #else typedef unsigned short _TCHAR; #endif diff --git a/include/winnt.h b/include/winnt.h index adc5d3d686..adb7ef5669 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -463,11 +463,14 @@ typedef int LONG, *PLONG; #endif /* Some systems might have wchar_t, but we really need 16 bit characters */ -#ifdef WINE_UNICODE_NATIVE -typedef wchar_t WCHAR, *PWCHAR; +#if defined(WINE_UNICODE_NATIVE) +typedef wchar_t WCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t WCHAR; #else -typedef unsigned short WCHAR, *PWCHAR; +typedef unsigned short WCHAR; #endif +typedef WCHAR *PWCHAR; typedef ULONG UCSCHAR; #define MIN_UCSCHAR (0) diff --git a/include/winnt.rh b/include/winnt.rh index 59791bc996..786a38f326 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -24,10 +24,12 @@ * macro which only exists in the user's code. */ #ifndef WINE_NO_UNICODE_MACROS -# ifdef UNICODE +# ifndef UNICODE +# define __TEXT(string) string +# elif defined(WINE_UNICODE_NATIVE) # define __TEXT(string) L##string # else -# define __TEXT(string) string +# define __TEXT(string) u##string # endif # define TEXT(string) __TEXT(string) #endif

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

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/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/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

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

11 Feb '20

Module: wine Branch: master Commit: d1373e8aae1b15b96e847488e4b6617789f8fb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1373e8aae1b15b96e847488… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:30 2020 +0100 shell32/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/shell32/tests/shlexec.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 12ef18c1d8..030ab54525 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1096,7 +1096,7 @@ static filename_tests_t noquotes_tests[]= static void test_lpFile_parsed(void) { - char fileA[MAX_PATH]; + char fileA[MAX_PATH + 38]; INT_PTR rc; if (skip_shlexec_tests) @@ -1549,7 +1549,7 @@ static const argify_tests_t argify_tests[] = static void test_argify(void) { - char fileA[MAX_PATH], params[2*MAX_PATH+12]; + char fileA[MAX_PATH + 18], params[2 * MAX_PATH + 28]; INT_PTR rc; const argify_tests_t* test; const char *bad; @@ -1607,7 +1607,7 @@ static void test_argify(void) static void test_filename(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH + 20]; const filename_tests_t* test; char* c; INT_PTR rc; @@ -1647,7 +1647,7 @@ static void test_filename(void) } else { - char quoted[MAX_PATH + 2]; + char quoted[MAX_PATH + 22]; quotedfile = TRUE; sprintf(quoted, "\"%s\"", filename); @@ -1873,7 +1873,7 @@ static void test_fileurls(void) static void test_urls(void) { - char url[MAX_PATH]; + char url[MAX_PATH + 15]; INT_PTR rc; if (!create_test_class("fakeproto", FALSE)) @@ -1968,7 +1968,7 @@ static void test_urls(void) static void test_find_executable(void) { char notepad_path[MAX_PATH]; - char filename[MAX_PATH]; + char filename[MAX_PATH + 17]; char command[MAX_PATH]; const filename_tests_t* test; INT_PTR rc; @@ -2114,8 +2114,8 @@ static filename_tests_t lnk_tests[]= static void test_lnks(void) { - char filename[MAX_PATH]; - char params[MAX_PATH]; + char filename[MAX_PATH + 26]; + char params[MAX_PATH + 18]; const filename_tests_t* test; INT_PTR rc; @@ -2208,7 +2208,7 @@ static void test_lnks(void) static void test_exes(void) { - char filename[MAX_PATH]; + char filename[2 * MAX_PATH + 17]; char params[1024]; INT_PTR rc; @@ -2386,7 +2386,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) static void test_dde(void) { - char filename[MAX_PATH], defApplication[MAX_PATH]; + char filename[MAX_PATH + 14], defApplication[MAX_PATH]; const dde_tests_t* test; char params[1024]; INT_PTR rc; @@ -2553,7 +2553,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) static void test_dde_default_app(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH + 14]; HSZ hszApplication; dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_default_app_tests_t* test; @@ -2655,7 +2655,7 @@ static void init_test(void) { HMODULE hdll; HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO*); - char filename[MAX_PATH]; + char filename[MAX_PATH + 26]; WCHAR lnkfile[MAX_PATH]; char params[1024]; const char* const * testfile; @@ -2812,7 +2812,7 @@ static void cleanup_test(void) static void test_directory(void) { - char path[MAX_PATH], curdir[MAX_PATH]; + char path[MAX_PATH + 10], curdir[MAX_PATH]; char params[1024], dirpath[1024]; INT_PTR rc;

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
88
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 February 2020