Index: lang/bg-BG.rc =================================================================== --- lang/bg-BG.rc (revision 38909) +++ lang/bg-BG.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&", ID_WINDOWS_CASCADE MENUITEM " & ", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&" BEGIN MENUITEM " & ", ID_HELP_TOPICS Index: lang/cs-CZ.rc =================================================================== --- lang/cs-CZ.rc (revision 38909) +++ lang/cs-CZ.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&Kaskda", ID_WINDOWS_CASCADE MENUITEM "&Penst do poped", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Npovda" BEGIN MENUITEM "&Npovda pro sprvce loh", ID_HELP_TOPICS Index: lang/da-DK.rc =================================================================== --- lang/da-DK.rc (revision 38909) +++ lang/da-DK.rc (working copy) @@ -65,6 +65,22 @@ MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring til front", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Hjlp" BEGIN MENUITEM "Opgavestyring &Hjlpe Emner", ID_HELP_TOPICS Index: lang/de-DE.rc =================================================================== --- lang/de-DE.rc (revision 38909) +++ lang/de-DE.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "be&rlappend", ID_WINDOWS_CASCADE MENUITEM "&In Vordergrund", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&?" BEGIN MENUITEM "&Hilfethemen", ID_HELP_TOPICS Index: lang/el-GR.rc =================================================================== --- lang/el-GR.rc (revision 38909) +++ lang/el-GR.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&" BEGIN MENUITEM " & ", ID_HELP_TOPICS Index: lang/en-US.rc =================================================================== --- lang/en-US.rc (revision 38909) +++ lang/en-US.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Help" BEGIN MENUITEM "Task Manager &Help Topics", ID_HELP_TOPICS Index: lang/es-ES.rc =================================================================== --- lang/es-ES.rc (revision 38909) +++ lang/es-ES.rc (working copy) @@ -75,6 +75,22 @@ MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "A&yuda" BEGIN MENUITEM "&Temas de Ayuda del Administrador de Tareas", Index: lang/fr-FR.rc =================================================================== --- lang/fr-FR.rc (revision 38909) +++ lang/fr-FR.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Aide" BEGIN MENUITEM "&Rubriques d'aide du Gestionnaire des tches", ID_HELP_TOPICS Index: lang/hu-HU.rc =================================================================== --- lang/hu-HU.rc (revision 38909) +++ lang/hu-HU.rc (working copy) @@ -67,6 +67,22 @@ MENUITEM "&Lpcszetes rendezs", ID_WINDOWS_CASCADE MENUITEM "&Eltrbe helyezs", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Sg" BEGIN MENUITEM "&Tmakrk", ID_HELP_TOPICS Index: lang/id-ID.rc =================================================================== --- lang/id-ID.rc (revision 38909) +++ lang/id-ID.rc (working copy) @@ -65,6 +65,22 @@ MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Help" BEGIN MENUITEM "Task Manager &Help Topics", ID_HELP_TOPICS Index: lang/it-IT.rc =================================================================== --- lang/it-IT.rc (revision 38909) +++ lang/it-IT.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&Sovrapponi", ID_WINDOWS_CASCADE MENUITEM "&Porta in primo piano", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Aiuto" BEGIN MENUITEM "Task Manager &Help Topics", ID_HELP_TOPICS Index: lang/ja-JP.rc =================================================================== --- lang/ja-JP.rc (revision 38909) +++ lang/ja-JP.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "d˂ĕ\\(&C)", ID_WINDOWS_CASCADE MENUITEM "Oɕ\\(&B)", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "wv(&H)" BEGIN MENUITEM "gsbŇ(&H)", ID_HELP_TOPICS Index: lang/ko-KR.rc =================================================================== --- lang/ko-KR.rc (revision 38909) +++ lang/ko-KR.rc (working copy) @@ -68,6 +68,22 @@ MENUITEM "ܽ â 迭(&C)", ID_WINDOWS_CASCADE MENUITEM " (&B)", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "(&H)" BEGIN MENUITEM "۾ ׸(&H)", ID_HELP_TOPICS Index: lang/nl-NL.rc =================================================================== --- lang/nl-NL.rc (revision 38909) +++ lang/nl-NL.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&Trapsgewijs", ID_WINDOWS_CASCADE MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Help" BEGIN MENUITEM "&Help-onderwerpen", ID_HELP_TOPICS Index: lang/no-NO.rc =================================================================== --- lang/no-NO.rc (revision 38909) +++ lang/no-NO.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&Overlappet", ID_WINDOWS_CASCADE MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Hjelp" BEGIN MENUITEM "Emner i &hjelp for Oppgavebehandling", ID_HELP_TOPICS Index: lang/pl-PL.rc =================================================================== --- lang/pl-PL.rc (revision 38909) +++ lang/pl-PL.rc (working copy) @@ -71,6 +71,22 @@ MENUITEM "&Kaskadowo", ID_WINDOWS_CASCADE MENUITEM "&Przesu na wierzch", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "Pomo&c" BEGIN MENUITEM "Meneder zada - tematy &pomocy", ID_HELP_TOPICS Index: lang/pt-BR.rc =================================================================== --- lang/pt-BR.rc (revision 38909) +++ lang/pt-BR.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "Em &cascata", ID_WINDOWS_CASCADE MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "Aj&uda" BEGIN MENUITEM "&Tpicos da Ajuda do Gerenciador de tarefas", ID_HELP_TOPICS Index: lang/ru-RU.rc =================================================================== --- lang/ru-RU.rc (revision 38909) +++ lang/ru-RU.rc (working copy) @@ -65,6 +65,22 @@ MENUITEM "&", ID_WINDOWS_CASCADE MENUITEM "& ", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&" BEGIN MENUITEM "& ", ID_HELP_TOPICS Index: lang/sk-SK.rc =================================================================== --- lang/sk-SK.rc (revision 38909) +++ lang/sk-SK.rc (working copy) @@ -14,13 +14,13 @@ IDR_TASKMANAGER MENU DISCARDABLE BEGIN - POPUP "&Sbor" + POPUP "&Sbor" // 0 BEGIN MENUITEM "&Nov loha (Spusti...)", ID_FILE_NEW MENUITEM SEPARATOR MENUITEM "U&koni Sprvcu loh", ID_FILE_EXIT END - POPUP "&Monosti" + POPUP "&Monosti" // 1 BEGIN MENUITEM "&Vdy navrchu", ID_OPTIONS_ALWAYSONTOP , CHECKED @@ -31,7 +31,7 @@ MENUITEM "&Zobrazi 16-bitov lohy", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "&Zobrazi" + POPUP "&Zobrazi" // 2 BEGIN MENUITEM "&Obnovi", ID_VIEW_REFRESH POPUP "&Rchlos aktualizcie" @@ -57,7 +57,7 @@ END MENUITEM "&Zobrazi asy jadra", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Okna" + POPUP "&Okna" // 3 (namiesto tohto POPUPu sa pouziva IDS_MENU_WINDOWS preco?!) BEGIN MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Veda seba", ID_WINDOWS_TILEVERTICALLY @@ -66,8 +66,24 @@ MENUITEM "&Kaskda", ID_WINDOWS_CASCADE MENUITEM "Presun dopred&u", ID_WINDOWS_BRINGTOFRONT END - POPUP "&Pomocnk" + POPUP "&Vypn" // 4 BEGIN + MENUITEM "Prepn do s&pornho reimu", ID_POWER_SAVING + , GRAYED + MENUITEM "Prepn do reimu &spnku", ID_HIBERNATION + , GRAYED + MENUITEM "&Vypn", ID_SHUTDOWN + MENUITEM "&Retartova", ID_RESTART + MENUITEM "&Odhlsi pouvatea %s", ID_LOGOFF_USER + MENUITEM "&Prepn pouvatea\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END + POPUP "&Pomocnk" // 5 + BEGIN MENUITEM "Tmy &Pomocnka pre Sprvcu loh", ID_HELP_TOPICS MENUITEM SEPARATOR MENUITEM "&o je &Sprvca loh", ID_HELP_ABOUT Index: lang/sv-SE.rc =================================================================== --- lang/sv-SE.rc (revision 38909) +++ lang/sv-SE.rc (working copy) @@ -83,6 +83,22 @@ MENUITEM "&verlappande", ID_WINDOWS_CASCADE MENUITEM "&Fr till frgrunden", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&Hjlp" BEGIN MENUITEM "Aktivitetshanteraren &hjlpavsnitt", ID_HELP_TOPICS Index: lang/uk-UA.rc =================================================================== --- lang/uk-UA.rc (revision 38909) +++ lang/uk-UA.rc (working copy) @@ -66,6 +66,22 @@ MENUITEM "&", ID_WINDOWS_CASCADE MENUITEM " & ", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "&" BEGIN MENUITEM "&", ID_HELP_TOPICS Index: lang/zh-CN.rc =================================================================== --- lang/zh-CN.rc (revision 38909) +++ lang/zh-CN.rc (working copy) @@ -74,6 +74,22 @@ MENUITEM "(&C)", ID_WINDOWS_CASCADE MENUITEM "ǰ(&B)", ID_WINDOWS_BRINGTOFRONT END + POPUP "Sh&ut Down" + BEGIN + MENUITEM "Stand &By", ID_POWER_SAVING + , GRAYED + MENUITEM "&Hibernate", ID_HIBERNATION + , GRAYED + MENUITEM "T&urn Off", ID_SHUTDOWN + MENUITEM "&Restart", ID_RESTART + MENUITEM "&Log Off %s", ID_LOGOFF_USER + MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER + , GRAYED + MENUITEM "&Disconnect", ID_DISCONNECT + , GRAYED + MENUITEM "&Eject Computer", ID_EJECT_COMPUTER + , GRAYED + END POPUP "(&H)" BEGIN MENUITEM "(&H)", ID_HELP_TOPICS Index: precomp.h =================================================================== --- precomp.h (revision 38909) +++ precomp.h (working copy) @@ -36,5 +36,6 @@ #include "priority.h" #include "run.h" #include "trayicon.h" +#include "shutdown.h" #endif /* __PRECOMP_H */ Index: resource.h =================================================================== --- resource.h (revision 38909) +++ resource.h (working copy) @@ -181,6 +181,14 @@ #define ID_PROCESS_PAGE_SETPRIORITY_LOW 32814 #define ID_PROCESS_PAGE_DEBUGCHANNELS 32815 #define IDS_LICENSE 32816 +#define ID_POWER_SAVING 32817 +#define ID_HIBERNATION 32818 +#define ID_SHUTDOWN 32819 +#define ID_RESTART 32820 +#define ID_LOGOFF_USER 32821 +#define ID_SWITCH_USER 32822 +#define ID_DISCONNECT 32823 +#define ID_EJECT_COMPUTER 32824 #define IDC_STATIC -1 #define IDS_TAB_APPS 310 @@ -248,7 +256,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 157 -#define _APS_NEXT_COMMAND_VALUE 32817 +#define _APS_NEXT_COMMAND_VALUE 32825 #define _APS_NEXT_CONTROL_VALUE 1048 #define _APS_NEXT_SYMED_VALUE 110 #endif Index: shutdown.c =================================================================== --- shutdown.c (revision 0) +++ shutdown.c (revision 0) @@ -0,0 +1,17 @@ +/* Template file for shutdown menu of taskmgr */ + +#include + +void ShutDown_PowerSaving(){} + +void ShutDown_Hibernation(){} + +// ShutDown and Restart needs privilege + +// LogOff function isn't needed + +void ShutDown_SwitchUser(){} + +void ShutDown_Disconnect(){} + +void ShutDown_Eject_Computer(){} Index: shutdown.h =================================================================== --- shutdown.h (revision 0) +++ shutdown.h (revision 0) @@ -0,0 +1,29 @@ +/* Template header file for shutdown menu of taskmgr */ + +#ifndef __SHUTDOWN_H +#define __SHUTDOWN_H + +void ShutDown_PowerSaving(); +void ShutDown_Hibernation(); + +/* shutdown and restart */ +void ShutDown_Privilege() +{ + HANDLE hToken; + TOKEN_PRIVILEGES npr; + if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); + npr.PrivilegeCount = 1; + npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); + CloseHandle(hToken); + } +} + +/* LogOff function isn't needed */ +void ShutDown_SwitchUser(); +void ShutDown_Disconnect(); +void ShutDown_Eject_Computer(); + +#endif /* __SHUTDOWN_H */ Index: taskmgr.c =================================================================== --- taskmgr.c (revision 38909) +++ taskmgr.c (working copy) @@ -222,6 +222,42 @@ case ID_PROCESS_PAGE_DEBUGCHANNELS: ProcessPage_OnDebugChannels(); break; +// Shut Down items + case ID_POWER_SAVING: +// ShutDown_PowerSaving(); + break; + case ID_HIBERNATION: +// ShutDown_Hibernation(); + break; + case ID_SHUTDOWN: + { + /* call function for privilege */ + ShutDown_Privilege(); + /* ShutDown to a point that is safe to turn off the power */ + /* ExitWindowsEx(EWX_SHUTDOWN, EWX_FORCEIFHUNG); // needs SeShutdownPrivilege */ + /* ShutDown and PowerOff if there is power-off feature */ + ExitWindowsEx(EWX_POWEROFF, EWX_FORCEIFHUNG); // needs SeShutdownPrivilege + break; + } + case ID_RESTART: + { + /* call function for privilege */ + ShutDown_Privilege(); + ExitWindowsEx(EWX_REBOOT, EWX_FORCEIFHUNG); // needs SeShutdownPrivilege + break; + } + case ID_LOGOFF_USER: + ExitWindowsEx(EWX_LOGOFF, EWX_FORCEIFHUNG); + break; + case ID_SWITCH_USER: +// ShutDown_SwitchUser(); + break; + case ID_DISCONNECT: +// ShutDown_Disconnect(); + break; + case ID_EJECT_COMPUTER: +// ShutDown_Eject_Computer(); + break; case ID_HELP_ABOUT: OnAbout(); break; @@ -470,7 +506,7 @@ memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - (void)TabCtrl_InsertItem(hTabWnd, 0, &item); + (void)TabCtrl_InsertItem(hTabWnd, 0, &item); // tab number LoadStringW(hInst, IDS_TAB_PROCESSES, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; @@ -843,7 +879,7 @@ hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); hOptionsMenu = GetSubMenu(hMenu, 1); - TaskManagerSettings.ActiveTabPage = TabCtrl_GetCurSel(hTabWnd); + TaskManagerSettings.ActiveTabPage = TabCtrl_GetCurSel(hTabWnd); // !!! try comment this line of code !!! for (i = GetMenuItemCount(hViewMenu) - 1; i > 2; i--) { hSubMenu = GetSubMenu(hViewMenu, i); if (hSubMenu) @@ -867,7 +903,7 @@ LoadStringW(hInst, IDS_MENU_DETAILS, szTemp, 256); AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); - if (GetMenuItemCount(hMenu) <= 4) { + if (GetMenuItemCount(hMenu) <= 4) { // maybe 5 ? hSubMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_WINDOWSMENU)); LoadStringW(hInst, IDS_MENU_WINDOWS, szTemp, 256); @@ -877,9 +913,7 @@ } CheckMenuRadioItem(hViewMenu, ID_VIEW_LARGE, ID_VIEW_DETAILS, TaskManagerSettings.ViewMode, MF_BYCOMMAND); - /* - * Give the application list control focus - */ + /* Give the application list control focus */ SetFocus(hApplicationPageListCtrl); break; @@ -897,14 +931,12 @@ if (TaskManagerSettings.Show16BitTasks) CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED); - if (GetMenuItemCount(hMenu) > 4) + if (GetMenuItemCount(hMenu) > 4) // maybe 5 ? { DeleteMenu(hMenu, 3, MF_BYPOSITION); DrawMenuBar(hMainWnd); } - /* - * Give the process list control focus - */ + /* Give the process list control focus */ SetFocus(hProcessPageListCtrl); break; @@ -913,7 +945,7 @@ ShowWindow(hProcessPage, SW_HIDE); ShowWindow(hPerformancePage, SW_SHOW); BringWindowToTop(hPerformancePage); - if (GetMenuItemCount(hMenu) > 4) { + if (GetMenuItemCount(hMenu) > 4) { // maybe 5 ? DeleteMenu(hMenu, 3, MF_BYPOSITION); DrawMenuBar(hMainWnd); } @@ -939,9 +971,7 @@ CheckMenuRadioItem(hSubMenu, ID_VIEW_CPUHISTORY_ONEGRAPHALL, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, MF_BYCOMMAND); else CheckMenuRadioItem(hSubMenu, ID_VIEW_CPUHISTORY_ONEGRAPHALL, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, ID_VIEW_CPUHISTORY_ONEGRAPHALL, MF_BYCOMMAND); - /* - * Give the tab control focus - */ + /* Give the tab control focus */ SetFocus(hTabWnd); break; } @@ -964,7 +994,7 @@ if (!dwRet || ( (long)dwSize < (long)dwRet+14)) { lpszBuf[0] = L'\0'; } else { - lpszTemp[lstrlenW(lpszTemp)-2] = L'\0'; /*remove cr and newline character */ + lpszTemp[lstrlenW(lpszTemp)-2] = L'\0'; /* remove cr and newline character */ wsprintfW(lpszBuf, L"%s (0x%x)", lpszTemp, (int)GetLastError()); } if (lpszTemp) {