December 2017 - Wine-commits

Alexandre Julliard : patches: Add commit URL to committed patch notifications.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: tools Branch: master Commit: fd1adfc8ec7aa9bbace4f1cb034d69e4ebffa269 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fd1adfc8ec7aa9bbace4f1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 21 17:44:33 2017 +0100 patches: Add commit URL to committed patch notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 62 +++++++++++++++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/patches/expire b/patches/expire index ba98885..53e3f27 100755 --- a/patches/expire +++ b/patches/expire @@ -160,12 +160,24 @@ foreach my $arg (@ARGV) else { $dir = $arg; } } +sub read_file($) +{ + my $file = shift; + if (open FILE, "<$file") + { + chomp( my $ret = <FILE> ); + close FILE; + return $ret; + } + return undef; +} + sub get_patch_state($) { my $file = shift; my %patch; - return undef unless open PATCH, "<$dir/$file"; + return () unless open PATCH, "<$dir/$file"; while (<PATCH>) { if (/^Subject: (.*)$/) { $patch{subject} = $1; } @@ -190,33 +202,11 @@ sub get_patch_state($) $patch{file} = $file; $patch{status} ||= "nil"; $patch{mtime} ||= (stat "$dir/$file")[9]; + $patch{commit} = read_file( "$dir/$file.commit" ) if $patch{status} eq "committed"; + $patch{prev_status} = read_file( "$dir/OLD/$file.status" ) || "nil"; return %patch; } -sub get_previous_state($) -{ - my $file = shift; - my $prev_status = "nil"; - - if (open PREVSTATUS, "<$dir/OLD/$file.status") - { - $prev_status = <PREVSTATUS>; - chomp $prev_status; - close PREVSTATUS; - } - return $prev_status; -} - -sub get_patch_reviewer($) -{ - my $file = shift; - - return undef unless open REVIEW, "<$dir/$file.review"; - chomp( my $ret = <REVIEW> ); - close REVIEW; - return $ret; -} - sub get_notify_headers($$) { my $file = shift; @@ -254,11 +244,12 @@ sub get_notify_headers($$) return @headers; } -sub notify_state_change($$$) +sub notify_state_change(%) { - my $file = shift; - my $prev_status = shift; - my $status = shift; + my (%patch) = @_; + my $file = $patch{file}; + my $status = $patch{status}; + my $prev_status = $patch{prev_status}; return if $prev_status eq $status; @@ -269,7 +260,7 @@ sub notify_state_change($$$) if ($status eq "assigned") { - my $reviewer = get_patch_reviewer( $file ); + my $reviewer = read_file( "$dir/$file.review" ); push @{$reviews{$reviewer}}, $file if $reviewer; } @@ -293,7 +284,11 @@ been reviewed and its status set to "$status_descr{$status}". $status_explanation{$status} EOF - if ($status ne "committed" && $status ne "assigned") + if ($patch{commit}) + { + printf SENDMAIL "\nCommit: %s\n", $patch{commit}; + } + elsif ($status ne "committed" && $status ne "assigned") { print SENDMAIL <<"EOF"; @@ -373,9 +368,9 @@ foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; my %patch = get_patch_state( $file ); - my $prev_status = get_previous_state( $file ); + next unless defined $patch{file}; - notify_state_change( $file, $prev_status, $patch{status} ); + notify_state_change( %patch ); $patches{$patch{msgid}} = \%patch; } @@ -394,6 +389,7 @@ foreach my $p (keys %patches) { unlink "$dir/$file"; unlink "$dir/$file.status"; + unlink "$dir/$file.commit"; unlink "$dir/$file.order"; unlink "$dir/$file.review"; unlink "$dir/$file.testbot";

1 0

Francois Gouget : testbot/web: Make the title class a bit more generic.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: tools Branch: master Commit: 39e9f6a3154300b663d1e0b08c64faaa9ec0011b URL: https://source.winehq.org/git/tools.git/?a=commit;h=39e9f6a3154300b663d1e0b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 22 01:41:53 2017 +0100 testbot/web: Make the title class a bit more generic. Instead of hardcoding the text color it now inherits it from the normal non-link text. This makes it usable on white backgrounds too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 8c03a91..e58a4d8 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -340,7 +340,7 @@ pre .boterror { color: #e55600; } .canceled { color: black; } -a.title { color:white; text-decoration: none; } +a.title { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; }

1 0

Francois Gouget : testbot/web: Unclutter the Activity page's Time column.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: tools Branch: master Commit: fd2f7b16e44ef765cbcd050311310856ea0640a2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fd2f7b16e44ef765cbcd050… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 22 01:42:08 2017 +0100 testbot/web: Unclutter the Activity page's Time column. Most of the time the date change is quite obvious so now the date is now only shown if hovering over the time. This avoids much line wrapping and makes the column more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 677272f..ca5b94c 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -52,7 +52,7 @@ sub _GetHtmlTime($) { my ($Timestamp) = @_; return "<noscript><div>", - strftime("%d %H:%M:%S", localtime($Timestamp)), "</div></noscript>\n" . + strftime("<a class='title' title='%d'>%H:%M:%S</a>", localtime($Timestamp)), "</div></noscript>\n" . "<script type='text/javascript'></script>"; @@ -100,8 +100,8 @@ function Pad2(n) function ShowDateTime(Sec1970) { var Dt = new Date(Sec1970 * 1000); - document.write(Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + - Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds())); + document.write('<a class="title" title="' + Pad2(Dt.getDate()) + '">' + Pad2(Dt.getHours()) + ':' + + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) + "</a>"); } //--></script> EOF

1 0

Francois Gouget : testbot: Add a history Record when the Engine starts or stops.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: tools Branch: master Commit: 98779a2195f8f0a458205e747ec20fb70f55f7fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=98779a2195f8f0a458205e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 22 01:43:50 2017 +0100 testbot: Add a history Record when the Engine starts or stops. A missing stop record will show that the TestBot Engine crashed (or was stopped abruptly). The gap between the stop and start records will also allow identifying the downtime. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 36a18ad..827879c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -749,6 +749,7 @@ sub main() LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } $MaxVMsWhenIdle = $MaxActiveVMs if (!defined $MaxVMsWhenIdle); + SaveRecord('engine', 'start'); Cleanup(1); # Check for patches that arrived while the server was off. @@ -871,6 +872,7 @@ sub main() } } } + SaveRecord('engine', 'stop'); LogMsg "Normal WineTestBot Engine shutdown\n"; return 0;

1 0

Francois Gouget : testbot/web: Show TestBot start/ stop events on the Activity page.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: tools Branch: master Commit: 4bea10ac77a1a7d23118301c7c4c5e128abad252 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bea10ac77a1a7d23118301… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 22 01:45:02 2017 +0100 testbot/web: Show TestBot start/stop events on the Activity page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 17 ++++++++++++++++- testbot/web/Activity.pl | 8 +++++++- testbot/web/WineTestBot.css | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index dcc5895..38cd556 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -51,6 +51,7 @@ describing the TestBot activity. The structure is as follows: end => <EndTimestamp>, runnable => <RunnableTasksCount>, queued => <QueuedTasksCount>, + engine => <StartOrStop>, statusvms => { <VMName1> => { vm => <VMObject>, @@ -102,6 +103,20 @@ sub GetActivity($) { ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; } + elsif ($Record->Type eq "engine" and $Record->Name =~ /^(?:start|stop)$/) + { + $Group->{engine} = $Record->Name; + foreach my $VM (@{$VMs->GetItems()}) + { + my $StatusVMs = ( $Group->{statusvms} ||= {} ); + my $VMStatus = ( $StatusVMs->{$VM->Name} ||= {} ); + $VMStatus->{vmstatus} = $VMStatus; + weaken($VMStatus->{vmstatus}); # avoid memory cycles + $VMStatus->{start} = $Group->{start}; + $VMStatus->{status} = "engine"; + $VMStatus->{rows} = 1; + } + } elsif ($Record->Type eq "vmstatus") { # Ignore retired / deleted VMs @@ -165,7 +180,7 @@ sub GetActivity($) { $LastVMStatus->{end} = $VMStatus->{start} if ($LastVMStatus); } - elsif ($LastVMStatus) + elsif ($LastVMStatus and $LastVMStatus->{status} ne "engine") { $VMStatus = $StatusVMs->{$VM->Name} = $LastVMStatus; $LastStatusVMs{$VM->Name}->{$VM->Name} = {merged => 1, vmstatus => $VMStatus}; diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index ca5b94c..e57ab7d 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -139,6 +139,12 @@ EOF next if (!$Group->{statusvms}); print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>"; + if ($Group->{engine}) + { + print "<td class='Record RecordEngine'>$Group->{engine}</td>\n"; + print "<td colspan='", scalar(@SortedVMs), "'><hr></td>\n"; + next; + } if ($Group->{runnable} or $Group->{queued}) { print "<td class='Record'>", ($Group->{runnable} || 0), " / ", ($Group->{queued} || 0), "</td>"; @@ -229,7 +235,7 @@ sub GenerateFooter($) print "<span class='Record-running'>running</span> a task (in which case it links to it),<br>\n"; print "<span class='Record-dirty'>dirty</span> while the server is powering off the VM after a task or while it assesses its state on startup.</p>\n"; - print "<p>If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round.</p>\n"; + print "<p>If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. A long horizontal bar indicates the TestBot server was restarted. </p>\n"; print "<p>The VM could also be <span class='Record-offline'>offline</span> due to a temporary issue,<br>\n"; print "or until the administrator can look at it for <span class='Record-maintenance'>maintenance</span>,<br>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index e58a4d8..f0f3c01 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -344,6 +344,7 @@ a.title { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } +.RecordEngine { font-style: italic; color: #601919; } .RecordHost { font-size: smaller; } .RecordJob { font-size: smaller; } .RecordDuration { }

1 0

Stefan Dösinger : d3d8/tests: Work around focus-follows-mouse test failures.
by Alexandre Julliard 21 Dec '17

21 Dec '17

Module: wine Branch: master Commit: 724f68c4553c1e88d065bc97be53e4c437be2511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=724f68c4553c1e88d065bc97… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 18 21:39:29 2017 +0100 d3d8/tests: Work around focus-follows-mouse test failures. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 915ab8b..8743a24 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2888,7 +2888,11 @@ static void test_wndproc(void) hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); - ShowWindow(device_window, SW_HIDE); + /* Remove the WS_VISIBLE flag to test hidden windows. This is enough to trigger d3d's hidden + * window codepath, but does not actually hide the window without a SetWindowPos(SWP_FRAMECHANGED) + * call. This way we avoid focus changes and random failures on focus follows mouse WMs. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); flush_events(); expect_messages = focus_loss_messages_hidden;

1 0

Józef Kucia : wined3d: Consider CPU blitter when clearing discarded textures.
by Alexandre Julliard 21 Dec '17

21 Dec '17

Module: wine Branch: master Commit: d38076fd57a50452b17d61f771688bbfcd3a5563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38076fd57a50452b17d61f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 21 12:08:25 2017 +0100 wined3d: Consider CPU blitter when clearing discarded textures. In order to avoid invalidating system memory for "converted" surfaces. Fixes a regression introduced by commit 56128d18d4df ("wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt()."). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 9 ++++----- dlls/ddraw/tests/ddraw7.c | 9 ++++----- dlls/wined3d/surface.c | 4 +++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 7b7f1c2..98c86d0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9960,11 +9960,10 @@ static void test_color_fill(void) hr = IDirectDrawSurface4_Lock(surface, NULL, &surface_desc, DDLOCK_READONLY, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, surface %s.\n", hr, tests[i].name); color = surface_desc.lpSurface; - todo_wine_if(tests[i].caps & DDSCAPS_VIDEOMEMORY && U3(z_fmt).dwZBitMask != 0xffff) - ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) - || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), - "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", - *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); + ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) + || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), + "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", + *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); hr = IDirectDrawSurface4_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, surface %s.\n", hr, tests[i].name); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c7a2b13..9182228 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9911,11 +9911,10 @@ static void test_color_fill(void) hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, DDLOCK_READONLY, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, surface %s.\n", hr, tests[i].name); color = surface_desc.lpSurface; - todo_wine_if(tests[i].caps & DDSCAPS_VIDEOMEMORY && U3(z_fmt).dwZBitMask != 0xffff) - ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) - || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), - "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", - *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); + ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) + || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), + "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", + *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, surface %s.\n", hr, tests[i].name); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 02e0c70..da22c7a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2698,13 +2698,15 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) { struct wined3d_resource *resource; struct wined3d_texture *texture; + DWORD locations; resource = view->resource; if (resource->type == WINED3D_RTYPE_BUFFER) return resource->pool == WINED3D_POOL_SYSTEM_MEM; texture = texture_from_resource(resource); - if (texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding) + locations = texture->sub_resources[view->sub_resource_idx].locations; + if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED);

1 0

Zebediah Figura : user32/tests: Explicitly test minimized window size.
by Alexandre Julliard 21 Dec '17

21 Dec '17

Module: wine Branch: master Commit: 54388647afee51639788321e5342c2432372c261 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54388647afee51639788321e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 21 01:21:00 2017 -0600 user32/tests: Explicitly test minimized window size. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fc35542..c0d83ef 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6532,6 +6532,8 @@ static void test_ShowWindow(void) LPARAM ret; SetRect(&rcMain, 120, 120, 210, 210); + SetRect(&rcMinimized, -32000, -32000, -32000 + GetSystemMetrics(SM_CXMINIMIZED), + -32000 + GetSystemMetrics(SM_CYMINIMIZED)); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -6568,8 +6570,10 @@ static void test_ShowWindow(void) ok(style & WS_VISIBLE, "window should be visible\n"); ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); - GetWindowRect(hwnd, &rcMinimized); - ok(!EqualRect(&rcMain, &rcMinimized), "rects shouldn't match\n"); + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); /* shouldn't be able to resize minimized windows */ ret = SetWindowPos(hwnd, 0, 0, 0, (rcMinimized.right - rcMinimized.left) * 2, @@ -6577,7 +6581,9 @@ static void test_ShowWindow(void) SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); ok(ret, "not expected ret: %lu\n", ret); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6625,7 +6631,9 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); ok(!ret, "not expected ret: %lu\n", ret); @@ -6635,7 +6643,9 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6670,9 +6680,8 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); GetWindowRect(hwnd, &rc); todo_wine - ok((rc.left == -32000 || rc.left == 3000) && - (rc.top == -32000 || rc.top == 3000), - "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, @@ -6685,9 +6694,9 @@ static void test_ShowWindow(void) style = GetWindowLongA(hwnd, GWL_STYLE); ok(style & WS_MINIMIZE, "window should be minimized\n"); GetWindowRect(hwnd, &rc); - ok((rc.left == -32000 || rc.left == 3000) && - (rc.top == -32000 || rc.top == 3000), - "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); }

1 0

Zebediah Figura : user32/tests: Also test client rect size.
by Alexandre Julliard 21 Dec '17

21 Dec '17

Module: wine Branch: master Commit: b7cdfd312cd407d3f83cbf5076eb2bfe88261b1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7cdfd312cd407d3f83cbf50… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 21 01:21:01 2017 -0600 user32/tests: Also test client rect size. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c0d83ef..6268042 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6528,12 +6528,16 @@ static void test_ShowWindow(void) { HWND hwnd; DWORD style; - RECT rcMain, rc, rcMinimized; + RECT rcMain, rc, rcMinimized, rcClient, rcEmpty; LPARAM ret; - SetRect(&rcMain, 120, 120, 210, 210); + SetRect(&rcClient, 0, 0, 90, 90); + rcMain = rcClient; + OffsetRect(&rcMain, 120, 120); + AdjustWindowRect(&rcMain, WS_CAPTION, 0); SetRect(&rcMinimized, -32000, -32000, -32000 + GetSystemMetrics(SM_CXMINIMIZED), -32000 + GetSystemMetrics(SM_CYMINIMIZED)); + SetRectEmpty(&rcEmpty); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -6551,6 +6555,9 @@ static void test_ShowWindow(void) GetWindowRect(hwnd, &rc); ok(EqualRect(&rcMain, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); ret = ShowWindow(hwnd, SW_SHOW); ok(!ret, "not expected ret: %lu\n", ret); @@ -6562,6 +6569,9 @@ static void test_ShowWindow(void) GetWindowRect(hwnd, &rc); ok(EqualRect(&rcMain, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); ret = ShowWindow(hwnd, SW_MINIMIZE); ok(ret, "not expected ret: %lu\n", ret); @@ -6574,6 +6584,10 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); /* shouldn't be able to resize minimized windows */ ret = SetWindowPos(hwnd, 0, 0, 0, (rcMinimized.right - rcMinimized.left) * 2, @@ -6584,6 +6598,10 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6595,6 +6613,9 @@ static void test_ShowWindow(void) GetWindowRect(hwnd, &rc); ok(EqualRect(&rcMain, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); ret = EnableWindow(hwnd, FALSE); ok(!ret, "not expected ret: %lu\n", ret); @@ -6611,6 +6632,9 @@ static void test_ShowWindow(void) GetWindowRect(hwnd, &rc); ok(EqualRect(&rcMain, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0); ok(!ret, "not expected ret: %lu\n", ret); @@ -6622,6 +6646,9 @@ static void test_ShowWindow(void) GetWindowRect(hwnd, &rc); ok(EqualRect(&rcMain, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); ret = ShowWindow(hwnd, SW_MINIMIZE); ok(ret, "not expected ret: %lu\n", ret); @@ -6634,6 +6661,10 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); ok(!ret, "not expected ret: %lu\n", ret); @@ -6646,6 +6677,10 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6657,6 +6692,9 @@ static void test_ShowWindow(void) GetWindowRect(hwnd, &rc); ok(EqualRect(&rcMain, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); ok(!ret, "not expected ret: %lu\n", ret); @@ -6682,6 +6720,10 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, @@ -6697,6 +6739,10 @@ static void test_ShowWindow(void) todo_wine ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); }

1 0

Zebediah Figura : user32/tests: Add a basic test for maximizing windows.
by Alexandre Julliard 21 Dec '17

21 Dec '17

Module: wine Branch: master Commit: d95be60ff65b96b82576b5bc0ead5fb6c6729cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d95be60ff65b96b82576b5bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 21 01:21:02 2017 -0600 user32/tests: Add a basic test for maximizing windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6268042..f9472ec 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6528,8 +6528,9 @@ static void test_ShowWindow(void) { HWND hwnd; DWORD style; - RECT rcMain, rc, rcMinimized, rcClient, rcEmpty; + RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized; LPARAM ret; + MONITORINFO mon_info; SetRect(&rcClient, 0, 0, 90, 90); rcMain = rcClient; @@ -6547,6 +6548,12 @@ static void test_ShowWindow(void) 0, 0, 0, NULL); assert(hwnd); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + rcMaximized = mon_info.rcWork; + AdjustWindowRectEx(&rcMaximized, GetWindowLongA(hwnd, GWL_STYLE) & ~WS_BORDER, + 0, GetWindowLongA(hwnd, GWL_EXSTYLE)); + style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(!(style & WS_VISIBLE), "window should not be visible\n"); @@ -6617,6 +6624,35 @@ static void test_ShowWindow(void) ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); + ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "not expected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(!(style & WS_DISABLED), "window should not be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(!(style & WS_MINIMIZE), "window should be minimized\n"); + ok(style & WS_MAXIMIZE, "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMaximized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMaximized), wine_dbgstr_rect(&rc)); + /* maximized windows can be resized */ + ret = SetWindowPos(hwnd, 0, 300, 300, 200, 200, SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "not expected ret: %lu\n", ret); + SetRect(&rcResized, 300, 300, 500, 500); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcResized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcResized), wine_dbgstr_rect(&rc)); + + ShowWindow(hwnd, SW_RESTORE); + ok(ret, "not expected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(!(style & WS_DISABLED), "window should not be disabled\n"); + ok(style & WS_VISIBLE, "window should be visible\n"); + ok(!(style & WS_MINIMIZE), "window should not be minimized\n"); + ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMain), + wine_dbgstr_rect(&rc)); + ret = EnableWindow(hwnd, FALSE); ok(!ret, "not expected ret: %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE);

1 0