[PATCH 6/7] win32u: Move __wine_set_user_driver implementation from user32.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/Makefile.in | 1 - dlls/user32/clipboard.c | 2 +- dlls/user32/driver.c | 171 ----------------------------------- dlls/user32/user32.spec | 1 - dlls/user32/user_main.c | 2 - dlls/user32/user_private.h | 7 -- dlls/win32u/driver.c | 34 ++++--- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/sysparams.c | 3 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/wrappers.c | 6 +- include/ntuser.h | 1 + include/wine/gdi_driver.h | 1 - 15 files changed, 31 insertions(+), 205 deletions(-) delete mode 100644 dlls/user32/driver.c
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=112162 Your paranoid android. === debian11 (32 bit report) === user32: dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?ducome\winetest\tools\testbot\var\wine-win32\programs\winetest" input.c:2160: Test failed: GetRawInputBuffer returned 5 input.c:2182: Test failed: Unexpected rawinput data: -2 input.c:2160: Test failed: GetRawInputBuffer returned 10 input.c:1628: Test failed: wrong position 2, expected 64x128 got 63x126 input.c:1628: Test failed: wrong position 6, expected 60x120 got 61x122 input.c:1628: Test failed: wrong position 16, expected 50x100 got 56x112 input.c:1628: Test failed: wrong position 25, expected 41x82 got 52x104 input.c:1628: Test failed: wrong position 36, expected 30x60 got 46x92 input.c:1628: Test failed: wrong position 59, expected 7x14 got 37x74 input.c:1628: Test failed: wrong position 61, expected 5x10 got 36x72 === debian11 (32 bit Chinese:China report) === user32: win.c:11361: Test failed: expected 00BE010C, got 003D005C win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11763: Test failed: 007800F8: expected NOT topmost win.c:11787: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11810: Test failed: 001800CC: expected NOT topmost win.c:11811: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11811: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11834: Test failed: 001800CC: expected NOT topmost win.c:11835: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11835: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11869: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11869: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11892: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11903: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11903: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11606: Test failed: 1: hwnd 001800CC is still topmost win.c:11606: Test failed: 2: hwnd 000E00CE is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost === debian11 (32 bit WoW report) === user32: dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" dialog.c:2144: Test failed: Unexpected window text "?%u$ome\winetest\tools\testbot\var\wine-wow32\programs\winetest" input.c:2160: Test failed: GetRawInputBuffer returned 6 input.c:2162: Test failed: Unexpected rawinput data: -6 input.c:2160: Test failed: GetRawInputBuffer returned 1 input.c:1628: Test failed: wrong position 4, expected 62x124 got 61x122 input.c:1628: Test failed: wrong position 5, expected 61x122 got 63x126 input.c:1628: Test failed: wrong position 7, expected 59x118 got 62x124 input.c:1628: Test failed: wrong position 9, expected 57x114 got 58x116 input.c:1628: Test failed: wrong position 11, expected 55x110 got 57x114 input.c:1628: Test failed: wrong position 12, expected 54x108 got 56x112 input.c:1628: Test failed: wrong position 18, expected 48x96 got 56x112 input.c:1628: Test failed: wrong position 20, expected 46x92 got 55x110 input.c:1628: Test failed: wrong position 25, expected 41x82 got 50x100 input.c:1628: Test failed: wrong position 28, expected 38x76 got 48x96 input.c:1628: Test failed: wrong position 30, expected 36x72 got 47x94 input.c:1628: Test failed: wrong position 33, expected 33x66 got 49x98 input.c:1628: Test failed: wrong position 34, expected 32x64 got 46x92 input.c:1628: Test failed: wrong position 37, expected 29x58 got 44x88 input.c:1628: Test failed: wrong position 38, expected 28x56 got 47x94 input.c:1628: Test failed: wrong position 42, expected 24x48 got 44x88 input.c:1628: Test failed: wrong position 43, expected 23x46 got 42x84 input.c:1628: Test failed: wrong position 44, expected 22x44 got 41x82 input.c:1628: Test failed: wrong position 45, expected 21x42 got 43x86 input.c:1628: Test failed: wrong position 46, expected 20x40 got 40x80 input.c:1628: Test failed: wrong position 47, expected 19x38 got 39x78 input.c:1628: Test failed: wrong position 48, expected 18x36 got 42x84 input.c:1628: Test failed: wrong position 53, expected 13x26 got 36x72 input.c:1628: Test failed: wrong position 54, expected 12x24 got 35x70 input.c:1628: Test failed: wrong position 57, expected 9x18 got 37x74 input.c:1628: Test failed: wrong position 58, expected 8x16 got 34x68 win.c:11344: Test failed: expected 01FC015E, got 00300084 win.c:11353: Test failed: GetActiveWindow() = 00000000 win.c:11353: Test failed: GetFocus() = 00000000 win.c:11361: Test failed: expected 01FC015E, got 00300084 win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11763: Test failed: 018D00E8: expected NOT topmost win.c:11787: Test failed: 018D00E8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost win.c:11810: Test failed: 00AB00E6: expected NOT topmost win.c:11811: Test failed: 018D00E8: expected next 00070146, got 00000000 win.c:11811: Test failed: 018D00E8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost win.c:11834: Test failed: 00AB00E6: expected NOT topmost win.c:11835: Test failed: 018D00E8: expected next 00070146, got 00000000 win.c:11835: Test failed: 018D00E8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost win.c:11869: Test failed: 018D00E8: expected next 00070146, got 00000000 win.c:11869: Test failed: 018D00E8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost win.c:11892: Test failed: 018D00E8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost win.c:11903: Test failed: 018D00E8: expected next 00070146, got 00000000 win.c:11903: Test failed: 018D00E8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost win.c:11606: Test failed: 1: hwnd 00AB00E6 is still topmost win.c:11606: Test failed: 2: hwnd 009F008C is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 018D00E8 is still topmost === debian11 (64 bit WoW 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:11361: Test failed: expected 0000000001FD0140, got 000000000075007C
participants (3)
-
Huw Davies -
Jacek Caban -
Marvin