Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 17:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]: When ntvdm crashes and we restart it in the same console, do not add fresh new menu items but just keep the old ones.

Browse source 
Patch by Christoph von Wittich, with some added comments to think about.
CORE-9487 #resolve

svn path=/trunk/; revision=67970
This commit is contained in:
Hermès Bélusca-Maïto 2015-05-30 15:51:18 +00:00
parent 829726353b
commit 9565c83981
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
reactos/subsystems/mvdm/ntvdm/ntvdm.c
View file

@ -116,6 +116,21 @@ AppendMenuItems(HMENU hMenu,
} while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0));
}
BOOL
VdmMenuExists(HMENU hConsoleMenu)
{
INT MenuPos, i;
MenuPos = GetMenuItemCount(hConsoleMenu);
/* Check for the presence of one of the VDM menu items */
for (i = 0; i <= MenuPos; i++)
{
if (GetMenuItemID(hConsoleMenu, i) == ID_SHOWHIDE_MOUSE)
return TRUE;
}
return FALSE;
}
/*static*/ VOID
CreateVdmMenu(HANDLE ConOutHandle)
{
@ -124,9 +139,17 @@ CreateVdmMenu(HANDLE ConOutHandle)
ID_VDM_QUIT);
if (hConsoleMenu == NULL) return;
/* Get the position where we are going to insert our menu items */
VdmMenuPos = GetMenuItemCount(hConsoleMenu);
AppendMenuItems(hConsoleMenu, VdmMainMenuItems);
DrawMenuBar(GetConsoleWindow());
// FIXME: What happens if the menu already exist?
// VdmMenuPos points *after* the already existing menu!
/* Really add the menu if it doesn't already exist (in case eg. NTVDM crashed) */
if (!VdmMenuExists(hConsoleMenu))
{
AppendMenuItems(hConsoleMenu, VdmMainMenuItems);
DrawMenuBar(GetConsoleWindow());
}
}
/*static*/ VOID