Remove all hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/timer.c _____
Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 13:13:36 UTC (rev 14870) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 13:35:52 UTC (rev 14871) @@ -403,8 +403,28 @@
STRING_TIME_HELP2, "Enter new time: "
+STRING_TIMER_HELP1, "Elapsed %d msecs\n"
+STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n"
+STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n \ +TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n \ + ON set stopwach ON\n \ + OFF set stopwach OFF\n \ + /S Split time. Return stopwach split\n \ + time without changing its value\n \ + /n Specifiy the stopwach number.\n \ + Stopwaches avaliable are 0 to 10\n \ + If it is not specified default is 1\n \ + /Fn Format for output\n \ + n can be:\n \ + 0 milliseconds\n \ + 1 hh%cmm%css%cdd\n\n \ +if none of ON, OFF or /S is specified the command\n \ +will toggle stopwach state\n\n" + + + STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" _____
Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 13:13:36 UTC (rev 14870) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 13:35:52 UTC (rev 14871) @@ -180,6 +180,9 @@
#define STRING_TIME_HELP1 678 #define STRING_TIME_HELP2 679
+#define STRING_TIMER_HELP1 680 +#define STRING_TIMER_HELP2 681 +#define STRING_TIMER_HELP3 682
_____
Modified: trunk/reactos/subsys/system/cmd/timer.c --- trunk/reactos/subsys/system/cmd/timer.c 2005-04-30 13:13:36 UTC (rev 14870) +++ trunk/reactos/subsys/system/cmd/timer.c 2005-04-30 13:35:52 UTC (rev 14871) @@ -8,6 +8,7 @@
*/
#include "precomp.h" +#include "resource.h"
#ifdef INCLUDE_CMD_TIMER
@@ -36,7 +37,7 @@ static VOID PrintElapsedTime (DWORD time,INT format) { - + WCHAR szMsg[RC_STRING_MAX_SIZE]; DWORD h,m,s,ms;
#ifdef _DEBUG @@ -46,7 +47,8 @@ switch (format) { case 0: - ConOutPrintf(_T("Elapsed %d msecs\n"),time); + LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf((LPTSTR)szMsg,time); break;
case 1: @@ -56,7 +58,8 @@ time /=60; m = time % 60; h = time / 60; - ConOutPrintf(_T("Elapsed %02d%c%02d%c%02d%c%02d\n"), + LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf((LPTSTR)szMsg, h,cTimeSeparator, m,cTimeSeparator, s,cDecimalSeparator,ms/10); @@ -67,6 +70,8 @@
INT CommandTimer (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + // all timers are kept static DWORD clksT[10]; @@ -99,29 +104,8 @@
if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPrintf(_T( - "allow the use of ten stopwaches.\n" - "\n" - "TIMER [ON|OFF] [/S] [/n] [/Fn]\n" - "\n" - " ON set stopwach ON\n" - " OFF set stopwach OFF\n" - " /S Split time. Return stopwach split\n" - " time without changing its value\n" - " /n Specifiy the stopwach number.\n" - " Stopwaches avaliable are 0 to 10\n" - " If it is not specified default is 1\n" - " /Fn Format for output\n" - " n can be:\n" - " 0 milliseconds\n" - " 1 hh%cmm%css%cdd\n" - "\n"), - cTimeSeparator,cTimeSeparator,cDecimalSeparator); - - ConOutPrintf(_T( - "if none of ON, OFF or /S is specified the command\n" - "will toggle stopwach state\n" - "\n")); + LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg,cTimeSeparator,cTimeSeparator,cDecimalSeparator); return 0; }
-
greatlrd＠svn.reactos.com