Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NtUser]

Browse source 
- Use internal function to validate menu handle. See CORE-11479 for more information.

svn path=/trunk/; revision=71704
This commit is contained in:
James Tabor 2016-06-30 15:48:20 +00:00
parent 876a3b2681
commit e95ca2d8b7
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/win32ss/user/ntuser/menu.c
View file

@ -242,6 +242,15 @@ PMENU FASTCALL VerifyMenu(PMENU pMenu)
return pMenu; return pMenu;
} }
BOOL
FASTCALL
IntIsMenu(HMENU Menu)
{
if (UserGetMenuObject(Menu)) return TRUE;
return FALSE;
}
PMENU WINAPI PMENU WINAPI
IntGetMenu(HWND hWnd) IntGetMenu(HWND hWnd)
{ {

2
reactos/win32ss/user/ntuser/menu.h
View file

@ -122,6 +122,8 @@ typedef struct tagROSMENUITEMINFO
// //
// //
BOOL FASTCALL IntIsMenu(HMENU);
PMENU FASTCALL PMENU FASTCALL
IntGetMenuObject(HMENU hMenu); IntGetMenuObject(HMENU hMenu);

2
reactos/win32ss/user/ntuser/window.h
View file

@ -16,7 +16,7 @@ extern ATOM AtomFlashWndState;
#define HAS_THINFRAME(Style, ExStyle) \ #define HAS_THINFRAME(Style, ExStyle) \
(((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP))))
#define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && pWnd->IDMenu) #define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && IntIsMenu(UlongToHandle(pWnd->IDMenu)))
#define IntIsDesktopWindow(WndObj) \ #define IntIsDesktopWindow(WndObj) \
(WndObj->spwndParent == NULL) (WndObj->spwndParent == NULL)