December 2017 - Wine-Commits

Alexandre Julliard : patches: Add link to commit for committed patches.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

Module: tools Branch: master Commit: 8db125df744d54ce1dc3abfa13724c3589ea3299 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8db125df744d54ce1dc3abf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 21 17:26:49 2017 +0100 patches: Add link to commit for committed patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/patches/update b/patches/update index 963234b..03af078 100755 --- a/patches/update +++ b/patches/update @@ -101,6 +101,18 @@ sub uniq return grep { !$seen{$_}++ } @_; } +sub read_file($) +{ + my $file = shift; + if (open FILE, "<$file") + { + chomp( my $ret = <FILE> ); + close FILE; + return $ret; + } + return undef; +} + my $js = <<END; function toggle_display(id) { @@ -171,21 +183,9 @@ foreach my $file (readdir DIR) $patch{"id"} = $file; $patch{"author"} = "Marvin (Testbot)" if $patch{"from_marvin"}; - $patch{"status"} = "nil"; - - if (open STATUS, "<$dir/$file.status") - { - my $status = <STATUS>; - chomp $status; - $patch{"status"} = $status; - close STATUS; - } - $patch{"order"} = $file; - if (open ORDER, "<$dir/$file.order") - { - $patch{"order"} = <ORDER>; - close ORDER; - } + $patch{"status"} = read_file( "$dir/$file.status" ) || "nil"; + $patch{"order"} = read_file( "$dir/$file.order" ) || $file; + $patch{"commit"} = read_file( "$dir/$file.commit" ) if $patch{status} eq "committed"; if (open REVIEW, "<:raw", "$dir/$file.review") { $_ = <REVIEW>; @@ -272,8 +272,15 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k next unless $patch->{"subject"} =~ /^\[.*PATCH.*\]/; } - printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td>", - $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}; + printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td>", $row & 1 ? "odd" : "even", $patch->{status}, $file; + if (defined($patch->{commit})) + { + printf INDEX "<td class=\"status\"><a href=\"%s\">%s</a></td>", $patch->{commit}, $status_descr{$patch->{status}}; + } + else + { + printf INDEX "<td class=\"status\"><a href=\"#legend\">%s</a></td>", $status_descr{$patch->{status}} || $patch->{status}; + } if (defined $patch->{"children"}) { printf INDEX "<td class=\"author\">%s</td>", escapeHTML($patch->{"author"});

1 0

Alexandre Julliard : patches: Add commit URL to committed patch notifications.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

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 Dec. 22, 2017

Dec. 22, 2017

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: Add a history Record when the Engine starts or stops.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

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: Unclutter the Activity page's Time column.
by Alexandre Julliard Dec. 22, 2017

Dec. 22, 2017

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

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

Dec. 21, 2017

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

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

Dec. 21, 2017

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

Stefan Dösinger : d3d9/tests: Work around focus-follows-mouse test failures.
by Alexandre Julliard Dec. 21, 2017

Dec. 21, 2017

Module: wine Branch: master Commit: 1437317819ca6be7a5914209722c003ef056f7f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1437317819ca6be7a5914209… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 18 21:39:28 2017 +0100 d3d9/tests: Work around focus-follows-mouse test failures. Removing WS_VISIBLE without updating the window state with SWP_FRAMECHANGED is enough to trigger d3d9's hidden window codepath (native and in Wine), but doesn't actually hide the window. This prevents unpredictable focus changes on focus follows mouse WMs. 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/d3d9/tests/d3d9ex.c | 6 +++++- dlls/d3d9/tests/device.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0e43a19..1a3af32 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2954,7 +2954,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; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1a226ec..a9fd4e4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3906,7 +3906,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

Nikolay Sivov : comctl32/tests: Add separate test for CreateUpDownControl( ).
by Alexandre Julliard Dec. 21, 2017

Dec. 21, 2017

Module: wine Branch: master Commit: 2d7aa093234bed47b1a21c64f93722be3684bb13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d7aa093234bed47b1a21c64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 21 12:14:44 2017 +0300 comctl32/tests: Add separate test for CreateUpDownControl(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/updown.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index d6dbde0..1c21873 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -800,6 +800,29 @@ static void test_UDS_SETBUDDYINT(void) DestroyWindow(updown); } +static void test_CreateUpDownControl(void) +{ + HWND updown, buddy; + DWORD range, pos; + RECT rect; + + GetClientRect(parent_wnd, &rect); + updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), g_edit, 100, 10, 50); + ok(updown != NULL, "Failed to create control.\n"); + + buddy = (HWND)SendMessageA(updown, UDM_GETBUDDY, 0, 0); + ok(buddy == g_edit, "Unexpected buddy window.\n"); + + range = SendMessageA(updown, UDM_GETRANGE, 0, 0); + ok(range == MAKELONG(100, 10), "Unexpected range.\n"); + + pos = SendMessageA(updown, UDM_GETPOS, 0, 0); + ok(pos == MAKELONG(50, 1), "Unexpected position.\n"); + + DestroyWindow(updown); +} + START_TEST(updown) { HMODULE mod = GetModuleHandleA("comctl32.dll"); @@ -821,6 +844,7 @@ START_TEST(updown) test_updown_base(); test_updown_unicode(); test_UDS_SETBUDDYINT(); + test_CreateUpDownControl(); DestroyWindow(g_edit); DestroyWindow(parent_wnd);

1 0

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

Dec. 21, 2017

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