wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Francois Gouget : testbot/LogUtils: Simplify a couple of regular expressions.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: 455f0160ccedaef1ffc246a7fbbf7052f9ed5808 URL: https://source.winehq.org/git/tools.git/?a=commit;h=455f0160ccedaef1ffc246a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:03:12 2020 +0100 testbot/LogUtils: Simplify a couple of regular expressions. 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 18ebe93..2d4e4ee 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -102,7 +102,7 @@ sub GetLogLineCategory($) $Line =~ /: error: / or $Line =~ /: undefined reference to `/ or $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^Makefile:\d+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or @@ -1048,7 +1048,7 @@ sub _GetLineKey($) $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error - $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; + $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; # Note: The 'done (258)' lines are modified by ParseWineTestReport() and # no longer contain the pid. So they need no further change here.

1 0

Francois Gouget : winetest/dissect: The done lines always contain timing information.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: 6bcbb9bd44c8f7ad18bb1a1f5d2f1ef5498ec73a URL: https://source.winehq.org/git/tools.git/?a=commit;h=6bcbb9bd44c8f7ad18bb1a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:02:26 2020 +0100 winetest/dissect: The done lines always contain timing information. Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 6c6c594..ca8648a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -710,8 +710,8 @@ while ($line = <IN>) { } } elsif (($dll ne "" and - $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) or + $line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$ in /) { my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : testbot/LogUtils: The done lines always contain timing information.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: tools Branch: master Commit: a7914bbc8ec49e8d71e6ab66aae806a0eac849f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a7914bbc8ec49e8d71e6ab6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 03:02:41 2020 +0100 testbot/LogUtils: The done lines always contain timing information. Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. 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 a95eeca..18ebe93 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -648,8 +648,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) or - $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) or + $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);

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

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

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

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

Gabriel Ivăncescu : jscript: Preserve the 'enter_notified' field when an error occurs.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 9576ff70482eff2a4359534a84059ac398f9175f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9576ff70482eff2a4359534a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:28:01 2020 +0100 jscript: Preserve the 'enter_notified' field when an error occurs. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index f97c36f5be..5e02d4f614 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -306,6 +306,7 @@ void enter_script(script_ctx_t *ctx, jsexcept_t *ei) HRESULT leave_script(script_ctx_t *ctx, HRESULT result) { jsexcept_t *ei = ctx->ei; + BOOL enter_notified = ei->enter_notified; JScriptError *error; TRACE("ctx %p ei %p prev %p\n", ctx, ei, ei->prev); @@ -333,7 +334,7 @@ HRESULT leave_script(script_ctx_t *ctx, HRESULT result) result = SCRIPT_E_REPORTED; } } - if(ei->enter_notified && ctx->site) + if(enter_notified && ctx->site) IActiveScriptSite_OnLeaveScript(ctx->site); reset_ei(ei); return result;

1 0

Gabriel Ivăncescu : jscript: Implement the SCRIPTITEM_CODEONLY flag.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f32a729032bd25f4a61956c3689dacf59958b098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32a729032bd25f4a61956c3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:26:54 2020 +0100 jscript: Implement the SCRIPTITEM_CODEONLY flag. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 197043745d..f97c36f5be 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -115,7 +115,7 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig for(item = ctx->named_items; item; item = item->next) { if((item->flags & flags) == flags && !wcscmp(item->name, item_name)) { - if(!item->disp) { + if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { IUnknown *unk; if(!ctx->site)

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
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