[hbelusca] 63955: [TASKMGR] Starting implementing a shutdown menu in taskmgr (see eg. on Windows XP). It is a synthesis of the available patches of CORE-2332 from Mario Kacmar, fixed by Timo Kreuze...
Author: hbelusca Date: Tue Aug 26 18:57:20 2014 New Revision: 63955
URL: http://svn.reactos.org/svn/reactos?rev=63955&view=rev Log: [TASKMGR] Starting implementing a shutdown menu in taskmgr (see eg. on Windows XP). It is a synthesis of the available patches of CORE-2332 from Mario Kacmar, fixed by Timo Kreuzer and by myself.
CORE-2332 #resolve #comment Shutdown code committed in revision 63955, closing the report. Please reopen when you implement the other missing functionalities.
Added: trunk/reactos/base/applications/taskmgr/shutdown.c (with props) trunk/reactos/base/applications/taskmgr/shutdown.h (with props) Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/applications/taskmgr/applpage.c 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/precomp.h trunk/reactos/base/applications/taskmgr/resource.h trunk/reactos/base/applications/taskmgr/taskmgr.c
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] Tue Aug 26 18:57:20 2014 @@ -18,6 +18,7 @@ trayicon.c taskmgr.c graphctl.c + shutdown.c precomp.h)
add_executable(taskmgr ${SOURCE} taskmgr.rc)
Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/a... ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Tue Aug 26 18:57:20 2014 @@ -554,11 +554,11 @@ { if (pAPLI->bHung) { - LoadStringW( GetModuleHandleW(NULL), IDS_Not_Responding , szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + LoadStringW( GetModuleHandleW(NULL), IDS_NOT_RESPONDING , szMsg, sizeof(szMsg) / sizeof(szMsg[0])); } else { - LoadStringW( GetModuleHandleW(NULL), IDS_Running, (LPWSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + LoadStringW( GetModuleHandleW(NULL), IDS_RUNNING, (LPWSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0])); } wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); }
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "У&големÑване", ID_WINDOWS_MAXIMIZE MENUITEM "Ðа&диплÑне", ID_WINDOWS_CASCADE MENUITEM "Ðзваждане &оÑпÑед ", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "Ðомо&Ñ" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "ÐаеÑа памеÑ: %dK / %dK" IDS_STATUS_CPUUSAGE "ÐаеÑоÑÑ Ð½Ð° ЦÐУ: %3d%%" IDS_STATUS_PROCESSES "ÐейÑÑвиÑ: %d" - IDS_Not_Responding "Ðе оÑговаÑÑ" - IDS_Running "РабоÑи" -END + IDS_NOT_RESPONDING "Ðе оÑговаÑÑ" + IDS_RUNNING "РабоÑи" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "Ma&ximalizovat", ID_WINDOWS_MAXIMIZE MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE MENUITEM "&PÅenést do popÅedÃ", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&NápovÄda" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Využità pamÄti: %dK / %dK" IDS_STATUS_CPUUSAGE "Využità CPU: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" - IDS_Not_Responding "NeodpovÃdá" - IDS_Running "BÄžÃ" -END + IDS_NOT_RESPONDING "NeodpovÃdá" + IDS_RUNNING "BÄžÃ" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "Ma&ksimeree", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring til front", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Hjælp" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" - IDS_Not_Responding "Not Responding" - IDS_Running "Running" -END + IDS_NOT_RESPONDING "Not Responding" + IDS_RUNNING "Running" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Ma&ximieren", ID_WINDOWS_MAXIMIZE MENUITEM "Ãbe&rlappend", ID_WINDOWS_CASCADE MENUITEM "&In Vordergrund", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&?" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU-Auslastung: %3d%%" IDS_STATUS_PROCESSES "Prozesse: %d" - IDS_Not_Responding "Keine Rückmeldung" - IDS_Running "Wird ausgeführt" -END + IDS_NOT_RESPONDING "Keine Rückmeldung" + IDS_RUNNING "Wird ausgeführt" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Îε&γÎÎ¸Ï Î½Ïη", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Îοήθεια" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" - IDS_Not_Responding "Not Responding" - IDS_Running "Running" -END + IDS_NOT_RESPONDING "Not Responding" + IDS_RUNNING "Running" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "Ma&ximize", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Help" BEGIN @@ -422,6 +433,6 @@ IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" - IDS_Not_Responding "Not Responding" - IDS_Running "Running" -END + IDS_NOT_RESPONDING "Not Responding" + IDS_RUNNING "Running" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascada", ID_WINDOWS_CASCADE MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "A&yuda" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Uso Memoria: %dK / %dK" IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%" IDS_STATUS_PROCESSES "Procesos: %d" - IDS_Not_Responding "No Responde" - IDS_Running "Funcionando" -END + IDS_NOT_RESPONDING "No Responde" + IDS_RUNNING "Funcionando" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Agra&ndir", ID_WINDOWS_MAXIMIZE 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 + 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 END POPUP "&Aide" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Fichier d'échange utilisé : %dK / %dK" IDS_STATUS_CPUUSAGE "UC utilisée : %3d%%" IDS_STATUS_PROCESSES "Processus : %d" - IDS_Not_Responding "Ne répond pas" - IDS_Running "En cours d'exécution" -END + IDS_NOT_RESPONDING "Ne répond pas" + IDS_RUNNING "En cours d'exécution" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "&××××", ID_WINDOWS_MAXIMIZE MENUITEM "×××ר×", ID_WINDOWS_CASCADE MENUITEM "×&×× ××¤× ××", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&×¢×ר×" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" - IDS_Not_Responding "Not Responding" - IDS_Running "Running" -END + IDS_NOT_RESPONDING "Not Responding" + IDS_RUNNING "Running" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "&Teljes méret", ID_WINDOWS_MAXIMIZE MENUITEM "&Lépcsõzetes rendezés", ID_WINDOWS_CASCADE MENUITEM "&Elõtérbe helyezés", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Súgó" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Mem használat: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU használat: %3d%%" IDS_STATUS_PROCESSES "Folyamatok: %d" - IDS_Not_Responding "Nem válaszol" - IDS_Running "Fut" -END + IDS_NOT_RESPONDING "Nem válaszol" + IDS_RUNNING "Fut" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Ma&ximize", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascade", ID_WINDOWS_CASCADE MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Help" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Pemakaian Mem: %dK / %dK" IDS_STATUS_CPUUSAGE "Pemakaian CPU: %3d%%" IDS_STATUS_PROCESSES "Proses: %d" - IDS_Not_Responding "Tidak Merespon" - IDS_Running "Berjalan" -END + IDS_NOT_RESPONDING "Tidak Merespon" + IDS_RUNNING "Berjalan" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "Ma&ssimizza", ID_WINDOWS_MAXIMIZE 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 + 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 END POPUP "&Aiuto" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Uso Mem: %dK / %dK" IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%" IDS_STATUS_PROCESSES "Processi: %d" - IDS_Not_Responding "Non risponde" - IDS_Running "In esecuzione" -END + IDS_NOT_RESPONDING "Non risponde" + IDS_RUNNING "In esecuzione" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "æ大å(&X)", ID_WINDOWS_MAXIMIZE MENUITEM "éãã¦è¡¨ç¤º(&C)", ID_WINDOWS_CASCADE MENUITEM "æåã«è¡¨ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "ãã«ã(&H)" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "ã¡ã¢ãªä½¿ç¨é: %dKB / %dKB" IDS_STATUS_CPUUSAGE "CPU 使ç¨ç: %3d%%" IDS_STATUS_PROCESSES "ããã»ã¹: %d" - IDS_Not_Responding "å¿çãªã" - IDS_Running "å®è¡ä¸" -END + IDS_NOT_RESPONDING "å¿çãªã" + IDS_RUNNING "å®è¡ä¸" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "ìµëí(&X)", ID_WINDOWS_MAXIMIZE MENUITEM "ê³ë¨ì ì°½ ë°°ì´(&C)", ID_WINDOWS_CASCADE MENUITEM "맨 ìì¼ë¡ ê°ì ¸ì¤ê¸°(&B)", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "ëìë§(&H)" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "ë©ëª¨ë¦¬ ì¬ì©: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU ì¬ì©: %3d%%" IDS_STATUS_PROCESSES "íë¡ì¸ì¤: %d" - IDS_Not_Responding "ìëµ ìì" - IDS_Running "ì¤í ì¤" -END + IDS_NOT_RESPONDING "ìëµ ìì" + IDS_RUNNING "ì¤í ì¤" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "&Maximaliseren", ID_WINDOWS_MAXIMIZE MENUITEM "&Trapsgewijs", ID_WINDOWS_CASCADE MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Help" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Geheugengebruik: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU-gebruik: %3d%%" IDS_STATUS_PROCESSES "Processen: %d" - IDS_Not_Responding "Reageert niet" - IDS_Running "Geactiveerd" -END + IDS_NOT_RESPONDING "Reageert niet" + IDS_RUNNING "Geactiveerd" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE MENUITEM "&Overlappet", ID_WINDOWS_CASCADE MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Hjelp" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Tildelt minne: %dK / %dK" IDS_STATUS_CPUUSAGE "Prosessorbruk: %3d%%" IDS_STATUS_PROCESSES "Prosesser: %d" - IDS_Not_Responding "Ingen reaksjon" - IDS_Running "Kjører" -END + IDS_NOT_RESPONDING "Ingen reaksjon" + IDS_RUNNING "Kjører" +END
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] Tue Aug 26 18:57:20 2014 @@ -52,6 +52,17 @@ MENUITEM "&Maksymalizuj", ID_WINDOWS_MAXIMIZE MENUITEM "&Kaskadowo", ID_WINDOWS_CASCADE MENUITEM "&PrzesuŠna wierzch", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "Pomo&c" BEGIN @@ -431,6 +442,6 @@ IDS_STATUS_MEMUSAGE "Pam. zadeklar.: %dK / %dK" IDS_STATUS_CPUUSAGE "Użycie procesora: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" - IDS_Not_Responding "Nie odpowiada" - IDS_Running "Uruchomiony" -END + IDS_NOT_RESPONDING "Nie odpowiada" + IDS_RUNNING "Uruchomiony" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE 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 + 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 END POPUP "Aj&uda" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Uso de Memória: %dK / %dK" IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%" IDS_STATUS_PROCESSES "Processo: %d" - IDS_Not_Responding "Não respondendo" - IDS_Running "Execuando" -END + IDS_NOT_RESPONDING "Não respondendo" + IDS_RUNNING "Execuando" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Ma&ximizeazÄ", ID_WINDOWS_MAXIMIZE MENUITEM "AranjÄri în casca&dÄ", ID_WINDOWS_CASCADE MENUITEM "&Aduce în prim plan", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&?" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Utilizare memorie: %dko/%dko" IDS_STATUS_CPUUSAGE "Utilizare procesor: %3d%%" IDS_STATUS_PROCESSES "Procese: %d" - IDS_Not_Responding "EXECUÈIE ANORMALÄ" - IDS_Running "execuÈie normalÄ" -END + IDS_NOT_RESPONDING "EXECUÈIE ANORMALÄ" + IDS_RUNNING "execuÈie normalÄ" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "&РазвеÑнÑÑÑ", ID_WINDOWS_MAXIMIZE MENUITEM "&ÐаÑкадом", ID_WINDOWS_CASCADE MENUITEM "&Ðа пеÑедний план", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&СпÑавка" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "ÐÑделение памÑÑи: %dK / %dK" IDS_STATUS_CPUUSAGE "ÐагÑÑзка ЦÐ: %3d%%" IDS_STATUS_PROCESSES "ÐÑоÑеÑÑов: %d" - IDS_Not_Responding "Ðе оÑвеÑаеÑ" - IDS_Running "РабоÑаеÑ" -END + IDS_NOT_RESPONDING "Ðе оÑвеÑаеÑ" + IDS_RUNNING "РабоÑаеÑ" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Ma&ximalizovaÅ¥", ID_WINDOWS_MAXIMIZE MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE MENUITEM "Presunúť dopred&u", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&PomocnÃk" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Využitá pamäť: %dK / %dK" IDS_STATUS_CPUUSAGE "Využitie procesora: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" - IDS_Not_Responding "Neodpovedá" - IDS_Running "Spustené" -END + IDS_NOT_RESPONDING "Neodpovedá" + IDS_RUNNING "Spustené" +END
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] Tue Aug 26 18:57:20 2014 @@ -49,6 +49,17 @@ MENUITEM "Ma&ximizo", ID_WINDOWS_MAXIMIZE MENUITEM "Ujevare", ID_WINDOWS_CASCADE MENUITEM "Sjelle para", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "Ndihme" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %dK / %dK" IDS_STATUS_CPUUSAGE "Perdorimi i CPU: %3d%%" IDS_STATUS_PROCESSES "Proceset: %d" - IDS_Not_Responding "Nuk pergjigjet" - IDS_Running "Ne pune" -END + IDS_NOT_RESPONDING "Nuk pergjigjet" + IDS_RUNNING "Ne pune" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "Ma&ximera", ID_WINDOWS_MAXIMIZE MENUITEM "&Ãverlappande", ID_WINDOWS_CASCADE MENUITEM "&För till förgrunden", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Hjälp" BEGIN @@ -426,6 +437,6 @@ IDS_STATUS_MEMUSAGE "Minnesanv: %dK / %dK" IDS_STATUS_CPUUSAGE "Processoranv: %3d%%" IDS_STATUS_PROCESSES "Processer: %d" - IDS_Not_Responding "Svarar inte" - IDS_Running "IgÃ¥ng" -END + IDS_NOT_RESPONDING "Svarar inte" + IDS_RUNNING "IgÃ¥ng" +END
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] Tue Aug 26 18:57:20 2014 @@ -47,6 +47,17 @@ MENUITEM "&Büyüt", ID_WINDOWS_MAXIMIZE MENUITEM "B&asamaklandır", ID_WINDOWS_CASCADE MENUITEM "&Ãne Getir", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&Yardım" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Bellek Kullanımı: %d KB / %d KB" IDS_STATUS_CPUUSAGE "CPU Kullanımı: %%%3d" IDS_STATUS_PROCESSES "Ä°Ålem: %d" - IDS_Not_Responding "Yanıt Vermiyor" - IDS_Running "ÃalıÅıyor" -END + IDS_NOT_RESPONDING "Yanıt Vermiyor" + IDS_RUNNING "ÃalıÅıyor" +END
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] Tue Aug 26 18:57:20 2014 @@ -45,6 +45,17 @@ MENUITEM "&РозгоÑнÑÑи", ID_WINDOWS_MAXIMIZE MENUITEM "&ÐаÑкадом", ID_WINDOWS_CASCADE MENUITEM "Ðа пеÑеднÑ&й план", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "&ÐовÑдка" BEGIN @@ -424,6 +435,6 @@ IDS_STATUS_MEMUSAGE "Ðам'ÑÑÑ: %dK / %dK" IDS_STATUS_CPUUSAGE "ÐикоÑиÑÑÐ°Ð½Ð½Ñ Ð¦Ð: %3d%%" IDS_STATUS_PROCESSES "ÐÑоÑеÑÑв: %d" - IDS_Not_Responding "Ðе вÑдповÑдаÑ" - IDS_Running "ÐиконÑÑÑÑÑÑ" -END + IDS_NOT_RESPONDING "Ðе вÑдповÑдаÑ" + IDS_RUNNING "ÐиконÑÑÑÑÑÑ" +END
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] Tue Aug 26 18:57:20 2014 @@ -51,6 +51,17 @@ MENUITEM "æ大å(&X)", ID_WINDOWS_MAXIMIZE MENUITEM "å±å (&C)", ID_WINDOWS_CASCADE MENUITEM "åç½®(&B)", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "帮å©(&H)" BEGIN @@ -430,6 +441,6 @@ IDS_STATUS_MEMUSAGE "å å使ç¨æ åµ: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU 使ç¨æ åµ: %3d%%" IDS_STATUS_PROCESSES "èçç¨åº: %d" - IDS_Not_Responding "没æååº" - IDS_Running "æ£å¨è¿è¡" -END + IDS_NOT_RESPONDING "没æååº" + IDS_RUNNING "æ£å¨è¿è¡" +END
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] Tue Aug 26 18:57:20 2014 @@ -53,6 +53,17 @@ MENUITEM "æ大å(&X)", ID_WINDOWS_MAXIMIZE MENUITEM "層ç(&C)", ID_WINDOWS_CASCADE MENUITEM "åç½®(&B)", ID_WINDOWS_BRINGTOFRONT + 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 END POPUP "說æ(&H)" BEGIN @@ -432,6 +443,6 @@ IDS_STATUS_MEMUSAGE "è¨æ¶é«ä½¿ç¨æ æ³: %dK / %dK" IDS_STATUS_CPUUSAGE "CPU 使ç¨æ æ³: %3d%%" IDS_STATUS_PROCESSES "èçç¨åº: %d" - IDS_Not_Responding "æ²æåæ" - IDS_Running "æ£å¨éè¡" -END + IDS_NOT_RESPONDING "æ²æåæ" + IDS_RUNNING "æ£å¨éè¡" +END
Modified: trunk/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/p... ============================================================================== --- trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] Tue Aug 26 18:57:20 2014 @@ -30,5 +30,6 @@ #include "optnmenu.h" #include "run.h" #include "trayicon.h" +#include "shutdown.h"
#endif /* __PRECOMP_H */
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] Tue Aug 26 18:57:20 2014 @@ -180,6 +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 IDC_STATIC -1
#define IDS_TAB_APPS 310 @@ -241,5 +250,5 @@ #define IDS_STATUS_MEMUSAGE 363 #define IDS_STATUS_CPUUSAGE 364 #define IDS_STATUS_PROCESSES 365 -#define IDS_Not_Responding 366 -#define IDS_Running 367 +#define IDS_NOT_RESPONDING 366 +#define IDS_RUNNING 367
Added: 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 (added) +++ trunk/reactos/base/applications/taskmgr/shutdown.c [iso-8859-1] Tue Aug 26 18:57:20 2014 @@ -0,0 +1,155 @@ +/* + * ReactOS Task Manager + * + * shutdown.c + * + * Copyright (C) 1999 - 2001 Brian Palmer brianp@reactos.org + * 2011 Mário Kacmár /Mario Kacmar/ aka Kario (kario@szm.sk) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "precomp.h" +#include <ndk/exfuncs.h> +#include <ndk/pofuncs.h> + +// Uncomment when NtInitiatePowerAction() is implemented +// #define NT_INITIATE_POWERACTION_IMPLEMENTED + +static BOOL +EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) +{ + BOOL Success; + HANDLE hToken; + + Success = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken); + if (Success) + { + TOKEN_PRIVILEGES tp; + + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + + Success = LookupPrivilegeValueW(NULL, + lpszPrivilegeName, + &tp.Privileges[0].Luid); + if (Success) + { + Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); + } + + CloseHandle(hToken); + } + + return Success; +} + +VOID +ShutDown_PowerSaving(VOID) // StandBy +{ + EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + +#ifdef NT_INITIATE_POWERACTION_IMPLEMENTED + NtInitiatePowerAction(PowerActionSleep, + PowerSystemSleeping1, + 0, FALSE); +#else + NtSetSystemPowerState(PowerActionSleep, + PowerSystemSleeping1, + 0); +#endif + + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); +} + +VOID +ShutDown_Hibernation(VOID) +{ + EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + +#ifdef NT_INITIATE_POWERACTION_IMPLEMENTED + NtInitiatePowerAction(PowerActionHibernate, + PowerSystemHibernate, + 0, FALSE); +#else + NtSetSystemPowerState(PowerActionHibernate, + PowerSystemHibernate, + 0); +#endif + + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); +} + +VOID +ShutDown_PowerOff(VOID) +{ + /* Trick: on Windows, pressing the CTRL key forces shutdown via NT API */ + BOOL ForceShutdown = !!(GetKeyState(VK_CONTROL) & 0x8000); + + EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + if (ForceShutdown) + { + NtShutdownSystem(ShutdownPowerOff); + } + 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); + } + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); +} + +VOID +ShutDown_Restart(VOID) // Reboot +{ + /* Trick: on Windows, pressing the CTRL key forces reboot via NT API */ + BOOL ForceReboot = !!(GetKeyState(VK_CONTROL) & 0x8000); + + EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + if (ForceReboot) + { + NtShutdownSystem(ShutdownReboot); + } + else + { + ExitWindowsEx(EWX_REBOOT, + SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); + } + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); +} + +VOID +ShutDown_LogOffUser(VOID) +{ + ExitWindowsEx(EWX_LOGOFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); +} + +VOID +ShutDown_SwitchUser(VOID) +{ +} + +VOID +ShutDown_Disconnect(VOID) +{ +} + +VOID +ShutDown_Eject_Computer(VOID) +{ +}
Propchange: trunk/reactos/base/applications/taskmgr/shutdown.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: 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 (added) +++ trunk/reactos/base/applications/taskmgr/shutdown.h [iso-8859-1] Tue Aug 26 18:57:20 2014 @@ -0,0 +1,48 @@ +/* + * ReactOS Task Manager + * + * shutdown.h + * + * Copyright (C) 1999 - 2001 Brian Palmer brianp@reactos.org + * 2011 Mário Kacmár /Mario Kacmar/ aka Kario (kario@szm.sk) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#pragma once + +VOID +ShutDown_PowerSaving(VOID); // StandBy + +VOID +ShutDown_Hibernation(VOID); + +VOID +ShutDown_PowerOff(VOID); + +VOID +ShutDown_Restart(VOID); // Reboot + +VOID +ShutDown_LogOffUser(VOID); + +VOID +ShutDown_SwitchUser(VOID); + +VOID +ShutDown_Disconnect(VOID); + +VOID +ShutDown_Eject_Computer(VOID);
Propchange: trunk/reactos/base/applications/taskmgr/shutdown.h ------------------------------------------------------------------------------ svn:eol-style = native
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] Tue Aug 26 18:57:20 2014 @@ -317,6 +317,33 @@ case ID_PROCESS_PAGE_DEBUGCHANNELS: ProcessPage_OnDebugChannels(); break; + +/* ShutDown items */ + case ID_POWER_SAVING: + ShutDown_PowerSaving(); + break; + case ID_HIBERNATION: + ShutDown_Hibernation(); + break; + case ID_SHUTDOWN: + ShutDown_PowerOff(); + break; + case ID_RESTART: + ShutDown_Restart(); + break; + case ID_LOGOFF_USER: + ShutDown_LogOffUser(); + 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; @@ -957,7 +984,7 @@ LoadStringW(hInst, IDS_MENU_DETAILS, szTemp, 256); AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp);
- if (GetMenuItemCount(hMenu) <= 4) { + if (GetMenuItemCount(hMenu) <= 5) { hSubMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_WINDOWSMENU));
LoadStringW(hInst, IDS_MENU_WINDOWS, szTemp, 256); @@ -987,7 +1014,7 @@
if (TaskManagerSettings.Show16BitTasks) CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED); - if (GetMenuItemCount(hMenu) > 4) + if (GetMenuItemCount(hMenu) > 5) { DeleteMenu(hMenu, 3, MF_BYPOSITION); DrawMenuBar(hMainWnd); @@ -1003,7 +1030,7 @@ ShowWindow(hProcessPage, SW_HIDE); ShowWindow(hPerformancePage, SW_SHOW); BringWindowToTop(hPerformancePage); - if (GetMenuItemCount(hMenu) > 4) { + if (GetMenuItemCount(hMenu) > 5) { DeleteMenu(hMenu, 3, MF_BYPOSITION); DrawMenuBar(hMainWnd); }
-
hbelusca＠svn.reactos.org