[NTVDM]: When ntvdm crashes and we restart it in the same console, do not add fresh...

[reactos.git] / reactos / subsystems / mvdm / ntvdm / ntvdm.c

diff --git a/reactos/subsystems/mvdm/ntvdm/ntvdm.c b/reactos/subsystems/mvdm/ntvdm/ntvdm.c
index 2399fe1..a6ac026 100644 (file)
--- a/reactos/subsystems/mvdm/ntvdm/ntvdm.c
+++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.c
@@ -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
@@ -542,7 +565,8 @@ Cleanup:
 
     /* Quit the VDM */
     DPRINT1("\n\n\nNTVDM - Exiting...\n\n\n");
-
+    /* Some VDDs rely on the fact that NTVDM calls ExitProcess on Windows */
+    ExitProcess(0);
     return 0;
 }