Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 03:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement keyboard navigation for menus

Browse source 
svn path=/trunk/; revision=8317
This commit is contained in:
Gé van Geldorp 2004-02-22 18:04:52 +00:00
parent af770309fc
commit dc9250b384
5 changed files with 874 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/ChangeLog
View file

@ -1,3 +1,7 @@
2004-02-22 Ge van Geldorp <ge@gse.nl>
* Implement keyboard navigation for menus
2004-02-22 Casper S. Hornstrup <chorns@users.sourceforge.net>
* Makefile (all): Put REGTESTS dependency earlier in the list.

1
reactos/include/messages.h
View file

@ -1054,6 +1054,7 @@ extern "C" {
#define WM_NCXBUTTONUP (172)
#define WM_NCXBUTTONDBLCLK (173)
#define WM_NEXTDLGCTL (40)
#define WM_NEXTMENU (531)
#define WM_NOTIFY (78)
#define WM_NOTIFYFORMAT (85)
#define WM_NULL (0)

6
reactos/include/structs.h
View file

@ -3136,6 +3136,12 @@ typedef struct tagMDICREATESTRUCTW {
typedef_tident(MDICREATESTRUCT)
typedef_tident(LPMDICREATESTRUCT)
typedef struct tagMDINEXTMENU {
HMENU hmenuIn;
HMENU hmenuNext;
HWND hwndNext;
} MDINEXTMENU,*PMDINEXTMENU,*LPMDINEXTMENU;
typedef struct tagMEASUREITEMSTRUCT {
UINT CtlType;
UINT CtlID;

931
reactos/lib/user32/windows/menu.c
View file

File diff suppressed because it is too large Load diff

134
reactos/subsys/win32k/ntuser/menu.c
View file

@ -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.46 2004/02/19 21:12:09 weiden Exp $
/* $Id: menu.c,v 1.47 2004/02/22 18:04:52 gvg Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -888,58 +888,96 @@ IntBuildMenuItemList(PMENU_OBJECT MenuObject, PVOID Buffer, ULONG nMax)
{
DWORD res = 0;
UINT sz;
MENUITEMINFOW mii;
ROSMENUITEMINFO mii;
PVOID Buf;
PMENU_ITEM CurItem = MenuObject->MenuItemList;
if(nMax)
{
sz = sizeof(MENUITEMINFOW) + sizeof(RECT);
Buf = Buffer;
mii.cbSize = sz;
mii.fMask = 0;
while(CurItem && (nMax >= sz))
{
mii.cch = CurItem->Text.Length / sizeof(WCHAR);
mii.dwItemData = CurItem->dwItemData;
if(CurItem->Text.Length)
mii.dwTypeData = NULL;
else
mii.dwTypeData = (LPWSTR)CurItem->Text.Buffer;
mii.fState = CurItem->fState;
mii.fType = CurItem->fType;
mii.hbmpChecked = CurItem->hbmpChecked;
mii.hbmpItem = CurItem->hbmpItem;
mii.hbmpUnchecked = CurItem->hbmpUnchecked;
mii.hSubMenu = CurItem->hSubMenu;
RtlCopyMemory(Buf, &mii, sizeof(MENUITEMINFOW));
Buf += sizeof(MENUITEMINFOW);
RtlCopyMemory(Buf, &CurItem->Rect, sizeof(RECT));
Buf += sizeof(RECT);
nMax -= sz;
if(CurItem->Text.Length && (nMax >= CurItem->Text.Length + sizeof(WCHAR)))
{
/* copy string */
RtlCopyMemory(Buf, (LPWSTR)CurItem->Text.Buffer, CurItem->Text.Length);
Buf += CurItem->Text.Length + sizeof(WCHAR);
nMax -= CurItem->Text.Length + sizeof(WCHAR);
}
else
break;
PWCHAR StrOut;
NTSTATUS Status;
WCHAR NulByte;
CurItem = CurItem->Next;
res++;
}
}
else
{
while(CurItem)
if (0 != nMax)
{
res += sizeof(MENUITEMINFOW) + sizeof(RECT);
res += CurItem->Text.Length + sizeof(WCHAR);
CurItem = CurItem->Next;
if (nMax < MenuObject->MenuInfo.MenuItemCount * sizeof(ROSMENUITEMINFO))
{
return 0;
}
StrOut = (PWCHAR)((char *) Buffer + MenuObject->MenuInfo.MenuItemCount
* sizeof(ROSMENUITEMINFO));
nMax -= MenuObject->MenuInfo.MenuItemCount * sizeof(ROSMENUITEMINFO);
sz = sizeof(ROSMENUITEMINFO);
Buf = Buffer;
mii.cbSize = sizeof(ROSMENUITEMINFO);
mii.fMask = 0;
NulByte = L'\0';
while (NULL != CurItem)
{
mii.cch = CurItem->Text.Length / sizeof(WCHAR);
mii.dwItemData = CurItem->dwItemData;
if (0 != CurItem->Text.Length)
{
mii.dwTypeData = StrOut;
}
else
{
mii.dwTypeData = NULL;
}
mii.fState = CurItem->fState;
mii.fType = CurItem->fType;
mii.hbmpChecked = CurItem->hbmpChecked;
mii.hbmpItem = CurItem->hbmpItem;
mii.hbmpUnchecked = CurItem->hbmpUnchecked;
mii.hSubMenu = CurItem->hSubMenu;
mii.Rect = CurItem->Rect;
mii.XTab = CurItem->XTab;
Status = MmCopyToCaller(Buf, &mii, sizeof(ROSMENUITEMINFO));
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
return 0;
}
Buf += sizeof(ROSMENUITEMINFO);
if (0 != CurItem->Text.Length
&& (nMax >= CurItem->Text.Length + sizeof(WCHAR)))
{
/* copy string */
Status = MmCopyToCaller(StrOut, CurItem->Text.Buffer,
CurItem->Text.Length);
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
return 0;
}
StrOut += CurItem->Text.Length / sizeof(WCHAR);
Status = MmCopyToCaller(StrOut, &NulByte, sizeof(WCHAR));
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
return 0;
}
StrOut++;
nMax -= CurItem->Text.Length + sizeof(WCHAR);
}
else if (0 != CurItem->Text.Length)
{
break;
}
CurItem = CurItem->Next;
res++;
}
}
}
else
{
while (NULL != CurItem)
{
res += sizeof(ROSMENUITEMINFO) + CurItem->Text.Length + sizeof(WCHAR);
CurItem = CurItem->Next;
}
}
return res;
}