[PATCH] win32u: Move menu handle management from user32.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 + dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 91 +++++++----------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 20 +------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 42 ++++++++++++++++- dlls/win32u/ntuser_private.h | 31 +++++++++++- dlls/win32u/sysparams.c | 6 +-- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 3 +- 17 files changed, 108 insertions(+), 109 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=111260 Your paranoid android. === debian11 (32 bit report) === user32: input.c:2160: Test failed: GetRawInputBuffer returned 6 input.c:2164: Test failed: Unexpected rawinput data: -11 input.c:2160: Test failed: GetRawInputBuffer returned 9 input.c:2162: Test failed: Unexpected rawinput data: -2 input.c:2163: Test failed: Unexpected rawinput data: -7 input.c:2162: Test failed: Unexpected rawinput data: -2 input.c:1623: Test failed: expected to get 64 mouse move points but got 63 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 53x106 input.c:1628: Test failed: wrong position 21, expected 45x90 got 56x112 input.c:1628: Test failed: wrong position 24, expected 42x84 got 54x108 input.c:1628: Test failed: wrong position 25, expected 41x82 got 51x102 input.c:1628: Test failed: wrong position 29, expected 37x74 got 49x98 input.c:1628: Test failed: wrong position 30, expected 36x72 got 51x102 input.c:1628: Test failed: wrong position 31, expected 35x70 got 50x100 input.c:1628: Test failed: wrong position 32, expected 34x68 got 48x96 input.c:1628: Test failed: wrong position 36, expected 30x60 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 37x74 input.c:1628: Test failed: wrong position 51, expected 15x30 got 42x84 input.c:1628: Test failed: wrong position 52, expected 14x28 got 41x82 input.c:1628: Test failed: wrong position 53, expected 13x26 got 40x80 input.c:1628: Test failed: wrong position 54, expected 12x24 got 39x78 input.c:1628: Test failed: wrong position 55, expected 11x22 got 36x72 win.c:11344: Test failed: expected 00BF0102, got 001E0080 win.c:11353: Test failed: GetActiveWindow() = 00000000 win.c:11353: Test failed: GetFocus() = 00000000 win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11763: Test failed: 0074010A: expected NOT topmost win.c:11787: Test failed: 0074010A: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost win.c:11810: Test failed: 001000E2: expected NOT topmost win.c:11811: Test failed: 0074010A: expected next 00070146, got 00000000 win.c:11811: Test failed: 0074010A: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost win.c:11834: Test failed: 001000E2: expected NOT topmost win.c:11835: Test failed: 0074010A: expected next 00070146, got 00000000 win.c:11835: Test failed: 0074010A: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost win.c:11869: Test failed: 0074010A: expected next 00070146, got 00000000 win.c:11869: Test failed: 0074010A: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost win.c:11892: Test failed: 0074010A: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost win.c:11903: Test failed: 0074010A: expected next 00070146, got 00000000 win.c:11903: Test failed: 0074010A: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost win.c:11606: Test failed: 1: hwnd 001000E2 is still topmost win.c:11606: Test failed: 2: hwnd 000D00E4 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 0074010A is still topmost === debian11 (32 bit Chinese:China report) === user32: input.c:2793: Test failed: 4: unexpected WM_MOUSEMOVE message input.c:2804: Test failed: 9: Unexpected cursor movement input.c:2521: Test failed: 10: foreground process expected WM_MOUSEMOVE message input.c:2521: Test failed: 11: foreground process expected WM_MOUSEMOVE message input.c:2521: Test failed: 12: foreground process expected WM_MOUSEMOVE message input.c:1733: Test failed: expected to get 64 mouse move points but got -1 input.c:1744: Test failed: expected to get 64 mouse move points but got -1 win.c:11344: Test failed: expected 017B0070, got 007A008C === debian11 (32 bit WoW report) === user32: input.c:2160: Test failed: GetRawInputBuffer returned 4 input.c:2182: Test failed: Unexpected rawinput data: -11 input.c:2160: Test failed: GetRawInputBuffer returned 11 input.c:2162: Test failed: Unexpected rawinput data: 5 input.c:2155: Test failed: GetRawInputBuffer returned unexpected size: 0 input.c:2160: Test failed: GetRawInputBuffer returned 0 input.c:2161: Test failed: GetRawInputBuffer returned unexpected size: 0 input.c:2163: Test failed: Unexpected rawinput data: 0 input.c:2164: Test failed: Unexpected rawinput data: 0 input.c:1623: Test failed: expected to get 64 mouse move points but got 62 input.c:1628: Test failed: wrong position 3, expected 63x126 got 64x128 input.c:1628: Test failed: wrong position 5, expected 61x122 got 63x126 input.c:1628: Test failed: wrong position 6, expected 60x120 got 61x122 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 16, expected 50x100 got 58x116 input.c:1628: Test failed: wrong position 17, expected 49x98 got 57x114 input.c:1628: Test failed: wrong position 18, expected 48x96 got 55x110 input.c:1628: Test failed: wrong position 19, expected 47x94 got 56x112 input.c:1628: Test failed: wrong position 21, expected 45x90 got 55x110 input.c:1628: Test failed: wrong position 27, expected 39x78 got 52x104 input.c:1628: Test failed: wrong position 29, expected 37x74 got 49x98 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 35, expected 31x62 got 48x96 input.c:1628: Test failed: wrong position 36, expected 30x60 got 46x92 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 40, expected 26x52 got 44x88 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 43x86 input.c:1628: Test failed: wrong position 46, expected 20x40 got 41x82 input.c:1628: Test failed: wrong position 47, expected 19x38 got 42x84 input.c:1628: Test failed: wrong position 49, expected 17x34 got 41x82 input.c:1628: Test failed: wrong position 51, expected 15x30 got 40x80 input.c:1628: Test failed: wrong position 52, expected 14x28 got 38x76 input.c:1628: Test failed: wrong position 53, expected 13x26 got 39x78 input.c:1628: Test failed: wrong position 55, expected 11x22 got 38x76 === debian11 (64 bit WoW report) === user32: input.c:2162: Test failed: Unexpected rawinput data: 1 input.c:2182: Test failed: Unexpected rawinput data: 3 input.c:2162: Test failed: Unexpected rawinput data: -6 input.c:2160: Test failed: GetRawInputBuffer returned 1 input.c:2162: Test failed: Unexpected rawinput data: 1 input.c:1623: Test failed: expected to get 64 mouse move points but got 63 input.c:1628: Test failed: wrong position 1, expected 65x130 got 64x128 input.c:1628: Test failed: wrong position 2, expected 64x128 got 65x130 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 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 10, expected 56x112 got 61x122 input.c:1628: Test failed: wrong position 11, expected 55x110 got 59x118 input.c:1628: Test failed: wrong position 12, expected 54x108 got 60x120 input.c:1628: Test failed: wrong position 14, expected 52x104 got 59x118 input.c:1628: Test failed: wrong position 16, expected 50x100 got 58x116 input.c:1628: Test failed: wrong position 18, expected 48x96 got 57x114 input.c:1628: Test failed: wrong position 20, expected 46x92 got 56x112 input.c:1628: Test failed: wrong position 23, expected 43x86 got 55x110 input.c:1628: Test failed: wrong position 24, expected 42x84 got 54x108 input.c:1628: Test failed: wrong position 26, expected 40x80 got 53x106 input.c:1628: Test failed: wrong position 27, expected 39x78 got 51x102 input.c:1628: Test failed: wrong position 28, expected 38x76 got 52x104 input.c:1628: Test failed: wrong position 30, expected 36x72 got 51x102 input.c:1628: Test failed: wrong position 32, expected 34x68 got 50x100 input.c:1628: Test failed: wrong position 34, expected 32x64 got 49x98 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 38, expected 28x56 got 47x94 input.c:1628: Test failed: wrong position 40, expected 26x52 got 46x92 input.c:1628: Test failed: wrong position 41, expected 25x50 got 44x88 input.c:1628: Test failed: wrong position 42, expected 24x48 got 45x90 input.c:1628: Test failed: wrong position 44, expected 22x44 got 44x88 input.c:1628: Test failed: wrong position 46, expected 20x40 got 43x86 input.c:1628: Test failed: wrong position 48, expected 18x36 got 42x84 input.c:1628: Test failed: wrong position 50, expected 16x32 got 41x82 input.c:1628: Test failed: wrong position 51, expected 15x30 got 39x78 input.c:1628: Test failed: wrong position 52, expected 14x28 got 40x80 input.c:1628: Test failed: wrong position 54, expected 12x24 got 39x78 input.c:1628: Test failed: wrong position 55, expected 11x22 got 37x74 input.c:1628: Test failed: wrong position 56, expected 10x20 got 38x76 input.c:1628: Test failed: wrong position 57, expected 9x18 got 36x72 input.c:1628: Test failed: wrong position 58, expected 8x16 got 37x74 input.c:1628: Test failed: wrong position 59, expected 7x14 got 35x70 input.c:1628: Test failed: wrong position 61, expected 5x10 got 34x68 input.c:1628: Test failed: wrong position 62, expected 4x8 got 35x70 input.c:1695: Test failed: expected to get 64 mouse move points but got 63 win.c:10999: Test failed: Expected foreground window 00000000000D0134, got 00000000021B0064 win.c:11002: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:11003: Test failed: Received WM_ACTIVATEAPP(0), did not expect it. win.c:11011: Test failed: Expected foreground window 00000000000D0134, got 0000000000000000 win.c:11021: Test failed: Received WM_ACTIVATEAPP(1), did not expect it.
On 3/25/22 06:19, Jacek Caban wrote:
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 + dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 91 +++++++----------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 20 +------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 42 ++++++++++++++++- dlls/win32u/ntuser_private.h | 31 +++++++++++- dlls/win32u/sysparams.c | 6 +-- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 3 +- 17 files changed, 108 insertions(+), 109 deletions(-)
FWIW, this is missing the NtUserDestroyMenu() declaration in ntuser.h.
On 3/25/22 15:56, Zebediah Figura wrote:
On 3/25/22 06:19, Jacek Caban wrote:
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 + dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 91 +++++++----------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 20 +------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 42 ++++++++++++++++- dlls/win32u/ntuser_private.h | 31 +++++++++++- dlls/win32u/sysparams.c | 6 +-- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 3 +- 17 files changed, 108 insertions(+), 109 deletions(-)
FWIW, this is missing the NtUserDestroyMenu() declaration in ntuser.h.
It's already there. Jacek
participants (4)
-
Huw Davies -
Jacek Caban -
Marvin -
Zebediah Figura