From bcefe84d60c4f7bfa4844ac7dae6c9eb337798bc Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Wed, 20 Aug 2003 10:08:53 +0000 Subject: [PATCH] added NtUserGetMenuDefaultItem() syscall svn path=/trunk/; revision=5697 --- reactos/iface/addsys/w32ksvc.db | 1 + reactos/include/win32k/ntuser.h | 6 ++++++ reactos/lib/user32/windows/menu.c | 7 +++---- reactos/subsys/win32k/include/menu.h | 7 +++++++ reactos/subsys/win32k/ntuser/menu.c | 17 ++++++++++++++++- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/reactos/iface/addsys/w32ksvc.db b/reactos/iface/addsys/w32ksvc.db index 4a6d62468fd..d37adce88b7 100644 --- a/reactos/iface/addsys/w32ksvc.db +++ b/reactos/iface/addsys/w32ksvc.db @@ -379,6 +379,7 @@ NtUserGetCursorFrameInfo 4 NtUserGetCursorInfo 1 NtUserGetDC 1 NtUserGetDCEx 3 +NtUserGetMenuDefaultItem 3 NtUserGetDoubleClickTime 0 NtUserGetForegroundWindow 0 NtUserGetGuiResources 2 diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h index ab99c744c10..20aae784974 100644 --- a/reactos/include/win32k/ntuser.h +++ b/reactos/include/win32k/ntuser.h @@ -661,6 +661,12 @@ STDCALL NtUserGetCursorInfo( DWORD Unknown0); +UINT STDCALL +NtUserGetMenuDefaultItem( + HMENU hMenu, + UINT fByPos, + UINT gmdiFlags); + HDC STDCALL NtUserGetDC(HWND hWnd); diff --git a/reactos/lib/user32/windows/menu.c b/reactos/lib/user32/windows/menu.c index 479ca44128c..eae294fa0b3 100644 --- a/reactos/lib/user32/windows/menu.c +++ b/reactos/lib/user32/windows/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.25 2003/08/15 15:55:02 weiden Exp $ +/* $Id: menu.c,v 1.26 2003/08/20 10:08:53 weiden Exp $ * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/menu.c @@ -501,15 +501,14 @@ GetMenuCheckMarkDimensions(VOID) /* - * @unimplemented + * @implemented */ UINT STDCALL GetMenuDefaultItem(HMENU hMenu, UINT fByPos, UINT gmdiFlags) { - UNIMPLEMENTED; - return -1; + return NtUserGetMenuDefaultItem(hMenu, fByPos, gmdiFlags); } diff --git a/reactos/subsys/win32k/include/menu.h b/reactos/subsys/win32k/include/menu.h index 504fd37d6e7..a53f8ae9778 100644 --- a/reactos/subsys/win32k/include/menu.h +++ b/reactos/subsys/win32k/include/menu.h @@ -170,6 +170,13 @@ BOOL STDCALL NtUserEndMenu(VOID); +UINT +STDCALL +NtUserGetMenuDefaultItem( + HMENU hMenu, + UINT fByPos, + UINT gmdiFlags); + BOOL STDCALL NtUserGetMenuBarInfo( diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c index e82296cb3a6..f26fc091023 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.18 2003/08/19 11:48:49 weiden Exp $ +/* $Id: menu.c,v 1.19 2003/08/20 10:08:53 weiden Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -989,6 +989,21 @@ NtUserEndMenu(VOID) } +/* + * @unimplemented + */ +UINT STDCALL +NtUserGetMenuDefaultItem( + HMENU hMenu, + UINT fByPos, + UINT gmdiFlags) +{ + UNIMPLEMENTED + + return -1; +} + + /* * @unimplemented */