March 2021 - Wine-devel - list.winehq.org

[PATCH 6/8] mshtml: Initialize HTMLImageElementFactory object with compat mode.
by Jacek Caban 11 Mar '21

11 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlimg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 5/8] mshtml: Initialize DOMEvent object with compat mode.
by Jacek Caban 11 Mar '21

11 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 12 ++++++------ dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 4/8] mshtml: Initialize HTMLAttributeCollection object with compat mode.
by Jacek Caban 11 Mar '21

11 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 3/8] mshtml: Initialize HTMLRectCollection object with compat mode.
by Jacek Caban 11 Mar '21

11 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 2/8] mshtml: Initialize HTMLRect object with compat mode.
by Jacek Caban 11 Mar '21

11 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 1/8] mshtml: Initilize attribute object with compatibility mode.
by Jacek Caban 11 Mar '21

11 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlattr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

Re: TestBot job 86609 results: [PATCH 3/4] include: Add DIPROPPOINTER definition.
by Arkadiusz Hiler 11 Mar '21

11 Mar '21

On Mon, Mar 08, 2021 at 07:07:01AM -0600, Marvin wrote: > VM Status Failures Command > debiant2 failed 10 > debiant2 failed 10 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=86609 > > > === debiant2 (32 bit report) === > > dinput: > mouse.c:152: Test failed: Failed: 00000001 > mouse.c:158: Test failed: Failed: 80070005 > mouse.c:161: Test failed: Failed: 00000001 > mouse.c:164: Test failed: Failed: 80070005 > mouse.c:178: Test failed: GetDeviceData() failed: 00000000 cnt:0 > > === debiant2 (32 bit Chinese:China report) === > > dinput: > mouse.c:152: Test failed: Failed: 00000001 > mouse.c:158: Test failed: Failed: 80070005 > mouse.c:161: Test failed: Failed: 00000001 > mouse.c:164: Test failed: Failed: 80070005 > mouse.c:178: Test failed: GetDeviceData() failed: 00000000 cnt:0 > > === debiant2 (32 bit WoW report) === > > dinput: > mouse.c:152: Test failed: Failed: 00000001 > mouse.c:158: Test failed: Failed: 80070005 > mouse.c:161: Test failed: Failed: 00000001 > mouse.c:164: Test failed: Failed: 80070005 > mouse.c:178: Test failed: GetDeviceData() failed: 00000000 cnt:0 > > === debiant2 (64 bit WoW report) === > > dinput: > mouse.c:152: Test failed: Failed: 00000001 > mouse.c:158: Test failed: Failed: 80070005 > mouse.c:161: Test failed: Failed: 00000001 > mouse.c:164: Test failed: Failed: 80070005 > mouse.c:178: Test failed: GetDeviceData() failed: 00000000 cnt:0 Those tests got run by the bot because of dinput.h change, but there no difference in behaviour vs the current upstream. Clean run: https://testbot.winehq.org/JobDetails.pl?Key=86616#k301 -- Cheers, Arek

2 1

[PATCH] configure: Use -Winit-self if possible.
by Zebediah Figura 11 Mar '21

11 Mar '21

This protects against variable initialization like "int x = x". gcc apparently treats this as an intentional way to suppress uninitialized or unused variable warnings, but in my case it has caused at least one confusing bug. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index b282cc76657..534c7c2d965 100644 --- a/configure.ac +++ b/configure.ac @@ -1045,6 +1045,7 @@ then WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers]) + WINE_TRY_CROSSCFLAGS([-Winit-self]) WINE_TRY_CROSSCFLAGS([-Wpacked-not-aligned],[EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-packed-not-aligned"]) WINE_TRY_CROSSCFLAGS([-Wpragma-pack],[EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-pragma-pack"]) WINE_TRY_CROSSCFLAGS([-Wshift-overflow=2]) @@ -2025,6 +2026,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Winit-self]) WINE_TRY_CFLAGS([-Wpacked-not-aligned],[EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned"]) WINE_TRY_CFLAGS([-Wpragma-pack],[EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack"]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) -- 2.20.1

1 0

[tools 1/2] testbot/LogUtils: Add support for WINETEST_TIME reports.
by Francois Gouget 11 Mar '21

11 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 47 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ed5dd74d4..e93eac01b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -314,14 +314,14 @@ sub GetReportLineCategory($) { my ($Line) = @_; - if ($Line =~ /: Test marked todo: /) + if ($Line =~ /:[0-9]* Test marked todo: /) { return "todo"; } - if ($Line =~ /: Tests skipped: / or + if ($Line =~ /:[0-9.]* Tests skipped: / or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped / or - $Line =~ /^[_.a-z0-9-]+:\d+: Line has been silenced after \d+ occurrences$/ or - $Line =~ /^[0-9a-f]+:[_a-z0-9]+: Silenced \d+ todos, \d+ skips and \d+ traces\.$/) + $Line =~ /^[_.a-z0-9-]+:\d+:[0-9.]* Line has been silenced after \d+ occurrences$/ or + $Line =~ /^[0-9a-f]+:[_a-z0-9]+:[0-9.]* Silenced \d+ todos, \d+ skips and \d+ traces\.$/) { return "skip"; } @@ -558,8 +558,8 @@ sub ParseWineTestReport($$$) $Cur->{Group} = undef; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Subtest ([_a-z0-9]+)/) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Subtest ([_a-z0-9]+)/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Subtest ([_a-z0-9]+)/) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Subtest ([_a-z0-9]+)/) { my ($Unit, $SubUnit) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "$SubUnit subtest"); @@ -567,23 +567,23 @@ sub ParseWineTestReport($$$) $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: /) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Test marked todo: /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test marked todo: /) { _CheckUnit($LogInfo, $Cur, $1, "todo"); $Cur->{LineTodos}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Tests skipped: /) or - $Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: /) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* Tests skipped: /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Tests skipped: /) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they @@ -604,16 +604,16 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: IgnoreExceptions=([01])/) or - $Line =~ /^([_.a-z0-9]+)\.c:\d+: IgnoreExceptions=([01])/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* IgnoreExceptions=([01])/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+:[0-9.]* IgnoreExceptions=([01])/) { my ($Unit, $Ignore) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "ignore exceptions"); $Cur->{IgnoreExceptions} = $Ignore; } elsif (($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /) or - $Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) + $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) or + $Line =~ /^([0-9a-f]+):([_.a-z0-9]+):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) { my ($Pid, $Unit) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); @@ -641,8 +641,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or - $Line =~ /^([_.a-z0-9]+)\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) { my ($Unit, $Pid) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); @@ -659,8 +659,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or - $Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) + $Line =~ /([0-9a-f]+):($Cur->{Unit}):[0-9.]* \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or + $Line =~ /^([0-9a-f]+):([_a-z0-9]+):[0-9.]* \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) { my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); @@ -1143,15 +1143,16 @@ sub _GetLineKey($) $Line =~ s/ +$//; # Remove the line number - $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block):)/$1$2/ + $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( Test (?:failed|succeeded inside todo block):)/$1$2/ or $Line =~ s/^([._a-zA-Z0-9-]+:)\d+(: recipe for target )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ # or the process id in Wine's exc_filter() lines - or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ + or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+:)[0-9.]*( unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1$2/ # or child process id - or $Line =~ s/^([_a-z0-9]+\.c:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ + or $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ + # The exact amount of data printed does not change the error or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; -- 2.20.1

1 2

[PATCH v2] winevulkan: Fix 64bit enums on old gcc versions.
by Georg Lehmann 11 Mar '21

11 Mar '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1d739c12cae..3ad210e4701 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -405,7 +405,13 @@ class VkEnum(object): def create_alias(self, name, alias_name): """ Create an aliased value for this enum """ - self.add(VkEnumValue(name, self.bitwidth, alias=alias_name)) + # Older GCC versions need a literal to initialize a static const uint64_t + # which is what we use for 64bit bitmasks. + if self.bitwidth == 64: + alias = next(x for x in self.values if x.name == alias_name) + self.add(VkEnumValue(name, self.bitwidth, value=alias.value, hex=alias.hex, alias=alias_name)) + else: + self.add(VkEnumValue(name, self.bitwidth, alias=alias_name)) def create_value(self, name, value): """ Create a new value for this enum """ @@ -475,14 +481,14 @@ class VkEnumValue(object): def __repr__(self): postfix = "ull" if self.bitwidth == 64 else "" - if self.is_alias(): + if self.is_alias() and self.value == None: return "{0}={1}".format(self.name, self.alias) return "{0}={1}{2}".format(self.name, self.value, postfix) def definition(self): """ Convert to text definition e.g. VK_FOO = 1 """ postfix = "ull" if self.bitwidth == 64 else "" - if self.is_alias(): + if self.is_alias() and self.value == None: return "{0} = {1}".format(self.name, self.alias) # Hex is commonly used for FlagBits and sometimes within -- 2.30.2

1 0