December 2019 - Wine-Devel - list.winehq.org

[PATCH] msvcrt: Improve strtod precision.

by Piotr Caban

This patch fixes strtod precision regression. It also removes floating points operations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 157 ++++++++++++++++++++++++----------- dlls/ucrtbase/tests/string.c | 20 +++-- 3 files changed, 123 insertions(+), 55 deletions(-)

Dec. 30, 2019

[PATCH] msvcrt: Improve strtod precision.

by Piotr Caban

This patch fixes strtod precision regression. It also removes floating points operations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 157 ++++++++++++++++++++++++----------- dlls/ucrtbase/tests/string.c | 20 +++-- 3 files changed, 123 insertions(+), 55 deletions(-)

Dec. 30, 2019

[PATCH] testbot/LobUtils: Update the ParseTaskLog() Perl documentation.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ac0eae63e..9de11d1a5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -78,6 +78,10 @@ Returns a hashtable containing a summary of the task log: =item Task Either 'ok' if the task was successful or a code indicating why it failed. +=item TestLauncher.exe... +Entries named after the binaries and files of interest to the TestBot that +have been updated. + =item NoLog Contains an error message if the task log could not be read. -- 2.20.1

Dec. 30, 2019

[PATCH] testbot/LogUtils: Ignore the pid when comparing exception messages.

by Francois Gouget

When the test framework detects and exception it includes the process id in the failure message to help diagnose if the failure happened in the main test process or one of its subprocesses. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c57742691..a3fa12b58 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -868,6 +868,8 @@ sub _GetLineKey($) # Remove the crash code address: it changes whenever the test is recompiled $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + # and the process id + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/; # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; -- 2.20.1

Dec. 30, 2019

[PATCH 2/2] testbot/LogUtils: Tag the "too much data" error byte count as variable.

by Francois Gouget

This will eventually allow removing a special case in GetLineKey(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0489f3e5b..2f230b521 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -285,7 +285,7 @@ sub _CloseTestUnit($$$) if ($Cur->{UnitSize} > $MaxUnitSize) { - _AddError($Parser, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); + _AddError($Parser, "prints too much data (($Cur->{UnitSize} bytes))", $Cur); } if (!$Cur->{IsBroken} and defined $Cur->{Rc}) { -- 2.20.1

Dec. 29, 2019

[PATCH 1/2] testbot/LogUtils: Ignore the variable parts of failure messages.

by Francois Gouget

Some failure messages have to include elements that change with every run in order to allow diagnosing. But this makes the failure message look different with every run, thus breaking the detection of new failures. So such 'variable' parts can now be enclosed in double parentheses, for instance "((0x2d))", to let the TestBot know it should ignore this part when comparing failure messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48209 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I'm open to other ways to identify the variable parts. testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c57742691..0489f3e5b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -863,6 +863,10 @@ sub _GetLineKey($) my ($Line) = @_; return undef if (!defined $Line); + # Remove variable parts. + # Use a non-greedy match to ensure the ignored part does not contain '))'. + $Line =~ s/$\(.+?$\)/(())/g; + # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; -- 2.20.1

Dec. 29, 2019

[PATCH] testbot/WineRun*: Trace the disconnection in all WineRun* scripts.

by Francois Gouget

It was already present in WineRunWineTest. There is no reason for it to be the exception. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 ++ testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 2 ++ 3 files changed, 5 insertions(+) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ccbba3bbf..f33b7bde6 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -491,6 +491,8 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) } } } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 985d9312e..9b0b479ee 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -507,6 +507,7 @@ if ($NewStatus eq "completed") } } +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index a324265eb..6a30de3d3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -582,6 +582,8 @@ elsif (!defined $TAError) { $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); } + +Debug(Elapsed($Start), " Disconnecting\n"); $TA->Disconnect(); -- 2.20.1

Dec. 29, 2019

[PATCH] testbot/Janitor: Document where filenames are untainted.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 139faea94..35500e1f0 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -261,7 +261,7 @@ if (opendir(my $dh, "$DataDir/staging")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); - $Entry =~ m%^([^/]+)$%; + $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5); -- 2.20.1

Dec. 29, 2019

[PATCH] testbot/Janitor: Update the list of files to keep in latest/.

by Francois Gouget

TestAgentd.exe and wine-parentsrc.txt were missing from the list, resulting in error messages in the log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c51637a19..139faea94 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -307,6 +307,13 @@ if (opendir(my $dh, "$DataDir/latest")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); + # Needed to analyze Wine patches + next if ($Entry eq "winefiles.txt" or $Entry eq "wine-parentsrc.txt"); + # Needed to update Windows VMs + next if ($Entry eq "TestAgentd.exe"); + # Needed to run the tests + next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); + next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { @@ -315,10 +322,6 @@ if (opendir(my $dh, "$DataDir/latest")) my $VMName = $1; next if ($AllVMs->GetItem($VMName)); } - elsif ($Entry =~ /^(?:TestLauncher[0-9]*\.exe|winefiles.txt|winetest[0-9]*-latest\.exe)$/) - { - next; - } Trace "Found a suspicious latest file: $Entry\n"; if ($JobPurgeDays != 0) -- 2.20.1

Dec. 29, 2019

[PATCH] tests: Trace elapsed time when $WINETEST_TIME is set.

by Francois Gouget

This simplifies narrowing down where a test gets stuck or is slow if it times out but prints few messages. Note that the elapsed time is relative to the current process start time. So subprocesses will have a different elapsed time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48094 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't see a good alternative to passing the main start time to subprocesses without using an environment variable. Using a temporary file or shared memory would be too much trouble for too little gain. So in this version each process uses its own start time as a reference for the elapsed time. Subprocesses will use a different elapsed time but that's just something to keep in mind when analysing the traces. Reference: https://www.winehq.org/pipermail/wine-devel/2019-December/156960.html include/wine/test.h | 55 +++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index a919ce81d68..ae0a130fa62 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -56,6 +56,9 @@ /* debug level */ extern int winetest_debug; +/* trace timing information */ +extern int winetest_time; + /* running in interactive mode? */ extern int winetest_interactive; @@ -202,6 +205,10 @@ extern const struct test winetest_testlist[]; /* debug level */ int winetest_debug = 1; +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + /* interactive mode? */ int winetest_interactive = 0; @@ -272,11 +279,20 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +const char *winetest_elapsed(void) +{ + DWORD now; + + if (!winetest_time) return ""; + winetest_last_time = now = GetTickCount(); + return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); +} + void winetest_subtest( const char* name ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Subtest %s\n", - data->current_file, data->current_line, name); + printf( "%s:%d:%s Subtest %s\n", + data->current_file, data->current_line, name, winetest_elapsed()); } int broken( int condition ) @@ -302,8 +318,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test succeeded inside todo block: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -312,8 +328,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test marked todo: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -324,17 +340,20 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d: Test failed: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test failed: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success) - printf( "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + if (winetest_report_success || + (winetest_time && GetTickCount() >= winetest_last_time + 1000)) + { + printf( "%s:%d:%s Test succeeded\n", + data->current_file, data->current_line, winetest_elapsed() ); + } InterlockedIncrement(&successes); return 1; } @@ -357,7 +376,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_debug > 0) { - printf( "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -368,7 +387,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); skipped++; } @@ -505,8 +524,8 @@ static int run_test( const char *name ) if (winetest_debug) { - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", @@ -531,8 +550,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) struct tls_data *data = get_tls_data(); if (data->current_file) - printf( "%s:%d: this is the last test seen before the exception\n", - data->current_file, data->current_line ); + printf( "%s:%d:%s this is the last test seen before the exception\n", + data->current_file, data->current_line, winetest_elapsed() ); printf( "%04x:%s: unhandled exception %08x at %p\n", GetCurrentProcessId(), current_test->name, ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); @@ -570,6 +589,8 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); + winetest_last_time = winetest_start_time = GetTickCount(); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); -- 2.20.1

Dec. 29, 2019

[PATCH] user32/tests: Don't trace the test_topmost() window handles.

by Francois Gouget

They change from one run to the next, causing the failures to always look new. Also for the topmost failures the window handle is irrelevant: all that matters is which window got the wrong results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See the Windows XP failures: https://test.winehq.org/data/fa97cbdf14883fb301dcc0a5264369f8ed184182/xp_fg… For instance: win.c:10896: Test failed: hwnd 02B4007C topmost state is wrong win.c:10899: Test failed: 02B4007C: expected NOT topmost win.c:11126: Test failed: hwnd 00180266 topmost state is wrong dlls/user32/tests/win.c | 278 ++++++++++++++++++++-------------------- 1 file changed, 139 insertions(+), 139 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index bb4eebfd0fa..46784cec43f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10809,99 +10809,99 @@ static void test_topmost(void) state[1] = hwnd; state[2] = hwnd2; - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, 0, hwnd2, owner, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd2, hwnd); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, hwnd2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd2, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(owner, HWND_TOPMOST); todo_wine - ok(is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(owner), "owner should be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(is_topmost(hwnd2), "hwnd2 should be topmost\n"); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd2 should NOT be topmost\n"); if (0) /*win7 64-bit is broken*/ check_z_order(hwnd, hwnd2, 0, owner, FALSE); swp_after(hwnd2, HWND_NOTOPMOST); - ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_BOTTOM); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, hwnd2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); /* FIXME: compensate todo_wine above */ swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); reset_window_state(state, ARRAY_SIZE(state)); @@ -10921,161 +10921,161 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ state[4] = hwnd_child; state[5] = hwnd_grandchild; - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(is_topmost(hwnd), "hwnd should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(is_topmost(hwnd_child), "child should be topmost\n"); todo_wine - ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child2), "child2 should be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, TRUE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_grandchild, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_TOP); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_grandchild, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); swp_after(hwnd_child2, HWND_NOTOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ @@ -11083,23 +11083,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, HWND_BOTTOM); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, 0, hwnd2, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ @@ -11107,23 +11107,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ reset_window_state(state, ARRAY_SIZE(state)); swp_after(hwnd_child, HWND_TOPMOST); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); todo_wine - ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); - ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(is_topmost(hwnd_child), "child should be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); + ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd_child, hwnd_child2); - ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); - ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); - ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); - ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(owner), "owner should NOT be topmost\n"); + ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n"); + ok(!is_topmost(hwnd_child), "child should NOT be topmost\n"); + ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n"); todo_wine - ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n"); if (!is_wine) /* FIXME: remove once Wine is fixed */ check_z_order(hwnd, hwnd2, 0, owner, FALSE); if (!is_wine) /* FIXME: remove once Wine is fixed */ -- 2.20.1

Dec. 29, 2019

[PATCH] msvcp140/tests: Don't trace the current time.

by Francois Gouget

This causes the failure to always look new and the last_write_time value does not really seem useful. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This also only fails on my box, but it does not change the fact that a failure will always look new. dlls/msvcp140/tests/msvcp140.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 751b1beed86..35a650ddbae 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1239,8 +1239,7 @@ static void test_Last_write_time(void) newtime = last_write_time + 222222; p_Set_last_write_time(f1W, newtime); ok(last_write_time != p_Last_write_time(f1W), - "last_write_time should have changed: %s\n", - wine_dbgstr_longlong(last_write_time)); + "last_write_time should have changed\n"); /* test the formula */ file = CreateFileW(f1W, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, -- 2.20.1

Dec. 29, 2019

Re: [PATCH] user32/tests: Fix a test failure on Windows < Vista.

by Sven Baars

On 29-12-2019 06:22, Zebediah Figura wrote: > On 12/28/19 3:42 PM, Sven Baars wrote: >> On 28-12-2019 19:09, Zebediah Figura wrote: >>> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >>> --- >>> dlls/user32/tests/winstation.c | 15 +++++++++++---- >>> 1 file changed, 11 insertions(+), 4 deletions(-) >> >> >> Hey Zeb, >> >> I looked into this test failure before, and found that it used to work >> on Vista and XP, but then just started failing at some point. So I was >> trying to find the cause of this instead of just skipping the test. Did >> you manage to figure this out? I'm not against skipping it or something, >> since it may as well have been a testbot update that caused this, but >> I'm just curious. > > Hmm, I wasn't aware of that, no. Do you know when the failure started? Well, the tests still succeeded in March and April it seems (at least sometimes): https://web.archive.org/web/20190422232113/http://test.winehq.org/data/

Dec. 29, 2019

Re: [PATCH] user32/tests: Fix a test failure on Windows < Vista.

by Zebediah Figura

On 12/28/19 3:42 PM, Sven Baars wrote: > On 28-12-2019 19:09, Zebediah Figura wrote: >> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >> --- >> dlls/user32/tests/winstation.c | 15 +++++++++++---- >> 1 file changed, 11 insertions(+), 4 deletions(-) > > > Hey Zeb, > > I looked into this test failure before, and found that it used to work > on Vista and XP, but then just started failing at some point. So I was > trying to find the cause of this instead of just skipping the test. Did > you manage to figure this out? I'm not against skipping it or something, > since it may as well have been a testbot update that caused this, but > I'm just curious. Hmm, I wasn't aware of that, no. Do you know when the failure started? > > Best, > Sven >

Dec. 29, 2019

Re: [PATCH] user32/tests: Fix a test failure on Windows < Vista.

by Sven Baars

On 28-12-2019 19:09, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/user32/tests/winstation.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) Hey Zeb, I looked into this test failure before, and found that it used to work on Vista and XP, but then just started failing at some point. So I was trying to find the cause of this instead of just skipping the test. Did you manage to figure this out? I'm not against skipping it or something, since it may as well have been a testbot update that caused this, but I'm just curious. Best, Sven

Dec. 28, 2019

[PATCH] user32/tests: Fix a test failure on Windows < Vista.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/winstation.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index aaa51d560ac..233ce966355 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -68,7 +68,10 @@ static HDESK initial_desktop; static DWORD CALLBACK thread( LPVOID arg ) { HDESK d1, d2; - HWND hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); ok( hwnd != 0, "CreateWindow failed\n" ); d1 = GetThreadDesktop(GetCurrentThreadId()); trace( "thread %p desktop: %p\n", arg, d1 ); @@ -92,9 +95,13 @@ static DWORD CALLBACK thread( LPVOID arg ) "bad last error %d\n", GetLastError() ); DestroyWindow( hwnd ); - ok( SetThreadDesktop( d2 ), "set thread desktop failed\n" ); - d1 = GetThreadDesktop(GetCurrentThreadId()); - ok( d1 == d2, "GetThreadDesktop did not return set desktop %p/%p\n", d1, d2 ); + ret = SetThreadDesktop( d2 ); + ok(ret || broken(!ret) /* < Vista */, "failed to set desktop, error %u\n", GetLastError()); + if (ret) + { + d1 = GetThreadDesktop(GetCurrentThreadId()); + ok( d1 == d2, "GetThreadDesktop did not return set desktop %p/%p\n", d1, d2 ); + } print_object( d2 ); if (arg < (LPVOID)5) { -- 2.24.0

Dec. 28, 2019

Wine staging 5.0 rc3 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc3 (865 patches are applied to wine vanilla) This release has a completely new set of rawinput patch, so enjoy. Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Fix free area search outside of reserved area in map_view() for non-zero bitmask. Added: * [48338] gdiplus: Improve GdipCreateBitmapFromHBITMAP support for GIF images. * [40649] activeds: Implement ADsOpenObject. Updated: * directmanipulation-new-dll * user32-rawinput Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

Dec. 28, 2019

Re: Bugs To Fix?

by Thales

Hello Michael, I've been working on regressions as a result of your post, and learning the ropes along the way. Thanks,...John Alway On Tuesday, December 17, 2019, 02:42:14 PM CST, Michael Stefaniuc <mstefani(a)winehq.org> wrote: Hello John, On 12/17/19 12:03 AM, Thales wrote: > What are some of the most important bugs that need fixing? I would personally I consider regressions to be more important than other bugs. Feel free to grab one from https://source.winehq.org/regressions Doing a regression test for one of the "61 regressions without commit id" is also a good task for somebody that wants to help out. bye michael > like to take a crack at one or more. I've been looking at Bugzilla and > there's quite a bit there to sift through. > > > Thanks for any feedback! > > ...John Alway

Dec. 28, 2019

Re: msvcrt:scanf float conversion behavior

by Piotr Caban

On 12/27/19 6:13 PM, Erich E. Hoover wrote: > I don't see this test, so I popped it in really quick and I'm getting 1 > ulp with the patch (4 without). I've copied part of the test strings only, sorry for that: 4.0621786324484881721115322e-53 (this one has problems in current wine) 1.5475148155234508405655166e-252 (this one has problems with the scanf patch you have attached) I'm currently in the middle of testing a different approach to solving that so I can't easily run the tests now. For the "4.06..." test I'm getting following failure: got 4.0621786324484868e-053, expected 4.0621786324484882e-053 (diff -3) where the first number is what Wine's strtod implementation returned and second one is how compiler parses the number during compilation. Thanks, Piotr

Dec. 27, 2019

[PATCH] quartz/tests: Skip the IVideoWindow tests if connecting returns E_FAIL.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3024fa84ef..d3d8893cb5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2267,7 +2267,13 @@ static void test_video_window(void) testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_GetAllocator(input, &allocator); @@ -2302,8 +2308,6 @@ static void test_video_window(void) hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height); todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -2324,6 +2328,7 @@ static void test_video_window(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); +out: IMediaControl_Release(control); IFilterGraph2_Release(graph); IVideoWindow_Release(window); -- 2.24.1

Dec. 27, 2019

Re: [PATCH 3/3] user32/tests: Work around failures on Windows 10 version 1607.

by Zebediah Figura

On 12/27/19 11:20 AM, Marvin wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=62628 > > Your paranoid android. > > > === w2003std (task log) === > > Task errors: > The task timed out > I'm not sure why it doesn't show up on test.winehq.org, but this seems to be preëxisting: <https://testbot.winehq.org/JobDetails.pl?Key=62629>

Dec. 27, 2019

[PATCH] ntdll/tests: Fix some test failures with Windows 10.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/reg.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9bb8d25020..51562786e9 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -387,7 +387,9 @@ todo_wine /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtOpenKey Failed: 0x%08x\n", status); + if (!status) pNtClose( key ); attr.Attributes = OBJ_CASE_INSENSITIVE; status = pNtOpenKey(&key, KEY_READ, &attr); @@ -615,8 +617,9 @@ static void test_NtCreateKey(void) attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); @@ -926,14 +929,14 @@ static void test_NtQueryLicenseKey(void) len = 0xbeef; status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); type = 0xdead; len = 0xbeef; status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n"); ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); pRtlFreeUnicodeString(&name); @@ -1291,7 +1294,7 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); attr.ObjectName = &link_str; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, + ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID /* Win10 1607+ */, "NtOpenKey wrong status 0x%08x\n", status ); key = (HKEY)0xdeadbeef; @@ -1320,8 +1323,10 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_NAME_TOO_LONG, - "NtOpenKey failed: 0x%08x\n", status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND /* XP */ + || status == STATUS_NAME_TOO_LONG + || status == STATUS_INVALID_PARAMETER /* Win10 1607+ */, + "NtOpenKey failed: 0x%08x\n", status ); attr.Attributes = OBJ_OPENLINK; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); -- 2.24.1

Dec. 27, 2019

Re: [PATCH 3/3] user32/tests: Work around failures on Windows 10 version 1607.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62628 Your paranoid android. === w2003std (task log) === Task errors: The task timed out

Dec. 27, 2019

Re: msvcrt:scanf float conversion behavior

by Erich E. Hoover

On Fri, Dec 27, 2019 at 4:48 AM Piotr Caban <piotr.caban(a)gmail.com> wrote: > > On 12/27/19 4:41 AM, Erich E. Hoover wrote: > > On Thu, Dec 26, 2019 at 7:05 AM Piotr Caban <piotr.caban(a)gmail.com> wrote: > >> ... > >> I was working on different strtod implementation (ucrtbase (as well as > >> glibc) uses sub 0.5 ulp precision algorithm). It's not ready yet. Also > >> it's not something that can be added during code-freeze. Yeah, my approach was to try and get something that can cope with the 53-bit "long double" problem on x86-64 until after code freeze. AJ wasn't particularly thrilled with adjusting the x87 FPU settings as a workaround. > ... > The 1.1e-30 tests is an example of a test that stopped working in strtod > with your patches. Since this test wasn't in strtod I didn't catch it until trying to fix scanf. > While working on new implementation of strtod I was > running Chromium string conversion tests (it's a 100k semi random > doubles conversion test). Here are some results: > ... I'd be curious to see what this looks like with my new approach, once I understand why you are getting different test results from me. > ucrtbase scanf tests: > - Windows: 0 failures > - Current 32-bit Wine: 36 failures, biggest error: 1 ulp > - Current 32-bit Wine with the patch you have attached: 49779 > failures, the exponent is sometimes off by 1, e.g. on > "1.5475148155234508e-252" Just to confirm, you're running the current tests for dlls/ucrtbase/tests/scanf.c on 32-bit x86? The reason that I ask is that I'm getting 0 failures for that (both with and without the patch) and 0 ulp for 1.5475148155234508e-252. > The test that produces the biggest error for strtod function is: > 4.0621786324484882e-053 I don't see this test, so I popped it in really quick and I'm getting 1 ulp with the patch (4 without). > I'm afraid that your patches will possibly cause tons of regressions and > I'm not sure yet how to proceed with it during the code-freeze. I think we need to figure out why we're getting different results on 32-bit. I've been doing most of my testing on 64-bit (since that's what broke horribly with the _control87 update), but the version I attached should pass all the current tests on both (whether applied to strtod or scanf). > There's > a quite simple algorithm that should have similar results as msvcrt (I > will need to implement it in order to know) that can possibly go into > Wine during code-freeze. On the other hand it will need to be rewritten > after the code-freeze so I'm not a fun of it. The proper algorithm I was > working on will definitely exceed 1k lines of code. Yikes, I figured a properly compliant implementation would be big - but not that big. > ... > I was thinking about having a common helper that will be used both in > strtod and scanf. Proper string to double conversion is complicated and > I don't think it should be mixed with scanf implementation. > ... Makes sense to me. Best, Erich

Dec. 27, 2019

Re: [PATCH 2/3] user32/tests: Get rid of some Windows 9x workarounds.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62627 Your paranoid android. === w2003std (task log) === Task errors: The task timed out === w1064v1809_zh_CN (32 bit report) === user32: dde.c:331: Test failed: Expected DMLERR_NO_ERROR, got 16386 dde.c:332: Test failed: Expected DDE_FNOTPROCESSED, got deadbeef dde.c:333: Test failed: hdata is NULL dde.c:284: Test failed: client failed with 3 error(s) === w1064v1507 (64 bit report) === user32: dde: Timeout

Dec. 27, 2019