Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 07:36:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[taskmgr]

Browse source 
- Allow task manager to activate and restore a previous instance when the mutex already exists
- Make application title identical to the window title for languages where it wasn't

svn path=/trunk/; revision=44801
This commit is contained in:
Gregor Schneider 2009-12-29 17:55:44 +00:00
parent e30be53d56
commit ff89b8ac95
10 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/taskmgr/lang/en-US.rc
View file

@ -165,7 +165,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "ReactOS Task Manager"
CAPTION "Task Manager"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN

2
reactos/base/applications/taskmgr/lang/fr-FR.rc
View file

@ -165,7 +165,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Gestionnaire des tâches ReactOS"
CAPTION "Gestionnaire des tâches"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN

2
reactos/base/applications/taskmgr/lang/ja-JP.rc
View file

@ -165,7 +165,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "ReactOS タスク マネージャ"
CAPTION "タスク マネージャ"
MENU IDR_TASKMANAGER
FONT 9, "MS UI Gothic"
BEGIN

4
reactos/base/applications/taskmgr/lang/ko-KR.rc
View file

@ -168,7 +168,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "ReactOS 작업 관리자"
CAPTION "작업 관리자"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN
@ -523,7 +523,7 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_APP_TITLE "작업 관리자"
IDS_APP_TITLE "작업 관리자"
IDC_TASKMGR "작업 관리자"
IDS_IDLE_PROCESS "System Idle Process"
END

4
reactos/base/applications/taskmgr/lang/nl-NL.rc
View file

@ -165,7 +165,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Reactos Taakbeheer"
CAPTION "Taakbeheer"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN
@ -523,7 +523,7 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_APP_TITLE "Reactos Taakbeheer"
IDS_APP_TITLE "Taakbeheer"
IDC_TASKMGR "Taakbeheer"
IDS_IDLE_PROCESS "Niet-actieve systeemprocessen"
END

2
reactos/base/applications/taskmgr/lang/ro-RO.rc
View file

@ -165,7 +165,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Gestionarul de activități ReactOS"
CAPTION "Gestionarul de activități"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN

2
reactos/base/applications/taskmgr/lang/sk-SK.rc
View file

@ -164,7 +164,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Správca úloh systému ReactOS"
CAPTION "Správca úloh systému"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN

2
reactos/base/applications/taskmgr/lang/uk-UA.rc
View file

@ -165,7 +165,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Äèñïåò÷åð çàâäàíü ReactOS"
CAPTION "Äèñïåò÷åð çàâäàíü"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN

2
reactos/base/applications/taskmgr/lang/zh-CN.rc
View file

@ -173,7 +173,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "ReactOS 任务管理器"
CAPTION "任务管理器"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN

21
reactos/base/applications/taskmgr/taskmgr.c
View file

@ -55,8 +55,27 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
/* check wether we're already running or not */
hMutex = CreateMutexW(NULL, TRUE, L"taskmgrros");
if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS))
if (hMutex && GetLastError() == ERROR_ALREADY_EXISTS)
{
/* Restore existing taskmanager and bring window to front */
/* Relies on the fact that the application title string and window title are the same */
HWND hTaskMgr;
TCHAR szTaskmgr[128];
LoadString(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(TCHAR));
hTaskMgr = FindWindow(NULL, szTaskmgr);
if (hTaskMgr != NULL)
{
SendMessage(hTaskMgr, WM_SYSCOMMAND, SC_RESTORE, 0);
SetForegroundWindow(hTaskMgr);
}
return 0;
}
else if (!hMutex)
{
return 1;
}
/* Initialize global variables */
hInst = hInstance;