diff --git a/reactos/subsys/win32k/include/menu.h b/reactos/subsys/win32k/include/menu.h index d1e3c56f9da..99655387c55 100644 --- a/reactos/subsys/win32k/include/menu.h +++ b/reactos/subsys/win32k/include/menu.h @@ -76,6 +76,9 @@ IntSetMenuContextHelpId(PMENU_OBJECT MenuObject, DWORD dwContextHelpId); BOOL FASTCALL IntGetMenuInfo(PMENU_OBJECT MenuObject, LPMENUINFO lpmi); +BOOL FASTCALL +IntIsMenu(HMENU hMenu); + BOOL FASTCALL IntSetMenuInfo(PMENU_OBJECT MenuObject, LPMENUINFO lpmi); diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c index d4ff6ca934e..bb877120416 100644 --- a/reactos/subsys/win32k/ntuser/menu.c +++ b/reactos/subsys/win32k/ntuser/menu.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: menu.c,v 1.32 2003/11/23 11:39:48 navaraf Exp $ +/* $Id: menu.c,v 1.33 2003/11/23 12:31:53 weiden Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -419,6 +419,22 @@ IntGetMenuInfo(PMENU_OBJECT MenuObject, LPMENUINFO lpmi) return FALSE; } + +BOOL FASTCALL +IntIsMenu(HMENU hMenu) +{ + + PMENU_OBJECT Menu; + + if (!(Menu = IntGetMenuObject(hMenu))) + return FALSE; + else + IntReleaseMenuObject(Menu); + + return TRUE; +} + + BOOL FASTCALL IntSetMenuInfo(PMENU_OBJECT MenuObject, LPMENUINFO lpmi) { diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c index 72e0cb5394d..c1c323394b4 100644 --- a/reactos/subsys/win32k/ntuser/window.c +++ b/reactos/subsys/win32k/ntuser/window.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: window.c,v 1.143 2003/11/23 11:39:48 navaraf Exp $ +/* $Id: window.c,v 1.144 2003/11/23 12:31:53 weiden Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -166,38 +166,6 @@ IntIsWindow(HWND hWnd) return TRUE; } -/* - * IntIsMenu - * - * The function determines whether the specified menu handle identifies - * an existing menu. - * - * Parameters - * hMenu - * Handle to the menu to test. - * - * Return Value - * If the menu handle identifies an existing menu, the return value - * is TRUE. If the menu handle does not identify an existing menu, - * the return value is FALSE. - * - * FIXME: Move this routine to menu.c. - */ - -BOOL FASTCALL -IntIsMenu(HMENU hMenu) -{ - - PMENU_OBJECT Menu; - - if (!(Menu = IntGetMenuObject(hMenu))) - return FALSE; - else - IntReleaseMenuObject(Menu); - - return TRUE; -} - /* * IntGetProcessWindowObject *