January 2021 - Wine-Devel - list.winehq.org

[PATCH 1/3] user32/tests: Add some tests for WM_CANCELMODE.
by Zebediah Figura Jan. 7, 2021

Jan. 7, 2021

In particular, test sending WM_CANCELMODE to a parent of the capture window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c9d2819e1a9..47864340e39 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11850,6 +11850,50 @@ static void test_other_process_window(const char *argv0) DestroyWindow(hwnd); } +static void test_cancel_mode(void) +{ + HWND hwnd1, hwnd2, child; + LRESULT ret; + + hwnd1 = CreateWindowA("MainWindowClass", "window 1", WS_OVERLAPPEDWINDOW, + 100, 200, 500, 300, NULL, NULL, NULL, NULL); + hwnd2 = CreateWindowA("MainWindowClass", "window 2", WS_OVERLAPPEDWINDOW, + 100, 200, 500, 300, NULL, NULL, NULL, NULL); + flush_events(TRUE); + SetCapture(hwnd1); + ok(GetCapture() == hwnd1, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd2, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(GetCapture() == hwnd1, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd1, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(!GetCapture(), "got capture %p\n", GetCapture()); + + child = CreateWindowA("MainWindowClass", "child", WS_CHILD, + 0, 0, 100, 100, hwnd1, NULL, NULL, NULL); + + SetCapture(child); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd2, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd1, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + ret = SendMessageA(child, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(!GetCapture(), "got capture %p\n", GetCapture()); + + DestroyWindow(child); + DestroyWindow(hwnd1); + DestroyWindow(hwnd2); +} + START_TEST(win) { char **argv; @@ -12016,6 +12060,7 @@ START_TEST(win) test_arrange_iconic_windows(); test_other_process_window(argv[0]); test_SC_SIZE(); + test_cancel_mode(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); -- 2.29.2

3 4

[PATCH] winex11.drv: Make Update _NET_WM_STATE before replaces the size hints for the WM_NORMAL_HINTS property.
by Jiajin Cui Jan. 7, 2021

Jan. 7, 2021

3 2

[PATCH] user32: Previous Windows versions support WS_EX_LAYERED only for top-level windows.
by Jiajin Cui Jan. 7, 2021

Jan. 7, 2021

2 1

[tools 1/2] testbot/WineReconfig: Do not prepare wineprefixes in advance.
by Francois Gouget Jan. 6, 2021

Jan. 6, 2021

This avoids test failures when the patch changes the initial Wine registry. Call CleanupWinePrefixes() after successful builds to ensure a clean transition and remove any stray wineprefix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48671 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: WineTest already has code to create any missing wineprefix. So all this patch does is make sure none is created in advance. testbot/bin/build/WineReconfig.pl | 47 ++++++------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index f9f6792a5a..bd9ff5779f 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -3,7 +3,7 @@ # # Updates the Wine source from Git and rebuilds it. # -# Copyright 2018 Francois Gouget +# Copyright 2018-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -65,12 +65,10 @@ sub UpdateWineBuilds($$) # WinePrefix helpers # -sub UpdateWinePrefixes($) +sub CleanupWinePrefixes() { - my ($TaskMissions) = @_; - - # Make sure no obsolete wineprefix is left behind in case WineReconfig - # is called with a different set of targets + # The TestBot used to prepare WinePrefixes in advance. + # Make sure no such obsolete wineprefix is left behind. foreach my $Dir (glob("'$DataDir/wineprefix-*'")) { if (basename($Dir) =~ /^(wineprefix-[a-zA-Z0-9\(a)_.-]+)$/) # untaint @@ -78,27 +76,6 @@ sub UpdateWinePrefixes($) rmtree("$DataDir/$1"); } } - - # Set up brand new WinePrefixes ready for use for testing. - # This way we do it once instead of doing it for every test, thus saving - # time. Note that this requires using a different wineprefix for each - # mission. - foreach my $Mission (@{$TaskMissions->{Missions}}) - { - next if ($Mission->{test} eq "build"); - - my $BaseName = SetupWineEnvironment($Mission); - InfoMsg "\nRecreating the $BaseName wineprefix\n"; - - # Wait for the wineprefix creation to complete so it is really done - # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "$ErrMessage\n"; - return 0; - } - } return 1; } @@ -107,7 +84,7 @@ sub UpdateWinePrefixes($) # Setup and command line processing # -my ($Usage, $OptUpdate, $OptBuild, $OptAddOns, $OptWinePrefix, $MissionStatement); +my ($Usage, $OptUpdate, $OptBuild, $OptAddOns, $MissionStatement); my $OptBuildFlags = $Build::Utils::FROM_SCRATCH; while (@ARGV) { @@ -128,10 +105,6 @@ while (@ARGV) { $OptAddOns = 1; } - elsif ($Arg eq "--wineprefix") - { - $OptWinePrefix = 1; - } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -159,9 +132,9 @@ while (@ARGV) my $TaskMissions; if (!defined $Usage) { - if (!$OptUpdate and !$OptBuild and !$OptAddOns and !$OptWinePrefix) + if (!$OptUpdate and !$OptBuild and !$OptAddOns) { - $OptUpdate = $OptBuild = $OptAddOns = $OptWinePrefix = 1; + $OptUpdate = $OptBuild = $OptAddOns = 1; } $MissionStatement ||= "win32:wow32:wow64"; my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); @@ -193,8 +166,7 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--wineprefix]\n"; - print " [--help] [MISSIONS]\n"; + print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--help] [MISSIONS]\n"; print "\n"; print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; @@ -202,7 +174,6 @@ if (defined $Usage) print " --update Update Wine's source code.\n"; print " --build Update the Wine builds.\n"; print " --addons Update the Gecko and Mono Wine addons.\n"; - print " --wineprefix Update the wineprefixes.\n"; print "If none of the above actions is specified they are all performed.\n"; print " MISSIONS Is a colon-separated list of missions. By default the\n"; print " following missions are run.\n"; @@ -236,7 +207,7 @@ exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptBuildFlags)); -exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($TaskMissions)); +exit(1) if ($OptBuild and !CleanupWinePrefixes()); LogMsg "ok\n"; exit; -- 2.20.1

1 1

[PATCH 1/4] ddraw/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel Jan. 6, 2021

Jan. 6, 2021

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++--------- 4 files changed, 76 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e1a315f291f..df5c8ac8400 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13964,6 +13964,7 @@ static void test_cursor_clipping(void) IDirectDraw *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -13986,9 +13987,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -13997,7 +14000,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14010,7 +14014,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14018,7 +14023,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14027,7 +14033,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14040,7 +14047,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14049,7 +14057,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14058,7 +14067,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 849d510a349..bc915c97864 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14925,6 +14925,7 @@ static void test_cursor_clipping(void) IDirectDraw2 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -14947,9 +14948,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14958,7 +14961,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14971,7 +14975,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14979,7 +14984,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14988,7 +14994,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15001,7 +15008,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15010,7 +15018,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15019,7 +15028,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 56a4777add5..f009b4583f4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17985,6 +17985,7 @@ static void test_cursor_clipping(void) IDirectDraw4 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18007,9 +18008,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18018,7 +18021,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18031,7 +18035,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18039,7 +18044,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18048,7 +18054,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18061,7 +18068,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18070,7 +18078,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18079,7 +18088,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c9ba50287be..613f8dae98b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18247,6 +18247,7 @@ static void test_cursor_clipping(void) IDirectDraw7 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18269,9 +18270,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18280,7 +18283,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18293,7 +18297,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18301,7 +18306,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18310,7 +18316,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18323,7 +18330,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18332,7 +18340,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18341,7 +18350,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); -- 2.25.1

4 12

[tools] testbot: Fix the spelling of comments, documentation and web pages.
by Francois Gouget Jan. 6, 2021

Jan. 6, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- testbot/lib/WineTestBot/Activity.pm | 2 +- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/Activity.pl | 2 +- testbot/web/Munin.pl | 2 +- testbot/web/Stats.pl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index eba45a039e..2a1e21f0ba 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -68,7 +68,7 @@ for the specified timestamp. Entries have the following structure: vm => <VMObject>, status => <VMStatus>, value => <RecordValue>, - task => <TaskObjectIfAppopriate>, + task => <TaskObjectIfAppropriate>, start => <StartTimestamp>, end => <EndTimestamp>, rows => <NbRows>, diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index c28e143310..800d136835 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -884,7 +884,7 @@ sub _RevertVMs($$) # Note that during regular operation we get dirty VMs before they are # assigned a process to shut them down. This makes it possible to pick # the best future VM while we still know which VM is hot. - # In constrast on startup the dirty VMs all have processes checking their + # In contrast on startup the dirty VMs all have processes checking their # status, hence the dirtychild check to ensure we are not prevented from # preparing the best VM (e.g. build): it delays preparing the future VMs # until either there are no dirty VM or a VM got prepared for a task diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 44b3f97cca..df31a095a7 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -373,7 +373,7 @@ sub GetPatchImpacts($) } elsif ($Line eq LastPartSeparator()) { - # All the diffs so far belongs to previous parts of this patchset. + # All the diffs so far belong to previous parts of this patchset. # But: # - Only the last part must be taken into account to determine if a # rebuild and testing is needed. diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index c9ce3439b3..094337569d 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -30,7 +30,7 @@ A Job is composed of one or more Steps that each perform one operation. A Step is in turn composed of one WineTestBot::Task object for each VM that the Step should be run on. -A Step's lifecyle is as follows: +A Step's lifecycle is as follows: =over =item * diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5a79ff91d1..141fee07b6 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -31,7 +31,7 @@ performing that Step in a WineTestBot::VM virtual machine. For instance a Step responsible for running a given test would have one Task object for each virtual machine that the test must be performed in. -A Task's lifecyle is as follows: +A Task's lifecycle is as follows: =over =item * diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d616a7c1db..9444779433 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -290,7 +290,7 @@ sub GenerateFooter($) print "running a task (in which case it links to it), \n"; print "dirty while the server is powering off the VM after a task or while it assesses its state on startup.\n"; - print "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. If any task needs to run on a maintenance, retired or deleted VM is is shown as +N. A long horizontal bar indicates the TestBot server was restarted. \n"; + print "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. If any task needs to run on a maintenance, retired or deleted VM it is shown as +N. A long horizontal bar indicates the TestBot server was restarted. \n"; print "This border indicates that the task timed out, \n"; print "this border denotes a transient (network?) error so the task will be re-run, \n"; print "and this border indicates a TestBot error. \n"; diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index 35160a159a..c2464d055c 100644 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -82,7 +82,7 @@ happened in the past 5 minutes. However we have to report on infrequent events: - New jobs arrive infrequently: around one per hour currently, and it is not rare for two of them to arrive at the same time. If we were to naively extrapolate 1 new job in the past 5 minutes as a rate of 12 jobs per hour - we'd get a graph with exagerated swings. But note that things would converge + we'd get a graph with exaggerated swings. But note that things would converge on a meaningful value as Munin averages things out for the monthly or yearly graphs. - We could instead record when the last job arrived and derive a rate by diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index f453891452..4a70cb0e00 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -426,7 +426,7 @@ sub GenerateFooter($) print "The Job rate and Task rate show the average hourly rate at which jobs / tasks are submitted to the TestBot. The Revert rate shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.\n"; print "The Busy time indicates how long the TestBot had at least one pending task and the Busy % shows how much of the wall clock time this represents. Note that the busy percentage and average Job completion times can be optimized by balancing the load on the different VM hosts.\n"; print "The average and maximum time statistics show how long the VMs spend in each state of their lifecycle. A VM starts in the powered off or dirty state. It is then reverted to a clean state with the right configuration for the tests. Then it goes into the sleep state during which it gets ready to run the tests. Depending on the VM configuration this may be immediate or may require booting the VM first. Then it goes into the run state while the tests are being uploaded, run, and the results retrieved. This means the test itself takes less time to run than indicated in this statistic. Also note that the WineTest and Wine update tasks are tallied separately because they take much longer than regular tasks. Once the tests complete the VM is marked dirty while it waits for the TestBot to decide whether to power it off, or immediately revert it for the next task.\n"; - print "The errors section shows how many Timeouts occurred, that is how many tasks failed to complete within the alloted time; how many failed due to a TestBot error; and how many had to be rerun due to a Transient error such as a network connection issue.\n"; + print "The errors section shows how many Timeouts occurred, that is how many tasks failed to complete within the allotted time; how many failed due to a TestBot error; and how many had to be rerun due to a Transient error such as a network connection issue.\n"; print "</td></tr></tbody>\n"; print "</tbody></table></div>\n"; -- 2.20.1

1 0

[PATCH] windowscodecs: Copy container_count GUIDs, not bytes, in GetContainerFormats.
by Rémi Bernon Jan. 6, 2021

Jan. 6, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- It seems to be an obvious typo, although I'm not aware of any bug caused by it. dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index db6d25b46b3..cbe8aae572d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1658,7 +1658,7 @@ static HRESULT WINAPI MetadataReaderInfo_GetContainerFormats(IWICMetadataReaderI { if (This->container_count && length < This->container_count) return WINCODEC_ERR_INSUFFICIENTBUFFER; - memcpy(formats, This->container_formats, This->container_count); + memcpy(formats, This->container_formats, This->container_count * sizeof(*formats)); } return S_OK; } -- 2.29.2

2 1

[PATCH v2 1/2] comctl32/tests: Add more tests for 32bpp bitmaps with and without alpha, and masks.
by Gabriel Ivăncescu Jan. 5, 2021

Jan. 5, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/imagelist.c | 67 +++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a580906..c74acb2 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2346,9 +2346,8 @@ static void test_loadimage(void) #define GetAValue(argb) ((BYTE) ((argb) >> 24)) -static void get_image_alpha(HIMAGELIST himl, int index, int width, int height, UINT32 *alpha) +static void get_image_bits(HIMAGELIST himl, int index, int width, int height, UINT32 *bits) { - int i; HBITMAP hbm_dst; void *bitmap_bits; BITMAPINFO bitmap_info = {{sizeof(BITMAPINFOHEADER), width, height, 1, 32, BI_RGB, 0, 0, 0, 0, 0}}; @@ -2358,9 +2357,7 @@ static void get_image_alpha(HIMAGELIST himl, int index, int width, int height, U SelectObject(hdc_dst, hbm_dst); pImageList_Draw(himl, index, hdc_dst, 0, 0, ILD_TRANSPARENT); - memcpy(alpha, bitmap_bits, (size_t)(width * height * 32 / 8)); - for (i = 0; i < width * height; i++) - alpha[i] = GetAValue(alpha[i]); + memcpy(bits, bitmap_bits, (size_t)(width * height * 32 / 8)); DeleteObject(hbm_dst); DeleteDC(hdc_dst); @@ -2372,6 +2369,11 @@ static void test_alpha(void) const static UINT32 test_bitmaps[] = { 0x00654321, 0x00ABCDEF, + 0x00654321, 0x00654321, + 0x00ABCDEF, 0x00654321, + 0x00ABCDEF, 0x00ABCDEF, + 0x00654321, 0x01ABCDEF, + 0x01654321, 0x00ABCDEF, 0x00654321, 0xFFABCDEF, 0x00654321, 0x89ABCDEF, 0xFF654321, 0x00ABCDEF, @@ -2381,31 +2383,72 @@ static void test_alpha(void) 0x87654321, 0xFFABCDEF, 0x87654321, 0x89ABCDEF }; + const static BYTE mask_bits = 0xAA; int i, ret; HDC hdc; - HBITMAP hbm_test; + HBITMAP hbm_test, hbm_mask; HIMAGELIST himl; - UINT32 alpha[2]; + UINT32 bits[2]; hdc = CreateCompatibleDC(0); - himl = pImageList_Create(2, 1, ILC_COLOR32 | ILC_MASK, 0, 10); + himl = pImageList_Create(2, 1, ILC_COLOR32 | ILC_MASK, 0, 15); for (i = 0; i < ARRAY_SIZE(test_bitmaps); i += 2) { hbm_test = create_test_bitmap(hdc, 2, 1, 32, test_bitmaps + i); - ret = pImageList_AddMasked(himl, hbm_test, CLR_NONE); + ret = pImageList_AddMasked(himl, hbm_test, RGB(0x65,0x43,0x21)); ok(ret == i / 2, "ImageList_AddMasked returned %d, expected %d\n", ret, i / 2); DeleteObject(hbm_test); - get_image_alpha(himl, i / 2, 2, 1, alpha); - ok(alpha[0] == GetAValue(test_bitmaps[i]) && alpha[1] == GetAValue(test_bitmaps[i + 1]), + get_image_bits(himl, i / 2, 2, 1, bits); + ok(GetAValue(bits[0]) == GetAValue(test_bitmaps[i]) && GetAValue(bits[1]) == GetAValue(test_bitmaps[i + 1]), + "Bitmap [%08X, %08X] returned alpha value [%02X, %02X], expected [%02X, %02X]\n", + test_bitmaps[i], test_bitmaps[i + 1], GetAValue(bits[0]), GetAValue(bits[1]), + GetAValue(test_bitmaps[i]), GetAValue(test_bitmaps[i + 1])); + + /* If all alpha values are zero, the image is considered to have no alpha and gets masked */ + if (!GetAValue(bits[0]) && !GetAValue(bits[1])) + ok(bits[0] == (test_bitmaps[i] == 0x654321 ? 0 : test_bitmaps[i]) && + bits[1] == (test_bitmaps[i + 1] == 0x654321 ? 0 : test_bitmaps[i + 1]), + "Bitmap [%08X, %08X] returned [%08X, %08X], expected [%08X, %08X]\n", + test_bitmaps[i], test_bitmaps[i + 1], bits[0], bits[1], + test_bitmaps[i] == 0x654321 ? 0 : test_bitmaps[i], + test_bitmaps[i + 1] == 0x654321 ? 0 : test_bitmaps[i + 1]); + } + + pImageList_Destroy(himl); + hbm_mask = CreateBitmap(2, 1, 1, 1, &mask_bits); + himl = pImageList_Create(2, 1, ILC_COLOR32 | ILC_MASK, 0, 15); + + for (i = 0; i < ARRAY_SIZE(test_bitmaps); i += 2) + { + hbm_test = create_test_bitmap(hdc, 2, 1, 32, test_bitmaps + i); + ret = pImageList_Add(himl, hbm_test, hbm_mask); + ok(ret == i / 2, "ImageList_Add returned %d, expected %d\n", ret, i / 2); + DeleteObject(hbm_test); + + get_image_bits(himl, i / 2, 2, 1, bits); + ok(GetAValue(bits[0]) == GetAValue(test_bitmaps[i]) && GetAValue(bits[1]) == GetAValue(test_bitmaps[i + 1]), "Bitmap [%08X, %08X] returned alpha value [%02X, %02X], expected [%02X, %02X]\n", - test_bitmaps[i], test_bitmaps[i + 1], alpha[0], alpha[1], + test_bitmaps[i], test_bitmaps[i + 1], GetAValue(bits[0]), GetAValue(bits[1]), GetAValue(test_bitmaps[i]), GetAValue(test_bitmaps[i + 1])); + + /* If all alpha values are zero, the image is considered to have no alpha and gets masked */ + if (!GetAValue(bits[0]) && !GetAValue(bits[1])) + todo_wine ok(!bits[0] && bits[1] == test_bitmaps[i + 1], + "Bitmap [%08X, %08X] returned [%08X, %08X], expected [%08X, %08X]\n", + test_bitmaps[i], test_bitmaps[i + 1], bits[0], bits[1], 0, test_bitmaps[i + 1]); + else + { + if (GetAValue(bits[0]) >= 0x80) + ok(bits[0] & 0x00FFFFFF, "Bitmap [%08X, %08X] has alpha and masked first pixel [%08X]\n", + test_bitmaps[i], test_bitmaps[i + 1], bits[0]); + } } pImageList_Destroy(himl); + DeleteObject(hbm_mask); DeleteDC(hdc); } -- 2.29.2

1 1

[PATCH] readme: Update German translation.
by Julian Rüger Jan. 5, 2021

Jan. 5, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] comctl32: Remove the masked background also when adding alpha images.
by Gabriel Ivăncescu Jan. 5, 2021

Jan. 5, 2021

Fixes a regression introduced by 61b9209221d28d5d02379791ac1316c1fc2ca3b7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50454 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/imagelist.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a6d9c73..170320c 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -290,6 +290,24 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, } add_dib_bits( himl, pos, count, width, height, info, mask_info, bits, mask_bits ); + + if (hbmMask && himl->hbmMask) + { + HDC hdcTemp = CreateCompatibleDC(0); + POINT pt; + INT i; + + SelectObject(hdcTemp, hbmMask); + for (i = 0; i < count; i++) + { + imagelist_point_from_index( himl, pos + i, &pt ); + BitBlt( himl->hdcMask, pt.x, pt.y, width, height, hdcTemp, i * width, 0, SRCCOPY ); + + /* Remove the background from the image */ + BitBlt( himl->hdcImage, pt.x, pt.y, width, height, himl->hdcMask, pt.x, pt.y, 0x220326 ); /* NOTSRCAND */ + } + DeleteDC(hdcTemp); + } ret = TRUE; done: -- 2.29.2

2 2