[PATCH] user32: Avoid pointer truncation in free_user_handle.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77dfc131928..fac534a7c87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -72,7 +72,7 @@ void release_user_handle_ptr( void *ptr ) */ void *free_user_handle( HANDLE handle, unsigned int type ) { - return UlongToHandle( NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle )); + return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle ); } -- 2.35.1
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=111250 Your paranoid android. === debian11 (32 bit report) === user32: input.c:2164: Test failed: Unexpected rawinput data: -4 input.c:2163: Test failed: Unexpected rawinput data: -4 input.c:2217: 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 4, expected 62x124 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 60x120 input.c:1628: Test failed: wrong position 8, expected 58x116 got 62x124 input.c:1628: Test failed: wrong position 9, expected 57x114 got 59x118 input.c:1628: Test failed: wrong position 10, expected 56x112 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 18, expected 48x96 got 54x108 input.c:1628: Test failed: wrong position 19, expected 47x94 got 57x114 input.c:1628: Test failed: wrong position 20, expected 46x92 got 53x106 input.c:1628: Test failed: wrong position 21, expected 45x90 got 52x104 input.c:1628: Test failed: wrong position 22, expected 44x88 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 25, expected 41x82 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 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 32, expected 34x68 got 47x94 input.c:1628: Test failed: wrong position 33, expected 33x66 got 50x100 input.c:1628: Test failed: wrong position 34, expected 32x64 got 46x92 input.c:1628: Test failed: wrong position 35, expected 31x62 got 49x98 input.c:1628: Test failed: wrong position 36, expected 30x60 got 45x90 input.c:1628: Test failed: wrong position 37, expected 29x58 got 44x88 input.c:1628: Test failed: wrong position 38, expected 28x56 got 48x96 input.c:1628: Test failed: wrong position 39, expected 27x54 got 43x86 input.c:1628: Test failed: wrong position 40, expected 26x52 got 47x94 input.c:1628: Test failed: wrong position 41, expected 25x50 got 42x84 input.c:1628: Test failed: wrong position 42, expected 24x48 got 41x82 input.c:1628: Test failed: wrong position 43, expected 23x46 got 46x92 input.c:1628: Test failed: wrong position 44, expected 22x44 got 45x90 input.c:1628: Test failed: wrong position 45, expected 21x42 got 44x88 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 49, expected 17x34 got 39x78 input.c:1628: Test failed: wrong position 50, expected 16x32 got 38x76 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 input.c:1628: Test failed: wrong position 60, expected 6x12 got 33x66 input.c:1628: Test failed: wrong position 61, expected 5x10 got 36x72 input.c:1628: Test failed: wrong position 62, expected 4x8 got 35x70 === debian11 (32 bit Chinese:China report) === user32: input.c:2163: Test failed: Unexpected rawinput data: -8 input.c:2160: Test failed: GetRawInputBuffer returned 9 input.c:2217: Test failed: Unexpected rawinput data: 7 input.c:1628: Test failed: wrong position 4, expected 62x124 got 63x126 input.c:1628: Test failed: wrong position 6, expected 60x120 got 59x118 input.c:1628: Test failed: wrong position 7, expected 59x118 got 58x116 input.c:1628: Test failed: wrong position 8, expected 58x116 got 57x114 input.c:1628: Test failed: wrong position 9, expected 57x114 got 56x112 input.c:1628: Test failed: wrong position 10, expected 56x112 got 62x124 input.c:1628: Test failed: wrong position 12, expected 54x108 got 55x110 input.c:1628: Test failed: wrong position 14, expected 52x104 got 54x108 input.c:1628: Test failed: wrong position 16, expected 50x100 got 53x106 input.c:1628: Test failed: wrong position 18, expected 48x96 got 52x104 input.c:1628: Test failed: wrong position 20, expected 46x92 got 51x102 input.c:1628: Test failed: wrong position 23, expected 43x86 got 50x100 input.c:1628: Test failed: wrong position 24, expected 42x84 got 49x98 input.c:1628: Test failed: wrong position 27, expected 39x78 got 48x96 input.c:1628: Test failed: wrong position 29, expected 37x74 got 47x94 input.c:1628: Test failed: wrong position 31, expected 35x70 got 46x92 input.c:1628: Test failed: wrong position 33, expected 33x66 got 45x90 input.c:1628: Test failed: wrong position 35, expected 31x62 got 44x88 input.c:1628: Test failed: wrong position 37, expected 29x58 got 43x86 input.c:1628: Test failed: wrong position 39, expected 27x54 got 46x92 input.c:1628: Test failed: wrong position 40, expected 26x52 got 42x84 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 47, expected 19x38 got 42x84 input.c:1628: Test failed: wrong position 48, expected 18x36 got 41x82 input.c:1628: Test failed: wrong position 49, expected 17x34 got 38x76 input.c:1628: Test failed: wrong position 50, expected 16x32 got 40x80 input.c:1628: Test failed: wrong position 51, expected 15x30 got 37x74 input.c:1628: Test failed: wrong position 52, expected 14x28 got 39x78 input.c:1628: Test failed: wrong position 53, expected 13x26 got 36x72 input.c:1628: Test failed: wrong position 54, expected 12x24 got 38x76 input.c:1628: Test failed: wrong position 55, expected 11x22 got 35x70 input.c:1628: Test failed: wrong position 56, expected 10x20 got 37x74 input.c:1628: Test failed: wrong position 57, expected 9x18 got 34x68 input.c:1628: Test failed: wrong position 58, expected 8x16 got 36x72 input.c:1628: Test failed: wrong position 59, expected 7x14 got 33x66 input.c:1628: Test failed: wrong position 60, expected 6x12 got 35x70 input.c:1628: Test failed: wrong position 61, expected 5x10 got 32x64 input.c:1628: Test failed: wrong position 62, expected 4x8 got 34x68 input.c:4236: Test failed: 200: wrong originId 1/2 input.c:4245: Test failed: 200: wrong originId 1/2 win.c:11344: Test failed: expected 00BF0102, got 001200D0 win.c:11353: Test failed: GetActiveWindow() = 00000000 win.c:11353: Test failed: GetFocus() = 00000000 win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11763: Test failed: 012100AC: expected NOT topmost win.c:11787: Test failed: 012100AC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost win.c:11810: Test failed: 010C00B8: expected NOT topmost win.c:11811: Test failed: 012100AC: expected next 00070146, got 00000000 win.c:11811: Test failed: 012100AC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost win.c:11834: Test failed: 010C00B8: expected NOT topmost win.c:11835: Test failed: 012100AC: expected next 00070146, got 00000000 win.c:11835: Test failed: 012100AC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost win.c:11869: Test failed: 012100AC: expected next 00070146, got 00000000 win.c:11869: Test failed: 012100AC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost win.c:11892: Test failed: 012100AC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost win.c:11903: Test failed: 012100AC: expected next 00070146, got 00000000 win.c:11903: Test failed: 012100AC: expected NOT topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost win.c:11606: Test failed: 1: hwnd 010C00B8 is still topmost win.c:11606: Test failed: 2: hwnd 001800C6 is still topmost win.c:11606: Test failed: 3: hwnd 00070146 is still topmost win.c:11606: Test failed: 4: hwnd 012100AC is still topmost === debian11 (32 bit WoW report) === user32: input.c:1315: Test failed: Wrong hook coords: (106 106) != (150,150) input.c:1323: Test failed: GetCursorPos: (106,106) input.c:2160: Test failed: GetRawInputBuffer returned 7 input.c:2162: Test failed: Unexpected rawinput data: -3 input.c:2160: Test failed: GetRawInputBuffer returned 1 input.c:2164: Test failed: Unexpected rawinput data: 0 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:2162: Test failed: Unexpected rawinput data: 0 input.c:2163: Test failed: Unexpected rawinput data: 0 input.c:2164: Test failed: Unexpected rawinput data: 0 input.c:2222: Test failed: GetRawInputData succeeded input.c:2223: Test failed: GetRawInputData returned deadbeef 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:2162: Test failed: Unexpected rawinput data: 0 input.c:2163: Test failed: Unexpected rawinput data: 0 input.c:2164: Test failed: Unexpected rawinput data: 0 input.c:2222: Test failed: GetRawInputData succeeded input.c:2223: Test failed: GetRawInputData returned deadbeef input.c:1628: Test failed: wrong position 2, expected 64x128 got 62x124 input.c:1628: Test failed: wrong position 8, expected 58x116 got 62x124 input.c:1628: Test failed: wrong position 9, expected 57x114 got 59x118 input.c:1628: Test failed: wrong position 18, expected 48x96 got 54x108 input.c:1628: Test failed: wrong position 19, expected 47x94 got 53x106 input.c:1628: Test failed: wrong position 20, expected 46x92 got 57x114 input.c:1628: Test failed: wrong position 27, expected 39x78 got 50x100 input.c:1628: Test failed: wrong position 28, expected 38x76 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 32, expected 34x68 got 47x94 input.c:1628: Test failed: wrong position 37, expected 29x58 got 44x88 input.c:1628: Test failed: wrong position 38, expected 28x56 got 48x96 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 43, expected 23x46 got 42x84 input.c:1628: Test failed: wrong position 44, expected 22x44 got 44x88 input.c:1628: Test failed: wrong position 46, expected 20x40 got 40x80 input.c:1628: Test failed: wrong position 48, expected 18x36 got 42x84 input.c:1628: Test failed: wrong position 49, expected 17x34 got 41x82 input.c:1628: Test failed: wrong position 52, expected 14x28 got 37x74 input.c:1628: Test failed: wrong position 58, expected 8x16 got 34x68 input.c:1628: Test failed: wrong position 59, expected 7x14 got 37x74 input.c:1628: Test failed: wrong position 60, expected 6x12 got 33x66 input.c:1628: Test failed: wrong position 61, expected 5x10 got 32x64 input.c:1628: Test failed: wrong position 62, expected 4x8 got 36x72 win.c:11361: Test failed: expected 00DB00EA, got 0027013C === debian11 (64 bit WoW report) === user32: win.c:11361: Test failed: expected 0000000000BF010C, got 000000000040005C win.c:11606: Test failed: 1: hwnd 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE is still topmost win.c:11606: Test failed: 1: hwnd 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE is still topmost win.c:11606: Test failed: 1: hwnd 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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: 00000000001800D6: 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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: 00000000001800D6: 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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 00000000001800D6 is still topmost win.c:11606: Test failed: 2: hwnd 0000000000B700BE 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
Hi Rémi, On 3/25/22 09:53, Rémi Bernon wrote:
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77dfc131928..fac534a7c87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -72,7 +72,7 @@ void release_user_handle_ptr( void *ptr ) */ void *free_user_handle( HANDLE handle, unsigned int type ) { - return UlongToHandle( NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle )); + return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle ); }
The patch itself looks good, but I think it would be more interesting to just get rid of free_user_handle from user32. At this point, the only remaining object managed by user32 is menu. I sent a patch moving it to win32u. Thanks, Jacek
On 3/25/22 12:22, Jacek Caban wrote:
Hi Rémi,
On 3/25/22 09:53, Rémi Bernon wrote:
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77dfc131928..fac534a7c87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -72,7 +72,7 @@ void release_user_handle_ptr( void *ptr ) */ void *free_user_handle( HANDLE handle, unsigned int type ) { - return UlongToHandle( NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle )); + return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle ); }
The patch itself looks good, but I think it would be more interesting to just get rid of free_user_handle from user32. At this point, the only remaining object managed by user32 is menu. I sent a patch moving it to win32u.
Thanks,
Jacek
Sure, I just wanted to make sure this didn't go unoticed. Note that for me it broke on prefix update rundll invocations, so maybe still worth having for the release. -- Rémi Bernon <rbernon(a)codeweavers.com>
On 3/25/22 17:43, Rémi Bernon wrote:
On 3/25/22 12:22, Jacek Caban wrote:
Hi Rémi,
On 3/25/22 09:53, Rémi Bernon wrote:
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77dfc131928..fac534a7c87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -72,7 +72,7 @@ void release_user_handle_ptr( void *ptr ) */ void *free_user_handle( HANDLE handle, unsigned int type ) { - return UlongToHandle( NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle )); + return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle ); }
The patch itself looks good, but I think it would be more interesting to just get rid of free_user_handle from user32. At this point, the only remaining object managed by user32 is menu. I sent a patch moving it to win32u.
Thanks,
Jacek
Sure, I just wanted to make sure this didn't go unoticed. Note that for me it broke on prefix update rundll invocations, so maybe still worth having for the release.
Nvm I can't read. -- Rémi Bernon <rbernon(a)codeweavers.com>
participants (3)
-
Jacek Caban -
Marvin -
Rémi Bernon