From: Dmitry Timoshkov dmitry@baikal.ru
Signed-off-by: Myah Caron qsniyg@protonmail.com --- This is a staging patch. I've added a test, but left the patch otherwise untouched.
dlls/user32/painting.c | 4 ++-- dlls/user32/tests/win.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 313c5fa1e6..2b4b7937aa 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1484,10 +1484,10 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ;
- if (!WIN_IsWindowDrawable( hwnd, TRUE )) return ERROR; hwnd = WIN_GetFullHandle( hwnd );
- GetClientRect(hwnd, &rc); + if (!WIN_IsWindowDrawable( hwnd, TRUE )) SetRectEmpty(&rc); + else GetClientRect(hwnd, &rc);
if (clipRect) IntersectRect(&cliprc,&rc,clipRect); else cliprc = rc; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 700e60db17..354ed5a2c1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4920,6 +4920,7 @@ static void test_scrollwindow( HWND hwnd) HDC hdc; RECT rc, rc2, rc3; COLORREF colr; + INT ret;
ShowWindow( hwnd, SW_SHOW); UpdateWindow( hwnd); @@ -4964,6 +4965,12 @@ static void test_scrollwindow( HWND hwnd) colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 ); ok ( colr == 0, "pixel should be black, color is %08x\n", colr);
+ ShowWindow(hwnd, SW_HIDE); + UpdateWindow( hwnd); + flush_events( TRUE ); + ret = ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, &rc3, NULL, NULL, SW_ERASE); + ok(ret == NULLREGION, "got ret %d\n", ret); + /* clean up */ ReleaseDC( hwnd, hdc); } -- 2.27.0
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=76315
Your paranoid android.
=== w1064v1507 (32 bit report) ===
user32: win.c:9485: Test failed: Timed out waiting for the child process
=== w1064v1809 (32 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 00030296 win.c:3167: Test failed: GetFocus() = 00000000 win.c:3179: Test failed: GetFocus() = 00000000 win.c:3182: Test failed: GetFocus() = 00000000 win.c:3185: Test failed: GetFocus() = 00000000 win.c:3188: Test failed: GetActiveWindow() = 00030296 win.c:3192: Test failed: GetFocus() = 00000000 win.c:3195: Test failed: GetFocus() = 00000000 win.c:3889: Test failed: hwnd 00020174/00110292 message 0737 win.c:3894: Test failed: hwnd 00110292/00110292 message 0202 win.c:3899: Test failed: hwnd 00110292/00110292 message 0203 win.c:3903: Test failed: message 0202 available
=== w1064v1809_2scr (32 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 0004007C win.c:3167: Test failed: GetFocus() = 00000000 win.c:3179: Test failed: GetFocus() = 00000000 win.c:3182: Test failed: GetFocus() = 00000000 win.c:3185: Test failed: GetFocus() = 00000000 win.c:3188: Test failed: GetActiveWindow() = 0004007C win.c:3192: Test failed: GetFocus() = 00000000 win.c:3195: Test failed: GetFocus() = 00000000 win.c:3889: Test failed: hwnd 00070052/000B0322 message 0737 win.c:3894: Test failed: hwnd 000B0322/000B0322 message 0202 win.c:3899: Test failed: hwnd 000B0322/000B0322 message 0203 win.c:3903: Test failed: message 0202 available
=== w1064v1809_ja (32 bit report) ===
user32: win.c:3724: Test failed: message 0738 available win.c:3849: Test failed: hwnd 000300D8 message 7fff win.c:3928: Test failed: hwnd 000300D8/000F014A message 7fff win.c:3931: Test failed: hwnd 000300D8/000F014A message 7fff
=== w1064v1809_zh_CN (32 bit report) ===
user32: win.c:3849: Test failed: hwnd 0003018E message 0282 win.c:3928: Test failed: hwnd 0003018E/004102DE message 0282 win.c:3931: Test failed: hwnd 0003018E/004102DE message 0282
=== w1064v1809 (64 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 0000000000030060 win.c:3188: Test failed: GetActiveWindow() = 0000000000030060 win.c:3889: Test failed: hwnd 00000000000200E4/00000000000A006E message 0737 win.c:3894: Test failed: hwnd 00000000000A006E/00000000000A006E message 0202 win.c:3899: Test failed: hwnd 00000000000A006E/00000000000A006E message 0203
=== debiant (32 bit report) ===
user32: monitor: Timeout
=== debiant (32 bit Chinese:China report) ===
user32: clipboard.c:833: Test failed: 6: gle 5 clipboard.c:838: Test failed: 6.0: got 0000 instead of 0008 clipboard.c:868: Test failed: 6: gle 1418 input.c:2514: Test failed: 4: Unexpected cursor movement input.c:2514: Test failed: 5: Unexpected cursor movement input.c:2514: Test failed: 6: Unexpected cursor movement input.c:2514: Test failed: 7: Unexpected cursor movement input.c:2514: Test failed: 8: Unexpected cursor movement input.c:2235: Test failed: 9: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 9: Unexpected cursor movement input.c:2235: Test failed: 10: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 10: Unexpected cursor movement input.c:2235: Test failed: 11: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 11: Unexpected cursor movement input.c:2235: Test failed: 12: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 12: Unexpected cursor movement input.c:2514: Test failed: 13: Unexpected cursor movement input.c:2514: Test failed: 14: Unexpected cursor movement input.c:2514: Test failed: 15: Unexpected cursor movement input.c:2514: Test failed: 16: Unexpected cursor movement monitor: Timeout msg: Timeout sysparams.c:3349: Test failed: Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got 0
=== debiant (32 bit WoW report) ===
user32: monitor: Timeout win.c:10192: Test failed: Expected foreground window 000D013E, got 00E10104 win.c:10194: Test failed: GetActiveWindow() = 00000000 win.c:10194: Test failed: GetFocus() = 00000000 win.c:10195: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10239: Test failed: Expected foreground window 009E00DC, got 00E10104 win.c:10241: Test failed: GetActiveWindow() = 00000000 win.c:10241: Test failed: GetFocus() = 00000000 win.c:10242: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10243: Test failed: Received WM_ACTIVATEAPP(0), did not expect it.
=== debiant (64 bit WoW report) ===
user32: clipboard.c:1383: Test failed: gle 5 clipboard.c:1385: Test failed: gle 1418 clipboard.c:1388: Test failed: got 00000000 clipboard.c:1389: Test failed: expected moveable mem 00000000 clipboard.c:1391: Test failed: got 00000000 clipboard.c:1392: Test failed: expected moveable mem 00000000 clipboard.c:1395: Test failed: got 00000000 clipboard.c:1396: Test failed: expected bitmap 00000000 clipboard.c:1398: Test failed: got 00000000 clipboard.c:1399: Test failed: expected bitmap 00000000 clipboard.c:1401: Test failed: got 00000000 clipboard.c:1402: Test failed: expected bitmap 00000000 clipboard.c:1404: Test failed: got 00000000 clipboard.c:1405: Test failed: expected palette 00000000 clipboard.c:1407: Test failed: got 00000000 clipboard.c:1408: Test failed: expected moveable mem 00000000 clipboard.c:1410: Test failed: got 00000000 clipboard.c:1411: Test failed: expected moveable mem 00000000 clipboard.c:1425: Test failed: got 00000000 clipboard.c:1426: Test failed: expected fixed mem 00000000 clipboard.c:1428: Test failed: got 00000000 clipboard.c:1429: Test failed: expected fixed mem 00000000 clipboard.c:1431: Test failed: got 00000000 clipboard.c:1432: Test failed: expected moveable mem 00000000 clipboard.c:1444: Test failed: wrong data 00000000 clipboard.c:1445: Test failed: expected moveable mem 00000000 clipboard.c:1448: Test failed: wrong data 00000000, cf 0000c040 clipboard.c:1449: Test failed: expected moveable mem 00000000 clipboard.c:1452: Test failed: wrong data 00000000 clipboard.c:1453: Test failed: expected moveable mem 00000000 clipboard.c:1456: Test failed: wrong data 00000000 clipboard.c:1457: Test failed: expected moveable mem 00000000 clipboard.c:1460: Test failed: wrong data 00000000 clipboard.c:1461: Test failed: expected fixed mem 00000000 clipboard.c:1464: Test failed: wrong data 00000000 clipboard.c:1465: Test failed: expected fixed mem 00000000 clipboard.c:1468: Test failed: wrong data 00000000 clipboard.c:1469: Test failed: expected moveable mem 00000000 clipboard.c:1475: Test failed: got 00000000 clipboard.c:1476: Test failed: expected moveable mem 00000000 clipboard.c:1477: Test failed: expected freed mem 00204462 clipboard.c:1480: Test failed: got 00000000 clipboard.c:1481: Test failed: expected fixed mem 00000000 clipboard.c:1486: Test failed: gle 1418 clipboard.c:1549: Test failed: wrong data 00000000 clipboard.c:1552: Test failed: wrong data 00000000, cf 0000c040 clipboard.c:1555: Test failed: wrong data 00000000 clipboard.c:1558: Test failed: wrong data 00000000 clipboard.c:1561: Test failed: wrong data 00000000 clipboard.c:1564: Test failed: wrong data 00000000 clipboard.c:1567: Test failed: wrong data 00000000 clipboard.c:1574: Test failed: expected fixed mem 00000000 clipboard.c:1576: Test failed: expected fixed mem 00000000 clipboard.c:1578: Test failed: expected fixed mem 00000000 clipboard.c:1580: Test failed: expected bitmap 00000000 clipboard.c:1582: Test failed: expected bitmap 00000000 clipboard.c:1584: Test failed: expected palette 00000000 clipboard.c:1586: Test failed: expected fixed mem 00000000 clipboard.c:1588: Test failed: expected fixed mem 00000000 clipboard.c:1600: Test failed: expected freed mem 00BED542 clipboard.c:1601: Test failed: expected freed mem 00BF247A clipboard.c:1602: Test failed: expected freed mem 002043F2 clipboard.c:1603: Test failed: expected freed mem 0020442A clipboard.c:1604: Test failed: expected freed mem 00BF1A7A input.c:2514: Test failed: 4: Unexpected cursor movement input.c:2514: Test failed: 5: Unexpected cursor movement input.c:2514: Test failed: 6: Unexpected cursor movement input.c:2514: Test failed: 7: Unexpected cursor movement input.c:2514: Test failed: 8: Unexpected cursor movement input.c:2235: Test failed: 9: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 9: Unexpected cursor movement input.c:2235: Test failed: 10: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 10: Unexpected cursor movement input.c:2235: Test failed: 11: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 11: Unexpected cursor movement input.c:2235: Test failed: 12: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 12: Unexpected cursor movement input.c:2514: Test failed: 13: Unexpected cursor movement input.c:2514: Test failed: 14: Unexpected cursor movement input.c:2514: Test failed: 15: Unexpected cursor movement input.c:2514: Test failed: 16: Unexpected cursor movement monitor: Timeout msg: Timeout sysparams.c:3349: Test failed: Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got 0 win.c:10166: Test failed: Expected foreground window 000D013E, got 00000000 win.c:10173: Test failed: Expected foreground window 000D013E, got 00E10102 win.c:10176: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10185: Test failed: Expected foreground window 000D013E, got 00000000
These appear to be unrelated to the patch.
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ On Thursday, July 30, 2020 7:43 AM, Marvin testbot@winehq.org wrote:
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=76315
Your paranoid android.
=== w1064v1507 (32 bit report) ===
user32: win.c:9485: Test failed: Timed out waiting for the child process
=== w1064v1809 (32 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 00030296 win.c:3167: Test failed: GetFocus() = 00000000 win.c:3179: Test failed: GetFocus() = 00000000 win.c:3182: Test failed: GetFocus() = 00000000 win.c:3185: Test failed: GetFocus() = 00000000 win.c:3188: Test failed: GetActiveWindow() = 00030296 win.c:3192: Test failed: GetFocus() = 00000000 win.c:3195: Test failed: GetFocus() = 00000000 win.c:3889: Test failed: hwnd 00020174/00110292 message 0737 win.c:3894: Test failed: hwnd 00110292/00110292 message 0202 win.c:3899: Test failed: hwnd 00110292/00110292 message 0203 win.c:3903: Test failed: message 0202 available
=== w1064v1809_2scr (32 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 0004007C win.c:3167: Test failed: GetFocus() = 00000000 win.c:3179: Test failed: GetFocus() = 00000000 win.c:3182: Test failed: GetFocus() = 00000000 win.c:3185: Test failed: GetFocus() = 00000000 win.c:3188: Test failed: GetActiveWindow() = 0004007C win.c:3192: Test failed: GetFocus() = 00000000 win.c:3195: Test failed: GetFocus() = 00000000 win.c:3889: Test failed: hwnd 00070052/000B0322 message 0737 win.c:3894: Test failed: hwnd 000B0322/000B0322 message 0202 win.c:3899: Test failed: hwnd 000B0322/000B0322 message 0203 win.c:3903: Test failed: message 0202 available
=== w1064v1809_ja (32 bit report) ===
user32: win.c:3724: Test failed: message 0738 available win.c:3849: Test failed: hwnd 000300D8 message 7fff win.c:3928: Test failed: hwnd 000300D8/000F014A message 7fff win.c:3931: Test failed: hwnd 000300D8/000F014A message 7fff
=== w1064v1809_zh_CN (32 bit report) ===
user32: win.c:3849: Test failed: hwnd 0003018E message 0282 win.c:3928: Test failed: hwnd 0003018E/004102DE message 0282 win.c:3931: Test failed: hwnd 0003018E/004102DE message 0282
=== w1064v1809 (64 bit report) ===
user32: win.c:3164: Test failed: GetActiveWindow() = 0000000000030060 win.c:3188: Test failed: GetActiveWindow() = 0000000000030060 win.c:3889: Test failed: hwnd 00000000000200E4/00000000000A006E message 0737 win.c:3894: Test failed: hwnd 00000000000A006E/00000000000A006E message 0202 win.c:3899: Test failed: hwnd 00000000000A006E/00000000000A006E message 0203
=== debiant (32 bit report) ===
user32: monitor: Timeout
=== debiant (32 bit Chinese:China report) ===
user32: clipboard.c:833: Test failed: 6: gle 5 clipboard.c:838: Test failed: 6.0: got 0000 instead of 0008 clipboard.c:868: Test failed: 6: gle 1418 input.c:2514: Test failed: 4: Unexpected cursor movement input.c:2514: Test failed: 5: Unexpected cursor movement input.c:2514: Test failed: 6: Unexpected cursor movement input.c:2514: Test failed: 7: Unexpected cursor movement input.c:2514: Test failed: 8: Unexpected cursor movement input.c:2235: Test failed: 9: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 9: Unexpected cursor movement input.c:2235: Test failed: 10: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 10: Unexpected cursor movement input.c:2235: Test failed: 11: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 11: Unexpected cursor movement input.c:2235: Test failed: 12: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 12: Unexpected cursor movement input.c:2514: Test failed: 13: Unexpected cursor movement input.c:2514: Test failed: 14: Unexpected cursor movement input.c:2514: Test failed: 15: Unexpected cursor movement input.c:2514: Test failed: 16: Unexpected cursor movement monitor: Timeout msg: Timeout sysparams.c:3349: Test failed: Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got 0
=== debiant (32 bit WoW report) ===
user32: monitor: Timeout win.c:10192: Test failed: Expected foreground window 000D013E, got 00E10104 win.c:10194: Test failed: GetActiveWindow() = 00000000 win.c:10194: Test failed: GetFocus() = 00000000 win.c:10195: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10239: Test failed: Expected foreground window 009E00DC, got 00E10104 win.c:10241: Test failed: GetActiveWindow() = 00000000 win.c:10241: Test failed: GetFocus() = 00000000 win.c:10242: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10243: Test failed: Received WM_ACTIVATEAPP(0), did not expect it.
=== debiant (64 bit WoW report) ===
user32: clipboard.c:1383: Test failed: gle 5 clipboard.c:1385: Test failed: gle 1418 clipboard.c:1388: Test failed: got 00000000 clipboard.c:1389: Test failed: expected moveable mem 00000000 clipboard.c:1391: Test failed: got 00000000 clipboard.c:1392: Test failed: expected moveable mem 00000000 clipboard.c:1395: Test failed: got 00000000 clipboard.c:1396: Test failed: expected bitmap 00000000 clipboard.c:1398: Test failed: got 00000000 clipboard.c:1399: Test failed: expected bitmap 00000000 clipboard.c:1401: Test failed: got 00000000 clipboard.c:1402: Test failed: expected bitmap 00000000 clipboard.c:1404: Test failed: got 00000000 clipboard.c:1405: Test failed: expected palette 00000000 clipboard.c:1407: Test failed: got 00000000 clipboard.c:1408: Test failed: expected moveable mem 00000000 clipboard.c:1410: Test failed: got 00000000 clipboard.c:1411: Test failed: expected moveable mem 00000000 clipboard.c:1425: Test failed: got 00000000 clipboard.c:1426: Test failed: expected fixed mem 00000000 clipboard.c:1428: Test failed: got 00000000 clipboard.c:1429: Test failed: expected fixed mem 00000000 clipboard.c:1431: Test failed: got 00000000 clipboard.c:1432: Test failed: expected moveable mem 00000000 clipboard.c:1444: Test failed: wrong data 00000000 clipboard.c:1445: Test failed: expected moveable mem 00000000 clipboard.c:1448: Test failed: wrong data 00000000, cf 0000c040 clipboard.c:1449: Test failed: expected moveable mem 00000000 clipboard.c:1452: Test failed: wrong data 00000000 clipboard.c:1453: Test failed: expected moveable mem 00000000 clipboard.c:1456: Test failed: wrong data 00000000 clipboard.c:1457: Test failed: expected moveable mem 00000000 clipboard.c:1460: Test failed: wrong data 00000000 clipboard.c:1461: Test failed: expected fixed mem 00000000 clipboard.c:1464: Test failed: wrong data 00000000 clipboard.c:1465: Test failed: expected fixed mem 00000000 clipboard.c:1468: Test failed: wrong data 00000000 clipboard.c:1469: Test failed: expected moveable mem 00000000 clipboard.c:1475: Test failed: got 00000000 clipboard.c:1476: Test failed: expected moveable mem 00000000 clipboard.c:1477: Test failed: expected freed mem 00204462 clipboard.c:1480: Test failed: got 00000000 clipboard.c:1481: Test failed: expected fixed mem 00000000 clipboard.c:1486: Test failed: gle 1418 clipboard.c:1549: Test failed: wrong data 00000000 clipboard.c:1552: Test failed: wrong data 00000000, cf 0000c040 clipboard.c:1555: Test failed: wrong data 00000000 clipboard.c:1558: Test failed: wrong data 00000000 clipboard.c:1561: Test failed: wrong data 00000000 clipboard.c:1564: Test failed: wrong data 00000000 clipboard.c:1567: Test failed: wrong data 00000000 clipboard.c:1574: Test failed: expected fixed mem 00000000 clipboard.c:1576: Test failed: expected fixed mem 00000000 clipboard.c:1578: Test failed: expected fixed mem 00000000 clipboard.c:1580: Test failed: expected bitmap 00000000 clipboard.c:1582: Test failed: expected bitmap 00000000 clipboard.c:1584: Test failed: expected palette 00000000 clipboard.c:1586: Test failed: expected fixed mem 00000000 clipboard.c:1588: Test failed: expected fixed mem 00000000 clipboard.c:1600: Test failed: expected freed mem 00BED542 clipboard.c:1601: Test failed: expected freed mem 00BF247A clipboard.c:1602: Test failed: expected freed mem 002043F2 clipboard.c:1603: Test failed: expected freed mem 0020442A clipboard.c:1604: Test failed: expected freed mem 00BF1A7A input.c:2514: Test failed: 4: Unexpected cursor movement input.c:2514: Test failed: 5: Unexpected cursor movement input.c:2514: Test failed: 6: Unexpected cursor movement input.c:2514: Test failed: 7: Unexpected cursor movement input.c:2514: Test failed: 8: Unexpected cursor movement input.c:2235: Test failed: 9: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 9: Unexpected cursor movement input.c:2235: Test failed: 10: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 10: Unexpected cursor movement input.c:2235: Test failed: 11: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 11: Unexpected cursor movement input.c:2235: Test failed: 12: foreground process expected WM_MOUSEMOVE message input.c:2514: Test failed: 12: Unexpected cursor movement input.c:2514: Test failed: 13: Unexpected cursor movement input.c:2514: Test failed: 14: Unexpected cursor movement input.c:2514: Test failed: 15: Unexpected cursor movement input.c:2514: Test failed: 16: Unexpected cursor movement monitor: Timeout msg: Timeout sysparams.c:3349: Test failed: Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got 0 win.c:10166: Test failed: Expected foreground window 000D013E, got 00000000 win.c:10173: Test failed: Expected foreground window 000D013E, got 00E10102 win.c:10176: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10185: Test failed: Expected foreground window 000D013E, got 00000000
-
Marvin -
Myah Caron