January 2021 - Wine-Commits

Zebediah Figura : kernel32/tests: Add a regression test for a deadlock calling FLS callbacks on process exit.
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: wine Branch: master Commit: 9bc3a9f78bf5e6a09d4e9811f645def4a477f3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc3a9f78bf5e6a09d4e9811… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 7 09:51:03 2021 -0600 kernel32/tests: Add a regression test for a deadlock calling FLS callbacks on process exit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 1b5d0d1393a..3c54351fa7b 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -776,8 +776,76 @@ static void test_FiberLocalStorageWithFibers(PFLS_CALLBACK_FUNCTION cbfunc) test_ConvertFiberToThread(); } +static void WINAPI fls_exit_deadlock_callback(void *arg) +{ + if (arg == (void *)1) + Sleep(INFINITE); + if (arg == (void *)2) + /* Unfortunately this test won't affect the exit code if it fails, but + * at least it will print a failure message. */ + ok(RtlDllShutdownInProgress(), "expected DLL shutdown\n"); +} + +static DWORD CALLBACK fls_exit_deadlock_thread(void *arg) +{ + FlsSetValue((DWORD_PTR)arg, (void *)1); + return 0; +} + +static void fls_exit_deadlock_child(void) +{ + DWORD index = FlsAlloc(fls_exit_deadlock_callback); + FlsSetValue(index, (void *)2); + CreateThread(NULL, 0, fls_exit_deadlock_thread, (void *)(DWORD_PTR)index, 0, NULL); + Sleep(100); + ExitProcess(0); +} + +static void test_fls_exit_deadlock(void) +{ + char **argv, cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + BOOL ret; + + /* Regression test for the following deadlock: + * + * Thread A Thread B + * ----------------------------- + * ExitThread + * acquire FLS lock + * call FLS callback + * ExitProcess + * terminate thread A + * acquire FLS lock + * + * Thread B deadlocks on acquiring the FLS lock (in order to itself call its + * FLS callbacks.) + */ + + winetest_get_mainargs(&argv); + sprintf(cmdline, "%s %s fls_exit_deadlock", argv[0], argv[1]); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "failed to create child, error %u\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(!ret, "wait failed\n"); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(fiber) { + char **argv; + int argc; + + argc = winetest_get_mainargs(&argv); + + if (argc == 3 && !strcmp(argv[2], "fls_exit_deadlock")) + { + fls_exit_deadlock_child(); + return; + } + init_funcs(); if (!pCreateFiber) @@ -790,4 +858,5 @@ START_TEST(fiber) test_FiberLocalStorage(); test_FiberLocalStorageCallback(FiberLocalStorageProc); test_FiberLocalStorageWithFibers(FiberLocalStorageProc); + test_fls_exit_deadlock(); }

1 0

Zebediah Figura : ntdll: Set the process detaching flag before calling FLS callbacks.
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: wine Branch: master Commit: 16592ca918999dd28764e071384361ea44bdf11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=16592ca918999dd28764e071… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 7 09:51:02 2021 -0600 ntdll: Set the process detaching flag before calling FLS callbacks. So that we will not deadlock trying to acquire fls_section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9b7e30b2c2b..3f43062f9f8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3182,12 +3182,14 @@ fail: */ void WINAPI LdrShutdownProcess(void) { + BOOL detaching = process_detaching; + TRACE("()\n"); - if (!process_detaching) + process_detaching = TRUE; + if (!detaching) RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 1 ); - process_detaching = TRUE; process_detach(); }

1 0

Zebediah Figura : user32/tests: Add some tests for WM_CANCELMODE.
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: wine Branch: master Commit: 522b230142e22673ac0eabf5fd246abd22098571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=522b230142e22673ac0eabf5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:46 2021 -0600 user32/tests: Add some tests for WM_CANCELMODE. In particular, test sending WM_CANCELMODE to a parent of the capture window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0

Francois Gouget : testbot/WineReconfig: Do not prepare wineprefixes in advance.
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: tools Branch: master Commit: e2888e5b253fee41bb4d77bdac3c61335050870b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e2888e5b253fee41bb4d77b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 6 23:29:46 2021 +0100 testbot/WineReconfig: Do not prepare wineprefixes in advance. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f9f6792..bd9ff57 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;

1 0

Francois Gouget : testbot/build: Remove unneeded Reconfig vs. WineReconfig differences.
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: tools Branch: master Commit: c0619f7f7abd6cb3a509d5584e58f9b2dffcb678 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c0619f7f7abd6cb3a509d55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 6 23:29:54 2021 +0100 testbot/build: Remove unneeded Reconfig vs. WineReconfig differences. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 1 + testbot/bin/build/WineReconfig.pl | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 458b5da..9e1043a 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -152,6 +152,7 @@ if (defined $Usage) print "Where:\n"; print " --update Update Wine's source code.\n"; print " --build Update the Wine builds.\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 following\n"; print " missions are run.\n"; print " - exe32: Build the 32 bit Windows test executables.\n"; diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index bd9ff57..75a21b3 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -168,15 +168,15 @@ if (defined $Usage) } 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 "Performs all the tasks needed for the host to be ready to run Wine tests: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; print "Where:\n"; 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 "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"; + print " MISSIONS Is a colon-separated list of missions. By default the following\n"; + print " missions are run.\n"; print " - win32: Build the regular 32 bit Wine.\n"; print " - wow32: Build the 32 bit WoW Wine.\n"; print " - wow64: Build the 64 bit WoW Wine.\n"; @@ -185,21 +185,20 @@ if (defined $Usage) exit 0; } -if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") +if ($DataDir =~ /'/) { - LogMsg "Unable to create '$DataDir/staging': $!\n"; + LogMsg "The install path contains invalid characters\n"; exit(1); } - -if ($DataDir =~ /'/) +if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") { - LogMsg "The install path contains invalid characters\n"; + LogMsg "Unable to create '$DataDir/staging': $!\n"; exit(1); } # -# Run the builds and/or tests +# Run the builds # exit(1) if ($OptBuild and !BuildNativeTestAgentd());

1 0

Rémi Bernon : server: Accept DBG_EXCEPTION_HANDLED parameter in continue_debug_event.
by Alexandre Julliard Jan. 6, 2021

Jan. 6, 2021

Module: wine Branch: master Commit: c414f232e6cb09a5ec6a4b015c4cdcf427e0531d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c414f232e6cb09a5ec6a4b01… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 6 15:33:10 2021 +0100 server: Accept DBG_EXCEPTION_HANDLED parameter in continue_debug_event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50453 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 27 ++++++++++++++------------- server/debugger.c | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ca338775351..202a939b76f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1053,7 +1053,7 @@ static void test_exceptions(void) ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res ); } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -1081,7 +1081,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -1091,7 +1091,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -3288,7 +3288,7 @@ static void test_rtlraiseexception(void) run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -3316,7 +3316,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -3326,7 +3326,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -4252,7 +4252,7 @@ static void test_thread_context(void) #undef COMPARE } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -4280,7 +4280,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -4290,7 +4290,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -5500,7 +5500,7 @@ static void test_thread_context(void) #undef COMPARE } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -5528,7 +5528,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -5538,7 +5538,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -8346,7 +8346,8 @@ START_TEST(exception) #endif - test_debugger(); + test_debugger(DBG_EXCEPTION_HANDLED); + test_debugger(DBG_CONTINUE); test_thread_context(); test_outputdebugstring(1, FALSE); test_ripevent(1); diff --git a/server/debugger.c b/server/debugger.c index e4a6c1e43a8..ee95d4ee326 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -677,6 +677,7 @@ DECL_HANDLER(continue_debug_event) struct process *process; if (req->status != DBG_EXCEPTION_NOT_HANDLED && + req->status != DBG_EXCEPTION_HANDLED && req->status != DBG_CONTINUE && req->status != DBG_REPLY_LATER) {

1 0

Gabriel Ivăncescu : comctl32: Remove the masked background when 32bpp bitmaps have no alpha values.
by Alexandre Julliard Jan. 6, 2021

Jan. 6, 2021

Module: wine Branch: master Commit: 4ac05afd39aff3030e3379ee06e32d6544ef5d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac05afd39aff3030e3379ee… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 5 19:53:18 2021 +0200 comctl32: Remove the masked background when 32bpp bitmaps have no alpha values. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 7 +++++++ dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a6d9c73c49b..307ccc0336c 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -234,6 +234,13 @@ static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int he mask_bits[i * mask_stride + j / 8] |= 0x80 >> (j % 8); } } + else if (mask_info) /* mask out the background */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((mask_bits[i * mask_stride + j / 8] << (j % 8)) & 0x80) + bits[i * stride + j] = 0; + } StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); if (mask_info) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index c74acb2a215..ed9b1cc97f2 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2436,7 +2436,7 @@ static void test_alpha(void) /* 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], + 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

1 0

Rémi Bernon : windowscodecs: Copy container_count GUIDs, not bytes, in GetContainerFormats.
by Alexandre Julliard Jan. 6, 2021

Jan. 6, 2021

Module: wine Branch: master Commit: 901366e3d4aecb84044a3f990bb2220a1e4a2b05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=901366e3d4aecb84044a3f99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 5 18:40:00 2021 +0100 windowscodecs: Copy container_count GUIDs, not bytes, in GetContainerFormats. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Gabriel Ivăncescu : comctl32/tests: Add more tests for 32bpp bitmaps with and without alpha, and masks.
by Alexandre Julliard Jan. 6, 2021

Jan. 6, 2021

Module: wine Branch: master Commit: a692a12541b72f3b9a5f75a6ad8b382613a37a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a692a12541b72f3b9a5f75a6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 5 19:53:17 2021 +0200 comctl32/tests: Add more tests for 32bpp bitmaps with and without alpha, and masks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 a5809060542..c74acb2a215 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); }

1 0

Francois Gouget : testbot: Fix the spelling of comments, documentation and web pages.
by Alexandre Julliard Jan. 6, 2021

Jan. 6, 2021

Module: tools Branch: master Commit: b264e96049a41a7814faeba2c20dc8538505fb05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b264e96049a41a7814faeba… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 6 14:00:17 2021 +0100 testbot: Fix the spelling of comments, documentation and web pages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 eba45a0..2a1e21f 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 c28e143..800d136 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 44b3f97..df31a09 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 c9ce343..0943375 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 5a79ff9..141fee0 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 d616a7c..9444779 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 35160a1..c2464d0 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 f453891..4a70cb0 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";

1 0