November 2019 - Wine-commits

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

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: 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: 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: 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 : kernel32: Match the Windows 10 1709+ SetConsoleFont() implementation.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: da238dc1d11cb57333de40d5ec76985c75f39130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da238dc1d11cb57333de40d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 14 00:29:58 2019 +0100 kernel32: Match the Windows 10 1709+ SetConsoleFont() implementation. That is return the same 'E_NOTIMPL' error code. Remove the todo_wine-s but keep the tests in case we want to implement the API for compatibility with old Windows versions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- dlls/kernel32/tests/console.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4c0bee2caf..a698e53efe 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1627,7 +1627,7 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index) { FIXME("(%p, %u): stub!\n", hConsole, index); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 171b2dad4d..1ecb350673 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2973,12 +2973,12 @@ static void test_SetConsoleFont(HANDLE std_output) skip("SetConsoleFont is not implemented\n"); return; } - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleFont(GetStdHandle(STD_INPUT_HANDLE), 0); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); if (!pGetNumberOfConsoleFonts)

1 0

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

14 Nov '19

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 14 Nov '19

14 Nov '19

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

Rémi Bernon : winealsa.drv: Increase buffer size to fix format-overflow warning.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: a8e7523ff164b111aedce5d8a2f0b5c07b6fb749 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e7523ff164b111aedce5d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:19 2019 +0100 winealsa.drv: Increase buffer size to fix format-overflow warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c2fe59ea79..09f98dc7b8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -631,7 +631,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, static snd_config_t *make_handle_underrun_config(const char *name) { snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[64]; + char dev_node_name[260]; const char *type_str; int err;

1 0

Rémi Bernon : winmm: Fix int-to-pointer and pointer-to-int casts warnings.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 0ef9ebde9f5ccd8eb9905c8a71a2184b61aa2610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ef9ebde9f5ccd8eb9905c8a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:23 2019 +0100 winmm: Fix int-to-pointer and pointer-to-int casts warnings. The stream pointer was used as the DWORD id, which is only going to work on 32bit. It may very well be that winmm is only used in 32bit, but then we still build a 64bit version of it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f0cd946d1..9075a78f34 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -54,6 +54,7 @@ #include "winemm.h" #include "wine/debug.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(winmm); @@ -72,12 +73,16 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct wine_rb_tree wine_midi_streams; +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry); + /************************************************************************** * WINMM_CreateIData [internal] */ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; + wine_rb_init(&wine_midi_streams, wine_midi_stream_compare); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); return psLastEvent != NULL; } @@ -924,6 +929,8 @@ typedef struct WINE_MIDIStream { WORD status; HANDLE hEvent; LPMIDIHDR lpMidiHdr; + DWORD dwStreamID; + struct wine_rb_entry entry; } WINE_MIDIStream; #define WINE_MSM_HEADER (WM_USER+0) @@ -935,12 +942,50 @@ typedef struct WINE_MIDIStream { #define MSM_STATUS_PAUSED WINE_MSM_PAUSE #define MSM_STATUS_PLAYING WINE_MSM_RESUME +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry) +{ + WINE_MIDIStream *stream = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + return memcmp(key, &stream->dwStreamID, sizeof(stream->dwStreamID)); +} + +static WINE_MIDIStream *wine_midi_stream_allocate(void) +{ + DWORD stream_id = 1; + WINE_MIDIStream *stream = NULL; + + EnterCriticalSection(&WINMM_cs); + + while (stream_id < 0xFFFFFFFF && wine_rb_get(&wine_midi_streams, &stream_id)) + stream_id++; + + if (stream_id < 0xFFFFFFFF && + (stream = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)))) + { + stream->dwStreamID = stream_id; + wine_rb_put(&wine_midi_streams, &stream_id, &stream->entry); + } + + LeaveCriticalSection(&WINMM_cs); + return stream; +} + +static void wine_midi_stream_free(WINE_MIDIStream *stream) +{ + EnterCriticalSection(&WINMM_cs); + + wine_rb_remove(&wine_midi_streams, &stream->entry); + HeapFree(GetProcessHeap(), 0, stream); + + LeaveCriticalSection(&WINMM_cs); +} + /************************************************************************** * MMSYSTEM_GetMidiStream [internal] */ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidiStrm, WINE_MIDI** lplpwm) { WINE_MIDI* lpwm = (LPWINE_MIDI)MMDRV_Get(hMidiStrm, MMDRV_MIDIOUT, FALSE); + struct wine_rb_entry *entry; if (lplpwm) *lplpwm = lpwm; @@ -949,7 +994,10 @@ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidi return FALSE; } - *lpMidiStrm = (WINE_MIDIStream*)lpwm->mod.rgIds.dwStreamID; + EnterCriticalSection(&WINMM_cs); + if ((entry = wine_rb_get(&wine_midi_streams, &lpwm->mod.rgIds.dwStreamID))) + *lpMidiStrm = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + LeaveCriticalSection(&WINMM_cs); return *lpMidiStrm != NULL; } @@ -1106,7 +1154,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI #endif if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && - ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD)lpMidiStrm) { + ((LPMIDIEVENT)lpData)->dwStreamID != lpMidiStrm->dwStreamID) { FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); @@ -1301,7 +1349,7 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) if(!ret) { lpMidiStrm->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&lpMidiStrm->lock); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); + wine_midi_stream_free(lpMidiStrm); } return midiOutClose((HMIDIOUT)hMidiStrm); @@ -1330,7 +1378,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (ret != MMSYSERR_NOERROR) return ret; - lpMidiStrm = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)); + lpMidiStrm = wine_midi_stream_allocate(); if (!lpMidiStrm) return MMSYSERR_NOMEM; @@ -1341,7 +1389,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0; - mosm.dwStreamID = (DWORD)lpMidiStrm; + mosm.dwStreamID = lpMidiStrm->dwStreamID; /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm);

1 0