Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-03 11:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTUSER] menu.c: Don't use RETURN() macro (#6185)

Browse source 
Also remove parentheses around return value.
This commit is contained in:
Thamatip Chitpong 2023-12-18 12:04:57 +07:00 committed by GitHub
parent b6274fdde1
commit 1df5225708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 164 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

343
win32ss/user/ntuser/menu.c
View file

@ -5075,7 +5075,7 @@ IntMenuItemInfo(
if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) ))) if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) )))
{ {
EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND); EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND);
return( FALSE); return FALSE;
} }
if (SetOrGet) if (SetOrGet)
{ {
@ -5085,7 +5085,7 @@ IntMenuItemInfo(
{ {
Ret = IntGetMenuItemInfo(Menu, MenuItem, ItemInfo); Ret = IntGetMenuItemInfo(Menu, MenuItem, ItemInfo);
} }
return( Ret); return Ret;
} }
BOOL FASTCALL BOOL FASTCALL
@ -5107,20 +5107,20 @@ UserMenuItemInfo(
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
return( FALSE); return FALSE;
} }
if ( Size != sizeof(MENUITEMINFOW) && if ( Size != sizeof(MENUITEMINFOW) &&
Size != FIELD_OFFSET(MENUITEMINFOW, hbmpItem) && Size != FIELD_OFFSET(MENUITEMINFOW, hbmpItem) &&
Size != sizeof(ROSMENUITEMINFO) ) Size != sizeof(ROSMENUITEMINFO) )
{ {
EngSetLastError(ERROR_INVALID_PARAMETER); EngSetLastError(ERROR_INVALID_PARAMETER);
return( FALSE); return FALSE;
} }
Status = MmCopyFromCaller(&ItemInfo, UnsafeItemInfo, Size); Status = MmCopyFromCaller(&ItemInfo, UnsafeItemInfo, Size);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
return( FALSE); return FALSE;
} }
/* If this is a pre-0x0500 _WIN32_WINNT MENUITEMINFOW, you can't /* If this is a pre-0x0500 _WIN32_WINNT MENUITEMINFOW, you can't
set/get hbmpItem */ set/get hbmpItem */
@ -5128,7 +5128,7 @@ UserMenuItemInfo(
&& 0 != (ItemInfo.fMask & MIIM_BITMAP)) && 0 != (ItemInfo.fMask & MIIM_BITMAP))
{ {
EngSetLastError(ERROR_INVALID_PARAMETER); EngSetLastError(ERROR_INVALID_PARAMETER);
return( FALSE); return FALSE;
} }
if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) ))) if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) )))
@ -5138,7 +5138,7 @@ UserMenuItemInfo(
return TRUE; return TRUE;
EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND); EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND);
return( FALSE); return FALSE;
} }
if (SetOrGet) if (SetOrGet)
@ -5154,12 +5154,12 @@ UserMenuItemInfo(
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
return( FALSE); return FALSE;
} }
} }
} }
return( Ret); return Ret;
} }
BOOL FASTCALL BOOL FASTCALL
@ -5177,18 +5177,18 @@ UserMenuInfo(
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
return( FALSE); return FALSE;
} }
if ( Size < sizeof(MENUINFO) || Size > sizeof(ROSMENUINFO) ) if ( Size < sizeof(MENUINFO) || Size > sizeof(ROSMENUINFO) )
{ {
EngSetLastError(ERROR_INVALID_PARAMETER); EngSetLastError(ERROR_INVALID_PARAMETER);
return( FALSE); return FALSE;
} }
Status = MmCopyFromCaller(&MenuInfo, UnsafeMenuInfo, Size); Status = MmCopyFromCaller(&MenuInfo, UnsafeMenuInfo, Size);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
return( FALSE); return FALSE;
} }
if(SetOrGet) if(SetOrGet)
@ -5206,12 +5206,12 @@ UserMenuInfo(
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
return( FALSE); return FALSE;
} }
} }
} }
return( Res); return Res;
} }
BOOL FASTCALL BOOL FASTCALL
@ -5575,22 +5575,20 @@ NtUserCheckMenuItem(
UINT uCheck) UINT uCheck)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(DWORD); DWORD Ret = (DWORD)-1;
TRACE("Enter NtUserCheckMenuItem\n"); TRACE("Enter NtUserCheckMenuItem\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN( (DWORD)-1); Ret = IntCheckMenuItem(Menu, uIDCheckItem, uCheck);
} }
RETURN( IntCheckMenuItem(Menu, uIDCheckItem, uCheck)); TRACE("Leave NtUserCheckMenuItem, ret=%lu\n", Ret);
CLEANUP:
TRACE("Leave NtUserCheckMenuItem, ret=%lu\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -5603,22 +5601,20 @@ NtUserDeleteMenu(
UINT uFlags) UINT uFlags)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserDeleteMenu\n"); TRACE("Enter NtUserDeleteMenu\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN( FALSE); Ret = IntRemoveMenuItem(Menu, uPosition, uFlags, TRUE);
} }
RETURN( IntRemoveMenuItem(Menu, uPosition, uFlags, TRUE)); TRACE("Leave NtUserDeleteMenu, ret=%i\n", Ret);
CLEANUP:
TRACE("Leave NtUserDeleteMenu, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -5653,27 +5649,27 @@ NtUserGetSystemMenu(HWND hWnd, BOOL bRevert)
{ {
PWND Window; PWND Window;
PMENU Menu; PMENU Menu;
DECLARE_RETURN(HMENU); HMENU Ret = NULL;
TRACE("Enter NtUserGetSystemMenu\n"); TRACE("Enter NtUserGetSystemMenu\n");
UserEnterExclusive(); UserEnterExclusive();
if (!(Window = UserGetWindowObject(hWnd))) if (!(Window = UserGetWindowObject(hWnd)))
{ {
RETURN(NULL); goto Exit;
} }
if (!(Menu = IntGetSystemMenu(Window, bRevert))) if (!(Menu = IntGetSystemMenu(Window, bRevert)))
{ {
RETURN(NULL); goto Exit;
} }
RETURN(Menu->head.h); Ret = UserHMGetHandle(Menu);
CLEANUP: Exit:
TRACE("Leave NtUserGetSystemMenu, ret=%p\n", _ret_); TRACE("Leave NtUserGetSystemMenu, ret=%p\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -5689,14 +5685,13 @@ NtUserSetSystemMenu(HWND hWnd, HMENU hMenu)
BOOL Result = FALSE; BOOL Result = FALSE;
PWND Window; PWND Window;
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL);
TRACE("Enter NtUserSetSystemMenu\n"); TRACE("Enter NtUserSetSystemMenu\n");
UserEnterExclusive(); UserEnterExclusive();
if (!(Window = UserGetWindowObject(hWnd))) if (!(Window = UserGetWindowObject(hWnd)))
{ {
RETURN( FALSE); goto Exit;
} }
if (hMenu) if (hMenu)
@ -5706,7 +5701,7 @@ NtUserSetSystemMenu(HWND hWnd, HMENU hMenu)
*/ */
if (!(Menu = IntGetMenuObject(hMenu))) if (!(Menu = IntGetMenuObject(hMenu)))
{ {
RETURN( FALSE); goto Exit;
} }
Result = IntSetSystemMenu(Window, Menu); Result = IntSetSystemMenu(Window, Menu);
@ -5714,12 +5709,10 @@ NtUserSetSystemMenu(HWND hWnd, HMENU hMenu)
else else
EngSetLastError(ERROR_INVALID_MENU_HANDLE); EngSetLastError(ERROR_INVALID_MENU_HANDLE);
RETURN( Result); Exit:
TRACE("Leave NtUserSetSystemMenu, ret=%i\n", Result);
CLEANUP:
TRACE("Leave NtUserSetSystemMenu, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Result;
} }
/* /*
@ -5732,7 +5725,6 @@ NtUserGetTitleBarInfo(
{ {
PWND WindowObject; PWND WindowObject;
TITLEBARINFO bartitleinfo; TITLEBARINFO bartitleinfo;
DECLARE_RETURN(BOOLEAN);
BOOLEAN retValue = TRUE; BOOLEAN retValue = TRUE;
TRACE("Enter NtUserGetTitleBarInfo\n"); TRACE("Enter NtUserGetTitleBarInfo\n");
@ -5781,12 +5773,9 @@ NtUserGetTitleBarInfo(
} }
} }
RETURN( retValue ); TRACE("Leave NtUserGetTitleBarInfo, ret=%u\n", retValue);
CLEANUP:
TRACE("Leave NtUserGetTitleBarInfo, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return retValue;
} }
/* /*
@ -5818,26 +5807,26 @@ NtUserDestroyMenu(
HMENU hMenu) HMENU hMenu)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserDestroyMenu\n"); TRACE("Enter NtUserDestroyMenu\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) if(!(Menu = UserGetMenuObject(hMenu)))
{ {
RETURN( FALSE); goto Exit;
} }
if (Menu->head.rpdesk != gptiCurrent->rpdesk) if (Menu->head.rpdesk != gptiCurrent->rpdesk)
{ {
EngSetLastError(ERROR_ACCESS_DENIED); EngSetLastError(ERROR_ACCESS_DENIED);
RETURN( FALSE); goto Exit;
} }
RETURN( IntDestroyMenuObject(Menu, TRUE)); Ret = IntDestroyMenuObject(Menu, TRUE);
CLEANUP: Exit:
TRACE("Leave NtUserDestroyMenu, ret=%i\n",_ret_); TRACE("Leave NtUserDestroyMenu, ret=%i\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -5850,22 +5839,20 @@ NtUserEnableMenuItem(
UINT uEnable) UINT uEnable)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(UINT); UINT Ret = (UINT)-1;
TRACE("Enter NtUserEnableMenuItem\n"); TRACE("Enter NtUserEnableMenuItem\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN(-1); Ret = IntEnableMenuItem(Menu, uIDEnableItem, uEnable);
} }
RETURN( IntEnableMenuItem(Menu, uIDEnableItem, uEnable)); TRACE("Leave NtUserEnableMenuItem, ret=%u\n", Ret);
CLEANUP:
TRACE("Leave NtUserEnableMenuItem, ret=%u\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -5911,12 +5898,11 @@ NtUserGetMenuBarInfo(
PWND pWnd; PWND pWnd;
HMENU hMenu; HMENU hMenu;
MENUBARINFO kmbi; MENUBARINFO kmbi;
BOOL Ret; BOOL Ret = FALSE;
PPOPUPMENU pPopupMenu; PPOPUPMENU pPopupMenu;
USER_REFERENCE_ENTRY Ref; USER_REFERENCE_ENTRY Ref;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PMENU Menu = NULL; PMENU Menu = NULL;
DECLARE_RETURN(BOOL);
TRACE("Enter NtUserGetMenuBarInfo\n"); TRACE("Enter NtUserGetMenuBarInfo\n");
UserEnterShared(); UserEnterShared();
@ -5924,7 +5910,7 @@ NtUserGetMenuBarInfo(
if (!(pWnd = UserGetWindowObject(hwnd))) if (!(pWnd = UserGetWindowObject(hwnd)))
{ {
EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); EngSetLastError(ERROR_INVALID_WINDOW_HANDLE);
RETURN(FALSE); goto Cleanup;
} }
UserRefObjectCo(pWnd, &Ref); UserRefObjectCo(pWnd, &Ref);
@ -5939,12 +5925,12 @@ NtUserGetMenuBarInfo(
{ {
case OBJID_CLIENT: case OBJID_CLIENT:
if (!pWnd->pcls->fnid) if (!pWnd->pcls->fnid)
RETURN(FALSE); goto Cleanup;
if (pWnd->pcls->fnid != FNID_MENU) if (pWnd->pcls->fnid != FNID_MENU)
{ {
WARN("called on invalid window: %u\n", pWnd->pcls->fnid); WARN("called on invalid window: %u\n", pWnd->pcls->fnid);
EngSetLastError(ERROR_INVALID_MENU_HANDLE); EngSetLastError(ERROR_INVALID_MENU_HANDLE);
RETURN(FALSE); goto Cleanup;
} }
// Windows does this! Wine checks for Atom and uses GetWindowLongPtrW. // Windows does this! Wine checks for Atom and uses GetWindowLongPtrW.
hMenu = (HMENU)co_IntSendMessage(hwnd, MN_GETHMENU, 0, 0); hMenu = (HMENU)co_IntSendMessage(hwnd, MN_GETHMENU, 0, 0);
@ -5958,21 +5944,21 @@ NtUserGetMenuBarInfo(
} }
break; break;
case OBJID_MENU: case OBJID_MENU:
if (pWnd->style & WS_CHILD) RETURN(FALSE); if (pWnd->style & WS_CHILD) goto Cleanup;
hMenu = UlongToHandle(pWnd->IDMenu); hMenu = UlongToHandle(pWnd->IDMenu);
TRACE("GMBI: OBJID_MENU hMenu %p\n",hMenu); TRACE("GMBI: OBJID_MENU hMenu %p\n",hMenu);
break; break;
case OBJID_SYSMENU: case OBJID_SYSMENU:
if (!(pWnd->style & WS_SYSMENU)) RETURN(FALSE); if (!(pWnd->style & WS_SYSMENU)) goto Cleanup;
Menu = IntGetSystemMenu(pWnd, FALSE); Menu = IntGetSystemMenu(pWnd, FALSE);
hMenu = UserHMGetHandle(Menu); hMenu = UserHMGetHandle(Menu);
break; break;
default: default:
RETURN(FALSE); goto Cleanup;
} }
if (!hMenu) if (!hMenu)
RETURN(FALSE); goto Cleanup;
_SEH2_TRY _SEH2_TRY
{ {
@ -5988,15 +5974,18 @@ NtUserGetMenuBarInfo(
if (kmbi.cbSize != sizeof(MENUBARINFO)) if (kmbi.cbSize != sizeof(MENUBARINFO))
{ {
EngSetLastError(ERROR_INVALID_PARAMETER); EngSetLastError(ERROR_INVALID_PARAMETER);
RETURN(FALSE); goto Cleanup;
} }
if (!Menu) Menu = UserGetMenuObject(hMenu);
if (!Menu) if (!Menu)
RETURN(FALSE); {
Menu = UserGetMenuObject(hMenu);
if (!Menu)
goto Cleanup;
}
if ((idItem < 0) || ((ULONG)idItem > Menu->cItems)) if ((idItem < 0) || ((ULONG)idItem > Menu->cItems))
RETURN(FALSE); goto Cleanup;
if (idItem == 0) if (idItem == 0)
{ {
@ -6041,16 +6030,17 @@ NtUserGetMenuBarInfo(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
RETURN(FALSE); Ret = FALSE;
goto Cleanup;
} }
RETURN(TRUE); Ret = TRUE;
CLEANUP: Cleanup:
if (pWnd) UserDerefObjectCo(pWnd); if (pWnd) UserDerefObjectCo(pWnd);
TRACE("Leave NtUserGetMenuBarInfo, ret=%i\n",_ret_); TRACE("Leave NtUserGetMenuBarInfo, ret=%i\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6064,27 +6054,29 @@ NtUserGetMenuIndex(
PMENU Menu, SubMenu; PMENU Menu, SubMenu;
PITEM MenuItem; PITEM MenuItem;
UINT i; UINT i;
DECLARE_RETURN(UINT); UINT Ret = 0xFFFFFFFF;
TRACE("Enter NtUserGetMenuIndex\n"); TRACE("Enter NtUserGetMenuIndex\n");
UserEnterShared(); UserEnterShared();
if ( !(Menu = UserGetMenuObject(hMenu)) || if ( !(Menu = UserGetMenuObject(hMenu)) ||
!(SubMenu = UserGetMenuObject(hSubMenu)) ) !(SubMenu = UserGetMenuObject(hSubMenu)) )
RETURN(0xFFFFFFFF); goto Exit;
MenuItem = Menu->rgItems; MenuItem = Menu->rgItems;
for (i = 0; i < Menu->cItems; i++, MenuItem++) for (i = 0; i < Menu->cItems; i++, MenuItem++)
{ {
if (MenuItem->spSubMenu == SubMenu) if (MenuItem->spSubMenu == SubMenu)
RETURN(MenuItem->wID); {
Ret = MenuItem->wID;
break;
}
} }
RETURN(0xFFFFFFFF);
CLEANUP: Exit:
TRACE("Leave NtUserGetMenuIndex, ret=%u\n",_ret_); TRACE("Leave NtUserGetMenuIndex, ret=%u\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6103,14 +6095,14 @@ NtUserGetMenuItemRect(
PMENU Menu; PMENU Menu;
PITEM MenuItem; PITEM MenuItem;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserGetMenuItemRect\n"); TRACE("Enter NtUserGetMenuItemRect\n");
UserEnterShared(); UserEnterShared();
if (!(Menu = UserGetMenuObject(hMenu))) if (!(Menu = UserGetMenuObject(hMenu)))
{ {
RETURN(FALSE); goto Exit;
} }
if ((MenuItem = MENU_FindItem (&Menu, &uItem, MF_BYPOSITION))) if ((MenuItem = MENU_FindItem (&Menu, &uItem, MF_BYPOSITION)))
@ -6121,16 +6113,16 @@ NtUserGetMenuItemRect(
Rect.bottom = MenuItem->cyItem; Rect.bottom = MenuItem->cyItem;
} }
else else
RETURN(FALSE); goto Exit;
if(!hWnd) if(!hWnd)
{ {
hWnd = Menu->hWnd; hWnd = Menu->hWnd;
} }
if (lprcItem == NULL) RETURN( FALSE); if (lprcItem == NULL) goto Exit;
if (!(ReferenceWnd = UserGetWindowObject(hWnd))) RETURN( FALSE); if (!(ReferenceWnd = UserGetWindowObject(hWnd))) goto Exit;
if (Menu->fFlags & MNF_POPUP) if (Menu->fFlags & MNF_POPUP)
{ {
@ -6161,14 +6153,14 @@ NtUserGetMenuItemRect(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
RETURN(FALSE); goto Exit;
} }
RETURN(TRUE); Ret = TRUE;
CLEANUP: Exit:
TRACE("Leave NtUserGetMenuItemRect, ret=%i\n",_ret_); TRACE("Leave NtUserGetMenuItemRect, ret=%i\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6183,7 +6175,7 @@ NtUserHiliteMenuItem(
{ {
PMENU Menu; PMENU Menu;
PWND Window; PWND Window;
DECLARE_RETURN(BOOLEAN); BOOL Ret = FALSE;
TRACE("Enter NtUserHiliteMenuItem\n"); TRACE("Enter NtUserHiliteMenuItem\n");
UserEnterExclusive(); UserEnterExclusive();
@ -6191,21 +6183,21 @@ NtUserHiliteMenuItem(
if(!(Window = UserGetWindowObject(hWnd))) if(!(Window = UserGetWindowObject(hWnd)))
{ {
EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); EngSetLastError(ERROR_INVALID_WINDOW_HANDLE);
RETURN(FALSE); goto Exit;
} }
if(!(Menu = UserGetMenuObject(hMenu))) if(!(Menu = UserGetMenuObject(hMenu)))
{ {
EngSetLastError(ERROR_INVALID_MENU_HANDLE); EngSetLastError(ERROR_INVALID_MENU_HANDLE);
RETURN(FALSE); goto Exit;
} }
RETURN( IntHiliteMenuItem(Window, Menu, uItemHilite, uHilite)); Ret = IntHiliteMenuItem(Window, Menu, uItemHilite, uHilite);
CLEANUP: Exit:
TRACE("Leave NtUserHiliteMenuItem, ret=%u\n",_ret_); TRACE("Leave NtUserHiliteMenuItem, ret=%i\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6224,7 +6216,7 @@ NtUserDrawMenuBarTemp(
PWND Window; PWND Window;
RECT Rect; RECT Rect;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DECLARE_RETURN(DWORD); DWORD Ret = 0;
ERR("Enter NtUserDrawMenuBarTemp\n"); ERR("Enter NtUserDrawMenuBarTemp\n");
UserEnterExclusive(); UserEnterExclusive();
@ -6232,13 +6224,13 @@ NtUserDrawMenuBarTemp(
if(!(Window = UserGetWindowObject(hWnd))) if(!(Window = UserGetWindowObject(hWnd)))
{ {
EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); EngSetLastError(ERROR_INVALID_WINDOW_HANDLE);
RETURN(0); goto Exit;
} }
if(!(Menu = UserGetMenuObject(hMenu))) if(!(Menu = UserGetMenuObject(hMenu)))
{ {
EngSetLastError(ERROR_INVALID_MENU_HANDLE); EngSetLastError(ERROR_INVALID_MENU_HANDLE);
RETURN(0); goto Exit;
} }
_SEH2_TRY _SEH2_TRY
@ -6255,15 +6247,15 @@ NtUserDrawMenuBarTemp(
if (Status != STATUS_SUCCESS) if (Status != STATUS_SUCCESS)
{ {
SetLastNtError(Status); SetLastNtError(Status);
RETURN(0); goto Exit;
} }
RETURN( IntDrawMenuBarTemp(Window, hDC, &Rect, Menu, hFont)); Ret = IntDrawMenuBarTemp(Window, hDC, &Rect, Menu, hFont);
CLEANUP: Exit:
ERR("Leave NtUserDrawMenuBarTemp, ret=%u\n",_ret_); ERR("Leave NtUserDrawMenuBarTemp, ret=%lu\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6280,19 +6272,19 @@ NtUserMenuItemFromPoint(
PWND Window = NULL; PWND Window = NULL;
PITEM mi; PITEM mi;
ULONG i; ULONG i;
DECLARE_RETURN(int); int Ret = -1;
TRACE("Enter NtUserMenuItemFromPoint\n"); TRACE("Enter NtUserMenuItemFromPoint\n");
UserEnterExclusive(); UserEnterExclusive();
if (!(Menu = UserGetMenuObject(hMenu))) if (!(Menu = UserGetMenuObject(hMenu)))
{ {
RETURN( -1); goto Exit;
} }
if (!(Window = UserGetWindowObject(Menu->hWnd))) if (!(Window = UserGetWindowObject(Menu->hWnd)))
{ {
RETURN( -1); goto Exit;
} }
X -= Window->rcWindow.left; X -= Window->rcWindow.left;
@ -6316,12 +6308,12 @@ NtUserMenuItemFromPoint(
} }
} }
RETURN( (mi ? i : NO_SELECTED_ITEM)); Ret = (mi ? i : NO_SELECTED_ITEM);
CLEANUP: Exit:
TRACE("Leave NtUserMenuItemFromPoint, ret=%i\n",_ret_); TRACE("Leave NtUserMenuItemFromPoint, ret=%i\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
@ -6370,23 +6362,20 @@ NtUserRemoveMenu(
UINT uFlags) UINT uFlags)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserRemoveMenu\n"); TRACE("Enter NtUserRemoveMenu\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN( FALSE); Ret = IntRemoveMenuItem(Menu, uPosition, uFlags, FALSE);
} }
RETURN(IntRemoveMenuItem(Menu, uPosition, uFlags, FALSE)); TRACE("Leave NtUserRemoveMenu, ret=%i\n", Ret);
CLEANUP:
TRACE("Leave NtUserRemoveMenu, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6400,19 +6389,19 @@ NtUserSetMenu(
{ {
PWND Window; PWND Window;
BOOL Changed; BOOL Changed;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenu\n"); TRACE("Enter NtUserSetMenu\n");
UserEnterExclusive(); UserEnterExclusive();
if (!(Window = UserGetWindowObject(hWnd))) if (!(Window = UserGetWindowObject(hWnd)))
{ {
RETURN( FALSE); goto Exit;
} }
if (!IntSetMenu(Window, Menu, &Changed)) if (!IntSetMenu(Window, Menu, &Changed))
{ {
RETURN( FALSE); goto Exit;
} }
// Not minimized and please repaint!!! // Not minimized and please repaint!!!
@ -6424,12 +6413,12 @@ NtUserSetMenu(
UserDerefObjectCo(Window); UserDerefObjectCo(Window);
} }
RETURN( TRUE); Ret = TRUE;
CLEANUP: Exit:
TRACE("Leave NtUserSetMenu, ret=%i\n",_ret_); TRACE("Leave NtUserSetMenu, ret=%i\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6441,22 +6430,20 @@ NtUserSetMenuContextHelpId(
DWORD dwContextHelpId) DWORD dwContextHelpId)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenuContextHelpId\n"); TRACE("Enter NtUserSetMenuContextHelpId\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN( FALSE); Ret = IntSetMenuContextHelpId(Menu, dwContextHelpId);
} }
RETURN(IntSetMenuContextHelpId(Menu, dwContextHelpId)); TRACE("Leave NtUserSetMenuContextHelpId, ret=%i\n", Ret);
CLEANUP:
TRACE("Leave NtUserSetMenuContextHelpId, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6469,22 +6456,20 @@ NtUserSetMenuDefaultItem(
UINT fByPos) UINT fByPos)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenuDefaultItem\n"); TRACE("Enter NtUserSetMenuDefaultItem\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN( FALSE); Ret = UserSetMenuDefaultItem(Menu, uItem, fByPos);
} }
RETURN( UserSetMenuDefaultItem(Menu, uItem, fByPos)); TRACE("Leave NtUserSetMenuDefaultItem, ret=%i\n", Ret);
CLEANUP:
TRACE("Leave NtUserSetMenuDefaultItem, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6495,22 +6480,20 @@ NtUserSetMenuFlagRtoL(
HMENU hMenu) HMENU hMenu)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenuFlagRtoL\n"); TRACE("Enter NtUserSetMenuFlagRtoL\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN( FALSE); Ret = IntSetMenuFlagRtoL(Menu);
} }
RETURN(IntSetMenuFlagRtoL(Menu)); TRACE("Leave NtUserSetMenuFlagRtoL, ret=%i\n", Ret);
CLEANUP:
TRACE("Leave NtUserSetMenuFlagRtoL, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6522,22 +6505,20 @@ NtUserThunkedMenuInfo(
LPCMENUINFO lpcmi) LPCMENUINFO lpcmi)
{ {
PMENU Menu; PMENU Menu;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserThunkedMenuInfo\n"); TRACE("Enter NtUserThunkedMenuInfo\n");
UserEnterExclusive(); UserEnterExclusive();
if (!(Menu = UserGetMenuObject(hMenu))) Menu = UserGetMenuObject(hMenu);
if (Menu)
{ {
RETURN(FALSE); Ret = UserMenuInfo(Menu, (PROSMENUINFO)lpcmi, TRUE);
} }
RETURN(UserMenuInfo(Menu, (PROSMENUINFO)lpcmi, TRUE)); TRACE("Leave NtUserThunkedMenuInfo, ret=%i\n", Ret);
CLEANUP:
TRACE("Leave NtUserThunkedMenuInfo, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*
@ -6555,7 +6536,7 @@ NtUserThunkedMenuItemInfo(
PMENU Menu; PMENU Menu;
NTSTATUS Status; NTSTATUS Status;
UNICODE_STRING lstrCaption; UNICODE_STRING lstrCaption;
DECLARE_RETURN(BOOL); BOOL Ret = FALSE;
TRACE("Enter NtUserThunkedMenuItemInfo\n"); TRACE("Enter NtUserThunkedMenuItemInfo\n");
UserEnterExclusive(); UserEnterExclusive();
@ -6567,7 +6548,7 @@ NtUserThunkedMenuItemInfo(
if (!(Menu = UserGetMenuObject(hMenu))) if (!(Menu = UserGetMenuObject(hMenu)))
{ {
RETURN(FALSE); goto Cleanup;
} }
/* Check if we got a Caption */ /* Check if we got a Caption */
@ -6581,23 +6562,27 @@ NtUserThunkedMenuItemInfo(
{ {
ERR("Failed to capture MenuItem Caption (status 0x%08x)\n",Status); ERR("Failed to capture MenuItem Caption (status 0x%08x)\n",Status);
SetLastNtError(Status); SetLastNtError(Status);
RETURN(FALSE); goto Cleanup;
} }
} }
if (bInsert) RETURN( UserInsertMenuItem(Menu, uItem, fByPosition, lpmii, &lstrCaption)); if (bInsert)
{
Ret = UserInsertMenuItem(Menu, uItem, fByPosition, lpmii, &lstrCaption);
goto Cleanup;
}
RETURN( UserMenuItemInfo(Menu, uItem, fByPosition, (PROSMENUITEMINFO)lpmii, TRUE, &lstrCaption)); Ret = UserMenuItemInfo(Menu, uItem, fByPosition, (PROSMENUITEMINFO)lpmii, TRUE, &lstrCaption);
CLEANUP: Cleanup:
if (lstrCaption.Buffer) if (lstrCaption.Buffer)
{ {
ReleaseCapturedUnicodeString(&lstrCaption, UserMode); ReleaseCapturedUnicodeString(&lstrCaption, UserMode);
} }
TRACE("Leave NtUserThunkedMenuItemInfo, ret=%i\n",_ret_); TRACE("Leave NtUserThunkedMenuItemInfo, ret=%i\n", Ret);
UserLeave(); UserLeave();
END_CLEANUP; return Ret;
} }
/* /*