- launch task manager

- set foregroundwindow when opening start menu (CTRL-ESC shortcut)

svn path=/trunk/; revision=8354

reactos/subsys/system/explorer/explorer_intres.h

@@ -136,7 +136,8 @@
 #define ID_STOP                         40009
 #define ID_MINIMIZE_ALL                 40010
 #define ID_EXPLORE                      40011
-#define ID_SWITCH_DESKTOP_1             40012
+#define ID_SWITCH_DESKTOP_1             50000
+#define ID_TASKMGR                      40012
 #define ID_WINDOW_NEW                   0xE130
 #define ID_WINDOW_ARRANGE               0xE131
 #define ID_WINDOW_CASCADE               0xE132
@@ -154,7 +155,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        161
-#define _APS_NEXT_COMMAND_VALUE         40015
+#define _APS_NEXT_COMMAND_VALUE         40013
 #define _APS_NEXT_CONTROL_VALUE         1003
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

reactos/subsys/system/explorer/explorer_intres.rc

@@ -669,6 +669,7 @@ BEGIN
     BEGIN
         MENUITEM "&About Explorer...",          ID_ABOUT_EXPLORER
         MENUITEM "&Settings...",                ID_DESKTOPBAR_SETTINGS
+        MENUITEM "&Task Manager...",            ID_TASKMGR
     END
 END
 

reactos/subsys/system/explorer/taskbar/desktopbar.cpp

@@ -245,6 +245,10 @@ int DesktopBar::Command(int id, int code)
 		explorer_show_frame(SW_SHOWNORMAL);
 		break;
 
+	  case ID_TASKMGR:
+		launch_file(_hwnd, TEXT("taskmgr.exe"), SW_SHOWNORMAL);
+		break;
+
 	  case ID_SWITCH_DESKTOP_1:
 	  case ID_SWITCH_DESKTOP_1+1:
 	  case ID_SWITCH_DESKTOP_1+2:

reactos/subsys/system/explorer/taskbar/startmenu.cpp

@@ -1360,6 +1360,7 @@ void StartMenuRoot::TrackStartmenu()
 
 	 // show previously hidden start menu
 	ShowWindow(hwnd, SW_SHOW);
+	SetForegroundWindow(hwnd);
 
 	while(IsWindow(hwnd)) {
 		if (!GetMessage(&msg, 0, 0, 0)) {