Module: wine Branch: master Commit: 7bc4ca5bef18e3a209e23f7279018502da5946d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bc4ca5bef18e3a209e23f727901850...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Aug 17 13:37:19 2022 +0200
wow64win: Fix NtUserGetMenuBarInfo thunk.
---
dlls/wow64win/user.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index bbe3e37a24d..d4b9aac4fb6 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2091,12 +2091,13 @@ NTSTATUS WINAPI wow64_NtUserGetMenuBarInfo( UINT *args ) }
info.cbSize = sizeof(info); - info.rcBar = info32->rcBar; - info.hMenu = UlongToHandle( info32->hMenu ); - info.hwndMenu = UlongToHandle( info32->hwndMenu ); - info.fBarFocused = info32->fBarFocused; - info.fFocused = info32->fFocused; - return NtUserGetMenuBarInfo( hwnd, id, item, &info ); + if (!NtUserGetMenuBarInfo( hwnd, id, item, &info )) return FALSE; + info32->rcBar = info.rcBar; + info32->hMenu = HandleToUlong( info.hMenu ); + info32->hwndMenu = HandleToUlong( info.hwndMenu ); + info32->fBarFocused = info.fBarFocused; + info32->fFocused = info.fFocused; + return TRUE; }
NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) @@ -2136,7 +2137,7 @@ NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args )
if (size != sizeof(MOUSEMOVEPOINT32) || count < 0 || count > ARRAYSIZE( ptin )) { - RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return -1; }