Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

implement VOID ConOutResPuts (UINT resID), VOID ConErrResPuts (UINT resID) to outpust msg from rc files

Browse source 
it take less memmory now, and it is bit faster 

CMD_ModuleHandle 
contain GetModuleHandle and it is only execute in main() in cmd 
it optimze for lite more speed in cmd

Langues changes
in En.rc follow new strings have been add and can be translate
STRING_ERROR_WRONG_DATE
STRING_SET_ERROR

svn path=/trunk/; revision=15081
This commit is contained in:
Magnus Olsen 2005-05-07 15:31:07 +00:00
parent 104e05622a
commit 8e7e661c54
49 changed files with 327 additions and 477 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/subsys/system/cmd/En.rc
View file

@ -559,5 +559,8 @@ STRING_ERROR_BADCOMMAND, "Bad command or filename\n"
STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n"
STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n"
STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ."
STRING_ERROR_DRIVER_NOT_READY "Drive not ready" STRING_ERROR_DRIVER_NOT_READY, "Drive not ready"
STRING_ERROR_WRONG_DATE, "Invalid date."
STRING_SET_ERROR "CMD: Not in environment '%s'\n"
} }

8
reactos/subsys/system/cmd/alias.c
View file

@ -237,7 +237,6 @@ VOID DestroyAlias (VOID)
/* specified routines */ /* specified routines */
VOID ExpandAlias (LPTSTR cmd, INT maxlen) VOID ExpandAlias (LPTSTR cmd, INT maxlen)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
unsigned n = 0, unsigned n = 0,
m, m,
i, i,
@ -281,8 +280,7 @@ VOID ExpandAlias (LPTSTR cmd, INT maxlen)
m = _tcslen (ptr->lpSubst); m = _tcslen (ptr->lpSubst);
if ((int)(_tcslen (cmd) - len + m - n) > maxlen) if ((int)(_tcslen (cmd) - len + m - n) > maxlen)
{ {
LoadString(GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_ALIAS_ERROR);
ConErrPrintf(szMsg);
/* the parser won't cause any problems with an empty line */ /* the parser won't cause any problems with an empty line */
cmd[0] = _T('\0'); cmd[0] = _T('\0');
@ -306,13 +304,11 @@ VOID ExpandAlias (LPTSTR cmd, INT maxlen)
INT CommandAlias (LPTSTR cmd, LPTSTR param) INT CommandAlias (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR ptr; LPTSTR ptr;
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_ALIAS_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

4
reactos/subsys/system/cmd/attrib.c
View file

@ -189,7 +189,6 @@ ChangeAttribute (LPTSTR pszPath, LPTSTR pszFile, DWORD dwMask,
INT CommandAttrib (LPTSTR cmd, LPTSTR param) INT CommandAttrib (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR *arg; LPTSTR *arg;
INT argc, i; INT argc, i;
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
@ -206,8 +205,7 @@ INT CommandAttrib (LPTSTR cmd, LPTSTR param)
/* print help */ /* print help */
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_ATTRIB_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_ATTRIB_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

4
reactos/subsys/system/cmd/batch.c
View file

@ -217,7 +217,6 @@ VOID ExitBatch (LPTSTR msg)
BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
HANDLE hFile; HANDLE hFile;
hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL,
@ -231,8 +230,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString(GetModuleHandle(NULL), STRING_BATCH_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_BATCH_ERROR);
ConErrPrintf(szMsg);
return FALSE; return FALSE;
} }

5
reactos/subsys/system/cmd/beep.c
View file

@ -32,12 +32,9 @@
INT cmd_beep (LPTSTR cmd, LPTSTR param) INT cmd_beep (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_BEEP_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_BEEP_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

4
reactos/subsys/system/cmd/call.c
View file

@ -43,7 +43,6 @@
INT cmd_call (LPTSTR cmd, LPTSTR param) INT cmd_call (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPBATCH_CONTEXT n = NULL; LPBATCH_CONTEXT n = NULL;
#ifdef _DEBUG #ifdef _DEBUG
@ -51,8 +50,7 @@ INT cmd_call (LPTSTR cmd, LPTSTR param)
#endif #endif
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_CALL_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CALL_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

12
reactos/subsys/system/cmd/chcp.c
View file

@ -29,8 +29,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
/* print help */ /* print help */
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_CHCP_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CHCP_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -40,7 +39,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (args == 0) if (args == 0)
{ {
/* display active code page number */ /* display active code page number */
LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, InputCodePage); ConErrPrintf(szMsg, InputCodePage);
return 0; return 0;
} }
@ -48,7 +47,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (args >= 2) if (args >= 2)
{ {
/* too many parameters */ /* too many parameters */
LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR2, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, param); ConErrPrintf(szMsg, param);
return 1; return 1;
} }
@ -61,7 +60,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (uNewCodePage == 0) if (uNewCodePage == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, arg[0]); ConErrPrintf(szMsg, arg[0]);
freep (arg); freep (arg);
return 1; return 1;
@ -69,8 +68,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (!SetConsoleCP(uNewCodePage)) if (!SetConsoleCP(uNewCodePage))
{ {
LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR4, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_CHCP_ERROR4);
ConErrPrintf(szMsg);
} }
else else
{ {

13
reactos/subsys/system/cmd/choice.c
View file

@ -123,13 +123,12 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
TCHAR Ch; TCHAR Ch;
DWORD amount,clk; DWORD amount,clk;
LoadString(GetModuleHandle(NULL), STRING_CHOICE_OPTION, Options, 2); LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, Options, 2);
lpOptions = Options; lpOptions = Options;
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_CHOICE_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CHOICE_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -169,8 +168,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
if (_tcslen (lpOptions) == 0) if (_tcslen (lpOptions) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_CHOICE_ERROR);
ConErrPuts(szMsg);
freep (arg); freep (arg);
return 1; return 1;
} }
@ -200,8 +198,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
if (*s != _T(',')) if (*s != _T(','))
{ {
LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_CHOICE_ERROR_TXT);
ConErrPuts(szMsg);
freep (arg); freep (arg);
return 1; return 1;
} }
@ -212,7 +209,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
} }
else if (arg[i][0] == _T('/')) else if (arg[i][0] == _T('/'))
{ {
LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CHOICE_ERROR_OPTION, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, arg[i]); ConErrPrintf(szMsg, arg[i]);
freep (arg); freep (arg);
return 1; return 1;

4
reactos/subsys/system/cmd/cls.c
View file

@ -33,15 +33,13 @@
INT cmd_cls (LPTSTR cmd, LPTSTR param) INT cmd_cls (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
COORD coPos; COORD coPos;
DWORD dwWritten; DWORD dwWritten;
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_CLS_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CLS_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

37
reactos/subsys/system/cmd/cmd.c
View file

@ -155,6 +155,7 @@ OSVERSIONINFO osvi;
HANDLE hIn; HANDLE hIn;
HANDLE hOut; HANDLE hOut;
HANDLE hConsole; HANDLE hConsole;
HANDLE CMD_ModuleHandle;
static NtQueryInformationProcessProc NtQueryInformationProcessPtr; static NtQueryInformationProcessProc NtQueryInformationProcessPtr;
static NtReadVirtualMemoryProc NtReadVirtualMemoryPtr; static NtReadVirtualMemoryProc NtReadVirtualMemoryPtr;
@ -1075,36 +1076,27 @@ VOID RemoveBreakHandler (VOID)
static VOID static VOID
ShowCommands (VOID) ShowCommands (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
/* print command list */ /* print command list */
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP1);
ConOutPrintf(szMsg);
PrintCommandList(); PrintCommandList();
/* print feature list */ /* print feature list */
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP2);
ConOutPuts(szMsg);
#ifdef FEATURE_ALIASES #ifdef FEATURE_ALIASES
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP3);
ConOutPuts(szMsg);
#endif #endif
#ifdef FEATURE_HISTORY #ifdef FEATURE_HISTORY
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP4, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP4);
ConOutPuts(szMsg);
#endif #endif
#ifdef FEATURE_UNIX_FILENAME_COMPLETION #ifdef FEATURE_UNIX_FILENAME_COMPLETION
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP5, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP5);
ConOutPuts(szMsg);
#endif #endif
#ifdef FEATURE_DIRECTORY_STACK #ifdef FEATURE_DIRECTORY_STACK
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP6, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP6);
ConOutPuts(szMsg);
#endif #endif
#ifdef FEATURE_REDIRECTION #ifdef FEATURE_REDIRECTION
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP7, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP7);
ConOutPuts(szMsg);
#endif #endif
ConOutChar(_T('\n')); ConOutChar(_T('\n'));
} }
@ -1120,7 +1112,6 @@ ShowCommands (VOID)
static VOID static VOID
Initialize (int argc, TCHAR* argv[]) Initialize (int argc, TCHAR* argv[])
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR commandline[CMDLINE_LENGTH]; TCHAR commandline[CMDLINE_LENGTH];
TCHAR ModuleName[_MAX_PATH + 1]; TCHAR ModuleName[_MAX_PATH + 1];
INT i; INT i;
@ -1153,8 +1144,7 @@ Initialize (int argc, TCHAR* argv[])
if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_CMD_HELP8, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CMD_HELP8);
ConOutPuts(szMsg);
ExitProcess(0); ExitProcess(0);
} }
SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT);
@ -1290,20 +1280,20 @@ Initialize (int argc, TCHAR* argv[])
static VOID Cleanup (int argc, TCHAR *argv[]) static VOID Cleanup (int argc, TCHAR *argv[])
{ {
#ifndef __REACTOS__
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#endif
/* run cmdexit.bat */ /* run cmdexit.bat */
if (IsExistingFile (_T("cmdexit.bat"))) if (IsExistingFile (_T("cmdexit.bat")))
{ {
LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_CMD_ERROR5);
ConErrPrintf(szMsg);
ParseCommandLine (_T("cmdexit.bat")); ParseCommandLine (_T("cmdexit.bat"));
} }
else if (IsExistingFile (_T("\\cmdexit.bat"))) else if (IsExistingFile (_T("\\cmdexit.bat")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts (STRING_CMD_ERROR5);
ConErrPrintf ((LPTSTR)szMsg);
ParseCommandLine (_T("\\cmdexit.bat")); ParseCommandLine (_T("\\cmdexit.bat"));
} }
#ifndef __REACTOS__ #ifndef __REACTOS__
@ -1435,6 +1425,7 @@ int main (int argc, char *argv[])
InputCodePage= GetConsoleCP(); InputCodePage= GetConsoleCP();
OutputCodePage = GetConsoleOutputCP(); OutputCodePage = GetConsoleOutputCP();
CMD_ModuleHandle = GetModuleHandle(NULL);
/* check switches on command-line */ /* check switches on command-line */
Initialize(argc, argv); Initialize(argc, argv);

4
reactos/subsys/system/cmd/cmd.h
View file

@ -124,6 +124,8 @@ VOID ParseCommandLine (LPTSTR);
VOID AddBreakHandler (VOID); VOID AddBreakHandler (VOID);
VOID RemoveBreakHandler (VOID); VOID RemoveBreakHandler (VOID);
extern HANDLE CMD_ModuleHandle;
/* Prototypes for CMDINPUT.C */ /* Prototypes for CMDINPUT.C */
VOID ReadCommand (LPTSTR, INT); VOID ReadCommand (LPTSTR, INT);
@ -179,6 +181,8 @@ VOID SetCursorXY (SHORT, SHORT);
VOID GetScreenSize (PSHORT, PSHORT); VOID GetScreenSize (PSHORT, PSHORT);
VOID SetCursorType (BOOL, BOOL); VOID SetCursorType (BOOL, BOOL);
VOID ConOutResPuts (UINT resID);
VOID ConErrResPuts (UINT resID);
/* Prototypes for COPY.C */ /* Prototypes for COPY.C */
INT cmd_copy (LPTSTR, LPTSTR); INT cmd_copy (LPTSTR, LPTSTR);

17
reactos/subsys/system/cmd/color.c
View file

@ -28,10 +28,7 @@
static VOID ColorHelp (VOID) static VOID ColorHelp (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConOutResPuts(STRING_COLOR_HELP1);
LoadString(GetModuleHandle(NULL), STRING_COLOR_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPuts(szMsg);
} }
@ -40,12 +37,11 @@ VOID SetScreenColor (WORD wColor, BOOL bFill)
DWORD dwWritten; DWORD dwWritten;
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
COORD coPos; COORD coPos;
TCHAR szMsg[RC_STRING_MAX_SIZE];
if ((wColor & 0xF) == (wColor &0xF0) >> 4) if ((wColor & 0xF) == (wColor &0xF0) >> 4)
{ {
LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_COLOR_ERROR1);
ConErrPuts(szMsg);
} }
else else
{ {
@ -91,17 +87,16 @@ INT CommandColor (LPTSTR first, LPTSTR rest)
if (StringToColor(&wColor, &rest) == FALSE) if (StringToColor(&wColor, &rest) == FALSE)
{ {
LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_COLOR_ERROR2);
ConErrPuts(szMsg);
return 1; return 1;
} }
LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, wColor); ConErrPrintf(szMsg, wColor);
if ((wColor & 0xF) == (wColor &0xF0) >> 4) if ((wColor & 0xF) == (wColor &0xF0) >> 4)
{ {
LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, wColor); ConErrPrintf(szMsg, wColor);
return 1; return 1;
} }

17
reactos/subsys/system/cmd/console.c
View file

@ -184,6 +184,14 @@ VOID ConPuts(LPTSTR szText, DWORD nStdHandle)
#endif #endif
} }
VOID ConOutResPuts (UINT resID)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
ConPuts(szMsg, STD_OUTPUT_HANDLE);
}
VOID ConOutPuts (LPTSTR szText) VOID ConOutPuts (LPTSTR szText)
{ {
ConPuts(szText, STD_OUTPUT_HANDLE); ConPuts(szText, STD_OUTPUT_HANDLE);
@ -238,7 +246,7 @@ VOID ConOutFormatMessage (DWORD MessageId, ...)
} }
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg); ConErrPrintf(szMsg);
} }
} }
@ -258,6 +266,13 @@ VOID ConErrChar (TCHAR c)
} }
VOID ConErrResPuts (UINT resID)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
ConPuts(szMsg, STD_ERROR_HANDLE);
}
VOID ConErrPuts (LPTSTR szText) VOID ConErrPuts (LPTSTR szText)
{ {
ConPuts(szText, STD_ERROR_HANDLE); ConPuts(szText, STD_ERROR_HANDLE);

21
reactos/subsys/system/cmd/copy.c
View file

@ -295,15 +295,13 @@ DeleteFileList (LPFILES f)
static INT static INT
Overwrite (LPTSTR fn) Overwrite (LPTSTR fn)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR inp[10]; TCHAR inp[10];
LPTSTR p; LPTSTR p;
TCHAR szOptions[4]; TCHAR szOptions[4];
LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, szOptions, 4); LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szOptions, 4);
LoadString(GetModuleHandle(NULL), STRING_COPY_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_COPY_HELP1);
ConOutPrintf(szMsg);
ConInString(inp, 10); ConInString(inp, 10);
ConOutPuts(_T("")); ConOutPuts(_T(""));
@ -347,7 +345,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
NULL, OPEN_EXISTING, 0, NULL); NULL, OPEN_EXISTING, 0, NULL);
if (hFileSrc == INVALID_HANDLE_VALUE) if (hFileSrc == INVALID_HANDLE_VALUE)
{ {
LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, source); ConErrPrintf(szMsg, source);
return 0; return 0;
} }
@ -375,7 +373,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
{ {
if (!_tcscmp (dest, source)) if (!_tcscmp (dest, source))
{ {
LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, source); ConErrPrintf(szMsg, source);
CloseHandle (hFileSrc); CloseHandle (hFileSrc);
@ -451,9 +449,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL);
if (dwWritten != dwRead) if (dwWritten != dwRead)
{ {
ConErrResPuts(STRING_COPY_ERROR3);
LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
free (buffer); free (buffer);
CloseHandle (hFileDest); CloseHandle (hFileDest);
@ -629,7 +625,6 @@ SetupCopy (LPFILES sources, TCHAR **p, BOOL bMultiple,
INT cmd_copy (LPTSTR first, LPTSTR rest) INT cmd_copy (LPTSTR first, LPTSTR rest)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR **p; TCHAR **p;
TCHAR drive_d[_MAX_DRIVE]; TCHAR drive_d[_MAX_DRIVE];
TCHAR dir_d[_MAX_DIR]; TCHAR dir_d[_MAX_DIR];
@ -651,8 +646,7 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
if (!_tcsncmp (rest, _T("/?"), 2)) if (!_tcsncmp (rest, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_COPY_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_COPY_HELP2);
ConOutPuts(szMsg);
return 1; return 1;
} }
@ -724,8 +718,7 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
} }
else if (bDestFound && bWildcards) else if (bDestFound && bWildcards)
{ {
LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR4, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_COPY_ERROR4);
ConErrPrintf(szMsg);
DeleteFileList (sources); DeleteFileList (sources);
freep (p); freep (p);

16
reactos/subsys/system/cmd/date.c
View file

@ -53,17 +53,17 @@ PrintDateString (VOID)
{ {
case 0: /* mmddyy */ case 0: /* mmddyy */
default: default:
LoadString(GetModuleHandle(NULL), STRING_DATE_HELP1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DATE_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); ConOutPrintf(szMsg, cDateSeparator, cDateSeparator);
break; break;
case 1: /* ddmmyy */ case 1: /* ddmmyy */
LoadString(GetModuleHandle(NULL), STRING_DATE_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DATE_HELP2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); ConOutPrintf(szMsg, cDateSeparator, cDateSeparator);
break; break;
case 2: /* yymmdd */ case 2: /* yymmdd */
LoadString(GetModuleHandle(NULL), STRING_DATE_HELP3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DATE_HELP3, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); ConOutPrintf(szMsg, cDateSeparator, cDateSeparator);
break; break;
} }
@ -184,7 +184,6 @@ ParseDate (LPTSTR s)
INT cmd_date (LPTSTR cmd, LPTSTR param) INT cmd_date (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR *arg; LPTSTR *arg;
INT argc; INT argc;
INT i; INT i;
@ -193,8 +192,7 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_DATE_HELP4, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_DATE_HELP4);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -237,7 +235,8 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
freep (arg); freep (arg);
return 0; return 0;
} }
ConErrPuts (_T("Invalid date.")); ConErrResPuts(STRING_ERROR_WRONG_DATE);
} }
} }
else else
@ -248,8 +247,7 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
return 0; return 0;
} }
LoadString(GetModuleHandle(NULL), STRING_DATE_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_DATE_ERROR);
ConErrPuts(szMsg);
} }
freep (arg); freep (arg);

21
reactos/subsys/system/cmd/del.c
View file

@ -112,8 +112,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_DEL_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_DEL_HELP1);
ConOutPrintf(szMsg);
return 0; return 0;
} }
@ -187,7 +186,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
{ {
if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT))) if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT)))
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE);
res = FilePromptYN (szMsg); res = FilePromptYN (szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
@ -243,10 +242,10 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
/* ask for deleting */ /* ask for deleting */
if (dwFlags & DEL_PROMPT) if (dwFlags & DEL_PROMPT)
{ {
LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, szFullPath); ConErrPrintf(szMsg, szFullPath);
LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE);
res = FilePromptYN ((LPTSTR)szMsg); res = FilePromptYN ((LPTSTR)szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
@ -257,7 +256,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL))
{ {
LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, szFullPath); ConErrPrintf(szMsg, szFullPath);
} }
@ -313,10 +312,10 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
// Don't ask if the file doesn't exist, the following code will make the error-msg // Don't ask if the file doesn't exist, the following code will make the error-msg
if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE))
{ {
LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, szFullPath); ConErrPrintf(szMsg, szFullPath);
LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE);
res = FilePromptYN ((LPTSTR)szMsg); res = FilePromptYN ((LPTSTR)szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
@ -330,7 +329,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
#endif #endif
if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL))
{ {
LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, szFullPath); ConErrPrintf(szMsg, szFullPath);
} }
@ -384,11 +383,11 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
{ {
if (dwFiles < 2) if (dwFiles < 2)
{ {
LoadString(GetModuleHandle(NULL), STRING_DEL_HELP3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_HELP3, szMsg, RC_STRING_MAX_SIZE);
} }
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_DEL_HELP4, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DEL_HELP4, szMsg, RC_STRING_MAX_SIZE);
} }
ConOutPrintf(szMsg, dwFiles); ConOutPrintf(szMsg, dwFiles);

4
reactos/subsys/system/cmd/delay.c
View file

@ -17,14 +17,12 @@
INT CommandDelay (LPTSTR cmd, LPTSTR param) INT CommandDelay (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
DWORD val; DWORD val;
DWORD mul=1000; DWORD mul=1000;
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_DELAY_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_DELAY_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

18
reactos/subsys/system/cmd/dir.c
View file

@ -216,9 +216,7 @@ static ULARGE_INTEGER recurse_bytes;
*/ */
static VOID DirHelp(VOID) static VOID DirHelp(VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConOutResPuts(STRING_DIR_HELP1);
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPuts(szMsg);
} }
@ -839,17 +837,17 @@ PrintDirectoryHeader(LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
/* print drive info */ /* print drive info */
if (szVolName[0] != _T('\0')) if (szVolName[0] != _T('\0'))
{ {
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf((LPTSTR)szMsg, szRootName[0], szVolName); ConOutPrintf((LPTSTR)szMsg, szRootName[0], szVolName);
} }
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, szRootName[0]); ConOutPrintf(szMsg, szRootName[0]);
} }
/* print the volume serial number if the return was successful */ /* print the volume serial number if the return was successful */
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf((LPTSTR)szMsg, ConOutPrintf((LPTSTR)szMsg,
HIWORD(dwSerialNr), HIWORD(dwSerialNr),
LOWORD(dwSerialNr)); LOWORD(dwSerialNr));
@ -1086,7 +1084,7 @@ PrintSummary(LPTSTR szPath,
{ {
ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg,ulFiles, szBuffer); ConOutPrintf(szMsg,ulFiles, szBuffer);
} }
@ -1094,7 +1092,7 @@ PrintSummary(LPTSTR szPath,
szRoot[0] = szPath[0]; szRoot[0] = szPath[0];
GetUserDiskFreeSpace(szRoot, &uliFree); GetUserDiskFreeSpace(szRoot, &uliFree);
ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf((LPTSTR)szMsg,ulDirs, szBuffer); ConOutPrintf((LPTSTR)szMsg,ulDirs, szBuffer);
return 0; return 0;
@ -1430,7 +1428,7 @@ DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */
and if we are in recursive mode... we must have results */ and if we are in recursive mode... we must have results */
if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0)))
{ {
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, szTemp); ConOutPrintf(szMsg, szTemp);
} }
@ -1782,7 +1780,7 @@ TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!(lpFlags->bBareFormat) && (dwCount > 0)) if (!(lpFlags->bBareFormat) && (dwCount > 0))
{ {
ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator);
LoadString(GetModuleHandle(NULL), STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg,dwCountFiles, szBytes); ConOutPrintf(szMsg,dwCountFiles, szBytes);
} }

15
reactos/subsys/system/cmd/dirstack.c
View file

@ -137,15 +137,13 @@ INT GetDirectoryStackDepth (VOID)
*/ */
INT CommandPushd (LPTSTR first, LPTSTR rest) INT CommandPushd (LPTSTR first, LPTSTR rest)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR curPath[MAX_PATH]; TCHAR curPath[MAX_PATH];
TCHAR newPath[MAX_PATH]; TCHAR newPath[MAX_PATH];
BOOL bChangePath = FALSE; BOOL bChangePath = FALSE;
if (!_tcsncmp (rest, _T("/?"), 2)) if (!_tcsncmp (rest, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_DIRSTACK_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -171,13 +169,11 @@ INT CommandPushd (LPTSTR first, LPTSTR rest)
*/ */
INT CommandPopd (LPTSTR first, LPTSTR rest) INT CommandPopd (LPTSTR first, LPTSTR rest)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
if (!_tcsncmp(rest, _T("/?"), 2)) if (!_tcsncmp(rest, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_DIRSTACK_HELP2);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -198,13 +194,11 @@ INT CommandPopd (LPTSTR first, LPTSTR rest)
*/ */
INT CommandDirs (LPTSTR first, LPTSTR rest) INT CommandDirs (LPTSTR first, LPTSTR rest)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPDIRENTRY lpDir; LPDIRENTRY lpDir;
if (!_tcsncmp(rest, _T("/?"), 2)) if (!_tcsncmp(rest, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_DIRSTACK_HELP3);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -213,8 +207,7 @@ INT CommandDirs (LPTSTR first, LPTSTR rest)
if (lpDir == NULL) if (lpDir == NULL)
{ {
LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_DIRSTACK_HELP4);
ConOutPuts(szMsg);
return 0; return 0;
} }

17
reactos/subsys/system/cmd/echo.c
View file

@ -40,8 +40,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_ECHO_HELP4);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -62,7 +61,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
ConOutPuts (param); ConOutPuts (param);
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, bEcho ? D_ON : D_OFF); ConOutPrintf(szMsg, bEcho ? D_ON : D_OFF);
} }
} }
@ -73,7 +72,6 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
INT CommandEchos (LPTSTR cmd, LPTSTR param) INT CommandEchos (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("CommandEchos '%s' : '%s'\n"), cmd, param); DebugPrintf (_T("CommandEchos '%s' : '%s'\n"), cmd, param);
@ -81,8 +79,7 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_ECHO_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -95,7 +92,6 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param)
INT CommandEchoerr (LPTSTR cmd, LPTSTR param) INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("CommandEchoerr '%s' : '%s'\n"), cmd, param); DebugPrintf (_T("CommandEchoerr '%s' : '%s'\n"), cmd, param);
@ -103,8 +99,7 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_ECHO_HELP2);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -126,7 +121,6 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
INT CommandEchoserr (LPTSTR cmd, LPTSTR param) INT CommandEchoserr (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("CommandEchoserr '%s' : '%s'\n"), cmd, param); DebugPrintf (_T("CommandEchoserr '%s' : '%s'\n"), cmd, param);
@ -134,8 +128,7 @@ INT CommandEchoserr (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_ECHO_HELP3);
ConOutPuts((LPTSTR)szMsg);
return 0; return 0;
} }

81
reactos/subsys/system/cmd/error.c
View file

@ -23,22 +23,6 @@
#include "precomp.h" #include "precomp.h"
#include "resource.h" #include "resource.h"
/*
#define PARAMETERF_ERROR _T("Parameter format not correct - %c\n")
#define INVALID_SWITCH _T("Invalid switch - /%c\n")
#define TOO_MANY_PARAMETERS _T("Too many parameters - %s\n")
#define PATH_NOT_FOUND _T("Path not found\n")
#define FILE_NOT_FOUND _T("File not found\n")
#define REQ_PARAM_MISSING _T("Required parameter missing\n")
#define INVALID_DRIVE _T("Invalid drive specification\n")
#define INVALID_PARAM_FORMAT _T("Invalid parameter format - %s\n")
#define BADCOMMAND _T("Bad command or filename\n")
#define OUT_OF_MEMORY _T("Out of memory error.\n")
#define CANNOTPIPE _T("Error! Cannot pipe! Cannot open temporary file!\n")
#define D_PAUSEMSG _T("Press any key to continue . . .")
*/
VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
{ {
@ -71,7 +55,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
} }
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, dwErrorCode); ConErrPrintf(szMsg, dwErrorCode);
return; return;
} }
@ -81,19 +65,19 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
switch (dwErrorCode) switch (dwErrorCode)
{ {
case ERROR_FILE_NOT_FOUND: case ERROR_FILE_NOT_FOUND:
LoadString(GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
break; break;
case ERROR_PATH_NOT_FOUND: case ERROR_PATH_NOT_FOUND:
LoadString(GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
break; break;
case ERROR_NOT_READY: case ERROR_NOT_READY:
LoadString(GetModuleHandle(NULL), STRING_ERROR_DRIVER_NOT_READY, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_DRIVER_NOT_READY, szMsg, RC_STRING_MAX_SIZE);
break; break;
default: default:
LoadString(GetModuleHandle(NULL), STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg); ConErrPrintf(szMsg);
return; return;
} }
@ -109,7 +93,7 @@ VOID error_parameter_format(TCHAR ch)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_PARAMETERF_ERROR, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, ch); ConErrPrintf(szMsg, ch);
} }
@ -118,7 +102,7 @@ VOID error_invalid_switch (TCHAR ch)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, ch); ConErrPrintf(szMsg, ch);
} }
@ -127,26 +111,20 @@ VOID error_too_many_parameters (LPTSTR s)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, s); ConErrPrintf(szMsg, s);
} }
VOID error_path_not_found (VOID) VOID error_path_not_found (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_PATH_NOT_FOUND);
LoadString(GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
} }
VOID error_file_not_found (VOID) VOID error_file_not_found (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_FILE_NOT_FOUND);
LoadString(GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
} }
@ -154,62 +132,44 @@ VOID error_sfile_not_found (LPTSTR f)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(_T("%s - %s\n"), szMsg, f); ConErrPrintf(_T("%s - %s\n"), szMsg, f);
} }
VOID error_req_param_missing (VOID) VOID error_req_param_missing (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
LoadString(GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
} }
VOID error_invalid_drive (VOID) VOID error_invalid_drive (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_INVALID_DRIVE);
LoadString(GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
} }
VOID error_bad_command (VOID) VOID error_bad_command (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_BADCOMMAND);
LoadString(GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
} }
VOID error_no_pipe (VOID) VOID error_no_pipe (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_CANNOTPIPE);
LoadString(GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
} }
VOID error_out_of_memory (VOID) VOID error_out_of_memory (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_OUT_OF_MEMORY);
LoadString(GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg);
} }
VOID error_invalid_parameter_format (LPTSTR s) VOID error_invalid_parameter_format (LPTSTR s)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConErrResPuts(STRING_ERROR_INVALID_PARAM_FORMAT);
LoadString(GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, s);
} }
@ -217,7 +177,7 @@ VOID error_syntax (LPTSTR s)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(GetModuleHandle(NULL), STRING_ERROR_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
if (s) if (s)
ConErrPrintf(_T("%s - %s\n"), szMsg, s); ConErrPrintf(_T("%s - %s\n"), szMsg, s);
@ -228,10 +188,7 @@ VOID error_syntax (LPTSTR s)
VOID msg_pause (VOID) VOID msg_pause (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; ConOutResPuts(STRING_ERROR_D_PAUSEMSG);
LoadString(GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, szMsg, RC_STRING_MAX_SIZE);
ConOutPuts(szMsg);
} }
/* EOF */ /* EOF */

11
reactos/subsys/system/cmd/for.c
View file

@ -61,8 +61,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_FOR_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_FOR_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -82,7 +81,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Check next element is 'IN' */ /* Check next element is 'IN' */
if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2))) if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2)))
{ {
LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FOR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
error_syntax(szMsg); error_syntax(szMsg);
return 1; return 1;
} }
@ -94,7 +93,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Folowed by a '(', find also matching ')' */ /* Folowed by a '(', find also matching ')' */
if ((*param != _T('(')) || (NULL == (pp = _tcsrchr (param, _T(')'))))) if ((*param != _T('(')) || (NULL == (pp = _tcsrchr (param, _T(')')))))
{ {
LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FOR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
error_syntax(szMsg); error_syntax(szMsg);
return 1; return 1;
} }
@ -108,7 +107,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Check DO follows */ /* Check DO follows */
if ((_tcsnicmp (pp, _T("do"), 2) != 0) || !_istspace (*(pp + 2))) if ((_tcsnicmp (pp, _T("do"), 2) != 0) || !_istspace (*(pp + 2)))
{ {
LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FOR_ERROR3, szMsg, RC_STRING_MAX_SIZE);
error_syntax(szMsg); error_syntax(szMsg);
return 1; return 1;
} }
@ -120,7 +119,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Check that command tail is not empty */ /* Check that command tail is not empty */
if (*pp == _T('\0')) if (*pp == _T('\0'))
{ {
LoadString(GetModuleHandle(NULL), STRING_FOR_ERROR4, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FOR_ERROR4, szMsg, RC_STRING_MAX_SIZE);
error_syntax(szMsg); error_syntax(szMsg);
return 1; return 1;
} }

14
reactos/subsys/system/cmd/free.c
View file

@ -75,7 +75,7 @@ PrintDiskInfo (LPTSTR szDisk)
if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':')) if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':'))
{ {
LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg); ConErrPrintf(szMsg);
return; return;
} }
@ -86,7 +86,7 @@ PrintDiskInfo (LPTSTR szDisk)
if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial, if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial,
NULL, NULL, NULL, 0)) NULL, NULL, NULL, 0))
{ {
LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive); ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive);
return; return;
} }
@ -94,7 +94,7 @@ PrintDiskInfo (LPTSTR szDisk)
if (szVolume[0] == _T('\0')) if (szVolume[0] == _T('\0'))
{ {
LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
_tcscpy (szVolume, szMsg); _tcscpy (szVolume, szMsg);
} }
@ -106,7 +106,7 @@ PrintDiskInfo (LPTSTR szDisk)
if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl, if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl,
&dwBytPerSec, &dwFreeCl, &dwTotCl)) &dwBytPerSec, &dwFreeCl, &dwTotCl))
{ {
LoadString(GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf (_T("%s %s:\n"), szMsg, szDrive); ConErrPrintf (_T("%s %s:\n"), szMsg, szDrive);
return; return;
} }
@ -121,14 +121,13 @@ PrintDiskInfo (LPTSTR szDisk)
ConvertULargeInteger (uliSize, szFree, 40); ConvertULargeInteger (uliSize, szFree, 40);
LoadString(GetModuleHandle(NULL), STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, szDrive, szVolume, szSerial, szTotal, szUsed, szFree); ConOutPrintf(szMsg, szDrive, szVolume, szSerial, szTotal, szUsed, szFree);
} }
INT CommandFree (LPTSTR cmd, LPTSTR param) INT CommandFree (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR szParam; LPTSTR szParam;
TCHAR szDefPath[MAX_PATH]; TCHAR szDefPath[MAX_PATH];
INT argc, i; INT argc, i;
@ -136,8 +135,7 @@ INT CommandFree (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_FREE_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_FREE_HELP2);
ConOutPuts(szMsg);
return 0; return 0;
} }

8
reactos/subsys/system/cmd/goto.c
View file

@ -49,8 +49,8 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_GOTO_HELP1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_GOTO_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPuts(szMsg); ConOutResPuts(STRING_GOTO_HELP1);
return 0; return 0;
} }
@ -62,7 +62,7 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
if (*param == _T('\0')) if (*param == _T('\0'))
{ {
LoadString(GetModuleHandle(NULL), STRING_GOTO_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ExitBatch(szMsg); ExitBatch(szMsg);
return 1; return 1;
} }
@ -95,7 +95,7 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
return 0; return 0;
} }
LoadString(GetModuleHandle(NULL), STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, param); ConErrPrintf(szMsg, param);
ExitBatch(NULL); ExitBatch(NULL);

4
reactos/subsys/system/cmd/if.c
View file

@ -39,7 +39,6 @@
INT cmd_if (LPTSTR cmd, LPTSTR param) INT cmd_if (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
INT x_flag = 0; /* when set cause 'then' clause to be executed */ INT x_flag = 0; /* when set cause 'then' clause to be executed */
LPTSTR pp; LPTSTR pp;
@ -49,8 +48,7 @@ INT cmd_if (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_IF_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_IF_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }

28
reactos/subsys/system/cmd/internal.c
View file

@ -154,7 +154,6 @@ VOID FreeLastPath (VOID)
*/ */
INT cmd_chdir (LPTSTR cmd, LPTSTR param) INT cmd_chdir (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR dir; /* pointer to the directory to change to */ LPTSTR dir; /* pointer to the directory to change to */
LPTSTR lpOldPath; LPTSTR lpOldPath;
LPTSTR endofstring; /* pointer to the null character in the directory to change to */ LPTSTR endofstring; /* pointer to the null character in the directory to change to */
@ -165,8 +164,7 @@ INT cmd_chdir (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_CD_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_CD_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -272,7 +270,6 @@ INT cmd_chdir (LPTSTR cmd, LPTSTR param)
*/ */
INT cmd_mkdir (LPTSTR cmd, LPTSTR param) INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR dir; /* pointer to the directory to change to */ LPTSTR dir; /* pointer to the directory to change to */
LPTSTR place; /* used to search for the \ when no space is used */ LPTSTR place; /* used to search for the \ when no space is used */
LPTSTR *p = NULL; LPTSTR *p = NULL;
@ -280,8 +277,7 @@ INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_MKDIR_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_MKDIR_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -316,8 +312,7 @@ INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
if (!dir) if (!dir)
{ {
LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts (STRING_ERROR_REQ_PARAM_MISSING);
ConErrPrintf (szMsg);
return 1; return 1;
} }
@ -347,7 +342,6 @@ INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
*/ */
INT cmd_rmdir (LPTSTR cmd, LPTSTR param) INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR dir; /* pointer to the directory to change to */ LPTSTR dir; /* pointer to the directory to change to */
LPTSTR place; /* used to search for the \ when no space is used */ LPTSTR place; /* used to search for the \ when no space is used */
@ -356,8 +350,7 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_RMDIR_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_RMDIR_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -391,8 +384,7 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
if (!dir) if (!dir)
{ {
LoadString(GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
ConErrPrintf(szMsg);
return 1; return 1;
} }
@ -421,12 +413,9 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
*/ */
INT CommandExit (LPTSTR cmd, LPTSTR param) INT CommandExit (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_EXIT_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_EXIT_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -442,12 +431,9 @@ INT CommandExit (LPTSTR cmd, LPTSTR param)
*/ */
INT CommandRem (LPTSTR cmd, LPTSTR param) INT CommandRem (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_REM_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_REM_HELP);
ConOutPuts(szMsg);
} }
return 0; return 0;

13
reactos/subsys/system/cmd/label.c
View file

@ -39,8 +39,7 @@ INT cmd_label (LPTSTR cmd, LPTSTR param)
/* print help */ /* print help */
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_LABEL_HELP1);
ConOutPrintf(szMsg);
return 0; return 0;
} }
@ -93,23 +92,23 @@ INT cmd_label (LPTSTR cmd, LPTSTR param)
/* print drive info */ /* print drive info */
if (szOldLabel[0] != _T('\0')) if (szOldLabel[0] != _T('\0'))
{ {
LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_LABEL_HELP2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, _totupper(szRootPath[0]), szOldLabel); ConOutPrintf(szMsg, _totupper(szRootPath[0]), szOldLabel);
} }
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_LABEL_HELP3, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, _totupper(szRootPath[0])); ConOutPrintf(szMsg, _totupper(szRootPath[0]));
} }
/* print the volume serial number */ /* print the volume serial number */
LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP4, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_LABEL_HELP4, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
if (szLabel[0] == _T('\0')) if (szLabel[0] == _T('\0'))
{ {
LoadString(GetModuleHandle(NULL), STRING_LABEL_HELP5, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_LABEL_HELP5, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg); ConOutResPuts(STRING_LABEL_HELP5);
ConInString(szLabel, 80); ConInString(szLabel, 80);
} }

2
reactos/subsys/system/cmd/locale.c
View file

@ -74,6 +74,6 @@ VOID PrintTime (VOID)
GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,
szTime, sizeof(szTime)); szTime, sizeof(szTime));
LoadString(GetModuleHandle(NULL), STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(_T("%s: %s\n"), szMsg, szTime); ConOutPrintf(_T("%s: %s\n"), szMsg, szTime);
} }

5
reactos/subsys/system/cmd/memory.c
View file

@ -68,8 +68,7 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_MEMMORY_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_MEMMORY_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -85,7 +84,7 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param)
ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE); ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE);
ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE); ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE);
LoadString(GetModuleHandle(NULL), STRING_MEMMORY_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MEMMORY_HELP2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, ConOutPrintf(szMsg,
szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile,
szAvailPageFile, szTotalVirtual, szAvailVirtual); szAvailPageFile, szTotalVirtual, szAvailVirtual);

8
reactos/subsys/system/cmd/misc.c
View file

@ -437,11 +437,9 @@ HWND GetConsoleWindow (VOID)
INT PagePrompt (VOID) INT PagePrompt (VOID)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
INPUT_RECORD ir; INPUT_RECORD ir;
LoadString(GetModuleHandle(NULL), STRING_MISC_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_MISC_HELP1);
ConOutPrintf(szMsg);
RemoveBreakHandler (); RemoveBreakHandler ();
ConInDisable (); ConInDisable ();
@ -491,7 +489,7 @@ INT FilePromptYN (LPTSTR szFormat, ...)
for (p = szIn; _istspace (*p); p++) for (p = szIn; _istspace (*p); p++)
; ;
LoadString(GetModuleHandle(NULL), STRING_CHOICE_OPTION, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, szMsg, RC_STRING_MAX_SIZE);
if (_tcsncmp(p, &szMsg[0], 1) == 0) if (_tcsncmp(p, &szMsg[0], 1) == 0)
return PROMPT_YES; return PROMPT_YES;
@ -561,7 +559,7 @@ INT FilePromptYNA (LPTSTR szFormat, ...)
for (p = szIn; _istspace (*p); p++) for (p = szIn; _istspace (*p); p++)
; ;
LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, szMsg, RC_STRING_MAX_SIZE); LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, RC_STRING_MAX_SIZE);
if (_tcsncmp(p, &szMsg[0], 1) == 0) if (_tcsncmp(p, &szMsg[0], 1) == 0)
return PROMPT_YES; return PROMPT_YES;

17
reactos/subsys/system/cmd/move.c
View file

@ -43,7 +43,7 @@ static INT Overwrite (LPTSTR fn)
TCHAR inp[10]; TCHAR inp[10];
LPTSTR p; LPTSTR p;
LoadString(GetModuleHandle(NULL), STRING_MOVE_HELP1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MOVE_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, fn); ConOutPrintf(szMsg, fn);
ConInString(inp, 10); ConInString(inp, 10);
@ -92,8 +92,7 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
" /-Y\n" " /-Y\n"
"...")); "..."));
#else #else
LoadString(GetModuleHandle(NULL), STRING_MOVE_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_MOVE_HELP2);
ConOutPuts(szMsg);
#endif #endif
return 0; return 0;
} }
@ -192,9 +191,9 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
if (!bNothing) if (!bNothing)
{ {
if (MoveFile (szSrcPath, szFullDestPath)) if (MoveFile (szSrcPath, szFullDestPath))
LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
else else
LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg); ConOutPrintf(szMsg);
} }
} }
@ -215,9 +214,9 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
if (!bNothing) if (!bNothing)
{ {
if (MoveFile (szSrcPath, szDestPath)) if (MoveFile (szSrcPath, szDestPath))
LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
else else
LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg); ConOutPrintf(szMsg);
} }
} }
@ -235,9 +234,9 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
if (!bNothing) if (!bNothing)
{ {
if (MoveFile (szSrcPath, szFullDestPath)) if (MoveFile (szSrcPath, szFullDestPath))
LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
else else
LoadString(GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg); ConOutPrintf(szMsg);
} }
} }

4
reactos/subsys/system/cmd/msgbox.c
View file

@ -25,7 +25,6 @@
INT CommandMsgbox (LPTSTR cmd, LPTSTR param) INT CommandMsgbox (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
//used to parse command line //used to parse command line
LPTSTR tmp; LPTSTR tmp;
@ -45,8 +44,7 @@ INT CommandMsgbox (LPTSTR cmd, LPTSTR param)
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_MSGBOX_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_MSGBOX_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

7
reactos/subsys/system/cmd/path.c
View file

@ -36,12 +36,10 @@
INT cmd_path (LPTSTR cmd, LPTSTR param) INT cmd_path (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_PATH_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_PATH_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -55,8 +53,7 @@ INT cmd_path (LPTSTR cmd, LPTSTR param)
dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE);
if (dwBuffer == 0) if (dwBuffer == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_PATH_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_PATH_ERROR);
ConErrPrintf(szMsg);
return 0; return 0;
} }
else if (dwBuffer > ENV_BUFFER_SIZE) else if (dwBuffer > ENV_BUFFER_SIZE)

4
reactos/subsys/system/cmd/pause.c
View file

@ -37,7 +37,6 @@
INT cmd_pause (LPTSTR cmd, LPTSTR param) INT cmd_pause (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("cmd_pause: \'%s\' : \'%s\')\n"), cmd, param); DebugPrintf (_T("cmd_pause: \'%s\' : \'%s\')\n"), cmd, param);
@ -45,8 +44,7 @@ INT cmd_pause (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_PAUSE_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_PAUSE_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }

10
reactos/subsys/system/cmd/prompt.c
View file

@ -181,19 +181,15 @@ VOID PrintPrompt(VOID)
INT cmd_prompt (LPTSTR cmd, LPTSTR param) INT cmd_prompt (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_PROMPT_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_PROMPT_HELP1);
ConOutPuts(szMsg);
#ifdef FEATURE_DIRECTORY_STACK #ifdef FEATURE_DIRECTORY_STACK
LoadString(GetModuleHandle(NULL), STRING_PROMPT_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_PROMPT_HELP2);
ConOutPuts(szMsg);
#endif #endif
LoadString(GetModuleHandle(NULL), STRING_PROMPT_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_PROMPT_HELP3);
ConOutPuts(szMsg);
return 0; return 0;
} }

9
reactos/subsys/system/cmd/ren.c
View file

@ -62,8 +62,7 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp(param, _T("/?"), 2)) if (!_tcsncmp(param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_REN_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_REN_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -238,7 +237,7 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
{ {
if (!(dwFlags & REN_ERROR)) if (!(dwFlags & REN_ERROR))
{ {
LoadString(GetModuleHandle(NULL), STRING_REN_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_REN_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, GetLastError()); ConErrPrintf(szMsg, GetLastError());
} }
} }
@ -251,9 +250,9 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
if (!(dwFlags & REN_QUIET)) if (!(dwFlags & REN_QUIET))
{ {
if (dwFiles == 1) if (dwFiles == 1)
LoadString( GetModuleHandle(NULL), STRING_REN_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString( CMD_ModuleHandle, STRING_REN_HELP2, szMsg, RC_STRING_MAX_SIZE);
else else
LoadString( GetModuleHandle(NULL), STRING_REN_HELP3, szMsg, RC_STRING_MAX_SIZE); LoadString( CMD_ModuleHandle, STRING_REN_HELP3, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf((LPTSTR)szMsg,dwFiles); ConOutPrintf((LPTSTR)szMsg,dwFiles);
} }

2
reactos/subsys/system/cmd/resource.h
View file

@ -14,6 +14,7 @@
#define STRING_ERROR_CANNOTPIPE 110 #define STRING_ERROR_CANNOTPIPE 110
#define STRING_ERROR_D_PAUSEMSG 111 #define STRING_ERROR_D_PAUSEMSG 111
#define STRING_ERROR_DRIVER_NOT_READY 112 #define STRING_ERROR_DRIVER_NOT_READY 112
#define STRING_ERROR_WRONG_DATE 113
#define STRING_CHOICE_OPTION 200 #define STRING_CHOICE_OPTION 200
#define STRING_COPY_OPTION 201 #define STRING_COPY_OPTION 201
@ -63,6 +64,7 @@
#define STRING_TIME_ERROR1 348 #define STRING_TIME_ERROR1 348
#define STRING_TYPE_ERROR1 349 #define STRING_TYPE_ERROR1 349
#define STRING_WINDOW_ERROR1 350 #define STRING_WINDOW_ERROR1 350
#define STRING_SET_ERROR 351

4
reactos/subsys/system/cmd/screen.c
View file

@ -19,14 +19,12 @@
INT CommandScreen (LPTSTR cmd, LPTSTR param) INT CommandScreen (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
SHORT x,y; SHORT x,y;
BOOL bSkipText = FALSE; BOOL bSkipText = FALSE;
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_SCREEN_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_SCREEN_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

6
reactos/subsys/system/cmd/set.c
View file

@ -51,8 +51,7 @@ INT cmd_set (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_SET_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_SET_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -105,7 +104,8 @@ INT cmd_set (LPTSTR cmd, LPTSTR param)
dwBuffer = GetEnvironmentVariable (param, pszBuffer, ENV_BUFFER_SIZE); dwBuffer = GetEnvironmentVariable (param, pszBuffer, ENV_BUFFER_SIZE);
if (dwBuffer == 0) if (dwBuffer == 0)
{ {
ConErrPrintf (_T("CMD: Not in environment \"%s\"\n"), param); LoadString(CMD_ModuleHandle, STRING_SET_ERROR, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf (szMsg, param);
return 0; return 0;
} }
else if (dwBuffer > ENV_BUFFER_SIZE) else if (dwBuffer > ENV_BUFFER_SIZE)

4
reactos/subsys/system/cmd/shift.c
View file

@ -39,7 +39,6 @@
INT cmd_shift (LPTSTR cmd, LPTSTR param) INT cmd_shift (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("cmd_shift: (\'%s\', \'%s\')\n"), cmd, param); DebugPrintf (_T("cmd_shift: (\'%s\', \'%s\')\n"), cmd, param);
@ -47,8 +46,7 @@ INT cmd_shift (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_SHIFT_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_SHIFT_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

7
reactos/subsys/system/cmd/start.c
View file

@ -19,15 +19,13 @@
INT cmd_start (LPTSTR first, LPTSTR rest) INT cmd_start (LPTSTR first, LPTSTR rest)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szFullName[MAX_PATH]; TCHAR szFullName[MAX_PATH];
BOOL bWait = FALSE; BOOL bWait = FALSE;
TCHAR *param; TCHAR *param;
if (_tcsncmp (rest, _T("/?"), 2) == 0) if (_tcsncmp (rest, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_START_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_START_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -75,8 +73,7 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest); DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest);
#endif #endif
LoadString(GetModuleHandle(NULL), STRING_START_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_START_ERROR1);
ConErrPuts(szMsg);
} }
else else
{ {

10
reactos/subsys/system/cmd/time.c
View file

@ -132,7 +132,6 @@ static BOOL ParseTime (LPTSTR s)
INT cmd_time (LPTSTR cmd, LPTSTR param) INT cmd_time (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR *arg; LPTSTR *arg;
INT argc; INT argc;
INT i; INT i;
@ -141,8 +140,7 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_TIME_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_TIME_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -174,8 +172,7 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
{ {
TCHAR s[40]; TCHAR s[40];
LoadString(GetModuleHandle(NULL), STRING_TIME_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_TIME_HELP2);
ConOutPrintf(szMsg);
ConInString (s, 40); ConInString (s, 40);
@ -204,8 +201,7 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
nTimeString = -1; nTimeString = -1;
} }
LoadString(GetModuleHandle(NULL), STRING_TIME_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_TIME_ERROR1);
ConErrPuts(szMsg);
} }
freep (arg); freep (arg);

6
reactos/subsys/system/cmd/timer.c
View file

@ -47,7 +47,7 @@ PrintElapsedTime (DWORD time,INT format)
switch (format) switch (format)
{ {
case 0: case 0:
LoadString(GetModuleHandle(NULL), STRING_TIMER_HELP1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_TIMER_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, time); ConOutPrintf(szMsg, time);
break; break;
@ -58,7 +58,7 @@ PrintElapsedTime (DWORD time,INT format)
time /=60; time /=60;
m = time % 60; m = time % 60;
h = time / 60; h = time / 60;
LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString( CMD_ModuleHandle, STRING_TIMER_HELP2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, ConOutPrintf(szMsg,
h, cTimeSeparator, h, cTimeSeparator,
m, cTimeSeparator, m, cTimeSeparator,
@ -104,7 +104,7 @@ INT CommandTimer (LPTSTR cmd, LPTSTR param)
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_TIMER_HELP3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_TIMER_HELP3, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, cTimeSeparator, cTimeSeparator, cDecimalSeparator); ConOutPrintf(szMsg, cTimeSeparator, cTimeSeparator, cDecimalSeparator);
return 0; return 0;
} }

4
reactos/subsys/system/cmd/title.c
View file

@ -17,7 +17,6 @@
INT cmd_title (LPTSTR cmd, LPTSTR param) INT cmd_title (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
/* Do nothing if no args */ /* Do nothing if no args */
if (*param == _T('\0')) if (*param == _T('\0'))
@ -26,8 +25,7 @@ INT cmd_title (LPTSTR cmd, LPTSTR param)
/* Asking help? */ /* Asking help? */
if (!_tcsncmp(param, _T("/?"), 2)) if (!_tcsncmp(param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_TITLE_HELP, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_TITLE_HELP);
ConOutPuts(szMsg);
return 0; return 0;
} }

5
reactos/subsys/system/cmd/type.c
View file

@ -48,8 +48,7 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_TYPE_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_TYPE_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -65,7 +64,7 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
{ {
if (_T('/') == argv[i][0]) if (_T('/') == argv[i][0])
{ {
LoadString(GetModuleHandle(NULL), STRING_TYPE_ERROR1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_TYPE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, argv[i] + 1); ConErrPrintf(szMsg, argv[i] + 1);
continue; continue;
} }

28
reactos/subsys/system/cmd/ver.c
View file

@ -63,13 +63,11 @@ VOID ShortVersion (VOID)
*/ */
INT cmd_ver (LPTSTR cmd, LPTSTR param) INT cmd_ver (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
INT i; INT i;
if (_tcsstr (param, _T("/?")) != NULL) if (_tcsstr (param, _T("/?")) != NULL)
{ {
LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERSION_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -81,8 +79,7 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
if (param[0] == _T('\0')) if (param[0] == _T('\0'))
{ {
ConOutPuts(_T("\n"SHELLINFO)); ConOutPuts(_T("\n"SHELLINFO));
LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERSION_HELP2);
ConOutPuts(szMsg);
} }
else else
{ {
@ -106,26 +103,20 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
if (_totupper (param[i]) == _T('W')) if (_totupper (param[i]) == _T('W'))
{ {
/* Warranty notice */ /* Warranty notice */
LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERSION_HELP3);
ConOutPuts(szMsg);
} }
else if (_totupper (param[i]) == _T('R')) else if (_totupper (param[i]) == _T('R'))
{ {
/* Redistribution notice */ /* Redistribution notice */
LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP4, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERSION_HELP4);
ConOutPuts(szMsg);
} }
else if (_totupper (param[i]) == _T('C')) else if (_totupper (param[i]) == _T('C'))
{ {
/* Developer listing */ /* Developer listing */
LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP6, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERSION_HELP6);
ConOutPrintf(szMsg); ConOutResPuts(STRING_FREEDOS_DEV);
LoadString(GetModuleHandle(NULL), STRING_FREEDOS_DEV, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERSION_HELP7);
ConOutPrintf(szMsg); ConOutResPuts(STRING_REACTOS_DEV);
LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP7, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg);
LoadString(GetModuleHandle(NULL), STRING_REACTOS_DEV, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg);
} }
else else
{ {
@ -135,8 +126,7 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
} }
} }
LoadString(GetModuleHandle(NULL), STRING_VERSION_HELP5, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERSION_HELP5);
ConOutPuts(szMsg);
return 0; return 0;
} }

8
reactos/subsys/system/cmd/verify.c
View file

@ -34,14 +34,13 @@ INT cmd_verify (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_VERIFY_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERIFY_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
if (!*param) if (!*param)
{ {
LoadString(GetModuleHandle(NULL), STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_VERIFY_HELP2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf((LPTSTR)szMsg, bVerify ? D_ON : D_OFF); ConOutPrintf((LPTSTR)szMsg, bVerify ? D_ON : D_OFF);
} }
else if (_tcsicmp (param, D_OFF) == 0) else if (_tcsicmp (param, D_OFF) == 0)
@ -50,8 +49,7 @@ INT cmd_verify (LPTSTR cmd, LPTSTR param)
bVerify = TRUE; bVerify = TRUE;
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_VERIFY_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VERIFY_HELP3);
ConOutPuts(szMsg);
} }
return 0; return 0;

10
reactos/subsys/system/cmd/vol.c
View file

@ -50,17 +50,17 @@ PrintVolumeHeader (LPTSTR pszRootPath)
/* print drive info */ /* print drive info */
if (szVolName[0] != '\0') if (szVolName[0] != '\0')
{ {
LoadString(GetModuleHandle(NULL), STRING_VOL_HELP1, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_VOL_HELP1, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, pszRootPath[0],szVolName); ConOutPrintf(szMsg, pszRootPath[0],szVolName);
} }
else else
{ {
LoadString(GetModuleHandle(NULL), STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, pszRootPath[0]); ConOutPrintf(szMsg, pszRootPath[0]);
} }
/* print the volume serial number */ /* print the volume serial number */
LoadString(GetModuleHandle(NULL), STRING_VOL_HELP3, szMsg, RC_STRING_MAX_SIZE); LoadString(CMD_ModuleHandle, STRING_VOL_HELP3, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); ConOutPrintf(szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
return 0; return 0;
} }
@ -68,14 +68,12 @@ PrintVolumeHeader (LPTSTR pszRootPath)
INT cmd_vol (LPTSTR cmd, LPTSTR param) INT cmd_vol (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szRootPath[] = _T("A:\\"); TCHAR szRootPath[] = _T("A:\\");
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString(GetModuleHandle(NULL), STRING_VOL_HELP4, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_VOL_HELP4);
ConOutPuts(szMsg);
return 0; return 0;
} }

11
reactos/subsys/system/cmd/window.c
View file

@ -175,13 +175,11 @@ static INT ServiceActivate (LPTSTR param, HWND hWnd)
INT CommandWindow (LPTSTR cmd, LPTSTR param) INT CommandWindow (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
HWND hwnd; HWND hwnd;
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_WINDOW_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_WINDOW_HELP1);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -193,14 +191,12 @@ INT CommandWindow (LPTSTR cmd, LPTSTR param)
INT CommandActivate (LPTSTR cmd, LPTSTR param) INT CommandActivate (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR str; LPTSTR str;
HWND hwnd; HWND hwnd;
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString(GetModuleHandle(NULL), STRING_WINDOW_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutResPuts(STRING_WINDOW_HELP2);
ConOutPuts(szMsg);
return 0; return 0;
} }
@ -220,8 +216,7 @@ INT CommandActivate (LPTSTR cmd, LPTSTR param)
hwnd = FindWindow(NULL, param); hwnd = FindWindow(NULL, param);
if (hwnd == NULL) if (hwnd == NULL)
{ {
LoadString(GetModuleHandle(NULL), STRING_WINDOW_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrResPuts(STRING_WINDOW_ERROR1);
ConErrPuts(szMsg);
return 1; return 1;
} }