[PATCH 3/6] user32: Split client and kernel parts of unpack_message.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 133 +++++++++-------------- dlls/user32/winproc.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 297 insertions(+), 86 deletions(-)
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=111171 Your paranoid android. === debian11 (32 bit report) === user32: input.c:1315: Test failed: Wrong hook coords: (106 106) != (150,150) input.c:1323: Test failed: GetCursorPos: (106,106) input.c:2163: Test failed: Unexpected rawinput data: 5 input.c:2160: Test failed: GetRawInputBuffer returned 7 input.c:2160: Test failed: GetRawInputBuffer returned 2 input.c:2162: Test failed: Unexpected rawinput data: 3 input.c:1623: Test failed: expected to get 64 mouse move points but got 63 input.c:1628: Test failed: wrong position 4, expected 62x124 got 64x128 input.c:1628: Test failed: wrong position 6, expected 60x120 got 63x126 input.c:1628: Test failed: wrong position 7, expected 59x118 got 62x124 input.c:1628: Test failed: wrong position 8, expected 58x116 got 60x120 input.c:1628: Test failed: wrong position 9, expected 57x114 got 61x122 input.c:1628: Test failed: wrong position 10, expected 56x112 got 59x118 input.c:1628: Test failed: wrong position 11, expected 55x110 got 58x116 input.c:1628: Test failed: wrong position 16, expected 50x100 got 58x116 input.c:1628: Test failed: wrong position 17, expected 49x98 got 55x110 input.c:1628: Test failed: wrong position 19, expected 47x94 got 54x108 input.c:1628: Test failed: wrong position 20, expected 46x92 got 56x112 input.c:1628: Test failed: wrong position 21, expected 45x90 got 55x110 input.c:1628: Test failed: wrong position 22, expected 44x88 got 53x106 input.c:1628: Test failed: wrong position 24, expected 42x84 got 54x108 input.c:1628: Test failed: wrong position 25, expected 41x82 got 53x106 input.c:1628: Test failed: wrong position 26, expected 40x80 got 51x102 input.c:1628: Test failed: wrong position 27, expected 39x78 got 50x100 input.c:1628: Test failed: wrong position 29, expected 37x74 got 52x104 input.c:1628: Test failed: wrong position 30, expected 36x72 got 51x102 input.c:1628: Test failed: wrong position 31, expected 35x70 got 48x96 input.c:1628: Test failed: wrong position 33, expected 33x66 got 49x98 input.c:1628: Test failed: wrong position 34, expected 32x64 got 47x94 input.c:1628: Test failed: wrong position 39, expected 27x54 got 44x88 input.c:1628: Test failed: wrong position 41, expected 25x50 got 43x86 input.c:1628: Test failed: wrong position 42, expected 24x48 got 45x90 input.c:1628: Test failed: wrong position 46, expected 20x40 got 43x86 input.c:1628: Test failed: wrong position 47, expected 19x38 got 40x80 input.c:1628: Test failed: wrong position 50, expected 16x32 got 42x84 input.c:1628: Test failed: wrong position 51, expected 15x30 got 41x82 input.c:1628: Test failed: wrong position 54, expected 12x24 got 39x78 input.c:1628: Test failed: wrong position 55, expected 11x22 got 38x76 input.c:1628: Test failed: wrong position 56, expected 10x20 got 36x72 === debian11 (32 bit Chinese:China report) === user32: input.c:3410: Test failed: expected WM_LBUTTONDOWN message input.c:3411: Test failed: expected WM_LBUTTONUP message input.c:2160: Test failed: GetRawInputBuffer returned 7 input.c:2163: Test failed: Unexpected rawinput data: 6 input.c:2160: Test failed: GetRawInputBuffer returned 2 input.c:2162: Test failed: Unexpected rawinput data: -5 input.c:2163: Test failed: Unexpected rawinput data: 4 input.c:1628: Test failed: wrong position 1, expected 65x130 got 62x124 input.c:1628: Test failed: wrong position 3, expected 63x126 got 64x128 input.c:1628: Test failed: wrong position 5, expected 61x122 got 60x120 input.c:1628: Test failed: wrong position 7, expected 59x118 got 62x124 input.c:1628: Test failed: wrong position 8, expected 58x116 got 59x118 input.c:1628: Test failed: wrong position 9, expected 57x114 got 61x122 input.c:1628: Test failed: wrong position 10, expected 56x112 got 58x116 input.c:1628: Test failed: wrong position 11, expected 55x110 got 57x114 input.c:1628: Test failed: wrong position 13, expected 53x106 got 59x118 input.c:1628: Test failed: wrong position 15, expected 51x102 got 58x116 input.c:1628: Test failed: wrong position 17, expected 49x98 got 57x114 input.c:1628: Test failed: wrong position 21, expected 45x90 got 55x110 input.c:1628: Test failed: wrong position 23, expected 43x86 got 54x108 input.c:1628: Test failed: wrong position 25, expected 41x82 got 53x106 input.c:1628: Test failed: wrong position 27, expected 39x78 got 49x98 input.c:1628: Test failed: wrong position 29, expected 37x74 got 51x102 input.c:1628: Test failed: wrong position 31, expected 35x70 got 50x100 input.c:1628: Test failed: wrong position 33, expected 33x66 got 46x92 input.c:1628: Test failed: wrong position 35, expected 31x62 got 45x90 input.c:1628: Test failed: wrong position 37, expected 29x58 got 47x94 input.c:1628: Test failed: wrong position 39, expected 27x54 got 46x92 input.c:1628: Test failed: wrong position 41, expected 25x50 got 45x90 input.c:1628: Test failed: wrong position 43, expected 23x46 got 44x88 input.c:1628: Test failed: wrong position 45, expected 21x42 got 40x80 input.c:1628: Test failed: wrong position 47, expected 19x38 got 42x84 input.c:1628: Test failed: wrong position 48, expected 18x36 got 39x78 input.c:1628: Test failed: wrong position 49, expected 17x34 got 41x82 input.c:1628: Test failed: wrong position 50, expected 16x32 got 38x76 input.c:1628: Test failed: wrong position 51, expected 15x30 got 37x74 input.c:1628: Test failed: wrong position 53, expected 13x26 got 39x78 input.c:1628: Test failed: wrong position 54, expected 12x24 got 36x72 input.c:1628: Test failed: wrong position 55, expected 11x22 got 38x76 input.c:1628: Test failed: wrong position 56, expected 10x20 got 35x70 input.c:1628: Test failed: wrong position 57, expected 9x18 got 37x74 input.c:1628: Test failed: wrong position 59, expected 7x14 got 33x66 input.c:1628: Test failed: wrong position 61, expected 5x10 got 35x70 input.c:1628: Test failed: wrong position 62, expected 4x8 got 32x64 input.c:1695: Test failed: expected to get 64 mouse move points but got 63 win.c:11344: Test failed: expected 01AF00CC, got 005E0096 === debian11 (32 bit WoW report) === user32: input.c:2164: Test failed: Unexpected rawinput data: -1 input.c:2182: Test failed: Unexpected rawinput data: 3 input.c:2160: Test failed: GetRawInputBuffer returned 7 input.c:2162: Test failed: Unexpected rawinput data: -3 input.c:2163: Test failed: Unexpected rawinput data: 5 input.c:1628: Test failed: wrong position 5, expected 61x122 got 62x124 input.c:1628: Test failed: wrong position 7, expected 59x118 got 61x122 input.c:1628: Test failed: wrong position 8, expected 58x116 got 62x124 input.c:1628: Test failed: wrong position 9, expected 57x114 got 60x120 input.c:1628: Test failed: wrong position 11, expected 55x110 got 59x118 input.c:1628: Test failed: wrong position 13, expected 53x106 got 58x116 input.c:1628: Test failed: wrong position 15, expected 51x102 got 57x114 input.c:1628: Test failed: wrong position 16, expected 50x100 got 58x116 input.c:1628: Test failed: wrong position 17, expected 49x98 got 56x112 input.c:1628: Test failed: wrong position 21, expected 45x90 got 54x108 input.c:1628: Test failed: wrong position 23, expected 43x86 got 53x106 input.c:1628: Test failed: wrong position 24, expected 42x84 got 52x104 input.c:1628: Test failed: wrong position 28, expected 38x76 got 52x104 input.c:1628: Test failed: wrong position 29, expected 37x74 got 50x100 input.c:1628: Test failed: wrong position 30, expected 36x72 got 51x102 input.c:1628: Test failed: wrong position 31, expected 35x70 got 49x98 input.c:1628: Test failed: wrong position 33, expected 33x66 got 48x96 input.c:1628: Test failed: wrong position 35, expected 31x62 got 47x94 input.c:1628: Test failed: wrong position 36, expected 30x60 got 48x96 input.c:1628: Test failed: wrong position 37, expected 29x58 got 46x92 input.c:1628: Test failed: wrong position 38, expected 28x56 got 47x94 input.c:1628: Test failed: wrong position 39, expected 27x54 got 45x90 input.c:1628: Test failed: wrong position 42, expected 24x48 got 45x90 input.c:1628: Test failed: wrong position 43, expected 23x46 got 43x86 input.c:1628: Test failed: wrong position 44, expected 22x44 got 44x88 input.c:1628: Test failed: wrong position 45, expected 21x42 got 42x84 input.c:1628: Test failed: wrong position 46, expected 20x40 got 43x86 input.c:1628: Test failed: wrong position 47, expected 19x38 got 41x82 input.c:1628: Test failed: wrong position 48, expected 18x36 got 42x84 input.c:1628: Test failed: wrong position 49, expected 17x34 got 40x80 input.c:1628: Test failed: wrong position 51, expected 15x30 got 39x78 input.c:1628: Test failed: wrong position 53, expected 13x26 got 38x76 input.c:1628: Test failed: wrong position 55, expected 11x22 got 37x74 input.c:1628: Test failed: wrong position 61, expected 5x10 got 34x68 input.c:1628: Test failed: wrong position 62, expected 4x8 got 35x70 win.c:11344: Test failed: expected 00DB00EA, got 00290134 === debian11 (64 bit WoW report) === user32: win.c:11361: Test failed: expected 0000000000BF010C, got 00000000000F0166 win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11763: Test failed: 00000000011100FC: expected NOT topmost win.c:11787: Test failed: 00000000011100FC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost win.c:11810: Test failed: 0000000000300096: expected NOT topmost win.c:11811: Test failed: 00000000011100FC: expected next 0000000000070148, got 0000000000000000 win.c:11811: Test failed: 00000000011100FC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost win.c:11834: Test failed: 0000000000300096: expected NOT topmost win.c:11835: Test failed: 00000000011100FC: expected next 0000000000070148, got 0000000000000000 win.c:11835: Test failed: 00000000011100FC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost win.c:11869: Test failed: 00000000011100FC: expected next 0000000000070148, got 0000000000000000 win.c:11869: Test failed: 00000000011100FC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost win.c:11892: Test failed: 00000000011100FC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost win.c:11903: Test failed: 00000000011100FC: expected next 0000000000070148, got 0000000000000000 win.c:11903: Test failed: 00000000011100FC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost win.c:11606: Test failed: 1: hwnd 0000000000300096 is still topmost win.c:11606: Test failed: 2: hwnd 00000000011200A0 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070148 is still topmost win.c:11606: Test failed: 4: hwnd 00000000011100FC is still topmost
Jacek Caban <jacek(a)codeweavers.com> writes:
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 133 +++++++++-------------- dlls/user32/winproc.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 297 insertions(+), 86 deletions(-)
This is breaking tests: tools/runtest -q -P wine -T . -M shell32.dll -p dlls/shell32/tests/shell32_test.exe appbar && touch dlls/shell32/tests/appbar.ok appbar.c:226: Test failed: SHAppBarMessage returned 0 appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:249: Test failed: SHAppBarMessage returned 0 appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:261: Test failed: rectangles intersect (0,2145)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:267: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:278: Test failed: SHAppBarMessage returned 0 appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:289: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:290: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:291: Test failed: rectangles intersect (0,2150)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:299: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:300: Test failed: rectangles intersect (0,2140)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:301: Test failed: rectangles intersect (0,2150)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:310: Test failed: rectangles intersect (0,2140)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:311: Test failed: rectangles intersect (0,0)-(3840,15) / (3825,0)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:319: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:320: Test failed: rectangles intersect (0,2140)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:321: Test failed: rectangles intersect (0,2150)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:326: Test failed: Expected windows[0] to be lower than windows[1] appbar.c:332: Test failed: SHAppBarMessage returned 0 appbar.c:339: Test failed: Some broken Vista boxes don't move the higher appbar down appbar.c:345: Test failed: rectangles intersect (0,2150)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:351: Test failed: SHAppBarMessage returned 0 appbar.c:358: Test failed: SHAppBarMessage returned 0 make: *** [Makefile:112960: dlls/shell32/tests/appbar.ok] Error 36 -- Alexandre Julliard julliard(a)winehq.org
On 3/24/22 22:09, Alexandre Julliard wrote:
Jacek Caban <jacek(a)codeweavers.com> writes:
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 133 +++++++++-------------- dlls/user32/winproc.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 297 insertions(+), 86 deletions(-) This is breaking tests:
tools/runtest -q -P wine -T . -M shell32.dll -p dlls/shell32/tests/shell32_test.exe appbar && touch dlls/shell32/tests/appbar.ok appbar.c:226: Test failed: SHAppBarMessage returned 0 appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:249: Test failed: SHAppBarMessage returned 0 appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:261: Test failed: rectangles intersect (0,2145)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:267: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:278: Test failed: SHAppBarMessage returned 0 appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:289: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:290: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:291: Test failed: rectangles intersect (0,2150)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:299: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:300: Test failed: rectangles intersect (0,2140)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:301: Test failed: rectangles intersect (0,2150)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:310: Test failed: rectangles intersect (0,2140)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:311: Test failed: rectangles intersect (0,0)-(3840,15) / (3825,0)-(3840,2160) appbar.c:77: Test failed: SHAppBarMessage returned 0 appbar.c:99: Test failed: SHAppBarMessage returned 0 appbar.c:319: Test failed: rectangles intersect (0,2140)-(3840,2160) / (0,2150)-(3840,2160) appbar.c:320: Test failed: rectangles intersect (0,2140)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:321: Test failed: rectangles intersect (0,2150)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:326: Test failed: Expected windows[0] to be lower than windows[1] appbar.c:332: Test failed: SHAppBarMessage returned 0 appbar.c:339: Test failed: Some broken Vista boxes don't move the higher appbar down appbar.c:345: Test failed: rectangles intersect (0,2150)-(3840,2160) / (3825,0)-(3840,2160) appbar.c:351: Test failed: SHAppBarMessage returned 0 appbar.c:358: Test failed: SHAppBarMessage returned 0 make: *** [Makefile:112960: dlls/shell32/tests/appbar.ok] Error 36
I can see the problem, sorry about that. I will send a better version next week, it doesn't seem appropriate for release day anyway. Thanks, Jacek
participants (4)
-
Alexandre Julliard -
Huw Davies -
Jacek Caban -
Marvin