Mikołaj Zalewski : taskmgr: Move Run dialog caption to resources, use the standard text.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f8a104f4a5fba966ac726db05d18c7f6dcb5f6e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f8a104f4a5fba966ac726db05d...

Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl>
Date:   Fri Jun 27 19:25:55 2008 +0200

taskmgr: Move Run dialog caption to resources, use the standard text.

---

 programs/taskmgr/Da.rc      |    1 +
 programs/taskmgr/De.rc      |    1 +
 programs/taskmgr/En.rc      |    1 +
 programs/taskmgr/Fr.rc      |    1 +
 programs/taskmgr/Ja.rc      |    1 +
 programs/taskmgr/Ko.rc      |    1 +
 programs/taskmgr/Nl.rc      |    1 +
 programs/taskmgr/No.rc      |    1 +
 programs/taskmgr/Pl.rc      |    1 +
 programs/taskmgr/Ru.rc      |    1 +
 programs/taskmgr/Si.rc      |    1 +
 programs/taskmgr/Tr.rc      |    1 +
 programs/taskmgr/resource.h |    6 ++++--
 programs/taskmgr/run.c      |   16 ++++++++--------
 14 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/programs/taskmgr/Da.rc b/programs/taskmgr/Da.rc
index 1d2e6f4..54ee078 100644
--- a/programs/taskmgr/Da.rc
+++ b/programs/taskmgr/Da.rc
@@ -433,6 +433,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Opgavebehandler"
     IDC_TASKMGR             "Opgavebehandler"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc
index 8821fac..c2886be 100644
--- a/programs/taskmgr/De.rc
+++ b/programs/taskmgr/De.rc
@@ -428,6 +428,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Task-Manager"
     IDC_TASKMGR             "Task-Manager"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc
index 4d1c3dc..bc160e3 100644
--- a/programs/taskmgr/En.rc
+++ b/programs/taskmgr/En.rc
@@ -433,6 +433,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Task Manager"
     IDC_TASKMGR             "Task Manager"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc
index e191ceb..4a9bf3d 100644
--- a/programs/taskmgr/Fr.rc
+++ b/programs/taskmgr/Fr.rc
@@ -434,6 +434,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Gestionnaire des t�ches"
     IDC_TASKMGR             "Gestionnaire des t�ches"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc
index 66915f7..d630269 100644
--- a/programs/taskmgr/Ja.rc
+++ b/programs/taskmgr/Ja.rc
@@ -434,6 +434,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "�^�X�N �}�l�[�W��"
     IDC_TASKMGR             "�^�X�N �}�l�[�W��"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc
index 08fd7b9..14070a2 100644
--- a/programs/taskmgr/Ko.rc
+++ b/programs/taskmgr/Ko.rc
@@ -433,6 +433,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "�۾� ������"
     IDC_TASKMGR             "�۾� ������"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc
index debedb5..e498d25 100644
--- a/programs/taskmgr/Nl.rc
+++ b/programs/taskmgr/Nl.rc
@@ -428,6 +428,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Task Manager"
     IDC_TASKMGR             "Task Manager"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc
index 9aa190d..006be94 100644
--- a/programs/taskmgr/No.rc
+++ b/programs/taskmgr/No.rc
@@ -433,6 +433,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Oppgavebehandler"
     IDC_TASKMGR             "Oppgavebehandler"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Pl.rc b/programs/taskmgr/Pl.rc
index 5a6fb9c..1d827f5 100644
--- a/programs/taskmgr/Pl.rc
+++ b/programs/taskmgr/Pl.rc
@@ -433,6 +433,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Mened�er zada�"
     IDC_TASKMGR             "Mened�er zada�"
+    IDS_RUNDLG_CAPTION      "Utw�rz nowe zadanie"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc
index 0534f75..10b8cae 100644
--- a/programs/taskmgr/Ru.rc
+++ b/programs/taskmgr/Ru.rc
@@ -433,6 +433,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "��������� �����"
     IDC_TASKMGR             "��������� �����"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc
index 6fb8616..ff7ed9b 100644
--- a/programs/taskmgr/Si.rc
+++ b/programs/taskmgr/Si.rc
@@ -435,6 +435,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "Upravitelj opravil"
     IDC_TASKMGR             "Upravitelj opravil"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/Tr.rc b/programs/taskmgr/Tr.rc
index b30d641..7677cd3 100644
--- a/programs/taskmgr/Tr.rc
+++ b/programs/taskmgr/Tr.rc
@@ -433,6 +433,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "G�rev Y�neticisi"
     IDC_TASKMGR             "G�rev Y�neticisi"
+    IDS_RUNDLG_CAPTION      "Create New Task"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h
index 27add7d..4ff4427 100644
--- a/programs/taskmgr/resource.h
+++ b/programs/taskmgr/resource.h
@@ -4,15 +4,17 @@
  * Used by taskmgr.rc
  *
  */
+#define IDS_APP_TITLE                   103
+#define IDC_TASKMGR                     109
+#define IDS_RUNDLG_CAPTION              110
+
 #define IDD_TASKMGR_DIALOG              102
 #define IDD_ABOUTBOX                    103
-#define IDS_APP_TITLE                   103
 #define IDM_ABOUT                       104
 #define IDM_EXIT                        105
 #define IDD_APPLICATION_PAGE            106
 #define IDI_TASKMGR                     107
 #define IDI_SMALL                       108
-#define IDC_TASKMGR                     109
 #define IDR_MAINFRAME                   128
 #define IDR_TASKMANAGER                 130
 #define IDD_PROCESS_PAGE                133
diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c
index 5aedc32..efb9fb0 100644
--- a/programs/taskmgr/run.c
+++ b/programs/taskmgr/run.c
@@ -54,10 +54,6 @@ void TaskManager_OnFileNew(void)
     HMODULE            hShell32;
     RUNFILEDLG        RunFileDlg;
     OSVERSIONINFO    versionInfo;
-    WCHAR            wTitle[40];
-    WCHAR            wText[256];
-    char            szTitle[40] = "Create New Task";
-    char            szText[256] = "Type the name of a program, folder, document, or Internet resource, and Task Manager will open it for you.";
 
     hShell32 = LoadLibrary(_T("SHELL32.DLL"));
     RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (char*)((long)0x3D));
@@ -70,12 +66,16 @@ void TaskManager_OnFileNew(void)
 
         if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
         {
-            MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTitle, -1, wTitle, 40);
-            MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szText, -1, wText, 256);
-            RunFileDlg(hMainWnd, 0, NULL, (LPCSTR)wTitle, (LPCSTR)wText, RFF_CALCDIRECTORY);
+            WCHAR wTitle[64];
+            LoadStringW(GetModuleHandleW(NULL), IDS_RUNDLG_CAPTION, wTitle, 64);
+            RunFileDlg(hMainWnd, 0, NULL, (LPCSTR)wTitle, NULL, RFF_CALCDIRECTORY);
         }
         else
-            RunFileDlg(hMainWnd, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY);
+        {
+            char szTitle[64];
+            LoadStringA(GetModuleHandleW(NULL), IDS_RUNDLG_CAPTION, szTitle, 64);
+            RunFileDlg(hMainWnd, 0, NULL, szTitle, NULL, RFF_CALCDIRECTORY);
+        }
     }
 
     FreeLibrary(hShell32);