ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-31 12:23:31 +00:00
Code Issues Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files
reactos/win32ss/user/ntuser/menu.c
+9
View File
@@ -242,6 +242,15 @@ PMENU FASTCALL VerifyMenu(PMENU pMenu)
return pMenu;
}
BOOL
FASTCALL
IntIsMenu(HMENU Menu)
{
if (UserGetMenuObject(Menu)) return TRUE;
return FALSE;
}
PMENU WINAPI
IntGetMenu(HWND hWnd)
{
reactos/win32ss/user/ntuser/menu.h
+2
View File
@@ -122,6 +122,8 @@ typedef struct tagROSMENUITEMINFO
//
//
BOOL FASTCALL IntIsMenu(HMENU);
PMENU FASTCALL
IntGetMenuObject(HMENU hMenu);
reactos/win32ss/user/ntuser/window.h
+1 -1
View File
@@ -16,7 +16,7 @@ extern ATOM AtomFlashWndState;
#define HAS_THINFRAME(Style, ExStyle) \
(((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) \
(WndObj->spwndParent == NULL)