wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Francois Gouget : winetest/dissect: Better deal with garbled result lines.
by Alexandre Julliard 15 Nov '19

15 Nov '19

Module: tools Branch: master Commit: d3e1a150e41f19adc112ba10d62d9a18d83d8fb3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d3e1a150e41f19adc112ba1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 15 13:11:45 2019 +0100 winetest/dissect: Better deal with garbled result lines. Part of the garbage may look like it is part of the dll or unit name, for instance 09d4comdlg32 or dd3d10core. So preferentially match lines using the current dll or unit name and only use regular matches to detect misplaced lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 9ff65f8..6c6c594 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -628,9 +628,9 @@ while ($line = <IN>) { $extra_failures++; } } - elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or - ($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("failed", escapeHTML($pollution) . @@ -639,9 +639,9 @@ while ($line = <IN>) { check_unit($l_unit, "failure"); $failures++; } - elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or - ($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (Test marked todo: .*)$/)) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test marked todo: .*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("todo", escapeHTML($pollution) . @@ -650,9 +650,9 @@ while ($line = <IN>) { check_unit($l_unit, "todo"); $todo++; } - elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or - ($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (Tests skipped: .*)$/)) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (Tests skipped: .*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("skipped", escapeHTML($pollution) . @@ -661,18 +661,18 @@ while ($line = <IN>) { # Don't complain and don't count misplaced skips $skipped++ if ($units{$l_unit}); } - elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/ or - ($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/)) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("trace", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); } - elsif ($line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or - ($unit ne "" and - $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /)) + elsif (($unit ne "" and + $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /) or + $line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) { my ($l_pid, $l_unit) = ($1, $2); if ($units{$l_unit}) @@ -685,9 +685,9 @@ while ($line = <IN>) { check_unit($l_unit, "unhandled exception"); $failures++; } - elsif ($line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or - ($unit ne "" and - $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) + elsif (($unit ne "" and + $line =~ /([0-9a-f]+):($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\./) { my ($l_pid, $l_unit, $l_total, $l_todo, $l_failures, $l_skipped) = ($1, $2, $3, $4, $5, $6); @@ -709,9 +709,9 @@ while ($line = <IN>) { check_unit($l_unit, "test summary") if ($class ne "result"); } } - elsif ($line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/ or - ($dll ne "" and - $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| 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)/) { my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : testbot/LogUtils: Pids are always present so simplify the regexes.
by Alexandre Julliard 15 Nov '19

15 Nov '19

Module: tools Branch: master Commit: 5f5782228b451526fa986581f87de55d2f82729b URL: https://source.winehq.org/git/tools.git/?a=commit;h=5f5782228b451526fa98658… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 15 12:55:24 2019 +0100 testbot/LogUtils: Pids are always present so simplify the regexes. Nowadays the tests themselves always put the pid on the unhandled exception and test summary lines. And both WineTest and TestLauncher always put it on the done lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 99b1568..5e5af0e 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -414,9 +414,9 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + elsif ($Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($Cur->{Unit} ne "" and - $Line =~ /(?:([0-9a-f]+):)?($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) + $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) { my ($Pid, $Unit) = ($1, $2); @@ -429,9 +429,9 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or + elsif ($Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($Cur->{Unit} ne "" and - $Line =~ /(?:([0-9a-f]+):)?($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) + $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); @@ -451,9 +451,9 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $Unit, "test summary") if ($Todos or $Failures); } } - elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/ or + elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/ or ($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/)) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/)) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); @@ -766,7 +766,7 @@ sub GetLogErrors($) next if ($GetCategory->($Line) !~ /error/); - if ($Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) { my $Unit = $1; $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout";

1 0

Francois Gouget : winetest/dissect: Pids are always present so simplify the regexes.
by Alexandre Julliard 15 Nov '19

15 Nov '19

Module: tools Branch: master Commit: eec8b2ab031f9edc7683674d3797e0d53ee1cc31 URL: https://source.winehq.org/git/tools.git/?a=commit;h=eec8b2ab031f9edc7683674… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 15 12:55:49 2019 +0100 winetest/dissect: Pids are always present so simplify the regexes. Nowadays the tests themselves always put the pid on the unhandled exception and test summary lines. And both WineTest and TestLauncher always put it on the done lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 30f11e1..9ff65f8 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -670,9 +670,9 @@ while ($line = <IN>) { get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + elsif ($line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($units_re): unhandled exception [0-9a-fA-F]{8} at /)) + $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /)) { my ($l_pid, $l_unit) = ($1, $2); if ($units{$l_unit}) @@ -685,9 +685,9 @@ while ($line = <IN>) { check_unit($l_unit, "unhandled exception"); $failures++; } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or + elsif ($line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) + $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { my ($l_pid, $l_unit, $l_total, $l_todo, $l_failures, $l_skipped) = ($1, $2, $3, $4, $5, $6); @@ -709,9 +709,9 @@ while ($line = <IN>) { check_unit($l_unit, "test summary") if ($class ne "result"); } } - elsif ($line =~ /^([_.a-z0-9-]+):([_a-z0-9]+)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/ or + elsif ($line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/ or ($dll ne "" and - $line =~ /(\Q$dll\E):([_a-z0-9]+)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/)) + $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/)) { my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : testbot/LogUtils: Better deal with garbled result lines.
by Alexandre Julliard 15 Nov '19

15 Nov '19

Module: tools Branch: master Commit: f3bdf1781b5c79a529f8e09dad2fc063e255b495 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f3bdf1781b5c79a529f8e09… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 15 12:55:44 2019 +0100 testbot/LogUtils: Better deal with garbled result lines. The garbage may look like it is part of the dll or unit name, for instance 09d4comdlg32 or dd3d10core. So preferentially match lines using the current dll or unit name and only use regular matches to detect misplaced lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5e5af0e..282906e 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -379,23 +379,23 @@ sub ParseWineTestReport($$$) _AddError($Parser, "Misplaced $SubUnit subtest\n"); } } - elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or - ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /)) + 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): /) { _CheckUnit($Parser, $Cur, $1, "failure"); $Cur->{LineFailures}++; } - elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or - ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /)) + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: /) { _CheckUnit($Parser, $Cur, $1, "todo"); $Cur->{LineTodos}++; } - elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or - ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+: Tests skipped: /)) + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Tests skipped: /) or + $Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: /) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they @@ -414,9 +414,9 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } - elsif ($Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or - ($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) + 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 /) { my ($Pid, $Unit) = ($1, $2); @@ -429,9 +429,9 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } - elsif ($Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or - ($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) + 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\./) { my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); @@ -451,9 +451,9 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $Unit, "test summary") if ($Todos or $Failures); } } - elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/ or - ($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/)) + 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)/) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : winetest/dissect: Simplify a couple of $units_re initializations.
by Alexandre Julliard 15 Nov '19

15 Nov '19

Module: tools Branch: master Commit: 768ee9ad04311a72aa10744e02387d2f4f60929f URL: https://source.winehq.org/git/tools.git/?a=commit;h=768ee9ad04311a72aa10744… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 15 12:50:47 2019 +0100 winetest/dissect: Simplify a couple of $units_re initializations. There is no need for a join() when there is no subtest, yet. 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 1bbd78e..30f11e1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -603,7 +603,7 @@ while ($line = <IN>) { ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); %units = ($unit => 1); - $units_re = join("|", keys %units); + $units_re = $unit; $testbox = create_test_unit_box(); if ($l_type eq "skipped") @@ -728,7 +728,7 @@ while ($line = <IN>) { # and that its results may be inconsistent. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); %units = ($unit => 1); - $units_re = join("|", keys %units); + $units_re = $unit; $testbox = create_test_unit_box(); add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)");

1 0

Sven Baars : d3dcompiler/tests: Fix some d3dcompiler_47 test failures on Windows 8.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: a63a98c3884fa4d9b299450634d6aea25c3ad48b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63a98c3884fa4d9b2994506… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Nov 14 10:56:07 2019 +0100 d3dcompiler/tests: Fix some d3dcompiler_47 test failures on Windows 8. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index ca7aa7760f..810eac8936 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -118,10 +118,12 @@ static void test_reflection_references(void) expected = E_NOINTERFACE; #endif hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); - ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); + ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, + "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); + ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, + "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL);

1 0

Matteo Bruni : d3d10/tests: Add reflection test.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 1559f6013c212639e41f9555ead7c30e4d43317b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1559f6013c212639e41f9555… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 14 21:00:00 2019 +0100 d3d10/tests: Add reflection test. Share and reuse most of the d3dcompiler test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/Makefile.in | 5 +- dlls/d3d10/tests/device.c | 1 - dlls/d3dcompiler_43/tests/reflection.c | 103 +++++++++++++++++++++++++++------ 3 files changed, 88 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1559f6013c212639e41f…

1 0

Matteo Bruni : d3dcompiler/tests: Clean up test_reflection_desc_ps_output() a bit.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 6889a0c3a04e79d7da19028a3bbbc3dd066bf060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6889a0c3a04e79d7da19028a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 14 20:59:59 2019 +0100 d3dcompiler/tests: Clean up test_reflection_desc_ps_output() a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 50 ++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index fb117fd6a9..c5726198af 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -908,27 +908,28 @@ static const DWORD test_reflection_desc_ps_output_blob_5[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -static const DWORD *test_reflection_desc_ps_output_blob[] = { - test_reflection_desc_ps_output_blob_0, - test_reflection_desc_ps_output_blob_1, - test_reflection_desc_ps_output_blob_2, - test_reflection_desc_ps_output_blob_3, - test_reflection_desc_ps_output_blob_4, - test_reflection_desc_ps_output_blob_5, -}; - -static const D3D11_SIGNATURE_PARAMETER_DESC test_reflection_desc_ps_output_result[] = -{ - {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}, - {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}, -}; - static void test_reflection_desc_ps_output(void) { + static const struct test_reflection_desc_ps_output_test + { + const DWORD *blob; + D3D11_SIGNATURE_PARAMETER_DESC desc; + } + tests[] = + { + {test_reflection_desc_ps_output_blob_0, + {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}}, + {test_reflection_desc_ps_output_blob_1, + {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_2, + {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_3, + {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_4, + {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_5, + {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}}, + }; HRESULT hr; ULONG count; ID3D11ShaderReflection *ref11; @@ -936,12 +937,12 @@ static void test_reflection_desc_ps_output(void) const D3D11_SIGNATURE_PARAMETER_DESC *pdesc; unsigned int i; - for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_output_result); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - hr = pD3DReflect(test_reflection_desc_ps_output_blob[i], test_reflection_desc_ps_output_blob[i][6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "(%u): D3DReflect failed %x\n", i, hr); + hr = pD3DReflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == S_OK, "(%u): got unexpected hr %x.\n", i, hr); - pdesc = &test_reflection_desc_ps_output_result[i]; + pdesc = &tests[i].desc; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, &desc); ok(hr == S_OK, "(%u): GetOutputParameterDesc failed, got %x, expected %x\n", i, hr, S_OK); @@ -1050,7 +1051,8 @@ static void test_reflection_bound_resources(void) const D3D11_SHADER_INPUT_BIND_DESC *pdesc; unsigned int i; - hr = pD3DReflect(test_reflection_bound_resources_blob, test_reflection_bound_resources_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + hr = pD3DReflect(test_reflection_bound_resources_blob, test_reflection_bound_resources_blob[6], + &IID_ID3D11ShaderReflection, (void **)&ref11); ok(hr == S_OK, "D3DReflect failed %x\n", hr); /* check invalid cases */

1 0

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByName() method.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 44e65ebd7c9ad293c2f150ff5fad6d5f746e169f URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e65ebd7c9ad293c2f150ff… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:58 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByName() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5c08cdf5e4..820e5c239f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2093,7 +2093,29 @@ static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflectio static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByName( ID3D10ShaderReflectionConstantBuffer *iface, const char *name) { - FIXME("iface %p, name %s stub!\n", iface, name); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D10ShaderReflectionConstantBuffer(iface); + unsigned int i; + + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return &null_variable.ID3D10ShaderReflectionVariable_iface; + } + + for (i = 0; i < cb->variable_count; ++i) + { + struct d3dcompiler_shader_reflection_variable *v = &cb->variables[i]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning ID3D10ShaderReflectionVariable %p.\n", v); + return &v->ID3D10ShaderReflectionVariable_iface; + } + } + + WARN("Invalid name specified.\n"); return &null_variable.ID3D10ShaderReflectionVariable_iface; }

1 0

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByIndex() method.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: a812c1a5ef177567db2e8f8d389d2f6f32399363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a812c1a5ef177567db2e8f8d… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:57 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByIndex() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 34a9984768..5c08cdf5e4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2077,9 +2077,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetDesc static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByIndex( ID3D10ShaderReflectionConstantBuffer *iface, UINT index) { - FIXME("iface %p, index %d stub!\n", iface, index); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D10ShaderReflectionConstantBuffer(iface); - return &null_variable.ID3D10ShaderReflectionVariable_iface; + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= cb->variable_count) + { + WARN("Invalid index specified.\n"); + return &null_variable.ID3D10ShaderReflectionVariable_iface; + } + + return &cb->variables[index].ID3D10ShaderReflectionVariable_iface; } static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByName(

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
90
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 November 2019