change _T((LPTSTR)szMsg)) to (LPTSTR)szMsg) thanks royce3 he did see my small mistage
Remove all hardcode string to En.rc from for.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____
Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 20:00:37 UTC (rev 14848) @@ -228,9 +228,18 @@
STRING_ECHO_HELP5, "ECHO is %s\n"
- STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT"
+STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n \ +FOR %variable IN (set) DO command [parameters]\n\n \ + %variable Specifies a replaceable parameter.\n \ + (set) Specifies a set of one or more files. Wildcards may be used.\n \ + command Specifies the command to carry out for each file.\n \ + parameters Specifies parameters or switches for the specified command.\n\n \ +To user the FOR comamnd in a batch program, specify %%variable instead of\n \ +%variable." + + STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path"
@@ -240,6 +249,7 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]"
+
@@ -283,6 +293,12 @@ STRING_DEL_ERROR8, "No Wildcards!\n" STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2, "Syntax error" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR4, "no command after 'do'." +STRING_FREE_ERROR1, "Invalid drive" +STRING_FREE_ERROR2, "unlabeled"
STRING_PARAM_ERROR, "Required parameter missing\n"
_____
Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -282,7 +282,7 @@
if ((int)(_tcslen (cmd) - len + m - n) > maxlen) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); /* the parser won't cause any problems with an empty line */ cmd[0] = _T('\0'); } @@ -311,7 +311,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; }
_____
Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -207,7 +207,7 @@
if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; }
_____
Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -233,7 +233,7 @@
if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return FALSE; }
_____
Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -37,7 +37,7 @@
if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; }
_____
Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/call.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -53,7 +53,7 @@
if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg);
return 0; } _____
Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -28,7 +28,7 @@
if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; }
@@ -39,7 +39,7 @@ { /* display active code page number */ LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), GetConsoleCP ()); + ConErrPrintf ((LPTSTR)szMsg, GetConsoleCP ());
return 0; } @@ -48,7 +48,7 @@ { /* too many parameters */ LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), param); + ConErrPrintf ((LPTSTR)szMsg, param);
return 1; } @@ -62,7 +62,7 @@ if (uNewCodePage == 0) { LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), arg[0]); + ConErrPrintf ((LPTSTR)szMsg, arg[0]); freep (arg); return 1; } @@ -70,7 +70,7 @@ if (!SetConsoleCP (uNewCodePage)) { LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } else { _____
Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -129,7 +129,7 @@
if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg);
return 0; } @@ -172,7 +172,7 @@ { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); freep (arg); return 1; } @@ -203,7 +203,7 @@ if (*s != _T(',')) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); freep (arg); return 1; } @@ -215,7 +215,7 @@ else if (arg[i][0] == _T('/')) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), arg[i]); + ConErrPrintf ((LPTSTR)szMsg, arg[i]); freep (arg); return 1; } _____
Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -41,7 +41,7 @@
if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; }
_____
Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -635,14 +635,14 @@
if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), in); + ConErrPrintf ((LPTSTR)szMsg, in); return; }
if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), in); + ConErrPrintf ((LPTSTR)szMsg, in); return; } #ifdef _DEBUG @@ -668,7 +668,7 @@ if (hFile[1] == INVALID_HANDLE_VALUE){
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return; }
@@ -721,7 +721,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), out); + ConErrPrintf ((LPTSTR)szMsg, out);
return; } @@ -729,7 +729,7 @@ if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), out); + ConErrPrintf ((LPTSTR)szMsg, out); return; }
@@ -783,7 +783,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), err); + ConErrPrintf ((LPTSTR)szMsg, err);
return; } @@ -791,7 +791,7 @@ if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), err); + ConErrPrintf ((LPTSTR)szMsg, err);
return; } @@ -1080,32 +1080,32 @@
/* print command list */ LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg)); + ConOutPrintf ((LPTSTR)szMsg); PrintCommandList ();
/* print feature list */ LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg);
#ifdef FEATURE_ALIASES LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_HISTORY LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_UNIX_FILENAME_COMPLETION LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_DIRECTORY_STACK LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_REDIRECTION LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif ConOutChar (_T('\n')); } @@ -1155,7 +1155,7 @@ if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); ExitProcess (0); } SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); @@ -1260,7 +1260,7 @@ if (IsExistingFile (_T("commandline"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), commandline); + ConErrPrintf ((LPTSTR)szMsg, commandline); ParseCommandLine (commandline); } } @@ -1297,14 +1297,14 @@ if (IsExistingFile (_T("cmdexit.bat"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg);
ParseCommandLine (_T("cmdexit.bat")); } else if (IsExistingFile (_T("\cmdexit.bat"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); ParseCommandLine (_T("\cmdexit.bat")); } #ifndef __REACTOS__ @@ -1321,7 +1321,7 @@ if (IsExistingFile (_T("commandline"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), commandline); + ConErrPrintf ((LPTSTR)szMsg, commandline); ParseCommandLine (commandline); } } _____
Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/color.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -31,7 +31,7 @@
{ WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg);
}
@@ -46,7 +46,7 @@ if ((wColor & 0xF) == (wColor &0xF0) >> 4) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); } else { @@ -93,17 +93,17 @@ if (StringToColor (&wColor, &rest) == FALSE) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); return 1; }
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), wColor); + ConErrPrintf ((LPTSTR)szMsg, wColor);
if ((wColor & 0xF) == (wColor &0xF0) >> 4) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), wColor); + ConErrPrintf ((LPTSTR)szMsg, wColor); return 1; }
_____
Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/console.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -234,7 +234,7 @@
else { LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } }
_____
Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -307,7 +307,7 @@
lpOptions = _T(Options);
LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg)); + ConOutPrintf ((LPTSTR)szMsg); ConInString (inp, 10); ConOutPuts (_T("")); @@ -352,7 +352,7 @@ if (hFileSrc == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), source); + ConErrPrintf ((LPTSTR)szMsg, source); return 0; }
@@ -380,7 +380,7 @@ if (!_tcscmp (dest, source)) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), source); + ConErrPrintf ((LPTSTR)szMsg, source); CloseHandle (hFileSrc); return 0; @@ -457,7 +457,7 @@ { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg);
free (buffer); CloseHandle (hFileDest); @@ -656,7 +656,7 @@ if (!_tcsncmp (rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 1; }
@@ -729,7 +729,7 @@ else if (bDestFound && bWildcards) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg);
DeleteFileList (sources); freep (p); _____
Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/date.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -54,17 +54,17 @@
case 0: /* mmddyy */ default: LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break;
case 1: /* ddmmyy */ LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break;
case 2: /* yymmdd */ LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break; } } @@ -194,7 +194,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; }
@@ -248,7 +248,7 @@ return 0; } LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); }
_____
Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/del.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -122,7 +122,7 @@
if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), + ConOutPrintf ((LPTSTR)szMsg,
lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10],
lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10],
lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], @@ -232,7 +232,7 @@ /* wildcards in filespec */ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif
GetFullPathName (arg[i], @@ -242,10 +242,10 @@
#ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath);
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), pFilePart); + ConErrPrintf ((LPTSTR)szMsg, pFilePart); #endif
@@ -269,17 +269,17 @@
#ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg);
#endif /* ask for deleting */ if (dwFlags & DEL_PROMPT) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN (_T((LPTSTR)szMsg)); + res = FilePromptYN ((LPTSTR)szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -290,7 +290,7 @@ if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); }
/* delete the file */ @@ -335,7 +335,7 @@ /* no wildcards in filespec */ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif GetFullPathName (arg[i], MAX_PATH, @@ -346,10 +346,10 @@ if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) //Don't ask if the file doesn't exist, the following code will make the error-msg { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN (_T((LPTSTR)szMsg)); + res = FilePromptYN ((LPTSTR)szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -359,12 +359,12 @@
#ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); #endif if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); }
if (!(dwFlags & DEL_NOTHING)) @@ -424,7 +424,7 @@ LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); } - ConOutPrintf (_T((LPTSTR)szMsg), dwFiles); + ConOutPrintf ((LPTSTR)szMsg, dwFiles); }
return 0; _____
Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -24,7 +24,7 @@
if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____
Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -212,7 +212,7 @@
{ WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); }
@@ -829,12 +829,12 @@ if (szVolName[0] != _T('\0')) { LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0], szVolName); + ConOutPrintf ((LPTSTR)szMsg, szRootName[0], szVolName); } else { LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0]); + ConOutPrintf ((LPTSTR)szMsg, szRootName[0]); }
@@ -843,7 +843,7 @@ /* print the volume serial number if the return was successful */ LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), + ConOutPrintf ((LPTSTR)szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
@@ -1075,7 +1075,7 @@ ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),ulFiles, szBuffer); + ConOutPrintf ((LPTSTR)szMsg,ulFiles, szBuffer); }
/* Print total directories and freespace */ @@ -1083,7 +1083,7 @@ GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),ulDirs, szBuffer); + ConOutPrintf ((LPTSTR)szMsg,ulDirs, szBuffer);
return 0; } @@ -1729,7 +1729,7 @@ { ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),dwCountFiles, szBytes); + ConOutPrintf ((LPTSTR)szMsg,dwCountFiles, szBytes); }
/* Add statistics to recursive statistics*/ _____
Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -145,7 +145,7 @@
if (!_tcsncmp (rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -178,7 +178,7 @@ if (!_tcsncmp(rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -206,7 +206,7 @@ if (!_tcsncmp(rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -217,7 +217,7 @@ if (lpDir == NULL) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____
Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -42,7 +42,7 @@
if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; }
@@ -63,7 +63,7 @@ ConOutPuts (param); else { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), bEcho ? D_ON : D_OFF); + ConOutPrintf ((LPTSTR)szMsg, bEcho ? D_ON : D_OFF); } }
@@ -81,7 +81,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } @@ -104,7 +104,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg);
return 0; } @@ -137,7 +137,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg);
return 0; } _____
Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/error.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -72,7 +72,7 @@
else { LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), dwErrorCode); + ConErrPrintf ((LPTSTR)szMsg, dwErrorCode); return; }
@@ -94,7 +94,7 @@
default: LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return; }
@@ -109,7 +109,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), ch); + ConErrPrintf ((LPTSTR)szMsg, ch); }
@@ -117,7 +117,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), ch); + ConErrPrintf ((LPTSTR)szMsg, ch); }
@@ -125,7 +125,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), s); + ConErrPrintf ((LPTSTR)szMsg, s); }
@@ -133,7 +133,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); }
@@ -141,7 +141,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); }
@@ -157,7 +157,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); }
@@ -165,7 +165,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); }
@@ -173,7 +173,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); }
@@ -181,7 +181,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); }
@@ -189,7 +189,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); }
@@ -197,7 +197,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), s); + ConErrPrintf ((LPTSTR)szMsg, s); }
@@ -208,9 +208,9 @@ LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
if (s) - ConErrPrintf (_T("%s - %s\n"),_T((LPTSTR)szMsg), s); + ConErrPrintf (_T("%s - %s\n"),(LPTSTR)szMsg, s); else - ConErrPrintf (_T("%s.\n"), _T((LPTSTR)szMsg) ); + ConErrPrintf (_T("%s.\n"), (LPTSTR)szMsg ); }
@@ -219,5 +219,5 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); } _____
Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/for.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -25,9 +25,13 @@
* 23-Feb-2001 (Carl Nettelblad cnettel@hem.passagen.se) * Implemented preservation of echo flag. Some other for related * code in other files fixed, too. + * + * 28-Apr-2005 (Magnus Olsen) magnus@greatlord.com) + * Remove all hardcode string to En.rc */
#include "precomp.h" +#include "resource.h"
/* @@ -49,6 +53,7 @@ LPBATCH_CONTEXT lpNew; LPTSTR pp; TCHAR var; + WCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG DebugPrintf (_T("cmd_for ('%s', '%s'\n"), cmd, param); @@ -56,17 +61,9 @@
if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Runs a specified command for each file in a set of files\n" - "\n" - "FOR %variable IN (set) DO command [parameters]\n" - "\n" - " %variable Specifies a replaceable parameter.\n" - " (set) Specifies a set of one or more files. Wildcards may be used.\n" - " command Specifies the command to carry out for each file.\n" - " parameters Specifies parameters or switches for the specified command.\n" - "\n" - "To user the FOR comamnd in a batch program, specify %%variable instead of\n" - "%variable.")); + LoadString( GetModuleHandle(NULL), STRING_FOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; }
@@ -86,7 +83,8 @@ /* Check next element is 'IN' */ if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2))) { - error_syntax (_T("'in' missing in for statement.")); + LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + error_syntax ((LPTSTR)szMsg); return 1; [truncated at 1000 lines; 163 more skipped]
-
greatlrd＠svn.reactos.com