November 2019 - Wine-Commits

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

Nov. 15, 2019

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 : winetest/dissect: Simplify a couple of $units_re initializations.
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

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

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

Nov. 15, 2019

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: Better deal with garbled result lines.
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

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 : testbot/LogUtils: Pids are always present so simplify the regexes.
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

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

Erich E. Hoover : msvcrt: Fix scanf file locking when returning EOF.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 925a88d1f701da76974eb967fd799152b25d6613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=925a88d1f701da76974eb967… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Nov 13 14:52:51 2019 -0700 msvcrt: Fix scanf file locking when returning EOF. Fixes regression introduced in 0a89a699135802b083d142130d3b0ef618485478. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48087 Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e2f216110d..de2a2af975 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -489,6 +489,7 @@ _FUNCTION_ { } /* if we have reached the EOF and output nothing then report EOF */ if (nch==_EOF_ && rd==0 && st==0) { + _UNLOCK_FILE_(file); return _EOF_RET; } /* terminate */ @@ -524,6 +525,7 @@ _FUNCTION_ { #if _MSVCR_VER >= 80 /* if we have reached the EOF and output nothing then report EOF */ if (nch==_EOF_ && rd==0 && st==0) { + _UNLOCK_FILE_(file); return _EOF_RET; } #endif

1 0

Hans Leidekker : shell32: Fix definitions for FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 on 64-bit.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 3ca6b296dac2856e0280503d0cdd40b9b4e4e7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ca6b296dac2856e0280503d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 14 13:24:09 2019 +0100 shell32: Fix definitions for FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 12 ++++++++++++ dlls/shell32/tests/shellpath.c | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8c6e8a89b2..d9d65cbaed 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2697,9 +2697,15 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x54 */ &FOLDERID_ProgramFilesX64, +#ifdef _WIN64 + CSIDL_Type_CurrVer, + ProgramFilesDirW, + Program_FilesW, +#else CSIDL_Type_NonExistent, NULL, NULL, +#endif KF_CATEGORY_FIXED, /* category */ ProgramFilesX64W, /* name */ @@ -2717,9 +2723,15 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x55 */ &FOLDERID_ProgramFilesCommonX64, +#ifdef _WIN64 + CSIDL_Type_CurrVer, + ProgramFilesCommonX64W, + Program_Files_Common_FilesW, +#else CSIDL_Type_NonExistent, NULL, NULL, +#endif KF_CATEGORY_FIXED, /* category */ ProgramFilesCommonX64W, /* name */ diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f768f44c8b..262714a9f3 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1932,6 +1932,28 @@ if (0) { /* crashes */ hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesX64, 0, NULL, &path); +#ifdef _WIN64 + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(path != NULL, "path not set\n"); + CoTaskMemFree(path); +#else + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "path set\n"); +#endif + + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesCommonX64, 0, NULL, &path); +#ifdef _WIN64 + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "path not set\n"); + CoTaskMemFree(path); +#else + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "path set\n"); +#endif } static BOOL is_in_strarray(const WCHAR *needle, const char *hay)

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetLight().
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 0914a2f2af31f118d9ab5f3eac438604de6baf18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0914a2f2af31f118d9ab5f3e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 13 21:47:50 2019 -0600 ddraw: Handle stateblocks in d3d_device7_SetLight(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e2643e6589..55a9c6b6a1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5545,7 +5545,9 @@ static HRESULT d3d_device7_SetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3 wined3d_mutex_lock(); /* Note: D3DLIGHT7 is compatible with struct wined3d_light. */ - hr = wined3d_device_set_light(device->wined3d_device, light_idx, (struct wined3d_light *)light); + hr = wined3d_stateblock_set_light(device->update_state, light_idx, (const struct wined3d_light *)light); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_light(device->wined3d_device, light_idx, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr);

1 0

Alistair Leslie-Hughes : dmstyle: Free list when Style track is destroyed.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: eeca42b32f5f0d792e373d512b8338e350131131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeca42b32f5f0d792e373d51… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 14 20:40:25 2019 +0100 dmstyle: Free list when Style track is destroyed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/styletrack.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 496e0c5ba7..cc15bd81d1 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -20,6 +20,8 @@ #include "dmstyle_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -80,7 +82,18 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list *cursor, *cursor2; + DMUS_PRIVATE_STYLE_ITEM *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_STYLE_ITEM, entry); + list_remove(cursor); + + IDirectMusicStyle8_Release(item->pObject); + heap_free(item); + } + + heap_free(This); DMSTYLE_UnlockModule(); }

1 0

Alistair Leslie-Hughes : dmime: Free list when SegTrigger track is destroyed.
by Alexandre Julliard Nov. 14, 2019

Nov. 14, 2019

Module: wine Branch: master Commit: 71b433bfed082486956eebd901f13ff9c42bd5dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b433bfed082486956eebd9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 14 20:40:27 2019 +0100 dmime: Free list when SegTrigger track is destroyed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 4b3a71c9a4..3050a5031b 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -21,6 +21,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -81,7 +83,19 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list *cursor, *cursor2; + DMUS_PRIVATE_SEGMENT_ITEM *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_SEGMENT_ITEM, entry); + list_remove(cursor); + + if (item->pObject) + IDirectMusicObject_Release(item->pObject); + heap_free(item); + } + + heap_free(This); DMIME_UnlockModule(); }

1 0