[hbelusca] 63961: [TASKMGR] - Simplify EnablePrivilege(). - Add "Lock computer" option to the shutdown menu. - Display the last error description if something failed when selecting one of the shutd...
Author: hbelusca Date: Wed Aug 27 12:46:22 2014 New Revision: 63961
URL: http://svn.reactos.org/svn/reactos?rev=63961&view=rev Log: [TASKMGR] - Simplify EnablePrivilege(). - Add "Lock computer" option to the shutdown menu. - Display the last error description if something failed when selecting one of the shutdown options. Inspired by the patch of Robert Naumann (see CORE-8048). CORE-8048 #resolve #comment I adapted some of your ideas to what I already committed in revision 63955, thanks!
Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/he-IL.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc trunk/reactos/base/applications/taskmgr/resource.h trunk/reactos/base/applications/taskmgr/shutdown.c trunk/reactos/base/applications/taskmgr/shutdown.h trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h
Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/C... ============================================================================== --- trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -8,17 +8,17 @@ debug.c endproc.c graph.c + graphctl.c optnmenu.c perfdata.c perfpage.c priority.c + proclist.c procpage.c - proclist.c run.c + shutdown.c + taskmgr.c trayicon.c - taskmgr.c - graphctl.c - shutdown.c precomp.h)
add_executable(taskmgr ${SOURCE} taskmgr.rc)
Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Ðомо&Ñ" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&NápovÄda" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjælp" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&?" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Îοήθεια" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "A&yuda" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aide" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&×¢×ר×" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Súgó" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aiuto" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "ãã«ã(&H)" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "ëìë§(&H)" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjelp" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -55,14 +55,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Pomo&c" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&uda" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&?" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&СпÑавка" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&PomocnÃk" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -52,14 +52,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Ndihme" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjälp" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Yardım" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&ÐовÑдка" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -54,14 +54,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "帮å©(&H)" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -56,14 +56,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - 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 + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "說æ(&H)" BEGIN
Modified: trunk/reactos/base/applications/taskmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/r... ============================================================================== --- trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -180,14 +180,15 @@ #define ID_PROCESS_PAGE_SETPRIORITY_LOW 32814 #define ID_PROCESS_PAGE_DEBUGCHANNELS 32815
-#define ID_POWER_SAVING 32816 -#define ID_HIBERNATION 32817 -#define ID_SHUTDOWN 32818 -#define ID_RESTART 32819 -#define ID_LOGOFF_USER 32820 -#define ID_SWITCH_USER 32821 -#define ID_DISCONNECT 32822 -#define ID_EJECT_COMPUTER 32823 +#define ID_SHUTDOWN_STANDBY 32816 +#define ID_SHUTDOWN_HIBERNATE 32817 +#define ID_SHUTDOWN_POWEROFF 32818 +#define ID_SHUTDOWN_REBOOT 32819 +#define ID_SHUTDOWN_LOGOFF 32820 +#define ID_SHUTDOWN_SWITCHUSER 32821 +#define ID_SHUTDOWN_LOCKCOMPUTER 32822 +#define ID_SHUTDOWN_DISCONNECT 32823 +#define ID_SHUTDOWN_EJECT_COMPUTER 32824
#define IDC_STATIC -1
Modified: trunk/reactos/base/applications/taskmgr/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/s... ============================================================================== --- trunk/reactos/base/applications/taskmgr/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/shutdown.c [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -5,6 +5,7 @@ * * Copyright (C) 1999 - 2001 Brian Palmer brianp@reactos.org * 2011 Mário Kacmár /Mario Kacmar/ aka Kario (kario@szm.sk) + * 2014 Robert Naumann gonzomdx@gmail.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,7 @@ #include "precomp.h" #include <ndk/exfuncs.h> #include <ndk/pofuncs.h> +#include <ndk/rtlfuncs.h>
// Uncomment when NtInitiatePowerAction() is implemented // #define NT_INITIATE_POWERACTION_IMPLEMENTED @@ -33,63 +35,78 @@ { BOOL Success; HANDLE hToken; + TOKEN_PRIVILEGES tp;
Success = OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken); - if (Success) - { - TOKEN_PRIVILEGES tp; + if (!Success) return Success;
- tp.PrivilegeCount = 1; - tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + Success = LookupPrivilegeValueW(NULL, + lpszPrivilegeName, + &tp.Privileges[0].Luid); + if (!Success) goto Quit;
- Success = LookupPrivilegeValueW(NULL, - lpszPrivilegeName, - &tp.Privileges[0].Luid); - if (Success) - { - Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); - } + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0);
- CloseHandle(hToken); - } + Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL);
+Quit: + CloseHandle(hToken); return Success; }
VOID -ShutDown_PowerSaving(VOID) // StandBy +ShutDown_StandBy(VOID) { - EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + NTSTATUS Status; + + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + }
#ifdef NT_INITIATE_POWERACTION_IMPLEMENTED - NtInitiatePowerAction(PowerActionSleep, - PowerSystemSleeping1, - 0, FALSE); + Status = NtInitiatePowerAction(PowerActionSleep, + PowerSystemSleeping1, + 0, FALSE); #else - NtSetSystemPowerState(PowerActionSleep, - PowerSystemSleeping1, - 0); + Status = NtSetSystemPowerState(PowerActionSleep, + PowerSystemSleeping1, + 0); #endif + + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status));
EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); }
VOID -ShutDown_Hibernation(VOID) +ShutDown_Hibernate(VOID) { - EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + NTSTATUS Status; + + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + }
#ifdef NT_INITIATE_POWERACTION_IMPLEMENTED - NtInitiatePowerAction(PowerActionHibernate, - PowerSystemHibernate, - 0, FALSE); + Status = NtInitiatePowerAction(PowerActionHibernate, + PowerSystemHibernate, + 0, FALSE); #else - NtSetSystemPowerState(PowerActionHibernate, - PowerSystemHibernate, - 0); + Status = NtSetSystemPowerState(PowerActionHibernate, + PowerSystemHibernate, + 0); #endif + + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status));
EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); } @@ -100,43 +117,60 @@ /* Trick: on Windows, pressing the CTRL key forces shutdown via NT API */ BOOL ForceShutdown = !!(GetKeyState(VK_CONTROL) & 0x8000);
- EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + } + if (ForceShutdown) { - NtShutdownSystem(ShutdownPowerOff); + NTSTATUS Status = NtShutdownSystem(ShutdownPowerOff); + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status)); } else { // The choice of EWX_SHUTDOWN or EWX_POWEROFF may be done with NtPowerInformation - ExitWindowsEx(EWX_POWEROFF, // EWX_SHUTDOWN - SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); + if (!ExitWindowsEx(EWX_POWEROFF /* EWX_SHUTDOWN */, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER)) + ShowWin32Error(GetLastError()); } + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); }
VOID -ShutDown_Restart(VOID) // Reboot +ShutDown_Reboot(VOID) { /* Trick: on Windows, pressing the CTRL key forces reboot via NT API */ BOOL ForceReboot = !!(GetKeyState(VK_CONTROL) & 0x8000);
- EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + } + if (ForceReboot) { - NtShutdownSystem(ShutdownReboot); + NTSTATUS Status = NtShutdownSystem(ShutdownReboot); + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status)); } else { - ExitWindowsEx(EWX_REBOOT, - SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); + if (!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER)) + ShowWin32Error(GetLastError()); } + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); }
VOID ShutDown_LogOffUser(VOID) { - ExitWindowsEx(EWX_LOGOFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); + if (!ExitWindowsEx(EWX_LOGOFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER)) + ShowWin32Error(GetLastError()); }
VOID @@ -145,11 +179,18 @@ }
VOID +ShutDown_LockComputer(VOID) +{ + if (!LockWorkStation()) + ShowWin32Error(GetLastError()); +} + +VOID ShutDown_Disconnect(VOID) { }
VOID -ShutDown_Eject_Computer(VOID) +ShutDown_EjectComputer(VOID) { }
Modified: trunk/reactos/base/applications/taskmgr/shutdown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/s... ============================================================================== --- trunk/reactos/base/applications/taskmgr/shutdown.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/shutdown.h [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -5,6 +5,7 @@ * * Copyright (C) 1999 - 2001 Brian Palmer brianp@reactos.org * 2011 Mário Kacmár /Mario Kacmar/ aka Kario (kario@szm.sk) + * 2014 Robert Naumann gonzomdx@gmail.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,16 +25,16 @@ #pragma once
VOID -ShutDown_PowerSaving(VOID); // StandBy +ShutDown_StandBy(VOID);
VOID -ShutDown_Hibernation(VOID); +ShutDown_Hibernate(VOID);
VOID ShutDown_PowerOff(VOID);
VOID -ShutDown_Restart(VOID); // Reboot +ShutDown_Reboot(VOID);
VOID ShutDown_LogOffUser(VOID); @@ -42,7 +43,10 @@ ShutDown_SwitchUser(VOID);
VOID +ShutDown_LockComputer(VOID); + +VOID ShutDown_Disconnect(VOID);
VOID -ShutDown_Eject_Computer(VOID); +ShutDown_EjectComputer(VOID);
Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/t... ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -319,29 +319,32 @@ break;
/* ShutDown items */ - case ID_POWER_SAVING: - ShutDown_PowerSaving(); - break; - case ID_HIBERNATION: - ShutDown_Hibernation(); - break; - case ID_SHUTDOWN: + case ID_SHUTDOWN_STANDBY: + ShutDown_StandBy(); + break; + case ID_SHUTDOWN_HIBERNATE: + ShutDown_Hibernate(); + break; + case ID_SHUTDOWN_POWEROFF: ShutDown_PowerOff(); break; - case ID_RESTART: - ShutDown_Restart(); - break; - case ID_LOGOFF_USER: + case ID_SHUTDOWN_REBOOT: + ShutDown_Reboot(); + break; + case ID_SHUTDOWN_LOGOFF: ShutDown_LogOffUser(); break; - case ID_SWITCH_USER: + case ID_SHUTDOWN_SWITCHUSER: ShutDown_SwitchUser(); break; - case ID_DISCONNECT: + case ID_SHUTDOWN_LOCKCOMPUTER: + ShutDown_LockComputer(); + break; + case ID_SHUTDOWN_DISCONNECT: ShutDown_Disconnect(); break; - case ID_EJECT_COMPUTER: - ShutDown_Eject_Computer(); + case ID_SHUTDOWN_EJECT_COMPUTER: + ShutDown_EjectComputer(); break;
case ID_HELP_ABOUT: @@ -1073,6 +1076,22 @@ } }
+VOID ShowWin32Error(DWORD dwError) +{ + LPWSTR lpMessageBuffer; + + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMessageBuffer, + 0, NULL) != 0) + { + MessageBoxW(hMainWnd, lpMessageBuffer, NULL, MB_OK | MB_ICONERROR); + if (lpMessageBuffer) LocalFree(lpMessageBuffer); + } +} + LPWSTR GetLastErrorText(LPWSTR lpszBuf, DWORD dwSize) { DWORD dwRet;
Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/t... ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -117,6 +117,7 @@ void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void); +VOID ShowWin32Error(DWORD dwError); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread);
-
hbelusca＠svn.reactos.org