wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

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/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

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

Alexandre Julliard : patches: Add link to commit for committed patches.
by Alexandre Julliard 22 Dec '17

22 Dec '17

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: Use https URLs everywhere.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: tools Branch: master Commit: 268dff50ca68dca10db56b7b55930f9768c7f1e5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=268dff50ca68dca10db56b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 21 17:24:55 2017 +0100 patches: Use https URLs everywhere. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 2 +- patches/update-regressions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index 6f930ea..963234b 100755 --- a/patches/update +++ b/patches/update @@ -124,7 +124,7 @@ print INDEX "<div id=\"logo_glass\"><a href=\"/patches/\"><img src=\"//winehq.or print INDEX "<div id=\"logo_text\"><a href=\"/patches/\"><img src=\"//winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n"; print INDEX "<div id=\"tabs\"><ul>", "<li><a href=\"//www.winehq.org/\">WineHQ</a></li>", - "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>", + "<li><a href=\"//wiki.winehq.org/\">Wiki</a></li>", "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>", "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n"; diff --git a/patches/update-regressions b/patches/update-regressions index 5c8b362..f4e4e2d 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -44,7 +44,7 @@ sub read_bugs() { my $csv = Text::CSV::Encoded->new({ binary => 1 }); - open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; + open LIST, "-|", "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&b…" or die "cannot query bug list"; <LIST>; # skip header line while (<LIST>) @@ -125,7 +125,7 @@ print OUTPUT "<div id=\"logo_glass\"><a href=\"/regressions\"><img src=\"//wineh print OUTPUT "<div id=\"logo_text\"><a href=\"/regressions\"><img src=\"//winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n"; print OUTPUT "<div id=\"tabs\"><ul>", "<li><a href=\"//www.winehq.org/\">WineHQ</a></li>", - "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>", + "<li><a href=\"//wiki.winehq.org/\">Wiki</a></li>", "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>", "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n";

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

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

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

21 Dec '17

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

Alexandre Julliard : ddraw: Validate the surface descriptor size in GetDisplayMode.
by Alexandre Julliard 21 Dec '17

21 Dec '17

Module: wine Branch: master Commit: 749e280df7f0c121ed48740341f125a903099bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749e280df7f0c121ed487403… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 18 11:12:04 2017 +0100 ddraw: Validate the surface descriptor size in GetDisplayMode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 27 +++++++++++++-------------- dlls/ddraw/tests/ddraw1.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 5 files changed, 81 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3e491c..27be401 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1627,17 +1627,14 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_display_mode mode; HRESULT hr; - DWORD Size; TRACE("iface %p, surface_desc %p.\n", iface, DDSD); - wined3d_mutex_lock(); /* This seems sane */ - if (!DDSD) - { - wined3d_mutex_unlock(); + if (!DDSD || (DDSD->dwSize != sizeof(DDSURFACEDESC) && DDSD->dwSize != sizeof(DDSURFACEDESC2))) return DDERR_INVALIDPARAMS; - } + + wined3d_mutex_lock(); if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) { @@ -1646,10 +1643,8 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 return hr; } - Size = DDSD->dwSize; - memset(DDSD, 0, Size); - - DDSD->dwSize = Size; + memset(DDSD, 0, DDSD->dwSize); + DDSD->dwSize = sizeof(*DDSD); DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; @@ -1682,21 +1677,25 @@ static HRESULT WINAPI ddraw4_GetDisplayMode(IDirectDraw4 *iface, DDSURFACEDESC2 static HRESULT WINAPI ddraw2_GetDisplayMode(IDirectDraw2 *iface, DDSURFACEDESC *surface_desc) { struct ddraw *ddraw = impl_from_IDirectDraw2(iface); + HRESULT hr; TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); - /* FIXME: Test sizes, properly convert surface_desc */ - return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + hr = ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + if (SUCCEEDED(hr)) surface_desc->dwSize = sizeof(*surface_desc); + return hr; } static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *surface_desc) { struct ddraw *ddraw = impl_from_IDirectDraw(iface); + HRESULT hr; TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); - /* FIXME: Test sizes, properly convert surface_desc */ - return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + hr = ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + if (SUCCEEDED(hr)) surface_desc->dwSize = sizeof(*surface_desc); + return hr; } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c306c4d..109910b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10132,6 +10132,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw_GetDisplayMode(ddraw, &desc.desc1); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a7801e..1db7ad9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -11643,6 +11643,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw2_GetDisplayMode(ddraw, &desc.desc1); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331d..7b7f1c2 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -13247,6 +13247,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw4_GetDisplayMode(ddraw, &desc.desc2); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC2), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d..c7a2b13 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12547,6 +12547,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw7_GetDisplayMode(ddraw, &desc.desc2); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC2), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); }

1 0

Nikolay Sivov : comctl32/tooltips: Reset window subclass data when removing tools.
by Alexandre Julliard 21 Dec '17

21 Dec '17

Module: wine Branch: master Commit: c98bed32d85e9c645b8381905f34d6a3b5398a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c98bed32d85e9c645b838190… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 21 02:05:09 2017 +0300 comctl32/tooltips: Reset window subclass data when removing tools. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 405b1e9..1c8cb66 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1142,6 +1142,13 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) return TRUE; } +static void TOOLTIPS_ResetSubclass (const TTTOOL_INFO *toolPtr) +{ + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); +} static LRESULT TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) @@ -1174,15 +1181,7 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) Free (toolPtr->lpszText); } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } - } + TOOLTIPS_ResetSubclass (toolPtr); /* delete tool from tool list */ if (infoPtr->uNumTools == 1) { @@ -1888,10 +1887,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* Reset subclassing data. */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) - SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, - TOOLTIPS_SubclassProc, 1, 0); + TOOLTIPS_ResetSubclass (toolPtr); } Free (infoPtr->tools);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2017